ooo-build r15400 - in trunk: . patches/dev300 patches/mono patches/vba
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15400 - in trunk: . patches/dev300 patches/mono patches/vba
- Date: Mon, 23 Feb 2009 19:47:18 +0000 (UTC)
Author: pmladek
Date: Mon Feb 23 19:47:18 2009
New Revision: 15400
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15400&view=rev
Log:
2009-02-23 Petr Mladek <pmladek suse cz>
* patches/dev300/apply:
* patches/dev300/buildfix-fmtargs.diff:
* patches/dev300/buildfix-fmtargs-m1.diff:
* patches/dev300/calc-filter-by-date-strip-time.diff:
* patches/dev300/calc-filter-by-date-strip-time-m1.diff:
* patches/dev300/calc-formula-asian-phonetic.diff:
* patches/dev300/calc-formula-asian-phonetic-m1.diff:
* patches/dev300/calc-multiline-formula-ref.diff:
* patches/dev300/calc-multiline-formula-ref-m1.diff:
* patches/dev300/cws-scsheetprotection02-sc.diff:
* patches/dev300/cws-scsheetprotection02-sc-m1.diff:
* patches/dev300/chart-odf-always-calc-a1.diff:
* patches/dev300/chart-odf-always-calc-a1-m1.diff:
* patches/dev300/sc-dataform-sc.diff:
* patches/dev300/sc-dataform-sc-m1.diff:
* patches/dev300/sc-drwlayer-units.diff:
* patches/dev300/sc-drwlayer-units-m1.diff:
* patches/dev300/sc-filters-fill-fix.diff:
* patches/dev300/sc-filters-fill-fix-m1.diff:
* patches/dev300/sc-overwrite-char-font-attrs.diff:
* patches/dev300/sc-overwrite-char-font-attrs-m1.diff:
* patches/dev300/sc-toggle-merge-center-m1.diff:
* patches/mono/mono-testtools.diff:
* patches/mono/mono-testtools-m1.diff:
* patches/vba/sc-hacky-handle-boolean.diff:
* patches/vba/sc-hacky-handle-boolean-m1.diff:
* patches/vba/sc-vba-build-lst.diff:
* patches/vba/sc-vba-build-lst-m1.diff:
* patches/vba/vba-workbook-worksheet-events.diff:
* patches/vba/vba-workbook-worksheet-events-m1.diff:
* patches/dev300/apply: udpate for ooo310-m2
* patches/dev300/apply: the following patches are already applied
in ooo310-m2:
* vba-xl-import-crash.diff
* fix-formulaaccess-core.diff
* forms-imageurl-fix.diff
* sdext-presenterview-thread-suicide.diff
* patches/dev300/apply: FIXME: temporary disabled the following diff
for >= ooo310-m2 (need an update):
* sc-toggle-merge-center.diff
* patches/dev300/buildfix-gcc-4.1.2-linker-error.diff: use the hack
also in the formula project
Added:
trunk/patches/dev300/buildfix-fmtargs-m1.diff (props changed)
- copied unchanged from r15397, /trunk/patches/dev300/buildfix-fmtargs.diff
trunk/patches/dev300/calc-filter-by-date-strip-time-m1.diff (props changed)
- copied unchanged from r15399, /trunk/patches/dev300/calc-filter-by-date-strip-time.diff
trunk/patches/dev300/calc-formula-asian-phonetic-m1.diff (props changed)
- copied unchanged from r15399, /trunk/patches/dev300/calc-formula-asian-phonetic.diff
trunk/patches/dev300/calc-multiline-formula-ref-m1.diff (props changed)
- copied unchanged from r15399, /trunk/patches/dev300/calc-multiline-formula-ref.diff
trunk/patches/dev300/chart-odf-always-calc-a1-m1.diff (props changed)
- copied unchanged from r15399, /trunk/patches/dev300/chart-odf-always-calc-a1.diff
trunk/patches/dev300/cws-scsheetprotection02-sc-m1.diff (props changed)
- copied unchanged from r15399, /trunk/patches/dev300/cws-scsheetprotection02-sc.diff
trunk/patches/dev300/sc-dataform-sc-m1.diff
- copied unchanged from r15397, /trunk/patches/dev300/sc-dataform-sc.diff
trunk/patches/dev300/sc-drwlayer-units-m1.diff
- copied unchanged from r15399, /trunk/patches/dev300/sc-drwlayer-units.diff
trunk/patches/dev300/sc-filters-fill-fix-m1.diff
- copied unchanged from r15399, /trunk/patches/dev300/sc-filters-fill-fix.diff
trunk/patches/dev300/sc-overwrite-char-font-attrs-m1.diff
- copied unchanged from r15399, /trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
trunk/patches/dev300/sc-toggle-merge-center-m1.diff
- copied unchanged from r15397, /trunk/patches/dev300/sc-toggle-merge-center.diff
trunk/patches/mono/mono-testtools-m1.diff (props changed)
- copied unchanged from r15397, /trunk/patches/mono/mono-testtools.diff
trunk/patches/vba/sc-hacky-handle-boolean-m1.diff
- copied unchanged from r15397, /trunk/patches/vba/sc-hacky-handle-boolean.diff
trunk/patches/vba/sc-vba-build-lst-m1.diff (props changed)
- copied unchanged from r15397, /trunk/patches/vba/sc-vba-build-lst.diff
trunk/patches/vba/vba-workbook-worksheet-events-m1.diff (props changed)
- copied unchanged from r15397, /trunk/patches/vba/vba-workbook-worksheet-events.diff
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/patches/dev300/apply
trunk/patches/dev300/buildfix-fmtargs.diff
trunk/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff
trunk/patches/dev300/calc-filter-by-date-strip-time.diff
trunk/patches/dev300/calc-formula-asian-phonetic.diff
trunk/patches/dev300/calc-multiline-formula-ref.diff
trunk/patches/dev300/chart-odf-always-calc-a1.diff
trunk/patches/dev300/cws-scsheetprotection02-sc.diff
trunk/patches/dev300/sc-dataform-sc.diff
trunk/patches/dev300/sc-drwlayer-units.diff
trunk/patches/dev300/sc-filters-fill-fix.diff
trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
trunk/patches/mono/mono-testtools.diff
trunk/patches/vba/sc-hacky-handle-boolean.diff
trunk/patches/vba/sc-vba-build-lst.diff
trunk/patches/vba/vba-workbook-worksheet-events.diff
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Feb 23 19:47:18 2009
@@ -1,3 +1,41 @@
+last change
+
+2008-12-03 Kohei Yoshida <kyoshida novell com>
+
+<------>* patches/dev300/apply:>
+<------>* patches/dev300/chart-axis-multi-chart-types-chart2.diff:
+<------>* patches/dev300/chart-axis-multi-chart-types-sc.diff: moved from th
+<------>test directory to enable them in build by default. These patches.
+<------>slightly modify chart's behavior to match Excel's behavior, for case
+<------>where multiple chart types are mixed in a single chart..
+<------>(i#95934, n#437322)
+
+
+ooo-build-3.1.0.1:
+
+ + features:
+ + support ooo310-m1 [Tor,
+ + bug fixes:
+ + more on skipping data in hidden cells when rendering charts
+ (bnc#404190, i#81209) [Kohei]
+ + avoid internal Err:529 (bnc#440808) [Kohei]
+ + another DataPilot and filtered ranges regression [Kohei]
+ + documetn Calc localized separator in helpcontent [Kohei]
+ + multiple chart types in a single chart (i#95934, bnc#437322) [Kohei]
+ + XLS import crasher (bnc#447560, bnc#458985) [Noel]
+ + "always save" on in Calc (bnc##450789) [Kohei]
+ + shapes export into XLS (i#96858) [Noel]
+ + SMTP dialog fix [Rene]
+ + VBA bits:
+ + XLS import crasher (bnc#447560, bnc#458985) [Noel]
+ + build bits:
+ + missing inline specifier (i#96585) [Thorsten]
+ + better packaging of Sun templates [KAMI]
+ + fixes for ARM [Matthias]
+ + MCS path [Jo]
++ update OxygenOffice bits [KAMI]
+
+
ooo-build-3.0.0.9:
+ speed up:
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Feb 23 19:47:18 2009
@@ -219,9 +219,16 @@
# sw-input-field-inline-edit.diff, Zhang Yun # removed since it causes some
# crashes with undo/redo
+[ TemporaryHacks <= dev300-m42 <= ooo310-m1 ]
+#realize a new feature named as Show Data Form in OpenOffice
+sc-dataform-sc-m1.diff, Amelia Wang
+
+[ TemporaryHacks > dev300-m42 > ooo310-m1 ]
#realize a new feature named as Show Data Form in OpenOffice
sc-dataform-sc.diff, Amelia Wang
+[ TemporaryHacks ]
+
sc-dataform-officecfg.diff, kohei
#realize extra piece of new feature named as Show Data Form about vba
@@ -429,7 +436,11 @@
# printf arguments cleanup
buildfix-fmtargs-m0.diff, cabral
-[ Fixes > dev300-m41 > ooo310-m0 ]
+[ Fixes == dev300-m42 == ooo310-m1 ]
+# printf arguments cleanup
+buildfix-fmtargs-m1.diff, cabral
+
+[ Fixes > dev300-m42 > ooo310-m1 ]
# printf arguments cleanup
buildfix-fmtargs.diff, cabral
@@ -692,11 +703,20 @@
# Saves and loads the standard filters in ods
sc-standard-filter-options-ods-hack.diff, i#35579, jonp
+
# Hides the filtered rows when height of rows are changed bxc #62161
# sc-filter-hide-filteredrows.diff, i#35581, jody
+
+[ CalcFixes <= dev300-m42 <= ooo310-m1 ]
+# Autofill doesnt fill filtered rows bxc 62499
+sc-filters-fill-fix-m1.diff, jody
+
+[ CalcFixes > dev300-m42 > ooo310-m1 ]
# Autofill doesnt fill filtered rows bxc 62499
sc-filters-fill-fix.diff, jody
+[ CalcFixes ]
+
# Support modification of data source range in DataPilot after table output has
# been generated.
sc-datapilot-dynamic-range.diff, i#23658, kohei
@@ -739,8 +759,16 @@
# Allow Cols/Rows to be resized even if document is read-only, n#165980, jody
sc-read-only-colrow-resize.diff, jody
+[ CalcFixes <= dev300-m42 <= ooo310-m1 ]
+# Implement 'Toggle merge & center'
+sc-toggle-merge-center-m1.diff, i#67243, jholesov
+
+[ CalcFixes > dev300-m42 > ooo310-m1 ]
# Implement 'Toggle merge & center'
-sc-toggle-merge-center.diff, i#67243, jholesov
+# FIXME for ooo310-m2
+#sc-toggle-merge-center.diff, i#67243, jholesov
+
+[ CalcFixes ]
# Add a 'Natural' variant of sorting, blocking on ODF extension issues
sc-natural-sort.diff, i#26565, kohei
@@ -780,10 +808,37 @@
# load, store and save the sheet protection options from and to an Excel file,
# and use that information to constrain cell cursor movement when the sheet is
# protected. Also to support encryption on Excel file export.
-cws-scsheetprotection02-sc.diff, i#97515, kohei
cws-scsheetprotection02-sfx2.diff, i#97515, kohei
cws-scsheetprotection02-svx.diff, i#97515, kohei
+[ CalcFixes <= dev300-m42 <= ooo310-m1 ]
+cws-scsheetprotection02-sc-m1.diff, i#97515, kohei
+# Unit conversion fixes in ScDrawLayer.
+sc-drwlayer-units-m1.diff, i#83735, jonp
+# overwrite character level font attributes when changing them at cell level.
+sc-overwrite-char-font-attrs-m1.diff, n#374580, i#53545, i#96853, kohei
+# When filtering by date, strip off the time element from each value.
+calc-filter-by-date-strip-time-m1.diff, n#414303, i#94695, kohei
+# preserve line breaks when referencing it in formula.
+calc-multiline-formula-ref-m1.diff, i#35913, kohei
+# always store ranges in ODF using Calc A1 formula syntax.
+chart-odf-always-calc-a1-m1.diff, n#463305, kohei
+
+[ CalcFixes > dev300-m42 > ooo310-m1 ]
+cws-scsheetprotection02-sc.diff, i#97515, kohei
+# Unit conversion fixes in ScDrawLayer.
+sc-drwlayer-units.diff, i#83735, jonp
+# overwrite character level font attributes when changing them at cell level.
+sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
+# When filtering by date, strip off the time element from each value.
+calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei
+# preserve line breaks when referencing it in formula.
+calc-multiline-formula-ref.diff, i#35913, kohei
+# always store ranges in ODF using Calc A1 formula syntax.
+chart-odf-always-calc-a1.diff, n#463305, kohei
+
+[ CalcFixes ]
+
# Enable these in ooo-build. They are still disabled upstream.
enable-xls-export-encryption.diff, kohei
enable-sheet-protection-options.diff, kohei
@@ -809,9 +864,6 @@
# Allow objects to stay within cells as expected when rows are resized.
sc-object-row-position.diff, i#47088, jonp
-# Unit conversion fixes in ScDrawLayer.
-sc-drwlayer-units.diff, i#83735, jonp
-
# Launch navigator when double-clicking the leftmost status area box.
sc-status-bar-launch-navigator.diff, i#49491, kohei
@@ -828,9 +880,6 @@
# button.
sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
-# overwrite character level font attributes when changing them at cell level.
-sc-overwrite-char-font-attrs.diff, n#374580, i#53545, i#96853, kohei
-
# ignore manual breaks when the "fit to x pages wide and x pages tall" option
# is used, for Excel interoperability.
sc-fit-to-width-height-skip-breaks.diff, n#404232, n#404563, i#94698, kohei
@@ -845,24 +894,15 @@
chart-axis-multi-chart-types-sc.diff, n#437322, i#95934, kohei
chart-axis-multi-chart-types-xmloff.diff, n#437322, i#95934, kohei
-# When filtering by date, strip off the time element from each value.
-calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei
-
# Don't use pShapeContext after deleting the instance. Fixes SEGFAULT.
calc-filter-xml-free-context.diff, n#467536, jonp
# modify the autofill behavior to bring it a little closer to Excel's.
calc-autofill-increment-fix.diff, i#5550, kohei
-# preserve line breaks when referencing it in formula.
-calc-multiline-formula-ref.diff, i#35913, kohei
-
# fixed chart wizard failure when the formula syntax is set to Excel A1/R1C1.
chart-wizard-xls-address-convention-fix.diff, n#411450, i#94696, kohei
-# always store ranges in ODF using Calc A1 formula syntax.
-chart-odf-always-calc-a1.diff, n#463305, kohei
-
# fixed change track export to xls files wrt cell change records.
calc-change-track-xls-export-fix.diff, n#416045, i#93839, kohei
@@ -882,12 +922,14 @@
# make biffdumper build
fix-biffdumper.diff, noelpwer
+[ CalcFixes <= dev300-m42 <= ooo310-m1 ]
# temp fix, removed call that causes crash ( need understand and fix this
# properly )
vba-xl-import-crash.diff, noelpwer
fix-formulaaccess-core.diff, noelpwer, i#98240
+
[ LinuxOnly ]
# accelerate linking, by extreme cunning i#63927
# this is an increasingly marginal win ...
@@ -1531,6 +1573,11 @@
ubuntu-lpi.diff, i#64895, mklose
ubuntu-sparc-hack.diff, mklose
+[ Mono <= dev300-m42 <= ooo310-m1 ]
+mono-testtools-m1.diff, rodo
+
+[ Mono > dev300-m42 > ooo310-m1 ]
+mono-testtools.diff, rodo
[ Mono ]
SectionOwner => rodo
@@ -1543,8 +1590,6 @@
cli_ure-source-bootstrap-managed_bootstrap-cs.diff
cli_ure-source-bootstrap-native_glue-cxx.diff
-mono-testtools.diff
-
# The build
mono-scp2.diff, rodo
@@ -1583,12 +1628,22 @@
mono-climaker-bridgetest.diff
-[ VBAObjects ]
-SectionOwner => noelpwer
+[ VBAObjects <= dev300-m42 <= ooo310-m1 ]
+#FIXME: changed by kendy, pmladek: Noel, please have a look
+sc-hacky-handle-boolean-m1.diff, noelpwer
+#tweak cws-npower7/8 to build vba before filter ( filter uses headers generated
+#from oovbapi.rdb )
+sc-vba-build-lst-m1.diff
+[ VBAObjects > dev300-m42 > ooo310-m1 ]
+#FIXME: changed by kendy, pmladek: Noel, please have a look
+sc-hacky-handle-boolean.diff, noelpwer
+#tweak cws-npower7/8 to build vba before filter ( filter uses headers generated
+#from oovbapi.rdb )
+sc-vba-build-lst.diff
-#FIXME: changed by kendy: Noel, please have a look
-sc-hacky-handle-boolean.diff
+[ VBAObjects ]
+SectionOwner => noelpwer
svx-source-inc-fmundo-hxx.diff, i#68893
svx-source-form-fmscriptingenv-cxx.diff, i#68893
@@ -1610,9 +1665,6 @@
vba-error-object.diff
-#tweak cws-npower7/8 to build vba before filter ( filter uses headers generated
-#from oovbapi.rdb )
-sc-vba-build-lst.diff
# allows access to some internals needed for vba api, doesn't change
# any functionality
sc-vba-autofill-support.diff, i#68883
@@ -1674,8 +1726,17 @@
vbaevents-services-sources.diff, i#68893
+[ VBAObjects <= dev300-m42 <= ooo310-m1 ]
+# vba workbook/worksheet events
+vba-workbook-worksheet-events-m1.diff, Fong
+
+[ VBAObjects > dev300-m42 > ooo310-m1 ]
# vba workbook/worksheet events
vba-workbook-worksheet-events.diff, Fong
+
+[ VBAObjects ]
+SectionOwner => noelpwer
+
# worksheet_calculate event fix
vba-worksheet-calculate-event-fix.diff, Fong
@@ -1741,6 +1802,8 @@
vba-servicemacros-rework.diff
+[ VBAObjects < dev300-m43 < ooo310-m2 ]
+# applied in ooo310-m2
forms-imageurl-fix.diff, n#446637, i#97892
[ VBAObjects < dev300-m42 < ooo310-m1 ]
@@ -1839,6 +1902,16 @@
buildfix-oox-depends-on-unotools.diff
+[ CalcFixes <= dev300-m42 <= ooo310-m1]
+# Support PHONETIC function to display asian phonetic guide.
+calc-formula-asian-phonetic-m1.diff, i#80764, i#80765, i#80766, kohei
+
+[ CalcFixes > dev300-m42 > ooo310-m1]
+# Support PHONETIC function to display asian phonetic guide.
+# FIXME: update by pmladek for ooo310-m2; Kohei, please review sc/inc/cell.hxx
+# they started to define the inline method inside the class definition, ...
+calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
+
[ CalcFixes ]
# Toggle gridline display per sheet.
@@ -1870,9 +1943,6 @@
# faster file load.
calc-xls-disable-adjust-row-height.diff, kohei
-# Support PHONETIC function to display asian phonetic guide.
-calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
-
# Support Excel English grammar needed for VBA and (probably) for xlsx filter.
calc-grammar-xls-english-offapi.diff, kohei
@@ -2731,11 +2801,14 @@
[ NovellOnlyWin32 ]
i92372.diff, i#92372, n#353143, tml
+[ Fixes < dev300-m43 < ooo310-m2 ]
+# NOTE: already applied in ooo310-m2
+sdext-presenterview-thread-suicide.diff, n#425072, thorsten
+
[ Fixes ]
#sw-import-TOC.diff ,n#404254, Amelia Wang
jurt-jnilib-deliver.diff, i#93516, thorsten
solenv-silent-mac-build.diff, thorsten
-sdext-presenterview-thread-suicide.diff, n#425072, thorsten
timely-canvas-disposing.diff, i#94007, thorsten
# only build full package for en_US, use langpacks for the rest
instset-prefer-langpacks.diff, thorsten
Modified: trunk/patches/dev300/buildfix-fmtargs.diff
==============================================================================
--- trunk/patches/dev300/buildfix-fmtargs.diff (original)
+++ trunk/patches/dev300/buildfix-fmtargs.diff Mon Feb 23 19:47:18 2009
@@ -1,14 +1,3 @@
---- setup_native/source/ulfconv/ulfconv.cxx 2008-04-10 06:07:37.000000000 -0400
-+++ setup_native/source/ulfconv/ulfconv.cxx 2009-01-15 15:15:23.000000000 -0500
-@@ -348,7 +348,7 @@
-
-
- } else {
-- fprintf(ostream, buffer);
-+ fprintf(ostream, "%s", buffer);
- }
- }
- }
--- rsc/source/prj/start.cxx 2008-04-11 03:26:42.000000000 -0400
+++ rsc/source/prj/start.cxx 2009-01-13 13:47:42.000000000 -0500
@@ -244,7 +244,7 @@
Modified: trunk/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff
==============================================================================
--- trunk/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff (original)
+++ trunk/patches/dev300/buildfix-gcc-4.1.2-linker-error.diff Mon Feb 23 19:47:18 2009
@@ -12,6 +12,19 @@
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1IMPLIB= i$(TARGET)
SHL1STDLIBS= $(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
+--- formula/util/makefile.mk.old 2009-02-12 14:54:21.000000000 +0100
++++ formula/util/makefile.mk 2009-02-23 13:37:56.000000000 +0100
+@@ -41,6 +41,10 @@ GEN_HID_OTHER=TRUE
+ # --- Settings ----------------------------------
+ .INCLUDE : settings.mk
+
++.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)"=="000400010002"
++# linker started to crash on SLED10 with ooo310-m1 sources
++LINKFLAGS+=-Wl,--no-as-needed
++.ENDIF
+
+ # --- formula core (for) -----------------------------------
+
--- sw/util/makefile.mk.old 2009-02-17 13:34:44.000000000 +0100
+++ sw/util/makefile.mk 2009-02-18 14:43:26.000000000 +0100
@@ -47,6 +47,11 @@ USE_DEFFILE=TRUE
Modified: trunk/patches/dev300/calc-filter-by-date-strip-time.diff
==============================================================================
--- trunk/patches/dev300/calc-filter-by-date-strip-time.diff (original)
+++ trunk/patches/dev300/calc-filter-by-date-strip-time.diff Mon Feb 23 19:47:18 2009
@@ -23,9 +23,9 @@
--- sc/source/core/data/table3.cxx
+++ sc/source/core/data/table3.cxx
@@ -64,6 +64,7 @@
- #include "userlist.hxx"
#include "progress.hxx"
#include "cellform.hxx"
+ #include "postit.hxx"
+#include "svtools/zformat.hxx"
#include <vector>
Modified: trunk/patches/dev300/calc-formula-asian-phonetic.diff
==============================================================================
--- trunk/patches/dev300/calc-formula-asian-phonetic.diff (original)
+++ trunk/patches/dev300/calc-formula-asian-phonetic.diff Mon Feb 23 19:47:18 2009
@@ -75,14 +75,18 @@
class ScMultipleReadHeader;
class ScMultipleWriteHeader;
-@@ -169,6 +171,69 @@ public:
+@@ -246,12 +246,77 @@ public:
+ inline void GetString( String& rString ) const { rString = maString; }
+ inline const String& GetString() const { return maString; }
- void SetString( const String& rString );
- void GetString( String& rString ) const;
-+
+ virtual bool HasPhonetic() const;
-+};
+
+ private:
+ String maString;
+ };
+
+ // ============================================================================
+
+/**
+ * A class for representing of Asian phonetic guide.
+ */
@@ -142,9 +146,13 @@
+ void GetPhonetic( ScPhonetic& rPhonetic ) const;
+
+ virtual bool HasPhonetic() const;
- };
-
-
++};
++
++// ============================================================================
++
+ class SC_DLLPUBLIC ScEditCell : public ScBaseCell
+ {
+ private:
@@ -206,6 +271,8 @@ public:
void GetData( const EditTextObject*& rpObject ) const;
void GetString( String& rString ) const;
@@ -228,9 +236,9 @@
enum ScMatrixMode {
MM_NONE = 0, // No matrix formula
MM_FORMULA = 1, // Upper left matrix formula cell
-@@ -589,6 +723,90 @@ inline void ScStringCell::SetString( const String& rString )
- aString = rString;
- }
+@@ -611,5 +611,89 @@ public:
+
+ // ============================================================================
+inline bool ScStringCell::HasPhonetic() const
+{
@@ -316,8 +324,7 @@
+ return true;
+}
+
-
- /*
+ #endif
diff --git sc/inc/cellsuno.hxx sc/inc/cellsuno.hxx
index 376e758..17b226d 100644
@@ -1946,15 +1953,15 @@
{
if( !pTableAnnotationAttrTokenMap )
@@ -1642,6 +1685,9 @@ ScXMLImport::ScXMLImport(
- pTableRowElemTokenMap( 0 ),
- pTableRowAttrTokenMap( 0 ),
- pTableRowCellElemTokenMap( 0 ),
-+ pTableRowCellElemTextTokenMap( 0 ),
-+ pTableRowCellElemTextRubyTokenMap( 0 ),
-+ pTableRowCellElemTextRubyAttrTokenMap( 0 ),
- pTableRowCellAttrTokenMap( 0 ),
- pTableAnnotationAttrTokenMap( 0 ),
- pDetectiveElemTokenMap( 0 ),
+ pTableRowElemTokenMap( 0 ),
+ pTableRowAttrTokenMap( 0 ),
+ pTableRowCellElemTokenMap( 0 ),
++ pTableRowCellElemTextTokenMap( 0 ),
++ pTableRowCellElemTextRubyTokenMap( 0 ),
++ pTableRowCellElemTextRubyAttrTokenMap( 0 ),
+ pTableRowCellAttrTokenMap( 0 ),
+ pTableAnnotationAttrTokenMap( 0 ),
+ pDetectiveElemTokenMap( 0 ),
@@ -1766,6 +1812,9 @@ ScXMLImport::~ScXMLImport() throw()
delete pTableRowElemTokenMap;
delete pTableRowAttrTokenMap;
Modified: trunk/patches/dev300/calc-multiline-formula-ref.diff
==============================================================================
--- trunk/patches/dev300/calc-multiline-formula-ref.diff (original)
+++ trunk/patches/dev300/calc-multiline-formula-ref.diff Mon Feb 23 19:47:18 2009
@@ -236,26 +236,24 @@
index 68007bf..1009cb8 100644
--- sc/source/core/data/column3.cxx
+++ sc/source/core/data/column3.cxx
-@@ -888,8 +888,17 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags,
- String aString;
- pForm->GetString(aString);
- if ( aString.Len() )
-- pNew = new ScStringCell(aString);
-- // #33224# LeerStrings nicht kopieren
-+ {
-+ if ( pForm->IsMultilineResult() )
-+ {
-+ pNew = new ScEditCell( aString, pDestDoc );
-+ }
-+ else
-+ {
-+ pNew = new ScStringCell(aString);
-+ // #33224# LeerStrings nicht kopieren
-+ }
-+ }
- }
- }
- if ( pNew && pSource->GetNotePtr() && ( nFlags & IDF_NOTE ) )
+@@ -841,7 +841,16 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
+ rForm.GetString( aString );
+ // #33224# do not clone empty string
+ if (aString.Len() > 0)
+- pNew = new ScStringCell( aString );
++ {
++ if ( pForm->IsMultilineResult() )
++ {
++ pNew = new ScEditCell( aString, pDestDoc );
++ }
++ else
++ {
++ pNew = new ScStringCell( aString );
++ }
++ }
+ }
+ }
+ break;
diff --git sc/source/core/tool/editutil.cxx sc/source/core/tool/editutil.cxx
index 65605ce..31dc996 100644
--- sc/source/core/tool/editutil.cxx
Modified: trunk/patches/dev300/chart-odf-always-calc-a1.diff
==============================================================================
--- trunk/patches/dev300/chart-odf-always-calc-a1.diff (original)
+++ trunk/patches/dev300/chart-odf-always-calc-a1.diff Mon Feb 23 19:47:18 2009
@@ -583,14 +583,14 @@
--- sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -306,7 +306,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const
- rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell)
- {
- rtl::OUString sAddress;
-- ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc );
-+ ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- return sAddress;
- }
-
+ rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell)
+ {
+ rtl::OUString sAddress;
+- ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc );
++ ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO );
+ return sAddress;
+ }
+
diff --git sc/source/filter/xml/XMLTableShapeImportHelper.cxx sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index 7f9fb3f..ddb902b 100644
--- sc/source/filter/xml/XMLTableShapeImportHelper.cxx
Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff (original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff Mon Feb 23 19:47:18 2009
@@ -358,9 +358,9 @@
--- sc/source/core/data/documen3.cxx
+++ sc/source/core/data/documen3.cxx
@@ -79,6 +79,8 @@
+ #include "drwlayer.hxx"
+ #include "unoreflist.hxx"
#include "listenercalls.hxx"
- #include "editutil.hxx" // ScPostIt EditTextObject
- #include "postit.hxx"
+#include "svtools/PasswordHelper.hxx"
+#include "tabprotection.hxx"
Modified: trunk/patches/dev300/sc-dataform-sc.diff
==============================================================================
--- trunk/patches/dev300/sc-dataform-sc.diff (original)
+++ trunk/patches/dev300/sc-dataform-sc.diff Mon Feb 23 19:47:18 2009
@@ -1040,11 +1040,11 @@
// -----------------------------------------------------------------------
-@@ -78,6 +80,7 @@ TYPEINIT1(ScUndoRepeatDB, SfxUndoAction);
- TYPEINIT1(ScUndoDataPilot, SfxUndoAction);
- TYPEINIT1(ScUndoConsolidate, SfxUndoAction);
- TYPEINIT1(ScUndoChartData, SfxUndoAction);
-+TYPEINIT1(ScUndoDataForm, SfxUndoAction); // amelia
+@@ -74,6 +74,7 @@ TYPEINIT1(ScUndoRepeatDB, ScSi
+ TYPEINIT1(ScUndoDataPilot, ScSimpleUndo);
+ TYPEINIT1(ScUndoConsolidate, ScSimpleUndo);
+ TYPEINIT1(ScUndoChartData, ScSimpleUndo);
++TYPEINIT1(ScUndoDataForm, SfxUndoAction); // amelia
// -----------------------------------------------------------------------
@@ -1313,9 +1313,9 @@
--- sc/source/ui/view/viewfun3.cxx
+++ sc/source/ui/view/viewfun3.cxx
@@ -208,6 +208,7 @@
- #include "editable.hxx"
#include "transobj.hxx"
#include "drwtrans.hxx"
+ #include "docuno.hxx"
+#include "undodat.hxx" // Amelia Wang
using namespace com::sun::star;
Modified: trunk/patches/dev300/sc-drwlayer-units.diff
==============================================================================
--- trunk/patches/dev300/sc-drwlayer-units.diff (original)
+++ trunk/patches/dev300/sc-drwlayer-units.diff Mon Feb 23 19:47:18 2009
@@ -6,8 +6,8 @@
--- sc/source/core/data/drwlayer.cxx 6 Jul 2007 12:33:05 -0000 1.51
+++ sc/source/core/data/drwlayer.cxx 19 Nov 2007 03:21:21 -0000
@@ -118,6 +118,10 @@
- #include "scmod.hxx"
- #include "chartarr.hxx"
+ #include "postit.hxx"
+ #include "attrib.hxx"
+#ifndef _SV_FIELD_HXX //autogen
+#include <vcl/field.hxx>
@@ -51,10 +51,10 @@
// Berechnung und Werte wie in detfunc.cxx
-- Size aSize( (long) ( pDoc->GetColWidth(nCol, nTab) * HMM_PER_TWIPS ),
-- (long) ( pDoc->GetRowHeight(nRow, nTab) * HMM_PER_TWIPS ) );
-+ Size aSize( (long) ( TwipsToHmm( pDoc->GetColWidth(nCol, nTab) ) ),
-+ (long) ( TwipsToHmm( pDoc->GetRowHeight(nRow, nTab) ) ) );
+- Size aSize( (long)(pDoc->GetColWidth( nCol1, nTab1 ) * HMM_PER_TWIPS),
+- (long)(pDoc->GetRowHeight( nRow1, nTab1 ) * HMM_PER_TWIPS) );
++ Size aSize( (long)( TwipsToHmm( pDoc->GetColWidth( nCol1, nTab1) ) ),
++ (long)( TwipsToHmm( pDoc->GetRowHeight( nRow1, nTab1) ) ) );
Rectangle aRect( aPos, aSize );
aRect.Left() -= 250;
aRect.Right() += 250;
Modified: trunk/patches/dev300/sc-filters-fill-fix.diff
==============================================================================
--- trunk/patches/dev300/sc-filters-fill-fix.diff (original)
+++ trunk/patches/dev300/sc-filters-fill-fix.diff Mon Feb 23 19:47:18 2009
@@ -16,9 +16,9 @@
{
+ if (pDocument->RowFiltered( rInner, nTab))
+ continue;
- aCol[nCol].Insert(static_cast<SCROW>(nRow), pSrcCell->Clone(pDocument));
+ ScAddress aDestPos( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), nTab );
+ aCol[nCol].Insert( aDestPos.Row(), pSrcCell->CloneWithoutNote( *pDocument ) );
}
- nProgress += nIMax - nIMin + 1;
Index: sc/inc/document.hxx
===================================================================
--- sc/inc/document.hxx.orig 2004-11-26 13:35:38.064526880 +0000
Modified: trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/dev300/sc-overwrite-char-font-attrs.diff (original)
+++ trunk/patches/dev300/sc-overwrite-char-font-attrs.diff Mon Feb 23 19:47:18 2009
@@ -56,7 +56,7 @@
class ScMultipleReadHeader;
class ScMultipleWriteHeader;
-@@ -203,8 +207,57 @@ public:
+@@ -285,6 +285,53 @@ public:
void GetString( String& rString ) const;
const EditTextObject* GetData() const { return pData; }
@@ -65,7 +65,7 @@
+ void RemoveCharAttribs( const ScPatternAttr& rAttr );
+};
+
-+// ----------------------------------------------------------------------------
++// ============================================================================
+
+class ScEditDataArray
+{
@@ -76,16 +76,16 @@
+ explicit Item(SCTAB nTab, SCCOL nCol, SCROW nRow,
+ EditTextObject* pOldData, EditTextObject* pNewData);
+ ~Item();
-+
++
+ const EditTextObject* GetOldData() const;
+ const EditTextObject* GetNewData() const;
+ SCTAB GetTab() const;
+ SCCOL GetCol() const;
+ SCROW GetRow() const;
-+
++
+ private:
+ Item(); // disabled
-+
++
+ private:
+ ::boost::shared_ptr<EditTextObject> mpOldData;
+ ::boost::shared_ptr<EditTextObject> mpNewData;
@@ -109,11 +109,7 @@
+ ::std::vector<Item> maArray;
};
-+// ----------------------------------------------------------------------------
-+
- enum ScMatrixMode {
- MM_NONE = 0, // No matrix formula
- MM_FORMULA = 1, // Upper left matrix formula cell
+ // ============================================================================
diff --git sc/inc/column.hxx sc/inc/column.hxx
index 48b44af..e6ea2d4 100644
--- sc/inc/column.hxx
@@ -142,7 +138,7 @@
- SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark );
+ SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
- void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+ void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
diff --git sc/inc/document.hxx sc/inc/document.hxx
@@ -174,7 +170,7 @@
- void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark );
+ void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark,
+ ScEditDataArray* pDataArray = NULL );
- void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+ void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark );
@@ -1422,6 +1425,8 @@ public:
@@ -214,7 +210,7 @@
- void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark );
+ void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
- void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+ void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
diff --git sc/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx
@@ -378,7 +374,7 @@
+ return &(*maIter++);
+}
+
-+//---------------------------------------------------------------------
++// ============================================================================
+
+ScEditDataArray::Item::Item(SCTAB nTab, SCCOL nCol, SCROW nRow,
+ EditTextObject* pOldData, EditTextObject* pNewData) :
@@ -419,7 +415,7 @@
+ return mnRow;
+}
+
- //---------------------------------------------------------------------
+ // ============================================================================
BOOL ScFormulaCell::IsEmpty()
diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx
@@ -880,9 +876,9 @@
+ pNewEditData = pEditCell->GetData()->Clone();
+ }
+
+ aChangeRanges.Append( ScRange( nCol, nRow, nTab ) );
ScPatternAttr* pOldPat = new ScPatternAttr(*pDoc->GetPattern( nCol, nRow, nTab ));
- pDoc->ApplyPattern( nCol, nRow, nTab, rAttr );
@@ -1344,11 +1358,10 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
if (bRecord)
Modified: trunk/patches/mono/mono-testtools.diff
==============================================================================
--- trunk/patches/mono/mono-testtools.diff (original)
+++ trunk/patches/mono/mono-testtools.diff Mon Feb 23 19:47:18 2009
@@ -81,7 +81,7 @@
- -reference:$(BIN)$/cli_vb_testobj.uno.dll \
- -reference:$(BIN)$/cli_cpp_bridgetest.uno.dll \
cli_bridgetest_inprocess.cs
- $(GNUCOPY) -p cli_bridgetest_inprocess.ini $(BIN)
+ $(GNUCOPY) cli_bridgetest_inprocess.ini $(BIN)
-.ENDIF
Modified: trunk/patches/vba/sc-hacky-handle-boolean.diff
==============================================================================
--- trunk/patches/vba/sc-hacky-handle-boolean.diff (original)
+++ trunk/patches/vba/sc-hacky-handle-boolean.diff Mon Feb 23 19:47:18 2009
@@ -5,14 +5,14 @@
diff -u -p -r1.43 global.hxx
--- sc/inc/global.hxx 8 Sep 2005 17:41:44 -0000 1.43
+++ sc/inc/global.hxx 9 Nov 2005 17:52:49 -0000
-@@ -237,6 +237,7 @@ const BYTE CR_MANUALSIZE = 32;
- #define IDF_STYLES 0x0040
- #define IDF_OBJECTS 0x0080
- #define IDF_EDITATTR 0x0100
-+#define IDF_SPECIAL_BOOLEAN 0x1000
- #define IDF_ATTRIB ( IDF_HARDATTR | IDF_STYLES )
- #define IDF_CONTENTS ( IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA )
- #define IDF_ALL ( IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS )
+@@ -234,6 +234,7 @@ const USHORT IDF_HARDATTR = 0x0020;
+ const USHORT IDF_STYLES = 0x0040; /// Cell styles.
+ const USHORT IDF_OBJECTS = 0x0080; /// Drawing objects.
+ const USHORT IDF_EDITATTR = 0x0100; /// Rich-text attributes.
++const USHORT IDF_SPECIAL_BOOLEAN = 0x1000;
+ const USHORT IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES;
+ const USHORT IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA;
+ const USHORT IDF_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
Index: sc/source/core/data/column3.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/data/column3.cxx,v
@@ -20,23 +20,32 @@
diff -u -p -r1.18 column3.cxx
--- sc/source/core/data/column3.cxx 28 Sep 2005 11:29:59 -0000 1.18
+++ sc/source/core/data/column3.cxx 9 Nov 2005 17:53:11 -0000
-@@ -828,7 +849,18 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
+@@ -781,6 +781,7 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
+ bool bCloneValue = (nFlags & IDF_VALUE) != 0;
+ bool bCloneDateTime = (nFlags & IDF_DATETIME) != 0;
+ bool bCloneString = (nFlags & IDF_STRING) != 0;
++ bool bCloneSpecialBoolean = (nFlags & IDF_SPECIAL_BOOLEAN) != 0;
+ bool bCloneFormula = (nFlags & IDF_FORMULA) != 0;
+ bool bCloneNote = (nFlags & IDF_NOTE) != 0;
+
+@@ -806,7 +807,19 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
+ break;
+
case CELLTYPE_FORMULA:
- {
- ScFormulaCell* pForm = (ScFormulaCell*)pSource;
-- if (nFlags & IDF_FORMULA)
-+ bool bForceFormula = false;
-+ if ( nFlags & IDF_SPECIAL_BOOLEAN )
-+ {
-+ rtl::OUStringBuffer aBuf;
-+ // #TODO #FIXME do we have a localisation issue here?
-+ pForm->GetFormula( aBuf );
-+ rtl::OUString aVal( aBuf.makeStringAndClear() );
-+ if ( aVal.equalsAscii( "=TRUE()" )
-+ || aVal.equalsAscii( "=FALSE()" ) )
-+ bForceFormula = true;
-+ }
-+ if ( bForceFormula || (nFlags & IDF_FORMULA) )
- {
- pNew = pForm->Clone( pDestDoc, rDestPos, TRUE );
- }
+- if (bCloneFormula)
++ bool bForceFormula = false;
++ if ( bCloneSpecialBoolean )
++ {
++ ScFormulaCell& rForm = (ScFormulaCell&)rSource;
++ rtl::OUStringBuffer aBuf;
++ // #TODO #FIXME do we have a localisation issue here?
++ rForm.GetFormula( aBuf );
++ rtl::OUString aVal( aBuf.makeStringAndClear() );
++ if ( aVal.equalsAscii( "=TRUE()" )
++ || aVal.equalsAscii( "=FALSE()" ) )
++ bForceFormula = true;
++ }
++ if (bForceFormula || bCloneFormula)
+ {
+ // note will be cloned below
+ pNew = rSource.CloneWithoutNote( rDestDoc, rDestPos );
Modified: trunk/patches/vba/sc-vba-build-lst.diff
==============================================================================
--- trunk/patches/vba/sc-vba-build-lst.diff (original)
+++ trunk/patches/vba/sc-vba-build-lst.diff Mon Feb 23 19:47:18 2009
@@ -1,11 +1,11 @@
--- sc/prj/build.lst 2007-02-09 16:45:03.000000000 +0000
+++ sc/prj/build.lst 2007-02-11 12:27:15.000000000 +0000
-@@ -34,7 +34,7 @@ sc sc\source\core\data nmake - all
- sc sc\source\core\src nmake - all sc_cosrc sc_sdi sc_inc NULL
- sc sc\source\core\tool nmake - all sc_tool sc_sdi sc_inc NULL
- sc sc\source\filter\ftools nmake - all sc_ftools sc_sdi sc_inc NULL
+@@ -33,7 +33,7 @@ sc sc\source\ui\undo nmake - all sc_
+ sc sc\source\ui\unoobj nmake - all sc_unobj sc_sdi sc_inc NULL
+ sc sc\source\ui\vba nmake - all sc_vba sc_sdi sc_inc NULL
+ sc sc\source\ui\view nmake - all sc_view sc_sdi sc_inc NULL
-sc sc\source\filter\excel nmake - all sc_excel sc_sdi sc_inc NULL
+sc sc\source\filter\excel nmake - all sc_excel sc_vba sc_sdi sc_inc NULL
+ sc sc\source\filter\ftools nmake - all sc_ftools sc_sdi sc_inc NULL
sc sc\source\filter\lotus nmake - all sc_lotus sc_sdi sc_inc NULL
- sc sc\source\filter\qpro nmake - all sc_qpro sc_sdi sc_inc NULL
- sc sc\source\filter\starcalc nmake - all sc_scalc sc_sdi sc_inc NULL
+ sc sc\source\filter\qpro nmake - all sc_qpro sc_sdi sc_inc NULL
Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff Mon Feb 23 19:47:18 2009
@@ -1908,17 +1908,17 @@
DoChange();
EndUndo();
+ pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
- }
- void __EXPORT ScUndoEnterData::Redo()
+ // #i97876# Spreadsheet data changes are not notified
+ ScModelObj* pModelObj = ScModelObj::getImplementation( pDocShell->GetModel() );
@@ -340,6 +342,7 @@ void __EXPORT ScUndoEnterData::Redo()
DoChange();
EndRedo();
+ pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
- }
- void __EXPORT ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget)
+ // #i97876# Spreadsheet data changes are not notified
+ ScModelObj* pModelObj = ScModelObj::getImplementation( pDocShell->GetModel() );
@@ -371,6 +374,7 @@ ScUndoEnterValue::ScUndoEnterValue( ScDo
bNeedHeight ( bHeight )
{
@@ -2149,9 +2149,9 @@
--- /home/feng/work/ooo-build/build/dev300-m14/sc/inc/docuno.hxx 2008-06-16 21:30:17.000000000 +0800
+++ sc/inc/docuno.hxx 2008-06-16 15:08:17.000000000 +0800
@@ -55,6 +55,7 @@
- #include <com/sun/star/sheet/XSheetAnnotations.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XCellRangesAccess.hpp>
+ #include <com/sun/star/util/XChangesNotifier.hpp>
+#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
@@ -2359,11 +2359,10 @@
$(SLO)$/vbaimage.obj \
- $(SLO)$/service.obj
+ $(SLO)$/service.obj \
-+ $(SLO)$/vbaeventshelper.obj \
-
++ $(SLO)$/vbaeventshelper.obj
# --- Targets ------------------------------------------------------
-
+
--- /home/feng/work/ooo-build/build/dev300-m14/sc/source/ui/vba/service.cxx 2008-06-16 21:30:17.000000000 +0800
+++ sc/source/ui/vba/service.cxx 2008-06-05 18:11:39.000000000 +0800
@@ -69,6 +69,10 @@ namespace hyperlink
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
