diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-03 17:23:57 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-03 17:23:57 +0100 |
| commit | d91410b81a02ce9b970ebd838fda0b28f6d8a5f8 (patch) | |
| tree | f07e2a0c064e24a06a010ef1a8481d16d62bd901 | |
| parent | 96c1ca518fbc4e42220057b70bbf07225628ceb9 (diff) | |
Force --fuzz=0 option and defuzz patches for SUSE configuration
* patches/apply.pl.in: force --fuzz=0 if not --defuzz is specified
* patches/dev300/build-java-target-extensions.diff:
* patches/dev300/build-java-target.diff:
* patches/dev300/buildfix-x86-64-visibility-workaround.diff:
* patches/dev300/calc-english-func-names-sc.diff:
* patches/dev300/calc-enhanced-merge-cells-sc.diff:
* patches/dev300/calc-filter-by-date-strip-time.diff:
* patches/dev300/calc-filter-xml-free-context.diff:
* patches/dev300/calc-find-replace-empty-cells-sc.diff:
* patches/dev300/calc-formula-variable-separators-sc.diff:
* patches/dev300/calc-html-csv-import-force-text-cell.diff:
* patches/dev300/calc-jump-on-formula-ref-offapi.diff:
* patches/dev300/calc-jump-on-formula-ref-sc.diff:
* patches/dev300/calc-jump-on-formula-ref-vcl.diff:
* patches/dev300/calc-ods-export-no-more-ushort.diff:
* patches/dev300/calc-ods-sheet-protection-sc.diff:
* patches/dev300/calc-perf-flat-segment-tree.diff:
* patches/dev300/calc-perf-ods-import-properties.diff:
* patches/dev300/calc-perf-page-and-manual-breaks.diff:
* patches/dev300/calc-perf-table-hidden-flags.diff:
* patches/dev300/calc-selection-fixed-cursor.diff:
* patches/dev300/calc-string-number-decimal.diff:
* patches/dev300/calc-subtotal-function-update.diff:
* patches/dev300/calc-xls-import-slanted-border-oox.diff:
* patches/dev300/calc-xls-import-slanted-border-sc.diff:
* patches/dev300/chart-highlight-selection-fix.diff:
* patches/dev300/chart-subtitle-xls-export.diff:
* patches/dev300/configure-fix-lpsolve-depends.diff:
* patches/dev300/cws-koheicsvimport-sc.diff:
* patches/dev300/default-no-startup-wizard.diff:
* patches/dev300/desktop-disable-startup-registration.diff:
* patches/dev300/external-apm-header.diff:
* patches/dev300/fit-list-to-size-popup.diff:
* patches/dev300/g++44-debug.diff:
* patches/dev300/go-oo-team.diff:
* patches/dev300/ia64-nss.diff:
* patches/dev300/kde4-oxygen-icons.diff:
* patches/dev300/kde4_vcl_fixes.diff:
* patches/dev300/layout-disable-experimental.diff:
* patches/dev300/link-as-needed.diff:
* patches/dev300/linkoo-dev300.diff:
* patches/dev300/novell-win32-agfa-monotype-fonts.diff:
* patches/dev300/novell-win32-odma.diff:
* patches/dev300/oox-calc-export-sotstorage-init.diff:
* patches/dev300/oox-custom-shape-polygons.diff:
* patches/dev300/oox-fix-list-style-apply.diff:
* patches/dev300/oox-pptx-export-para-linespacing.diff:
* patches/dev300/oox-pptx-import-fix-layout.diff:
* patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff:
* patches/dev300/oox-smartart-import.diff:
* patches/dev300/oox-tokenmap.string.h.diff:
* patches/dev300/oox-xlsx-import-fix-connector-shape.diff:
* patches/dev300/optional-outplace-ole.diff:
* patches/dev300/pptx-filter-as-a-separate-lib.diff:
* patches/dev300/pptx-fix-connector-crash.diff:
* patches/dev300/pptx-gfx-layout-fix.diff:
* patches/dev300/redirect-extensions.diff:
* patches/dev300/sc-cellformat-icon-toggle.diff:
* patches/dev300/sc-overwrite-char-font-attrs.diff:
* patches/dev300/sc-print-selected-sheets.diff:
* patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff:
* patches/dev300/slideshow-sound.diff:
* patches/dev300/solenv-installer-cleaner-paths.diff:
* patches/dev300/statusbar-fancy-modified-status-svx.diff:
* patches/dev300/svtools-emf-fix.diff:
* patches/dev300/svx-customshapes-NOOPTFILES.diff:
* patches/dev300/svx-text-rotation-fix.diff:
* patches/dev300/sw-collapse-empty-table-par-like-html.diff:
* patches/dev300/sw-no-macro-recorder-in-ui.diff:
* patches/dev300/sw-table-join-fix-i99267.diff:
* patches/dev300/testtool-more-defaults.diff:
* patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff:
* patches/dev300/ui-desktop-integration.diff:
* patches/dev300/unxsplash-rework.diff:
* patches/dev300/vbahelper-optionality-fix.diff:
* patches/dev300/vcl-better-fallback.diff:
* patches/dev300/webdav-locking.diff:
* patches/dev300/wiki-publisher-no-license.diff:
* patches/dev300/wmf-mm-text.diff:
* patches/dev300/wpsimport-writerperfect.diff:
* patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff:
* patches/dev300/xlsx-shared-import-and-export.diff:
* patches/dev300/xlsx-snapshot.diff:
* patches/dev300/xmloff_dis26300_conformance.diff:
* patches/evo2/buildfix-evo1-vs-evo2.diff:
* patches/gstreamer/gstreamer-config-office.diff:
* patches/gstreamer/gstreamer-solenv.diff:
* patches/mono/buildfix-testtool-disabled.diff:
* patches/mono/mono-climaker-bridgetest.diff:
* patches/mono/mono-scp2.diff:
* patches/unittesting/unittesting-vcl.diff:
* patches/vba/cws-vbasupportdev300.diff: defuzz patches
92 files changed, 7494 insertions, 10324 deletions
diff --git a/patches/apply.pl.in b/patches/apply.pl.in index 4400a3fa7..9b7055eca 100755 --- a/patches/apply.pl.in +++ b/patches/apply.pl.in @@ -1297,7 +1297,9 @@ if ($dry_run || $add_developer || $find_unused || $statistic) { # nasty path mess $patch_cmd = "$patch_dir/../../bin/defuzzpatch"; -f $patch_cmd || die "no defuzz patch command $patch_cmd"; - } + } else { + $patch_args = " --fuzz=0 $patch_args"; + } if (is_old_patch_version()) { $patch_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $patch_cmd; diff --git a/patches/dev300/build-java-target-extensions.diff b/patches/dev300/build-java-target-extensions.diff index 553b93782..cea268b22 100644 --- a/patches/dev300/build-java-target-extensions.diff +++ b/patches/dev300/build-java-target-extensions.diff @@ -23,7 +23,7 @@ --- tomcat/makefile.mk.old 2008-06-24 12:13:43.000000000 +0200 +++ tomcat/makefile.mk 2008-08-25 16:21:06.000000000 +0200 @@ -52,7 +52,12 @@ ADDITIONAL_FILES = jakarta-servletapi-5/ - PATCH_FILE_NAME=tomcat.patch + PATCH_FILES=tomcat.patch BUILD_DIR=jakarta-servletapi-5 + diff --git a/patches/dev300/build-java-target.diff b/patches/dev300/build-java-target.diff index 024888b28..1246e14fd 100644 --- a/patches/dev300/build-java-target.diff +++ b/patches/dev300/build-java-target.diff @@ -1,6 +1,6 @@ ---- configure.in.old 2009-04-06 20:56:26.000000000 +0200 -+++ configure.in 2009-04-06 20:57:09.000000000 +0200 -@@ -575,6 +575,17 @@ AC_ARG_WITH(java, +--- configure.in.old 2010-03-03 16:59:22.000000000 +0100 ++++ configure.in 2010-03-03 16:59:22.000000000 +0100 +@@ -579,6 +579,17 @@ AC_ARG_WITH(java, no support for Java components, applets, accessibility or XML filters. ], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java) @@ -18,7 +18,7 @@ AC_ARG_ENABLE(gcjaot, [ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation support to speed up buildsi by compiling the jars also -@@ -2733,6 +2744,44 @@ else +@@ -2946,6 +2957,44 @@ else JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME fi @@ -63,7 +63,7 @@ dnl =================================================================== dnl Checks for javac dnl =================================================================== -@@ -2793,6 +2842,17 @@ if test "$SOLAR_JAVA" != ""; then +@@ -3006,6 +3055,17 @@ if test "$SOLAR_JAVA" != ""; then fi AC_SUBST(JAVACISGCJ) @@ -81,7 +81,7 @@ dnl =================================================================== dnl Checks for javadoc dnl =================================================================== -@@ -3007,6 +3067,8 @@ fi +@@ -3220,6 +3280,8 @@ fi AC_SUBST(JAVA_HOME) AC_SUBST(JDK) AC_SUBST(JAVAFLAGS) @@ -90,9 +90,9 @@ AC_SUBST(JAVAINTERPRETER) AC_SUBST(JAVACOMPILER) AC_SUBST(JAVAAOTCOMPILER) ---- set_soenv.in.javatarget~ 2008-07-07 19:57:41.109846862 +0200 -+++ set_soenv.in 2008-07-07 20:04:44.665095643 +0200 -@@ -1842,6 +1842,7 @@ ToFile( "DMAKEROOT", $DMAKEROOT, +--- set_soenv.in.old 2010-03-03 16:59:08.000000000 +0100 ++++ set_soenv.in 2010-03-03 16:59:22.000000000 +0100 +@@ -1769,6 +1769,7 @@ ToFile( "DMAKEROOT", $DMAKEROOT, if ( $JDK ne "gcj" ) { ToFile( "CLASSPATH", $CLASSPATH, "e" ); ToFile( "XCLASSPATH", $XCLASSPATH, "e" ); @@ -100,7 +100,7 @@ } else { ToFile( "JAVACISGCJ", '@JAVACISGCJ@', "e" ); -@@ -1852,6 +1853,8 @@ if ( $GUI eq "UNX" ) { +@@ -1780,6 +1781,8 @@ if ( '@JDK@' ne '' ) { ToFile( "JDK", "@JDK@", "e" ); ToFile( "JAVAFLAGS", "@JAVAFLAGS@", "e" ); @@ -109,10 +109,10 @@ ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" ); ToFile( "JAVACOMPILER", PathFormat("@JAVACOMPILER@"), "e" ); ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" ); ---- solenv/inc/antsettings.mk.old 2008-04-10 19:33:24.000000000 +0200 -+++ solenv/inc/antsettings.mk 2008-08-25 13:52:31.000000000 +0200 -@@ -44,6 +44,18 @@ PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR) - ANT*:=$(ANT_HOME)$/bin$/ant +--- solenv/inc/antsettings.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/antsettings.mk 2010-03-03 16:59:22.000000000 +0100 +@@ -48,6 +48,18 @@ PATH!:=$(ANT_HOME)/bin:$(PATH) + ANT*:=$(ANT_HOME)/bin/ant ANT_BUILDFILE*=build.xml +.IF "$(ANT_COMPILER_FLAGS)"=="" @@ -130,7 +130,7 @@ .IF "$(ANT_DEBUG)"=="" .IF "$(debug)"=="" ANT_DEBUG=off -@@ -65,21 +77,12 @@ JAVA_HOME= +@@ -69,21 +81,12 @@ JAVA_HOME= .EXPORT : JAVA_HOME .ENDIF @@ -156,9 +156,9 @@ .ELSE # No java ANT= ANT_FLAGS= ---- solenv/inc/settings.mk.javatarget~ 2008-07-07 19:57:31.071845803 +0200 -+++ solenv/inc/settings.mk 2008-07-07 20:04:44.669096361 +0200 -@@ -157,6 +157,9 @@ JAVAI:=$(JAVAINTERPRETER) +--- solenv/inc/settings.mk.old 2010-03-03 16:44:07.000000000 +0100 ++++ solenv/inc/settings.mk 2010-03-03 16:59:22.000000000 +0100 +@@ -163,6 +163,9 @@ JAVAI:=$(JAVAINTERPRETER) .IF "$(JAVACISGCJ)" == "yes" JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C .ENDIF @@ -168,19 +168,19 @@ #classpath and response .IF "$(JDK)" == "J++" ---- hsqldb/makefile.mk.old 2008-05-14 11:31:19.000000000 +0200 -+++ hsqldb/makefile.mk 2008-08-25 16:11:36.000000000 +0200 -@@ -67,7 +67,7 @@ JAVA_HOME= - .EXPORT : JAVA_HOME - BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +--- hsqldb/makefile.mk.old 2009-10-21 11:50:17.000000000 +0200 ++++ hsqldb/makefile.mk 2010-03-03 16:59:22.000000000 +0100 +@@ -69,7 +69,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build + .IF "$(debug)"!="" + BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.debug="on" -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) -f $(ANT_BUILDFILE) jar .ENDIF + .ENDIF - .ENDIF # $(SOLAR_JAVA)!= "" ---- rhino/makefile.mk.old 2008-04-11 09:01:54.000000000 +0200 -+++ rhino/makefile.mk 2008-08-25 16:15:08.000000000 +0200 +--- rhino/makefile.mk.old 2009-10-08 16:18:04.000000000 +0200 ++++ rhino/makefile.mk 2010-03-03 16:59:22.000000000 +0100 @@ -55,7 +55,7 @@ JAVA_HOME= .EXPORT : JAVA_HOME BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar @@ -190,9 +190,9 @@ .ENDIF # --- Targets ------------------------------------------------------ ---- qadevOOo/makefile.mk.old 2009-02-12 14:55:56.000000000 +0100 -+++ qadevOOo/makefile.mk 2009-02-17 17:19:53.000000000 +0100 -@@ -48,7 +48,7 @@ TST: +--- qadevOOo/makefile.mk.old 2009-10-08 16:17:37.000000000 +0200 ++++ qadevOOo/makefile.mk 2010-03-03 16:59:22.000000000 +0100 +@@ -47,7 +47,7 @@ TST: .IF "$(SOLAR_JAVA)"=="TRUE" .IF "$(ANT_HOME)"!="NO_ANT_HOME" diff --git a/patches/dev300/buildfix-x86-64-visibility-workaround.diff b/patches/dev300/buildfix-x86-64-visibility-workaround.diff index bf88b9212..16521a9e6 100644 --- a/patches/dev300/buildfix-x86-64-visibility-workaround.diff +++ b/patches/dev300/buildfix-x86-64-visibility-workaround.diff @@ -38,8 +38,8 @@ +ToFile( "HAVE_GCC_VISIBILITY_BROKEN", + "@HAVE_GCC_VISIBILITY_BROKEN@", "e" ); ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" ); - ToFile( "CXX", $CXX, "e" ); - ToFile( "MINGWCXX", "@MINGWCXX@", "e" ); + ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS", + "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" ); Index: unxlng.mk =================================================================== --- solenv/inc/unxlng.mk (Revision 276754) diff --git a/patches/dev300/calc-english-func-names-sc.diff b/patches/dev300/calc-english-func-names-sc.diff index 1f334d567..07d481591 100644 --- a/patches/dev300/calc-english-func-names-sc.diff +++ b/patches/dev300/calc-english-func-names-sc.diff @@ -1,7 +1,5 @@ -diff --git sc/inc/docoptio.hxx sc/inc/docoptio.hxx -index e95a9d0..43fd868 100644 ---- sc/inc/docoptio.hxx -+++ sc/inc/docoptio.hxx +--- sc/inc/docoptio.hxx.old 2010-03-03 17:00:15.000000000 +0100 ++++ sc/inc/docoptio.hxx 2010-03-03 17:00:16.000000000 +0100 @@ -56,6 +56,7 @@ class SC_DLLPUBLIC ScDocOptions BOOL bDoAutoSpell; // Auto-Spelling BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen @@ -20,7 +18,7 @@ index e95a9d0..43fd868 100644 void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; } ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; } -@@ -142,6 +146,7 @@ inline void ScDocOptions::CopyTo(ScDocOptions& rOpt) +@@ -142,6 +146,7 @@ inline void ScDocOptions::CopyTo(ScDocOp rOpt.bDoAutoSpell = bDoAutoSpell; rOpt.bLookUpColRowNames = bLookUpColRowNames; rOpt.bFormulaRegexEnabled = bFormulaRegexEnabled; @@ -28,7 +26,7 @@ index e95a9d0..43fd868 100644 rOpt.eFormulaGrammar = eFormulaGrammar; rOpt.aFormulaSepArg = aFormulaSepArg; rOpt.aFormulaSepArrayRow = aFormulaSepArrayRow; -@@ -165,6 +170,7 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) +@@ -165,6 +170,7 @@ inline const ScDocOptions& ScDocOptions: bDoAutoSpell = rCpy.bDoAutoSpell; bLookUpColRowNames = rCpy.bLookUpColRowNames; bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled; @@ -36,7 +34,7 @@ index e95a9d0..43fd868 100644 eFormulaGrammar = rCpy.eFormulaGrammar; aFormulaSepArg = rCpy.aFormulaSepArg; aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow; -@@ -191,6 +197,7 @@ inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const +@@ -191,6 +197,7 @@ inline int ScDocOptions::operator==( con && rOpt.bDoAutoSpell == bDoAutoSpell && rOpt.bLookUpColRowNames == bLookUpColRowNames && rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled @@ -44,11 +42,9 @@ index e95a9d0..43fd868 100644 && rOpt.eFormulaGrammar == eFormulaGrammar && rOpt.aFormulaSepArg == aFormulaSepArg && rOpt.aFormulaSepArrayRow == aFormulaSepArrayRow -diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx -index d8e4101..8e40f9c 100644 ---- sc/source/core/data/documen3.cxx -+++ sc/source/core/data/documen3.cxx -@@ -1748,12 +1748,33 @@ const ScDocOptions& ScDocument::GetDocOptions() const +--- sc/source/core/data/documen3.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/core/data/documen3.cxx 2010-03-03 17:00:16.000000000 +0100 +@@ -1748,12 +1748,33 @@ const ScDocOptions& ScDocument::GetDocOp void ScDocument::SetDocOptions( const ScDocOptions& rOpt ) { DBG_ASSERT( pDocOptions, "No DocOptions! :-(" ); @@ -82,11 +78,9 @@ index d8e4101..8e40f9c 100644 // Update the separators. ScCompiler::UpdateSeparatorsNative( rOpt.GetFormulaSepArg(), rOpt.GetFormulaSepArrayCol(), rOpt.GetFormulaSepArrayRow()); -diff --git sc/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx -index f4c744e..ab7909f 100644 ---- sc/source/core/tool/docoptio.cxx -+++ sc/source/core/tool/docoptio.cxx -@@ -106,6 +106,7 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy ) +--- sc/source/core/tool/docoptio.cxx.old 2010-03-03 17:00:15.000000000 +0100 ++++ sc/source/core/tool/docoptio.cxx 2010-03-03 17:00:16.000000000 +0100 +@@ -106,6 +106,7 @@ ScDocOptions::ScDocOptions( const ScDocO bDoAutoSpell( rCpy.bDoAutoSpell ), bLookUpColRowNames( rCpy.bLookUpColRowNames ), bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ), @@ -101,8 +95,8 @@ index f4c744e..ab7909f 100644 + bUseEnglishFuncName = false; eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE; - ResetFormulaSeparators(aFormulaSepArg, aFormulaSepArrayCol, aFormulaSepArrayRow); -@@ -277,10 +279,11 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const + ResetFormulaSeparators(); +@@ -277,10 +279,11 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clon #define CFGPATH_FORMULA "Office.Calc/Formula" #define SCFORMULAOPT_GRAMMAR 0 @@ -118,7 +112,7 @@ index f4c744e..ab7909f 100644 #define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other" -@@ -318,6 +321,7 @@ Sequence<OUString> ScDocCfg::GetFormulaPropertyNames() +@@ -318,6 +321,7 @@ Sequence<OUString> ScDocCfg::GetFormulaP static const char* aPropNames[] = { "Syntax/Grammar", // SCFORMULAOPT_GRAMMAR @@ -140,7 +134,7 @@ index f4c744e..ab7909f 100644 case SCFORMULAOPT_SEP_ARG: { OUString aSep; -@@ -588,6 +599,12 @@ IMPL_LINK( ScDocCfg, FormulaCommitHdl, void *, EMPTYARG ) +@@ -588,6 +599,12 @@ IMPL_LINK( ScDocCfg, FormulaCommitHdl, v pValues[nProp] <<= nVal; } break; @@ -153,10 +147,8 @@ index f4c744e..ab7909f 100644 case SCFORMULAOPT_SEP_ARG: pValues[nProp] <<= GetFormulaSepArg(); break; -diff --git sc/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc -index 5767bfb..2481244 100644 ---- sc/source/ui/inc/optdlg.hrc -+++ sc/source/ui/inc/optdlg.hrc +--- sc/source/ui/inc/optdlg.hrc.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/ui/inc/optdlg.hrc 2010-03-03 17:00:16.000000000 +0100 @@ -199,11 +199,12 @@ #define FL_FORMULA_OPTIONS 80 #define FT_FORMULA_SYNTAX 81 @@ -178,10 +170,8 @@ index 5767bfb..2481244 100644 +#define FT_FORMULA_SEP_ARRAY_C 89 +#define ED_FORMULA_SEP_ARRAY_C 90 +#define BTN_FORMULA_SEP_RESET 91 -diff --git sc/source/ui/inc/tpformula.hxx sc/source/ui/inc/tpformula.hxx -index 054655e..856dcae 100644 ---- sc/source/ui/inc/tpformula.hxx -+++ sc/source/ui/inc/tpformula.hxx +--- sc/source/ui/inc/tpformula.hxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/inc/tpformula.hxx 2010-03-03 17:00:16.000000000 +0100 @@ -72,6 +72,7 @@ private: FixedLine maFlFormulaOpt; FixedText maFtFormulaSyntax; @@ -190,11 +180,9 @@ index 054655e..856dcae 100644 FixedLine maFlFormulaSeps; FixedText maFtSepFuncArg; -diff --git sc/source/ui/optdlg/tpformula.cxx sc/source/ui/optdlg/tpformula.cxx -index 0c1d143..b462efc 100644 ---- sc/source/ui/optdlg/tpformula.cxx -+++ sc/source/ui/optdlg/tpformula.cxx -@@ -59,6 +59,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreA +--- sc/source/ui/optdlg/tpformula.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/optdlg/tpformula.cxx 2010-03-03 17:00:16.000000000 +0100 +@@ -59,6 +59,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(W maFlFormulaOpt(this, ScResId(FL_FORMULA_OPTIONS)), maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)), maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)), @@ -202,7 +190,7 @@ index 0c1d143..b462efc 100644 maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)), maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)), maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)), -@@ -234,7 +235,7 @@ BOOL ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) +@@ -234,7 +235,7 @@ BOOL ScTpFormulaOptions::FillItemSet(Sfx } mpNewOptions->SetFormulaSyntax(eGram); @@ -211,7 +199,7 @@ index 0c1d143..b462efc 100644 mpNewOptions->SetFormulaSepArg(maEdSepFuncArg.GetText()); mpNewOptions->SetFormulaSepArrayCol(maEdSepArrayCol.GetText()); mpNewOptions->SetFormulaSepArrayRow(maEdSepArrayRow.GetText()); -@@ -266,6 +267,8 @@ void ScTpFormulaOptions::Reset(const SfxItemSet& /*rCoreSet*/) +@@ -266,6 +267,8 @@ void ScTpFormulaOptions::Reset(const Sfx maLbFormulaSyntax.SelectEntryPos(0); } @@ -220,10 +208,8 @@ index 0c1d143..b462efc 100644 OUString aSep = mpNewOptions->GetFormulaSepArg(); OUString aSepArrayRow = mpNewOptions->GetFormulaSepArrayRow(); OUString aSepArrayCol = mpNewOptions->GetFormulaSepArrayCol(); -diff --git sc/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src -index 78f7864..616345b 100644 ---- sc/source/ui/src/optdlg.src -+++ sc/source/ui/src/optdlg.src +--- sc/source/ui/src/optdlg.src.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/ui/src/optdlg.src 2010-03-03 17:00:16.000000000 +0100 @@ -218,16 +218,23 @@ TabPage RID_SCPAGE_FORMULA }; }; diff --git a/patches/dev300/calc-enhanced-merge-cells-sc.diff b/patches/dev300/calc-enhanced-merge-cells-sc.diff index 3320a3be3..ac11a3257 100644 --- a/patches/dev300/calc-enhanced-merge-cells-sc.diff +++ b/patches/dev300/calc-enhanced-merge-cells-sc.diff @@ -1,24 +1,22 @@ -diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx -index 123a716..fde95e5 100644 ---- sc/source/ui/docshell/docfunc.cxx -+++ sc/source/ui/docshell/docfunc.cxx -@@ -67,6 +67,7 @@ - #include "attrib.hxx" +--- sc/source/ui/docshell/docfunc.cxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/docshell/docfunc.cxx 2010-03-03 16:59:13.000000000 +0100 +@@ -62,6 +62,7 @@ + #include "dociter.hxx" #include "autoform.hxx" #include "cell.hxx" +#include "cellmergeoption.hxx" #include "detdata.hxx" #include "detfunc.hxx" #include "docpool.hxx" -@@ -101,6 +102,7 @@ - #include "tabprotection.hxx" +@@ -97,6 +98,7 @@ + #include "clipparam.hxx" #include <memory> +#include <set> using namespace com::sun::star; using ::com::sun::star::uno::Sequence; -@@ -1693,7 +1693,11 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, +@@ -1665,7 +1667,11 @@ BOOL ScDocFunc::InsertCells( const ScRan default: break; } @@ -31,7 +29,7 @@ index 123a716..fde95e5 100644 } qIncreaseRange.pop_back(); } -@@ -1742,7 +1746,10 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, +@@ -1714,7 +1720,10 @@ BOOL ScDocFunc::InsertCells( const ScRan while( !qIncreaseRange.empty() ) { ScRange aRange = qIncreaseRange.back(); @@ -43,7 +41,7 @@ index 123a716..fde95e5 100644 qIncreaseRange.pop_back(); } -@@ -2180,7 +2187,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, +@@ -2152,7 +2161,10 @@ BOOL ScDocFunc::DeleteCells( const ScRan if( !pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) ) { @@ -55,7 +53,7 @@ index 123a716..fde95e5 100644 } qDecreaseRange.pop_back(); } -@@ -3974,86 +3976,110 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e +@@ -4149,86 +4161,110 @@ BOOL ScDocFunc::FillAuto( ScRange& rRang //------------------------------------------------------------------------ @@ -64,14 +62,8 @@ index 123a716..fde95e5 100644 { + using ::std::set; + - ScDocShellModificator aModificator( rDocShell ); - -- ScDocument* pDoc = rDocShell.GetDocument(); -- SCCOL nStartCol = rRange.aStart.Col(); -- SCROW nStartRow = rRange.aStart.Row(); -- SCCOL nEndCol = rRange.aEnd.Col(); -- SCROW nEndRow = rRange.aEnd.Row(); -- SCTAB nTab = rRange.aStart.Tab(); + ScDocShellModificator aModificator( rDocShell ); + + SCCOL nStartCol = rOption.mnStartCol; + SCROW nStartRow = rOption.mnStartRow; + SCCOL nEndCol = rOption.mnEndCol; @@ -82,22 +74,26 @@ index 123a716..fde95e5 100644 + return TRUE; + } + -+ ScDocument* pDoc = rDocShell.GetDocument(); + ScDocument* pDoc = rDocShell.GetDocument(); +- SCCOL nStartCol = rRange.aStart.Col(); +- SCROW nStartRow = rRange.aStart.Row(); +- SCCOL nEndCol = rRange.aEnd.Col(); +- SCROW nEndRow = rRange.aEnd.Row(); +- SCTAB nTab = rRange.aStart.Tab(); + set<SCTAB>::const_iterator itrBeg = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end(); + SCTAB nTab1 = *itrBeg, nTab2 = *rOption.maTabs.rbegin(); - if (bRecord && !pDoc->IsUndoEnabled()) - bRecord = FALSE; + if (bRecord && !pDoc->IsUndoEnabled()) + bRecord = FALSE; -- ScEditableTester aTester( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow ); -- if (!aTester.IsEditable()) -- { -- if (!bApi) -- rDocShell.ErrorMessage(aTester.GetMessageId()); -- return FALSE; -- } +- ScEditableTester aTester( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow ); +- if (!aTester.IsEditable()) + for (set<SCTAB>::const_iterator itr = itrBeg; itr != itrEnd; ++itr) -+ { + { +- if (!bApi) +- rDocShell.ErrorMessage(aTester.GetMessageId()); +- return FALSE; +- } + ScEditableTester aTester( pDoc, *itr, nStartCol, nStartRow, nEndCol, nEndRow ); + if (!aTester.IsEditable()) + { @@ -106,11 +102,10 @@ index 123a716..fde95e5 100644 + return FALSE; + } -- if ( nStartCol == nEndCol && nStartRow == nEndRow ) -- { -- // nichts zu tun -- return TRUE; -- } +- if ( nStartCol == nEndCol && nStartRow == nEndRow ) +- { +- // nichts zu tun +- return TRUE; + if ( pDoc->HasAttrib( nStartCol, nStartRow, *itr, nEndCol, nEndRow, *itr, + HASATTR_MERGED | HASATTR_OVERLAPPED ) ) + { @@ -119,20 +114,23 @@ index 123a716..fde95e5 100644 + rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0); + return FALSE; + } -+ } + } -- if ( pDoc->HasAttrib( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, -- HASATTR_MERGED | HASATTR_OVERLAPPED ) ) -- { -- // "Zusammenfassen nicht verschachteln !" -- if (!bApi) -- rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0); -- return FALSE; -- } +- if ( pDoc->HasAttrib( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, +- HASATTR_MERGED | HASATTR_OVERLAPPED ) ) + ScDocument* pUndoDoc = NULL; + bool bNeedContentsUndo = false; + for (set<SCTAB>::const_iterator itr = itrBeg; itr != itrEnd; ++itr) -+ { + { +- // "Zusammenfassen nicht verschachteln !" +- if (!bApi) +- rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0); +- return FALSE; +- } +- +- BOOL bNeedContents = bContents && +- ( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) || +- !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) ); + SCTAB nTab = *itr; + bool bNeedContents = bContents && + ( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) || @@ -146,9 +144,14 @@ index 123a716..fde95e5 100644 + for( aPos.SetRow( nStartRow ); !bHasNotes && (aPos.Row() <= nEndRow); aPos.IncRow() ) + bHasNotes = ((aPos.Col() != nStartCol) || (aPos.Row() != nStartRow)) && (pDoc->GetNote( aPos ) != 0); -- BOOL bNeedContents = bContents && -- ( !pDoc->IsBlockEmpty( nTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) || -- !pDoc->IsBlockEmpty( nTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) ); +- ScDocument* pUndoDoc = 0; +- if (bRecord) +- { +- // test if the range contains other notes which also implies that we need an undo document +- bool bHasNotes = false; +- for( ScAddress aPos( nStartCol, nStartRow, nTab ); !bHasNotes && (aPos.Col() <= nEndCol); aPos.IncCol() ) +- for( aPos.SetRow( nStartRow ); !bHasNotes && (aPos.Row() <= nEndRow); aPos.IncRow() ) +- bHasNotes = ((aPos.Col() != nStartCol) || (aPos.Row() != nStartRow)) && (pDoc->GetNote( aPos ) != 0); + if (bNeedContents || bHasNotes || rOption.mbCenter) + { + if (!pUndoDoc) @@ -164,35 +167,28 @@ index 123a716..fde95e5 100644 + pDoc->BeginDrawUndo(); + } -- ScDocument* pUndoDoc = 0; -- if (bRecord) -- { -- // test if the range contains other notes which also implies that we need an undo document -- bool bHasNotes = false; -- for( ScAddress aPos( nStartCol, nStartRow, nTab ); !bHasNotes && (aPos.Col() <= nEndCol); aPos.IncCol() ) -- for( aPos.SetRow( nStartRow ); !bHasNotes && (aPos.Row() <= nEndRow); aPos.IncRow() ) -- bHasNotes = ((aPos.Col() != nStartCol) || (aPos.Row() != nStartRow)) && (pDoc->GetNote( aPos ) != 0); +- if (bNeedContents || bHasNotes) + if (bNeedContents) + pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); + pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); + + if (rOption.mbCenter) -+ { -+ pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) ); -+ pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) ); -+ } - -- if (bNeedContents || bHasNotes) -- { -- pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); -- pUndoDoc->InitUndo( pDoc, nTab, nTab ); + { +- pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); +- pUndoDoc->InitUndo( pDoc, nTab, nTab ); - // note captions are collected by drawing undo -- pDoc->CopyToDocument( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, +- pDoc->CopyToDocument( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, - IDF_ALL|IDF_NOCAPTIONS, FALSE, pUndoDoc ); -- } ++ pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) ); ++ pDoc->ApplyAttr( nStartCol, nStartRow, nTab, SvxVerJustifyItem( SVX_VER_JUSTIFY_CENTER, ATTR_VER_JUSTIFY ) ); + } - if( bHasNotes ) - pDoc->BeginDrawUndo(); -- } +- } + +- if (bNeedContents) +- pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); +- pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); + if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) ) + rDocShell.PostPaint( nStartCol, nStartRow, nTab, + nEndCol, nEndRow, nTab, PAINT_GRID ); @@ -202,13 +198,10 @@ index 123a716..fde95e5 100644 + pDoc->SetDirty(aRange); + } -- if (bNeedContents) -- pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); -- pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); +- if( bRecord ) + bNeedContentsUndo |= bNeedContents; + } - -- if( bRecord ) ++ + if (pUndoDoc) { - SdrUndoGroup* pDrawUndo = pDoc->GetDrawLayer() ? pDoc->GetDrawLayer()->GetCalcUndo() : 0; @@ -220,53 +213,50 @@ index 123a716..fde95e5 100644 + new ScUndoMerge(&rDocShell, rOption, bNeedContentsUndo, pUndoDoc, pDrawUndo) ); } -- if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) ) -- rDocShell.PostPaint( nStartCol, nStartRow, nTab, -- nEndCol, nEndRow, nTab, PAINT_GRID ); -- if (bNeedContents) -- pDoc->SetDirty( rRange ); - aModificator.SetDocumentModified(); +- if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) ) +- rDocShell.PostPaint( nStartCol, nStartRow, nTab, +- nEndCol, nEndRow, nTab, PAINT_GRID ); +- if (bNeedContents) +- pDoc->SetDirty( rRange ); + aModificator.SetDocumentModified(); - SfxBindings* pBindings = rDocShell.GetViewBindings(); -@@ -4069,49 +4095,81 @@ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, + SfxBindings* pBindings = rDocShell.GetViewBindings(); +@@ -4244,49 +4280,81 @@ BOOL ScDocFunc::MergeCells( const ScRang BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi ) { -- ScDocShellModificator aModificator( rDocShell ); +- ScDocShellModificator aModificator( rDocShell ); + ScCellMergeOption aOption(rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row()); + SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab(); + for (SCTAB i = nTab1; i <= nTab2; ++i) + aOption.maTabs.insert(i); - ++ + return UnmergeCells(aOption, bRecord, bApi); +} + +bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi ) +{ + using ::std::set; -+ + + if (rOption.maTabs.empty()) + // Nothing to unmerge. + return true; + + ScDocShellModificator aModificator( rDocShell ); - ScDocument* pDoc = rDocShell.GetDocument(); -- SCTAB nTab = rRange.aStart.Tab(); - - if (bRecord && !pDoc->IsUndoEnabled()) - bRecord = FALSE; - -- if ( pDoc->HasAttrib( rRange, HASATTR_MERGED ) ) -- { -- ScRange aExtended = rRange; -- pDoc->ExtendMerge( aExtended ); -- ScRange aRefresh = aExtended; -- pDoc->ExtendOverlapped( aRefresh ); + ScDocument* pDoc = rDocShell.GetDocument(); +- SCTAB nTab = rRange.aStart.Tab(); + + if (bRecord && !pDoc->IsUndoEnabled()) + bRecord = FALSE; + +- if ( pDoc->HasAttrib( rRange, HASATTR_MERGED ) ) + ScDocument* pUndoDoc = NULL; + bool bBeep = false; + for (set<SCTAB>::const_iterator itr = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end(); + itr != itrEnd; ++itr) -+ { + { +- ScRange aExtended = rRange; +- pDoc->ExtendMerge( aExtended ); + SCTAB nTab = *itr; + ScRange aRange = rOption.getSingleRange(nTab); + if ( !pDoc->HasAttrib(aRange, HASATTR_MERGED) ) @@ -274,62 +264,52 @@ index 123a716..fde95e5 100644 + bBeep = true; + continue; + } - -- if (bRecord) -- { -- ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); -- pUndoDoc->InitUndo( pDoc, nTab, nTab ); -- pDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pUndoDoc ); -- rDocShell.GetUndoManager()->AddUndoAction( -- new ScUndoRemoveMerge( &rDocShell, rRange, pUndoDoc ) ); -- } ++ + ScRange aExtended = aRange; + pDoc->ExtendMerge(aExtended); -+ ScRange aRefresh = aExtended; + ScRange aRefresh = aExtended; +- pDoc->ExtendOverlapped( aRefresh ); + pDoc->ExtendOverlapped(aRefresh); -- const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE ); -- ScPatternAttr aPattern( pDoc->GetPool() ); -- aPattern.GetItemSet().Put( rDefAttr ); -- pDoc->ApplyPatternAreaTab( rRange.aStart.Col(), rRange.aStart.Row(), -- rRange.aEnd.Col(), rRange.aEnd.Row(), nTab, -- aPattern ); -+ if (bRecord) -+ { + if (bRecord) + { +- ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); +- pUndoDoc->InitUndo( pDoc, nTab, nTab ); +- pDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pUndoDoc ); +- rDocShell.GetUndoManager()->AddUndoAction( +- new ScUndoRemoveMerge( &rDocShell, rRange, pUndoDoc ) ); + if (!pUndoDoc) + { + pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); + pUndoDoc->InitUndo(pDoc, *rOption.maTabs.begin(), *rOption.maTabs.rbegin()); + } + pDoc->CopyToDocument(aExtended, IDF_ATTRIB, FALSE, pUndoDoc); -+ } + } -- pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(), -- aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab, -- SC_MF_HOR | SC_MF_VER ); -+ const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE ); -+ ScPatternAttr aPattern( pDoc->GetPool() ); -+ aPattern.GetItemSet().Put( rDefAttr ); + const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE ); + ScPatternAttr aPattern( pDoc->GetPool() ); + aPattern.GetItemSet().Put( rDefAttr ); +- pDoc->ApplyPatternAreaTab( rRange.aStart.Col(), rRange.aStart.Row(), +- rRange.aEnd.Col(), rRange.aEnd.Row(), nTab, +- aPattern ); + pDoc->ApplyPatternAreaTab( aRange.aStart.Col(), aRange.aStart.Row(), + aRange.aEnd.Col(), aRange.aEnd.Row(), nTab, + aPattern ); -- pDoc->ExtendMerge( aRefresh, TRUE, FALSE ); -+ pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(), + pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(), +- aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab, +- SC_MF_HOR | SC_MF_VER ); + aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab, + SC_MF_HOR | SC_MF_VER ); -- if ( !AdjustRowHeight( aExtended ) ) -- rDocShell.PostPaint( aExtended, PAINT_GRID ); -- aModificator.SetDocumentModified(); -- } -- else if (!bApi) -- Sound::Beep(); //! FALSE zurueck??? -+ pDoc->ExtendMerge( aRefresh, TRUE, FALSE ); -+ -+ if ( !AdjustRowHeight( aExtended ) ) -+ rDocShell.PostPaint( aExtended, PAINT_GRID ); -+ } + pDoc->ExtendMerge( aRefresh, TRUE, FALSE ); + + if ( !AdjustRowHeight( aExtended ) ) + rDocShell.PostPaint( aExtended, PAINT_GRID ); +- aModificator.SetDocumentModified(); + } +- else if (!bApi) +- Sound::Beep(); //! FALSE zurueck??? + if (bBeep && !bApi) + Sound::Beep(); + @@ -340,13 +320,10 @@ index 123a716..fde95e5 100644 + } + aModificator.SetDocumentModified(); - return TRUE; + return TRUE; } -diff --git sc/source/ui/inc/cellmergeoption.hxx sc/source/ui/inc/cellmergeoption.hxx -new file mode 100644 -index 0000000..2e2dff2 ---- /dev/null -+++ sc/source/ui/inc/cellmergeoption.hxx +--- sc/source/ui/inc/cellmergeoption.hxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/inc/cellmergeoption.hxx 2010-03-03 16:59:13.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -408,11 +385,9 @@ index 0000000..2e2dff2 + + +#endif -diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx -index 8490bab..9976230 100644 ---- sc/source/ui/inc/docfunc.hxx -+++ sc/source/ui/inc/docfunc.hxx -@@ -49,6 +49,7 @@ class ScBaseCell; +--- sc/source/ui/inc/docfunc.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/inc/docfunc.hxx 2010-03-03 16:59:13.000000000 +0100 +@@ -48,6 +48,7 @@ class ScBaseCell; class ScTokenArray; struct ScTabOpParam; class ScTableProtection; @@ -420,23 +395,21 @@ index 8490bab..9976230 100644 // --------------------------------------------------------------------------- -@@ -172,9 +173,10 @@ public: +@@ -171,9 +172,10 @@ public: - BOOL ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi ); + BOOL ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, BOOL bApi ); -- BOOL MergeCells( const ScRange& rRange, BOOL bContents, +- BOOL MergeCells( const ScRange& rRange, BOOL bContents, + BOOL MergeCells( const ScCellMergeOption& rOption, BOOL bContents, - BOOL bRecord, BOOL bApi ); -- BOOL UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL bRecord, BOOL bApi ); +- BOOL UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + BOOL UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi ); + bool UnmergeCells( const ScCellMergeOption& rOption, BOOL bRecord, BOOL bApi ); BOOL SetNewRangeNames( ScRangeName* pNewRanges, BOOL bApi ); // takes ownership of pNewRanges - BOOL ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi ); -diff --git sc/source/ui/inc/undoblk.hxx sc/source/ui/inc/undoblk.hxx -index 31932fd..2320502 100644 ---- sc/source/ui/inc/undoblk.hxx -+++ sc/source/ui/inc/undoblk.hxx + BOOL ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi ); +--- sc/source/ui/inc/undoblk.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/ui/inc/undoblk.hxx 2010-03-03 16:59:13.000000000 +0100 @@ -34,6 +34,7 @@ #include "markdata.hxx" #include "viewutil.hxx" @@ -445,21 +418,21 @@ index 31932fd..2320502 100644 #include "cell.hxx" -@@ -454,10 +455,8 @@ class ScUndoMerge: public ScSimpleUndo +@@ -455,10 +456,8 @@ class ScUndoMerge: public ScSimpleUndo { public: - TYPEINFO(); -- ScUndoMerge( ScDocShell* pNewDocShell, -- SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, -- SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, + TYPEINFO(); +- ScUndoMerge( ScDocShell* pNewDocShell, +- SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, +- SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, - bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo ); + ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, + bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo); - virtual ~ScUndoMerge(); + virtual ~ScUndoMerge(); - virtual void Undo(); -@@ -468,7 +467,7 @@ public: - virtual String GetComment() const; + virtual void Undo(); +@@ -469,7 +468,7 @@ public: + virtual String GetComment() const; private: - ScRange maRange; @@ -467,89 +440,82 @@ index 31932fd..2320502 100644 bool mbMergeContents; // Merge contents in Redo(). ScDocument* mpUndoDoc; // wenn Daten zusammengefasst SdrUndoAction* mpDrawUndo; -@@ -920,7 +919,7 @@ class ScUndoRemoveMerge: public ScBlockUndo +@@ -950,7 +949,7 @@ class ScUndoRemoveMerge: public ScBlockU public: - TYPEINFO(); - ScUndoRemoveMerge( ScDocShell* pNewDocShell, -- const ScRange& rArea, + TYPEINFO(); + ScUndoRemoveMerge( ScDocShell* pNewDocShell, +- const ScRange& rArea, + const ScCellMergeOption& rOption, - ScDocument* pNewUndoDoc ); - virtual ~ScUndoRemoveMerge(); + ScDocument* pNewUndoDoc ); + virtual ~ScUndoRemoveMerge(); -@@ -932,6 +931,9 @@ public: - virtual String GetComment() const; +@@ -962,6 +961,9 @@ public: + virtual String GetComment() const; private: + void SetCurTab(); + + ScCellMergeOption maOption; - ScDocument* pUndoDoc; + ScDocument* pUndoDoc; }; -diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx -index 1f5102e..051a705 100644 ---- sc/source/ui/inc/viewfunc.hxx -+++ sc/source/ui/inc/viewfunc.hxx +--- sc/source/ui/inc/viewfunc.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/inc/viewfunc.hxx 2010-03-03 16:59:13.000000000 +0100 @@ -242,7 +242,7 @@ public: - BOOL TestMergeCells(); - BOOL TestRemoveMerge(); + BOOL TestMergeCells(); + BOOL TestRemoveMerge(); -- BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE ); +- BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE ); + BOOL MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord = TRUE, BOOL bCenter = FALSE ); - BOOL RemoveMerge( BOOL bRecord = TRUE ); - - void FillSimple( FillDir eDir, BOOL bRecord = TRUE ); -diff --git sc/source/ui/undo/undoblk.cxx sc/source/ui/undo/undoblk.cxx -index 5b3e219..fe2c7bc 100644 ---- sc/source/ui/undo/undoblk.cxx -+++ sc/source/ui/undo/undoblk.cxx -@@ -66,6 +66,7 @@ - #include "undoolk.hxx" + BOOL RemoveMerge( BOOL bRecord = TRUE ); + + void FillSimple( FillDir eDir, BOOL bRecord = TRUE ); +--- sc/source/ui/undo/undoblk.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/undo/undoblk.cxx 2010-03-03 16:59:13.000000000 +0100 +@@ -67,6 +67,7 @@ + #include "clipparam.hxx" #include "sc.hrc" +#include <set> // STATIC DATA ----------------------------------------------------------- -@@ -2066,8 +2067,9 @@ BOOL __EXPORT ScUndoRemoveBreaks::CanRepeat(SfxRepeatTarget& rTarget) const +@@ -2054,8 +2055,9 @@ BOOL __EXPORT ScUndoRemoveBreaks::CanRep // ScUndoRemoveMerge::ScUndoRemoveMerge( ScDocShell* pNewDocShell, -- const ScRange& rArea, ScDocument* pNewUndoDoc ) : -- ScBlockUndo( pNewDocShell, rArea, SC_UNDO_SIMPLE ), +- const ScRange& rArea, ScDocument* pNewUndoDoc ) : +- ScBlockUndo( pNewDocShell, rArea, SC_UNDO_SIMPLE ), + const ScCellMergeOption& rOption, ScDocument* pNewUndoDoc ) : + ScBlockUndo( pNewDocShell, rOption.getFirstSingleRange(), SC_UNDO_SIMPLE ), + maOption(rOption), - pUndoDoc( pNewUndoDoc ) + pUndoDoc( pNewUndoDoc ) { } -@@ -2084,66 +2086,78 @@ String __EXPORT ScUndoRemoveMerge::GetComment() const +@@ -2072,66 +2074,78 @@ String __EXPORT ScUndoRemoveMerge::GetCo void __EXPORT ScUndoRemoveMerge::Undo() { -- BeginUndo(); +- BeginUndo(); - -- ScDocument* pDoc = pDocShell->GetDocument(); +- ScDocument* pDoc = pDocShell->GetDocument(); +- +- ScRange aExtended = aBlockRange; +- pUndoDoc->ExtendMerge( aExtended ); + using ::std::set; -- ScRange aExtended = aBlockRange; -- pUndoDoc->ExtendMerge( aExtended ); +- pDoc->DeleteAreaTab( aExtended, IDF_ATTRIB ); +- pUndoDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pDoc ); + SetCurTab(); + BeginUndo(); -- pDoc->DeleteAreaTab( aExtended, IDF_ATTRIB ); -- pUndoDoc->CopyToDocument( aExtended, IDF_ATTRIB, FALSE, pDoc ); -+ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - -- BOOL bDidPaint = FALSE; -- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); -- if ( pViewShell ) -- { -- pViewShell->SetTabNo( aExtended.aStart.Tab() ); -- bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() ); -- } -- if (!bDidPaint) -- ScUndoUtil::PaintMore( pDocShell, aExtended ); +- BOOL bDidPaint = FALSE; + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); +- if ( pViewShell ) +- { +- pViewShell->SetTabNo( aExtended.aStart.Tab() ); +- bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() ); ++ + ScDocument* pDoc = pDocShell->GetDocument(); + for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end(); + itr != itrEnd; ++itr) @@ -567,9 +533,11 @@ index 5b3e219..fe2c7bc 100644 + } + if (!bDidPaint) + ScUndoUtil::PaintMore(pDocShell, aRange); -+ } + } +- if (!bDidPaint) +- ScUndoUtil::PaintMore( pDocShell, aExtended ); - EndUndo(); + EndUndo(); } void __EXPORT ScUndoRemoveMerge::Redo() @@ -577,42 +545,30 @@ index 5b3e219..fe2c7bc 100644 + using ::std::set; + + SetCurTab(); - BeginRedo(); - -- SCTAB nTab = aBlockRange.aStart.Tab(); - ScDocument* pDoc = pDocShell->GetDocument(); -- ScRange aExtended = aBlockRange; -- pDoc->ExtendMerge( aExtended ); -- ScRange aRefresh = aExtended; -- pDoc->ExtendOverlapped( aRefresh ); -- -- // ausfuehren + BeginRedo(); + +- SCTAB nTab = aBlockRange.aStart.Tab(); + ScDocument* pDoc = pDocShell->GetDocument(); +- ScRange aExtended = aBlockRange; +- pDoc->ExtendMerge( aExtended ); +- ScRange aRefresh = aExtended; +- pDoc->ExtendOverlapped( aRefresh ); - -- const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE ); -- ScPatternAttr aPattern( pDoc->GetPool() ); -- aPattern.GetItemSet().Put( rDefAttr ); -- pDoc->ApplyPatternAreaTab( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(), -- aBlockRange.aEnd.Col(), aBlockRange.aEnd.Row(), nTab, -- aPattern ); +- // ausfuehren - -- pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(), -- aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab, -- SC_MF_HOR | SC_MF_VER ); +- const SfxPoolItem& rDefAttr = pDoc->GetPool()->GetDefaultItem( ATTR_MERGE ); +- ScPatternAttr aPattern( pDoc->GetPool() ); +- aPattern.GetItemSet().Put( rDefAttr ); +- pDoc->ApplyPatternAreaTab( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(), +- aBlockRange.aEnd.Col(), aBlockRange.aEnd.Row(), nTab, +- aPattern ); - -- pDoc->ExtendMerge( aRefresh, TRUE, FALSE ); -- -- // Paint +- pDoc->RemoveFlagsTab( aExtended.aStart.Col(), aExtended.aStart.Row(), +- aExtended.aEnd.Col(), aExtended.aEnd.Row(), nTab, +- SC_MF_HOR | SC_MF_VER ); + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); -- BOOL bDidPaint = FALSE; -- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); -- if ( pViewShell ) -- { -- pViewShell->SetTabNo( aExtended.aStart.Tab() ); -- bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() ); -- } -- if (!bDidPaint) -- ScUndoUtil::PaintMore( pDocShell, aExtended ); +- pDoc->ExtendMerge( aRefresh, TRUE, FALSE ); + for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end(); + itr != itrEnd; ++itr) + { @@ -634,9 +590,16 @@ index 5b3e219..fe2c7bc 100644 + SC_MF_HOR | SC_MF_VER ); + + pDoc->ExtendMerge(aRange, TRUE, FALSE); -+ + +- // Paint + // Paint -+ + +- BOOL bDidPaint = FALSE; +- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); +- if ( pViewShell ) +- { +- pViewShell->SetTabNo( aExtended.aStart.Tab() ); +- bDidPaint = pViewShell->AdjustRowHeight( aExtended.aStart.Row(), aExtended.aEnd.Row() ); + BOOL bDidPaint = FALSE; + if ( pViewShell ) + { @@ -645,12 +608,14 @@ index 5b3e219..fe2c7bc 100644 + } + if (!bDidPaint) + ScUndoUtil::PaintMore(pDocShell, aRange); -+ } + } +- if (!bDidPaint) +- ScUndoUtil::PaintMore( pDocShell, aExtended ); - EndRedo(); + EndRedo(); } -@@ -2159,6 +2173,13 @@ BOOL __EXPORT ScUndoRemoveMerge::CanRepeat(SfxRepeatTarget& rTarget) const - return (rTarget.ISA(ScTabViewTarget)); +@@ -2147,6 +2161,13 @@ BOOL __EXPORT ScUndoRemoveMerge::CanRepe + return (rTarget.ISA(ScTabViewTarget)); } +void ScUndoRemoveMerge::SetCurTab() @@ -663,10 +628,8 @@ index 5b3e219..fe2c7bc 100644 // ----------------------------------------------------------------------- // // nur Umrandung setzen, per ScRangeList (StarOne) -diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx -index 5521813..f3f006c 100644 ---- sc/source/ui/undo/undoblk3.cxx -+++ sc/source/ui/undo/undoblk3.cxx +--- sc/source/ui/undo/undoblk3.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/ui/undo/undoblk3.cxx 2010-03-03 16:59:13.000000000 +0100 @@ -34,6 +34,7 @@ // INCLUDE ------------------------------------------------------------------- @@ -675,53 +638,66 @@ index 5521813..f3f006c 100644 #include <svx/boxitem.hxx> #include <svx/srchitem.hxx> #include <svx/linkmgr.hxx> -@@ -814,14 +815,12 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const +@@ -801,14 +802,12 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat( //---------------------------------------------------------------------------- -ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, -- SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, -- SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, +- SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, +- SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, - bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo ) +ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, + bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo ) - // - : ScSimpleUndo( pNewDocShell ), - // -- maRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), + // + : ScSimpleUndo( pNewDocShell ), + // +- maRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), + maOption(rOption), mbMergeContents( bMergeContents ), mpUndoDoc( pUndoDoc ), mpDrawUndo( pDrawUndo ) -@@ -850,51 +849,77 @@ String ScUndoMerge::GetComment() const +@@ -837,51 +836,77 @@ String ScUndoMerge::GetComment() const void ScUndoMerge::DoChange( bool bUndo ) const { -- ScDocument* pDoc = pDocShell->GetDocument(); +- ScDocument* pDoc = pDocShell->GetDocument(); +- +- ScUndoUtil::MarkSimpleBlock( pDocShell, maRange ); + using ::std::set; -- ScUndoUtil::MarkSimpleBlock( pDocShell, maRange ); -+ if (maOption.maTabs.empty()) -+ // Nothing to do. -+ return; - -- if (bUndo) +- if (bUndo) - // remove merge (contents are copied back below from undo document) -- pDoc->RemoveMerge( maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() ); -- else +- pDoc->RemoveMerge( maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() ); +- else - // repeat merge, but do not remove note captions (will be done by drawing redo below) -/*!*/ pDoc->DoMerge( maRange.aStart.Tab(), -- maRange.aStart.Col(), maRange.aStart.Row(), +- maRange.aStart.Col(), maRange.aStart.Row(), - maRange.aEnd.Col(), maRange.aEnd.Row(), false ); -+ ScDocument* pDoc = pDocShell->GetDocument(); -+ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); ++ if (maOption.maTabs.empty()) ++ // Nothing to do. ++ return; - // undo -> copy back deleted contents -- if (bUndo && mpUndoDoc) +- if (bUndo && mpUndoDoc) - { - pDoc->DeleteAreaTab( maRange, IDF_CONTENTS|IDF_NOCAPTIONS ); - mpUndoDoc->CopyToDocument( maRange, IDF_ALL|IDF_NOCAPTIONS, FALSE, pDoc ); - } +- +- // redo -> merge contents again +- else if (!bUndo && mbMergeContents) +- { +-/*!*/ pDoc->DoMergeContents( maRange.aStart.Tab(), +- maRange.aStart.Col(), maRange.aStart.Row(), +- maRange.aEnd.Col(), maRange.aEnd.Row() ); +- } ++ ScDocument* pDoc = pDocShell->GetDocument(); ++ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); + +- if (bUndo) +- DoSdrUndoAction( mpDrawUndo, pDoc ); +- else +- RedoSdrUndoAction( mpDrawUndo ); + ScRange aCurRange = maOption.getSingleRange(pDocShell->GetCurTab()); + ScUndoUtil::MarkSimpleBlock(pDocShell, aCurRange); + @@ -731,12 +707,12 @@ index 5521813..f3f006c 100644 + SCTAB nTab = *itr; + ScRange aRange = maOption.getSingleRange(nTab); -- // redo -> merge contents again -- else if (!bUndo && mbMergeContents) +- BOOL bDidPaint = FALSE; +- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); +- if ( pViewShell ) - { --/*!*/ pDoc->DoMergeContents( maRange.aStart.Tab(), -- maRange.aStart.Col(), maRange.aStart.Row(), -- maRange.aEnd.Col(), maRange.aEnd.Row() ); +- pViewShell->SetTabNo( maRange.aStart.Tab() ); +- bDidPaint = pViewShell->AdjustRowHeight( maRange.aStart.Row(), maRange.aEnd.Row() ); + if (bUndo) + // remove merge (contents are copied back below from undo document) + pDoc->RemoveMerge( aRange.aStart.Col(), aRange.aStart.Row(), aRange.aStart.Tab() ); @@ -789,31 +765,16 @@ index 5521813..f3f006c 100644 + ScUndoUtil::PaintMore(pDocShell, aRange); } -- if (bUndo) -- DoSdrUndoAction( mpDrawUndo, pDoc ); -- else -- RedoSdrUndoAction( mpDrawUndo ); -- -- BOOL bDidPaint = FALSE; -- ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); -- if ( pViewShell ) -- { -- pViewShell->SetTabNo( maRange.aStart.Tab() ); -- bDidPaint = pViewShell->AdjustRowHeight( maRange.aStart.Row(), maRange.aEnd.Row() ); -- } -- -- if (!bDidPaint) -- ScUndoUtil::PaintMore( pDocShell, maRange ); +- if (!bDidPaint) +- ScUndoUtil::PaintMore( pDocShell, maRange ); - -- ShowTable( maRange ); +- ShowTable( maRange ); + ShowTable(aCurRange); } -diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx -index c2eb810..d4cfb42 100644 ---- sc/source/ui/unoobj/cellsuno.cxx -+++ sc/source/ui/unoobj/cellsuno.cxx +--- sc/source/ui/unoobj/cellsuno.cxx.old 2010-03-03 16:44:07.000000000 +0100 ++++ sc/source/ui/unoobj/cellsuno.cxx 2010-03-03 16:59:13.000000000 +0100 @@ -71,6 +71,7 @@ #include <com/sun/star/text/WritingMode2.hpp> @@ -822,28 +783,25 @@ index c2eb810..d4cfb42 100644 #include "cellsuno.hxx" #include "cursuno.hxx" #include "textuno.hxx" -@@ -5404,10 +5405,14 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti - if ( pDocSh ) - { - ScDocFunc aFunc(*pDocSh); +@@ -5334,10 +5335,14 @@ void SAL_CALL ScCellRangeObj::merge( sal + if ( pDocSh ) + { + ScDocFunc aFunc(*pDocSh); + ScCellMergeOption aMergeOption( + aRange.aStart.Col(), aRange.aStart.Row(), + aRange.aEnd.Col(), aRange.aEnd.Row(), false); + aMergeOption.maTabs.insert(aRange.aStart.Tab()); - if ( bMerge ) -- aFunc.MergeCells( aRange, FALSE, TRUE, TRUE ); + if ( bMerge ) +- aFunc.MergeCells( aRange, FALSE, TRUE, TRUE ); + aFunc.MergeCells( aMergeOption, FALSE, TRUE, TRUE ); - else -- aFunc.UnmergeCells( aRange, TRUE, TRUE ); + else +- aFunc.UnmergeCells( aRange, TRUE, TRUE ); + aFunc.UnmergeCells( aMergeOption, TRUE, TRUE ); - //! Fehler abfangen? - } -diff --git sc/source/ui/view/cellmergeoption.cxx sc/source/ui/view/cellmergeoption.cxx -new file mode 100644 -index 0000000..ed6b8cb ---- /dev/null -+++ sc/source/ui/view/cellmergeoption.cxx + //! Fehler abfangen? + } +--- sc/source/ui/view/cellmergeoption.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/view/cellmergeoption.cxx 2010-03-03 16:59:13.000000000 +0100 @@ -0,0 +1,74 @@ +/************************************************************************* + * @@ -919,11 +877,9 @@ index 0000000..ed6b8cb + + return getSingleRange(nTab); +} -diff --git sc/source/ui/view/cellsh3.cxx sc/source/ui/view/cellsh3.cxx -index 57309e3..c689fa1 100644 ---- sc/source/ui/view/cellsh3.cxx -+++ sc/source/ui/view/cellsh3.cxx -@@ -772,6 +772,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) +--- sc/source/ui/view/cellsh3.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/cellsh3.cxx 2010-03-03 16:59:13.000000000 +0100 +@@ -772,6 +772,7 @@ void ScCellShell::Execute( SfxRequest& r { // test whether to merge or to split bool bMerge = false; @@ -931,7 +887,7 @@ index 57309e3..c689fa1 100644 switch( nSlot ) { case FID_MERGE_ON: -@@ -782,6 +783,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) +@@ -782,6 +783,7 @@ void ScCellShell::Execute( SfxRequest& r break; case FID_MERGE_TOGGLE: { @@ -939,7 +895,7 @@ index 57309e3..c689fa1 100644 SfxPoolItem* pItem = 0; if( rBindings.QueryState( nSlot, pItem ) >= SFX_ITEM_DEFAULT ) bMerge = !static_cast< SfxBoolItem* >( pItem )->GetValue(); -@@ -802,7 +804,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) +@@ -802,7 +804,7 @@ void ScCellShell::Execute( SfxRequest& r bMoveContents = ((const SfxBoolItem*)pItem)->GetValue(); } @@ -948,23 +904,19 @@ index 57309e3..c689fa1 100644 { if (!bApi && bMoveContents) // "ja" im Dialog geklickt rReq.AppendItem( SfxBoolItem( nSlot, bMoveContents ) ); -diff --git sc/source/ui/view/makefile.mk sc/source/ui/view/makefile.mk -index 48395f3..46b8122 100644 ---- sc/source/ui/view/makefile.mk -+++ sc/source/ui/view/makefile.mk -@@ -100,6 +100,7 @@ SLOFILES = \ - $(SLO)$/output3.obj \ +--- sc/source/ui/view/makefile.mk.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/view/makefile.mk 2010-03-03 16:59:14.000000000 +0100 +@@ -101,6 +101,7 @@ SLOFILES = \ + $(SLO)$/overlayobject.obj \ $(SLO)$/gridmerg.obj \ $(SLO)$/invmerge.obj \ + $(SLO)$/cellmergeoption.obj \ $(SLO)$/select.obj \ $(SLO)$/olinewin.obj \ $(SLO)$/hintwin.obj \ -diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx -index c563b9a..d6fd25d 100644 ---- sc/source/ui/view/viewfun2.cxx -+++ sc/source/ui/view/viewfun2.cxx -@@ -70,6 +70,7 @@ using namespace com::sun::star; +--- sc/source/ui/view/viewfun2.cxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/view/viewfun2.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -65,6 +65,7 @@ #include "attrib.hxx" #include "autoform.hxx" #include "cell.hxx" // EnterAutoSum @@ -972,18 +924,18 @@ index c563b9a..d6fd25d 100644 #include "compiler.hxx" #include "docfunc.hxx" #include "docpool.hxx" -@@ -1087,7 +1088,7 @@ BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue) +@@ -1082,7 +1083,7 @@ BOOL ScViewFunc::TestMergeCells() // V //---------------------------------------------------------------------------- -BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord ) +BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord, BOOL bCenter ) { - // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc), - // damit dann nicht die Inhalte-QueryBox kommt -@@ -1130,10 +1131,26 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord ) - return FALSE; - } + // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc), + // damit dann nicht die Inhalte-QueryBox kommt +@@ -1125,10 +1126,26 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, + return FALSE; + } + // Check for the contents of all selected tables. + bool bAskDialog = false; @@ -1002,24 +954,24 @@ index c563b9a..d6fd25d 100644 + bAskDialog = true; + } + - BOOL bOk = TRUE; + BOOL bOk = TRUE; -- if ( !pDoc->IsBlockEmpty( nStartTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) || -- !pDoc->IsBlockEmpty( nStartTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) ) +- if ( !pDoc->IsBlockEmpty( nStartTab, nStartCol,nStartRow+1, nStartCol,nEndRow, true ) || +- !pDoc->IsBlockEmpty( nStartTab, nStartCol+1,nStartRow, nEndCol,nEndRow, true ) ) + if (bAskDialog) - { - if (!bApi) - { -@@ -1153,7 +1170,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord ) - if (bOk) - { - HideCursor(); -- bOk = pDocSh->GetDocFunc().MergeCells( aMarkRange, rDoContents, bRecord, bApi ); + { + if (!bApi) + { +@@ -1148,7 +1165,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, + if (bOk) + { + HideCursor(); +- bOk = pDocSh->GetDocFunc().MergeCells( aMarkRange, rDoContents, bRecord, bApi ); + bOk = pDocSh->GetDocFunc().MergeCells( aMergeOption, rDoContents, bRecord, bApi ); - ShowCursor(); + ShowCursor(); - if (bOk) -@@ -1189,6 +1206,32 @@ BOOL ScViewFunc::TestRemoveMerge() + if (bOk) +@@ -1184,6 +1201,32 @@ BOOL ScViewFunc::TestRemoveMerge() //---------------------------------------------------------------------------- @@ -1051,16 +1003,16 @@ index c563b9a..d6fd25d 100644 + BOOL ScViewFunc::RemoveMerge( BOOL bRecord ) { - ScRange aRange; -@@ -1200,12 +1243,39 @@ BOOL ScViewFunc::RemoveMerge( BOOL bRecord ) + ScRange aRange; +@@ -1195,12 +1238,39 @@ BOOL ScViewFunc::RemoveMerge( BOOL bReco } - else if (GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE) - { + else if (GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE) + { + ScDocument* pDoc = GetViewData()->GetDocument(); ScRange aExtended( aRange ); - GetViewData()->GetDocument()->ExtendMerge( aExtended ); + pDoc->ExtendMerge( aExtended ); - ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + const ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTabCount = pDoc->GetTableCount(); + ScCellMergeOption aOption(aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(), aRange.aEnd.Row()); @@ -1087,17 +1039,15 @@ index c563b9a..d6fd25d 100644 + } + while (bExtended); - HideCursor(); -- BOOL bOk = pDocSh->GetDocFunc().UnmergeCells( aRange, bRecord, FALSE ); + HideCursor(); +- BOOL bOk = pDocSh->GetDocFunc().UnmergeCells( aRange, bRecord, FALSE ); + BOOL bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, bRecord, FALSE ); + aExtended = aOption.getFirstSingleRange(); MarkRange( aExtended ); - ShowCursor(); + ShowCursor(); -diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml -index 118fac7..322d448 100644 ---- sc/uiconfig/scalc/menubar/menubar.xml -+++ sc/uiconfig/scalc/menubar/menubar.xml +--- sc/uiconfig/scalc/menubar/menubar.xml.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/uiconfig/scalc/menubar/menubar.xml 2010-03-03 16:59:14.000000000 +0100 @@ -218,7 +218,13 @@ <menu:menuitem menu:id=".uno:SetTabBgColor"/> </menu:menupopup> diff --git a/patches/dev300/calc-filter-by-date-strip-time.diff b/patches/dev300/calc-filter-by-date-strip-time.diff index 53fc5b3db..13198306a 100644 --- a/patches/dev300/calc-filter-by-date-strip-time.diff +++ b/patches/dev300/calc-filter-by-date-strip-time.diff @@ -1,8 +1,6 @@ -diff --git sc/inc/column.hxx sc/inc/column.hxx -index 47417c3..11f2955 100644 ---- sc/inc/column.hxx -+++ sc/inc/column.hxx -@@ -379,7 +379,7 @@ public: +--- sc/inc/column.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/column.hxx 2010-03-03 16:59:11.000000000 +0100 +@@ -378,7 +378,7 @@ public: /// Including current, may return -1 SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const; @@ -11,10 +9,8 @@ index 47417c3..11f2955 100644 BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); //UNUSED2008-05 SCROW NoteCount( SCROW nMaxRow = MAXROW ) const; -diff --git sc/inc/dbcolect.hxx sc/inc/dbcolect.hxx -index 1346b12..edd5a09 100644 ---- sc/inc/dbcolect.hxx -+++ sc/inc/dbcolect.hxx +--- sc/inc/dbcolect.hxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/inc/dbcolect.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -88,6 +88,7 @@ private: SCCOLROW nQueryField[MAXQUERY]; ScQueryOp eQueryOp[MAXQUERY]; @@ -23,11 +19,9 @@ index 1346b12..edd5a09 100644 String* pQueryStr[MAXQUERY]; double nQueryVal[MAXQUERY]; ScQueryConnect eQueryConnect[MAXQUERY]; -diff --git sc/inc/document.hxx sc/inc/document.hxx -index 06b3fbe..ddb87fa 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx -@@ -1379,9 +1379,9 @@ public: +--- sc/inc/document.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:11.000000000 +0100 +@@ -1394,9 +1394,9 @@ public: void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr); BOOL GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, @@ -39,11 +33,9 @@ index 06b3fbe..ddb87fa 100644 BOOL GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScStrCollection& rStrings, BOOL bLimit = FALSE ); BOOL GetFormulaEntries( TypedScStrCollection& rStrings ); -diff --git sc/inc/global.hxx sc/inc/global.hxx -index cc2e078..de5be83 100644 ---- sc/inc/global.hxx -+++ sc/inc/global.hxx -@@ -791,6 +791,7 @@ struct ScQueryEntry +--- sc/inc/global.hxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/inc/global.hxx 2010-03-03 16:59:11.000000000 +0100 +@@ -797,6 +797,7 @@ struct ScQueryEntry { BOOL bDoQuery; BOOL bQueryByString; @@ -51,11 +43,9 @@ index cc2e078..de5be83 100644 SCCOLROW nField; ScQueryOp eOp; ScQueryConnect eConnect; -diff --git sc/inc/table.hxx sc/inc/table.hxx -index 597baf3..d623a9c 100644 ---- sc/inc/table.hxx -+++ sc/inc/table.hxx -@@ -638,8 +638,8 @@ public: +--- sc/inc/table.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:11.000000000 +0100 +@@ -643,8 +643,8 @@ public: SCSIZE Query(ScQueryParam& rQueryParam, BOOL bKeepSub); BOOL CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); @@ -66,11 +56,9 @@ index 597baf3..d623a9c 100644 BOOL GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); -diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx -index 242c5c0..560801d 100644 ---- sc/source/core/data/column3.cxx -+++ sc/source/core/data/column3.cxx -@@ -1470,8 +1470,9 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +--- sc/source/core/data/column3.cxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/core/data/column3.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -1470,8 +1470,9 @@ BOOL ScColumn::SetString( SCROW nRow, SC } @@ -81,7 +69,7 @@ index 242c5c0..560801d 100644 SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); String aString; SCROW nRow = 0; -@@ -1507,6 +1508,18 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec +@@ -1507,6 +1508,18 @@ void ScColumn::GetFilterEntries(SCROW nS nValue = 0.0; } @@ -100,7 +88,7 @@ index 242c5c0..560801d 100644 pData = new TypedStrData( aString, nValue, SC_STRTYPE_VALUE ); } #if 0 // DR -@@ -1525,6 +1538,8 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec +@@ -1525,6 +1538,8 @@ void ScColumn::GetFilterEntries(SCROW nS ++nIndex; } @@ -109,11 +97,9 @@ index 242c5c0..560801d 100644 } // -diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx -index a0b524f..68e4383 100644 ---- sc/source/core/data/documen3.cxx -+++ sc/source/core/data/documen3.cxx -@@ -1255,7 +1255,8 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, +--- sc/source/core/data/documen3.cxx.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/source/core/data/documen3.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -1260,7 +1260,8 @@ BOOL ScDocument::HasRowHeader( SCCOL nSt // GetFilterEntries - Eintraege fuer AutoFilter-Listbox // @@ -123,7 +109,7 @@ index a0b524f..68e4383 100644 { if ( ValidTab(nTab) && pTab[nTab] && pDBCollection ) { -@@ -1292,11 +1293,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt +@@ -1297,11 +1298,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL if ( bFilter ) { @@ -137,7 +123,7 @@ index a0b524f..68e4383 100644 } return TRUE; -@@ -1311,11 +1312,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScSt +@@ -1316,11 +1317,11 @@ BOOL ScDocument::GetFilterEntries( SCCOL // BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, @@ -151,11 +137,9 @@ index a0b524f..68e4383 100644 return TRUE; } -diff --git sc/source/core/data/global2.cxx sc/source/core/data/global2.cxx -index f71b842..c9b2e3e 100644 ---- sc/source/core/data/global2.cxx -+++ sc/source/core/data/global2.cxx -@@ -145,30 +145,32 @@ BOOL ScImportParam::operator==( const ScImportParam& rOther ) const +--- sc/source/core/data/global2.cxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/core/data/global2.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -145,30 +145,32 @@ BOOL ScImportParam::operator==( const Sc //------------------------------------------------------------------------ // struct ScQueryParam: @@ -171,9 +155,19 @@ index f71b842..c9b2e3e 100644 + nVal(0.0), + pSearchParam(NULL), + pSearchText(NULL) -+{ -+} -+ + { +- bDoQuery = FALSE; +- bQueryByString = FALSE; +- eOp = SC_EQUAL; +- eConnect = SC_AND; +- nField = 0; +- nVal = 0.0; +- pStr = new String; +- pSearchParam = NULL; +- pSearchText = NULL; + } + +-ScQueryEntry::ScQueryEntry(const ScQueryEntry& r) +ScQueryEntry::ScQueryEntry(const ScQueryEntry& r) : + bDoQuery(r.bDoQuery), + bQueryByString(r.bQueryByString), @@ -186,19 +180,6 @@ index f71b842..c9b2e3e 100644 + pSearchParam(NULL), + pSearchText(NULL) { -- bDoQuery = FALSE; -- bQueryByString = FALSE; -- eOp = SC_EQUAL; -- eConnect = SC_AND; -- nField = 0; -- nVal = 0.0; -- pStr = new String; -- pSearchParam = NULL; -- pSearchText = NULL; --} -- --ScQueryEntry::ScQueryEntry(const ScQueryEntry& r) --{ - bDoQuery = r.bDoQuery; - bQueryByString = r.bQueryByString; - eOp = r.eOp; @@ -211,7 +192,7 @@ index f71b842..c9b2e3e 100644 } ScQueryEntry::~ScQueryEntry() -@@ -185,6 +187,7 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r ) +@@ -185,6 +187,7 @@ ScQueryEntry& ScQueryEntry::operator=( c { bDoQuery = r.bDoQuery; bQueryByString = r.bQueryByString; @@ -227,7 +208,7 @@ index f71b842..c9b2e3e 100644 eOp = SC_EQUAL; eConnect = SC_AND; nField = 0; -@@ -223,6 +227,7 @@ BOOL ScQueryEntry::operator==( const ScQueryEntry& r ) const +@@ -223,6 +227,7 @@ BOOL ScQueryEntry::operator==( const ScQ { return bDoQuery == r.bDoQuery && bQueryByString == r.bQueryByString @@ -235,12 +216,9 @@ index f71b842..c9b2e3e 100644 && eOp == r.eOp && eConnect == r.eConnect && nField == r.nField -diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx -index 7dffb3d..7067799 100644 ---- sc/source/core/data/table3.cxx -+++ sc/source/core/data/table3.cxx -@@ -60,7 +60,8 @@ - #include "progress.hxx" +--- sc/source/core/data/table3.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/core/data/table3.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -61,6 +61,7 @@ #include "cellform.hxx" #include "postit.hxx" #include "queryparam.hxx" @@ -248,7 +226,7 @@ index 7dffb3d..7067799 100644 #include <vector> -@@ -1143,6 +1144,20 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, +@@ -1144,6 +1145,20 @@ BOOL ScTable::ValidQuery(SCROW nRow, con } else nCellVal = GetValue( static_cast<SCCOL>(rEntry.nField), nRow ); @@ -269,7 +247,7 @@ index 7dffb3d..7067799 100644 switch (rEntry.eOp) { case SC_EQUAL : -@@ -1930,12 +1945,13 @@ BOOL ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol * +@@ -1931,12 +1946,13 @@ BOOL ScTable::HasRowHeader( SCCOL nStart return TRUE; } @@ -286,7 +264,7 @@ index 7dffb3d..7067799 100644 { // remove the entry for this column from the query parameter ScQueryParam aParam( rParam ); -@@ -1953,15 +1969,18 @@ void ScTable::GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, co +@@ -1954,15 +1970,18 @@ void ScTable::GetFilteredFilterEntries( BOOL* pSpecial = new BOOL[nEntryCount]; lcl_PrepareQuery( pDocument, this, aParam, pSpecial ); @@ -307,11 +285,9 @@ index 7dffb3d..7067799 100644 delete[] pSpecial; } -diff --git sc/source/core/tool/dbcolect.cxx sc/source/core/tool/dbcolect.cxx -index 162fcbd..9ed2645 100644 ---- sc/source/core/tool/dbcolect.cxx -+++ sc/source/core/tool/dbcolect.cxx -@@ -158,6 +158,7 @@ ScDBData::ScDBData( const ScDBData& rData ) : +--- sc/source/core/tool/dbcolect.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/core/tool/dbcolect.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -159,6 +159,7 @@ ScDBData::ScDBData( const ScDBData& rDat nQueryField[i] = rData.nQueryField[i]; eQueryOp[i] = rData.eQueryOp[i]; bQueryByString[i] = rData.bQueryByString[i]; @@ -319,7 +295,7 @@ index 162fcbd..9ed2645 100644 pQueryStr[i] = new String( *(rData.pQueryStr[i]) ); nQueryVal[i] = rData.nQueryVal[i]; eQueryConnect[i] = rData.eQueryConnect[i]; -@@ -248,6 +249,7 @@ ScDBData& ScDBData::operator= (const ScDBData& rData) +@@ -249,6 +250,7 @@ ScDBData& ScDBData::operator= (const ScD nQueryField[i] = rData.nQueryField[i]; eQueryOp[i] = rData.eQueryOp[i]; bQueryByString[i] = rData.bQueryByString[i]; @@ -327,7 +303,7 @@ index 162fcbd..9ed2645 100644 *pQueryStr[i] = *rData.pQueryStr[i]; nQueryVal[i] = rData.nQueryVal[i]; eQueryConnect[i] = rData.eQueryConnect[i]; -@@ -518,6 +520,7 @@ void ScDBData::GetQueryParam( ScQueryParam& rQueryParam ) const +@@ -519,6 +521,7 @@ void ScDBData::GetQueryParam( ScQueryPar rEntry.nField = nQueryField[i]; rEntry.eOp = eQueryOp[i]; rEntry.bQueryByString = bQueryByString[i]; @@ -335,7 +311,7 @@ index 162fcbd..9ed2645 100644 *rEntry.pStr = *pQueryStr[i]; rEntry.nVal = nQueryVal[i]; rEntry.eConnect = eQueryConnect[i]; -@@ -549,6 +552,7 @@ void ScDBData::SetQueryParam(const ScQueryParam& rQueryParam) +@@ -550,6 +553,7 @@ void ScDBData::SetQueryParam(const ScQue nQueryField[i] = rEntry.nField; eQueryOp[i] = rEntry.eOp; bQueryByString[i] = rEntry.bQueryByString; @@ -343,11 +319,9 @@ index 162fcbd..9ed2645 100644 *pQueryStr[i] = *rEntry.pStr; nQueryVal[i] = rEntry.nVal; eQueryConnect[i] = rEntry.eConnect; -diff --git sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx -index 4a2d4d4..4f56adb 100644 ---- sc/source/ui/dbgui/filtdlg.cxx -+++ sc/source/ui/dbgui/filtdlg.cxx -@@ -451,24 +451,27 @@ void ScFilterDlg::UpdateValueList( USHORT nList ) +--- sc/source/ui/dbgui/filtdlg.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/dbgui/filtdlg.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -451,24 +451,27 @@ void ScFilterDlg::UpdateValueList( USHOR SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1; if (!pEntryLists[nColumn]) { @@ -377,7 +351,7 @@ index 4a2d4d4..4f56adb 100644 TypedStrData* pHdrEntry = aHdrColl[0]; if ( pHdrEntry ) { -@@ -1064,7 +1067,8 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) +@@ -1064,7 +1067,8 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, Co static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos(); @@ -387,11 +361,9 @@ index 4a2d4d4..4f56adb 100644 } } -diff --git sc/source/ui/dbgui/pfiltdlg.cxx sc/source/ui/dbgui/pfiltdlg.cxx -index 35bfc35..42c2c26 100644 ---- sc/source/ui/dbgui/pfiltdlg.cxx -+++ sc/source/ui/dbgui/pfiltdlg.cxx -@@ -352,11 +352,12 @@ void ScPivotFilterDlg::UpdateValueList( USHORT nList ) +--- sc/source/ui/dbgui/pfiltdlg.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/dbgui/pfiltdlg.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -352,11 +352,12 @@ void ScPivotFilterDlg::UpdateValueList( SCROW nFirstRow = theQueryData.nRow1; SCROW nLastRow = theQueryData.nRow2; nFirstRow++; @@ -405,10 +377,8 @@ index 35bfc35..42c2c26 100644 } TypedScStrCollection* pColl = pEntryLists[nColumn]; -diff --git sc/source/ui/inc/filtdlg.hxx sc/source/ui/inc/filtdlg.hxx -index c418e82..7409b5a 100644 ---- sc/source/ui/inc/filtdlg.hxx -+++ sc/source/ui/inc/filtdlg.hxx +--- sc/source/ui/inc/filtdlg.hxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/inc/filtdlg.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -167,6 +167,7 @@ private: ListBox* aFieldLbArr[4]; ListBox* aCondLbArr[4]; @@ -417,11 +387,9 @@ index c418e82..7409b5a 100644 BOOL bRefreshExceptQuery[MAXQUERY]; USHORT nFieldCount; BOOL bRefInputMode; -diff --git sc/source/ui/inc/gridwin.hxx sc/source/ui/inc/gridwin.hxx -index 4013e1a..aae0353 100644 ---- sc/source/ui/inc/gridwin.hxx -+++ sc/source/ui/inc/gridwin.hxx -@@ -218,7 +218,7 @@ private: +--- sc/source/ui/inc/gridwin.hxx.old 2010-03-03 16:44:05.000000000 +0100 ++++ sc/source/ui/inc/gridwin.hxx 2010-03-03 16:59:11.000000000 +0100 +@@ -219,7 +219,7 @@ private: BOOL IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ); void ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow, @@ -430,11 +398,9 @@ index 4013e1a..aae0353 100644 void FilterSelect( ULONG nSel ); void ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ); -diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx -index b547e2c..6fc33d5 100644 ---- sc/source/ui/view/gridwin.cxx -+++ sc/source/ui/view/gridwin.cxx -@@ -170,6 +170,7 @@ private: +--- sc/source/ui/view/gridwin.cxx.old 2010-03-03 16:59:09.000000000 +0100 ++++ sc/source/ui/view/gridwin.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -173,6 +173,7 @@ private: BOOL bInit; BOOL bCancelled; BOOL bInSelect; @@ -442,7 +408,7 @@ index b547e2c..6fc33d5 100644 ULONG nSel; ScFilterBoxMode eMode; -@@ -193,6 +194,8 @@ public: +@@ -196,6 +197,8 @@ public: BOOL IsInInit() const { return bInit; } void SetCancelled() { bCancelled = TRUE; } BOOL IsInSelect() const { return bInSelect; } @@ -451,7 +417,7 @@ index b547e2c..6fc33d5 100644 }; //------------------------------------------------------------------- -@@ -208,6 +211,7 @@ ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, +@@ -211,6 +214,7 @@ ScFilterListBox::ScFilterListBox( Window bInit( TRUE ), bCancelled( FALSE ), bInSelect( FALSE ), @@ -459,7 +425,7 @@ index b547e2c..6fc33d5 100644 nSel( 0 ), eMode( eNewMode ) { -@@ -912,7 +916,9 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) +@@ -916,7 +920,9 @@ void ScGridWindow::DoAutoFilterMenue( SC pFilterBox->SetSeparatorPos( nDefCount - 1 ); // get list entries @@ -470,7 +436,7 @@ index b547e2c..6fc33d5 100644 // check widths of numerical entries (string entries are not included) // so all numbers are completely visible -@@ -1122,7 +1128,7 @@ void ScGridWindow::FilterSelect( ULONG nSel ) +@@ -1126,7 +1132,7 @@ void ScGridWindow::FilterSelect( ULONG n ExecDataSelect( nCol, nRow, aString ); break; case SC_FILTERBOX_FILTER: @@ -479,7 +445,7 @@ index b547e2c..6fc33d5 100644 break; case SC_FILTERBOX_SCENARIO: pViewData->GetView()->UseScenario( aString ); -@@ -1155,7 +1161,7 @@ void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ) +@@ -1159,7 +1165,7 @@ void ScGridWindow::ExecDataSelect( SCCOL void ScGridWindow::ExecFilter( ULONG nSel, SCCOL nCol, SCROW nRow, @@ -488,7 +454,7 @@ index b547e2c..6fc33d5 100644 { SCTAB nTab = pViewData->GetTabNo(); ScDocument* pDoc = pViewData->GetDocument(); -@@ -1227,6 +1233,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, +@@ -1231,6 +1237,7 @@ void ScGridWindow::ExecFilter( ULONG nSe rNewEntry.bDoQuery = TRUE; rNewEntry.bQueryByString = TRUE; rNewEntry.nField = nCol; diff --git a/patches/dev300/calc-filter-xml-free-context.diff b/patches/dev300/calc-filter-xml-free-context.diff index 6b8d386f6..ca0b8c0d4 100644 --- a/patches/dev300/calc-filter-xml-free-context.diff +++ b/patches/dev300/calc-filter-xml-free-context.diff @@ -1,12 +1,10 @@ -Index: sc/source/filter/xml/xmlannoi.cxx -=================================================================== ---- sc/source/filter/xml/xmlannoi.cxx (revision 265800) -+++ sc/source/filter/xml/xmlannoi.cxx (working copy) -@@ -189,6 +189,7 @@ +--- sc/source/filter/xml/xmlannoi.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/xml/xmlannoi.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -195,6 +195,7 @@ void ScXMLAnnotationContext::EndElement( { pShapeContext->EndElement(); delete pShapeContext; + pShapeContext = NULL; } - ScMyImportAnnotation* pMyAnnotation = new ScMyImportAnnotation(); + mrAnnotationData.maAuthor = maAuthorBuffer.makeStringAndClear(); diff --git a/patches/dev300/calc-find-replace-empty-cells-sc.diff b/patches/dev300/calc-find-replace-empty-cells-sc.diff index f78ad8b0b..8c56a6a71 100644 --- a/patches/dev300/calc-find-replace-empty-cells-sc.diff +++ b/patches/dev300/calc-find-replace-empty-cells-sc.diff @@ -1,8 +1,6 @@ -diff --git sc/inc/table.hxx sc/inc/table.hxx -index 3c62a56..0c45c64 100644 ---- sc/inc/table.hxx -+++ sc/inc/table.hxx -@@ -702,6 +702,16 @@ private: +--- sc/inc/table.hxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:13.000000000 +0100 +@@ -706,6 +706,16 @@ private: BOOL SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark); BOOL ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark, ScDocument* pUndoDoc); @@ -19,11 +17,9 @@ index 3c62a56..0c45c64 100644 // benutzen globalen SortParam: BOOL IsSorted(SCCOLROW nStart, SCCOLROW nEnd); -diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx -index cb9dd4a..5b94923 100644 ---- sc/source/core/data/column.cxx -+++ sc/source/core/data/column.cxx -@@ -1373,7 +1373,24 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke +--- sc/source/core/data/column.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/core/data/column.cxx 2010-03-03 16:59:13.000000000 +0100 +@@ -1373,7 +1373,24 @@ void ScColumn::CopyToColumn(SCROW nRow1, CloneCell( i, nFlags, *rColumn.pDocument, aDestPos ); if (pNew) @@ -49,10 +45,8 @@ index cb9dd4a..5b94923 100644 } } } -diff --git sc/source/core/data/table6.cxx sc/source/core/data/table6.cxx -index 994596d..8d5ec0f 100644 ---- sc/source/core/data/table6.cxx -+++ sc/source/core/data/table6.cxx +--- sc/source/core/data/table6.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/data/table6.cxx 2010-03-03 16:59:13.000000000 +0100 @@ -52,6 +52,8 @@ //-------------------------------------------------------------------------- @@ -62,9 +56,9 @@ index 994596d..8d5ec0f 100644 BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal ) { // TRUE = more than 1 paragraph -@@ -660,6 +662,12 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem, +@@ -660,6 +662,12 @@ BOOL ScTable::SearchAndReplace(const Svx com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions(); - aSearchOptions.Locale = *ScGlobal::pLocale; + aSearchOptions.Locale = *ScGlobal::GetLocale(); + if (!aSearchOptions.searchString.getLength()) + { @@ -75,7 +69,7 @@ index 994596d..8d5ec0f 100644 // #107259# reflect UseAsianOptions flag in SearchOptions // (use only ignore case and width if asian options are disabled). // This is also done in SvxSearchDialog CommandHdl, but not in API object. -@@ -686,6 +694,274 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem, +@@ -686,6 +694,274 @@ BOOL ScTable::SearchAndReplace(const Svx return bFound; } @@ -350,11 +344,9 @@ index 994596d..8d5ec0f 100644 -diff --git sc/source/ui/view/tabvwsha.cxx sc/source/ui/view/tabvwsha.cxx -index c64698b..a7fd06d 100644 ---- sc/source/ui/view/tabvwsha.cxx -+++ sc/source/ui/view/tabvwsha.cxx -@@ -224,8 +224,13 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) +--- sc/source/ui/view/tabvwsha.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/tabvwsha.cxx 2010-03-03 16:59:13.000000000 +0100 +@@ -233,8 +233,13 @@ void __EXPORT ScTabViewShell::GetState( break; case SID_SEARCH_ITEM: diff --git a/patches/dev300/calc-formula-variable-separators-sc.diff b/patches/dev300/calc-formula-variable-separators-sc.diff index 4a4e4425d..1c5231328 100644 --- a/patches/dev300/calc-formula-variable-separators-sc.diff +++ b/patches/dev300/calc-formula-variable-separators-sc.diff @@ -1,8 +1,6 @@ -diff --git formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/FormulaCompiler.hxx -index 7da03fd..6df4898 100644 ---- formula/inc/formula/FormulaCompiler.hxx -+++ formula/inc/formula/FormulaCompiler.hxx -@@ -237,6 +237,8 @@ public: +--- formula/inc/formula/FormulaCompiler.hxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ formula/inc/formula/FormulaCompiler.hxx 2010-03-03 16:59:12.000000000 +0100 +@@ -245,6 +245,8 @@ public: including an address reference convention. */ inline FormulaGrammar::Grammar GetGrammar() const { return meGrammar; } @@ -11,11 +9,9 @@ index 7da03fd..6df4898 100644 protected: virtual String FindAddInFunction( const String& rUpperName, BOOL bLocalFirst ) const; virtual void fillFromAddInCollectionUpperName( NonConstOpCodeMapPtr xMap ) const; -diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx -index d031c9a..5834e9e 100644 ---- formula/source/core/api/FormulaCompiler.cxx -+++ formula/source/core/api/FormulaCompiler.cxx -@@ -1681,6 +1681,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String & +--- formula/source/core/api/FormulaCompiler.cxx.old 2009-11-20 11:39:07.000000000 +0100 ++++ formula/source/core/api/FormulaCompiler.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -1681,6 +1681,17 @@ void FormulaCompiler::AppendString( rtl: rBuffer.append(sal_Unicode('"')); } } @@ -33,11 +29,9 @@ index d031c9a..5834e9e 100644 // ----------------------------------------------------------------------------- OpCode FormulaCompiler::NextToken() { -diff --git sc/inc/docoptio.hxx sc/inc/docoptio.hxx -index 51a6405..bbd92e8 100644 ---- sc/inc/docoptio.hxx -+++ sc/inc/docoptio.hxx -@@ -36,6 +36,8 @@ +--- sc/inc/docoptio.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/inc/docoptio.hxx 2010-03-03 16:59:12.000000000 +0100 +@@ -37,6 +37,8 @@ #include "scdllapi.h" #include "optutil.hxx" @@ -45,10 +39,10 @@ index 51a6405..bbd92e8 100644 + class SC_DLLPUBLIC ScDocOptions { - double fIterEps; // Epsilon-Wert dazu -@@ -53,6 +55,11 @@ class SC_DLLPUBLIC ScDocOptions - BOOL bDoAutoSpell; // Auto-Spelling - BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen + double fIterEps; // Epsilon-Wert dazu +@@ -54,6 +56,11 @@ class SC_DLLPUBLIC ScDocOptions + BOOL bDoAutoSpell; // Auto-Spelling + BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled + ::formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax + @@ -57,8 +51,8 @@ index 51a6405..bbd92e8 100644 + ::rtl::OUString aFormulaSepArrayCol; public: - ScDocOptions(); -@@ -99,6 +106,20 @@ public: + ScDocOptions(); +@@ -100,6 +107,20 @@ public: void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; } BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; } @@ -79,9 +73,9 @@ index 51a6405..bbd92e8 100644 }; -@@ -119,6 +140,10 @@ inline void ScDocOptions::CopyTo(ScDocOptions& rOpt) - rOpt.bDoAutoSpell = bDoAutoSpell; - rOpt.bLookUpColRowNames = bLookUpColRowNames; +@@ -120,6 +141,10 @@ inline void ScDocOptions::CopyTo(ScDocOp + rOpt.bDoAutoSpell = bDoAutoSpell; + rOpt.bLookUpColRowNames = bLookUpColRowNames; rOpt.bFormulaRegexEnabled = bFormulaRegexEnabled; + rOpt.eFormulaGrammar = eFormulaGrammar; + rOpt.aFormulaSepArg = aFormulaSepArg; @@ -90,49 +84,47 @@ index 51a6405..bbd92e8 100644 } inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) -@@ -138,6 +163,10 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) - bDoAutoSpell = rCpy.bDoAutoSpell; - bLookUpColRowNames = rCpy.bLookUpColRowNames; +@@ -139,6 +164,10 @@ inline const ScDocOptions& ScDocOptions: + bDoAutoSpell = rCpy.bDoAutoSpell; + bLookUpColRowNames = rCpy.bLookUpColRowNames; bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled; + eFormulaGrammar = rCpy.eFormulaGrammar; + aFormulaSepArg = rCpy.aFormulaSepArg; + aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow; + aFormulaSepArrayCol = rCpy.aFormulaSepArrayCol; - return *this; + return *this; } -@@ -160,6 +189,10 @@ inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const - && rOpt.bDoAutoSpell == bDoAutoSpell - && rOpt.bLookUpColRowNames == bLookUpColRowNames +@@ -161,6 +190,10 @@ inline int ScDocOptions::operator==( con + && rOpt.bDoAutoSpell == bDoAutoSpell + && rOpt.bLookUpColRowNames == bLookUpColRowNames && rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled + && rOpt.eFormulaGrammar == eFormulaGrammar + && rOpt.aFormulaSepArg == aFormulaSepArg + && rOpt.aFormulaSepArrayRow == aFormulaSepArrayRow + && rOpt.aFormulaSepArrayCol == aFormulaSepArrayCol - ); + ); } -@@ -199,12 +232,15 @@ private: +@@ -200,12 +233,15 @@ private: class ScDocCfg : public ScDocOptions { - ScLinkConfigItem aCalcItem; + ScLinkConfigItem aCalcItem; + ScLinkConfigItem aFormulaItem; - ScLinkConfigItem aLayoutItem; + ScLinkConfigItem aLayoutItem; - DECL_LINK( CalcCommitHdl, void* ); + DECL_LINK( CalcCommitHdl, void* ); + DECL_LINK( FormulaCommitHdl, void* ); - DECL_LINK( LayoutCommitHdl, void* ); + DECL_LINK( LayoutCommitHdl, void* ); - com::sun::star::uno::Sequence<rtl::OUString> GetCalcPropertyNames(); + com::sun::star::uno::Sequence<rtl::OUString> GetCalcPropertyNames(); + com::sun::star::uno::Sequence<rtl::OUString> GetFormulaPropertyNames(); - com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames(); + com::sun::star::uno::Sequence<rtl::OUString> GetLayoutPropertyNames(); public: -diff --git sc/inc/sc.hrc sc/inc/sc.hrc -index 7301766..2eba0d8 100644 ---- sc/inc/sc.hrc -+++ sc/inc/sc.hrc -@@ -1660,5 +1660,9 @@ +--- sc/inc/sc.hrc.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/inc/sc.hrc 2010-03-03 16:59:12.000000000 +0100 +@@ -1665,6 +1665,10 @@ // Toggle sheet grid #define FID_TAB_TOGGLE_GRID (SC_OOO_BUILD_START + 2) @@ -140,13 +132,12 @@ index 7301766..2eba0d8 100644 +#define RID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 3) +#define HID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 4) + - #endif + #endif -diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx -index ec6c46c..27f9d36 100644 ---- sc/source/core/data/documen3.cxx -+++ sc/source/core/data/documen3.cxx -@@ -54,6 +54,7 @@ + +--- sc/source/core/data/documen3.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/documen3.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -55,6 +55,7 @@ #include "rangelst.hxx" #include "chartarr.hxx" #include "chartlock.hxx" @@ -154,9 +145,8 @@ index ec6c46c..27f9d36 100644 #include "refupdat.hxx" #include "docoptio.hxx" #include "viewopti.hxx" -@@ -1771,7 +1772,13 @@ void ScDocument::SetDocOptions( const ScDocOptions& rOpt ) +@@ -1753,6 +1754,12 @@ void ScDocument::SetDocOptions( const Sc *pDocOptions = rOpt; - rOpt.GetDate( d,m,y ); xPoolHelper->SetFormTableOpt(rOpt); + @@ -168,10 +158,8 @@ index ec6c46c..27f9d36 100644 } const ScViewOptions& ScDocument::GetViewOptions() const -diff --git sc/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx -index ffbb2d9..4338af6 100644 ---- sc/source/core/tool/docoptio.cxx -+++ sc/source/core/tool/docoptio.cxx +--- sc/source/core/tool/docoptio.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/core/tool/docoptio.cxx 2010-03-03 16:59:12.000000000 +0100 @@ -38,6 +38,8 @@ #include <com/sun/star/uno/Any.hxx> @@ -195,9 +183,9 @@ index ffbb2d9..4338af6 100644 //------------------------------------------------------------------------ -@@ -100,7 +105,11 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy ) - bMatchWholeCell( rCpy.bMatchWholeCell ), - bDoAutoSpell( rCpy.bDoAutoSpell ), +@@ -100,7 +105,11 @@ ScDocOptions::ScDocOptions( const ScDocO + bMatchWholeCell( rCpy.bMatchWholeCell ), + bDoAutoSpell( rCpy.bDoAutoSpell ), bLookUpColRowNames( rCpy.bLookUpColRowNames ), - bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ) + bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ), @@ -209,8 +197,8 @@ index ffbb2d9..4338af6 100644 } @@ -129,6 +138,67 @@ void ScDocOptions::ResetDocOptions() - bDoAutoSpell = FALSE; - bLookUpColRowNames = TRUE; + bDoAutoSpell = FALSE; + bLookUpColRowNames = TRUE; bFormulaRegexEnabled= TRUE; + eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE; + @@ -276,7 +264,7 @@ index ffbb2d9..4338af6 100644 } //======================================================================== -@@ -206,6 +276,13 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const +@@ -206,6 +276,13 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clon #define SCCALCOPT_REGEX 11 #define SCCALCOPT_COUNT 12 @@ -290,17 +278,17 @@ index ffbb2d9..4338af6 100644 #define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other" #define SCDOCLAYOUTOPT_TABSTOP 0 -@@ -227,7 +304,7 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames() - "Other/Precision", // SCCALCOPT_PRECISION - "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT +@@ -227,7 +304,7 @@ Sequence<OUString> ScDocCfg::GetCalcProp + "Other/Precision", // SCCALCOPT_PRECISION + "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT "Other/FindLabel", // SCCALCOPT_FINDLABEL - "Other/RegularExpressions" // SCCALCOPT_REGEX + "Other/RegularExpressions", // SCCALCOPT_REGEX - }; - Sequence<OUString> aNames(SCCALCOPT_COUNT); - OUString* pNames = aNames.getArray(); -@@ -237,6 +314,23 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames() - return aNames; + }; + Sequence<OUString> aNames(SCCALCOPT_COUNT); + OUString* pNames = aNames.getArray(); +@@ -237,6 +314,23 @@ Sequence<OUString> ScDocCfg::GetCalcProp + return aNames; } +Sequence<OUString> ScDocCfg::GetFormulaPropertyNames() @@ -322,18 +310,18 @@ index ffbb2d9..4338af6 100644 + Sequence<OUString> ScDocCfg::GetLayoutPropertyNames() { - static const char* aPropNames[] = -@@ -257,6 +351,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames() + static const char* aPropNames[] = +@@ -257,6 +351,7 @@ Sequence<OUString> ScDocCfg::GetLayoutPr ScDocCfg::ScDocCfg() : - aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ), + aCalcItem( OUString::createFromAscii( CFGPATH_CALC ) ), + aFormulaItem(OUString::createFromAscii(CFGPATH_FORMULA)), - aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) ) + aLayoutItem( OUString::createFromAscii( CFGPATH_DOCLAYOUT ) ) { - sal_Int32 nIntVal = 0; + sal_Int32 nIntVal = 0; @@ -328,6 +423,69 @@ ScDocCfg::ScDocCfg() : - SetDate( nDateDay, nDateMonth, nDateYear ); + SetDate( nDateDay, nDateMonth, nDateYear ); + aNames = GetFormulaPropertyNames(); + aValues = aFormulaItem.GetProperties(aNames); @@ -398,11 +386,11 @@ index ffbb2d9..4338af6 100644 + } + aFormulaItem.SetCommitLink( LINK(this, ScDocCfg, FormulaCommitHdl) ); + - aNames = GetLayoutPropertyNames(); - aValues = aLayoutItem.GetProperties(aNames); - aLayoutItem.EnableNotification(aNames); -@@ -410,6 +568,43 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG ) - return 0; + aNames = GetLayoutPropertyNames(); + aValues = aLayoutItem.GetProperties(aNames); + aLayoutItem.EnableNotification(aNames); +@@ -410,6 +568,43 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void + return 0; } +IMPL_LINK( ScDocCfg, FormulaCommitHdl, void *, EMPTYARG ) @@ -444,23 +432,21 @@ index ffbb2d9..4338af6 100644 + IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG ) { - Sequence<OUString> aNames = GetLayoutPropertyNames(); -@@ -439,6 +634,7 @@ void ScDocCfg::SetOptions( const ScDocOptions& rNew ) - *(ScDocOptions*)this = rNew; + Sequence<OUString> aNames = GetLayoutPropertyNames(); +@@ -439,6 +634,7 @@ void ScDocCfg::SetOptions( const ScDocOp + *(ScDocOptions*)this = rNew; - aCalcItem.SetModified(); + aCalcItem.SetModified(); + aFormulaItem.SetModified(); - aLayoutItem.SetModified(); + aLayoutItem.SetModified(); } -diff --git sc/source/ui/app/scmod.cxx sc/source/ui/app/scmod.cxx -index bc0a91f..2362c23 100644 ---- sc/source/ui/app/scmod.cxx -+++ sc/source/ui/app/scmod.cxx -@@ -2134,6 +2134,13 @@ SfxTabPage* ScModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem - pRet = (*ScTpCalcOptionsCreate)(pParent, rSet); - } - break; +--- sc/source/ui/app/scmod.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/app/scmod.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -2133,6 +2133,13 @@ SfxTabPage* ScModule::CreateTabPage( US + pRet = (*ScTpCalcOptionsCreate)(pParent, rSet); + } + break; + case SID_SC_TP_FORMULA: + { + ::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_FORMULA); @@ -468,34 +454,30 @@ index bc0a91f..2362c23 100644 + pRet = (*ScTpFormulaOptionsCreate)(pParent, rSet); + } + break; - case SID_SC_TP_CHANGES: - { //CHINA001 pRet = ScRedlineOptionsTabPage::Create(pParent, rSet); - ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE ); -diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx -index de9b284..7e6e248 100644 ---- sc/source/ui/attrdlg/scdlgfact.cxx -+++ sc/source/ui/attrdlg/scdlgfact.cxx -@@ -76,6 +76,7 @@ + case SID_SC_TP_CHANGES: + { //CHINA001 pRet = ScRedlineOptionsTabPage::Create(pParent, rSet); + ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE ); +--- sc/source/ui/attrdlg/scdlgfact.cxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/attrdlg/scdlgfact.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -82,6 +82,7 @@ #include "tpstat.hxx" //add for ScDocStatPage #include "tpusrlst.hxx" //add for ScTpUserLists #include "tpview.hxx" //add for ScTpContentOptions +#include "tpformula.hxx" // ause - -@@ -1432,6 +1433,8 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId ) - case RID_SCPAGE_CALC : - return ScTpCalcOptions::Create; + #include "editutil.hxx" +@@ -1551,6 +1552,8 @@ CreateTabPage ScAbstractDialogFactory_Im + case RID_SCPAGE_CALC : + return ScTpCalcOptions::Create; //break; + case RID_SCPAGE_FORMULA: + return ScTpFormulaOptions::Create; - case RID_SCPAGE_PRINT : - return ScTpPrintOptions::Create; + case RID_SCPAGE_PRINT : + return ScTpPrintOptions::Create; //break; -diff --git sc/source/ui/inc/optdlg.hrc sc/source/ui/inc/optdlg.hrc -index e834a11..aaeb33d 100644 ---- sc/source/ui/inc/optdlg.hrc -+++ sc/source/ui/inc/optdlg.hrc +--- sc/source/ui/inc/optdlg.hrc.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/inc/optdlg.hrc 2010-03-03 16:59:12.000000000 +0100 @@ -52,6 +52,7 @@ #define TP_LAYOUT 12 #define TP_INPUT 13 @@ -521,11 +503,8 @@ index e834a11..aaeb33d 100644 +#define FT_FORMULA_SEP_ARRAY_C 88 +#define ED_FORMULA_SEP_ARRAY_C 89 +#define BTN_FORMULA_SEP_RESET 90 -diff --git sc/source/ui/inc/tpformula.hxx sc/source/ui/inc/tpformula.hxx -new file mode 100644 -index 0000000..054655e ---- /dev/null -+++ sc/source/ui/inc/tpformula.hxx +--- sc/source/ui/inc/tpformula.hxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/inc/tpformula.hxx 2010-03-03 16:59:12.000000000 +0100 @@ -0,0 +1,96 @@ +/************************************************************************* + * @@ -623,10 +602,8 @@ index 0000000..054655e + + +#endif -diff --git sc/source/ui/optdlg/makefile.mk sc/source/ui/optdlg/makefile.mk -index e8a6d20..cb43db7 100644 ---- sc/source/ui/optdlg/makefile.mk -+++ sc/source/ui/optdlg/makefile.mk +--- sc/source/ui/optdlg/makefile.mk.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/optdlg/makefile.mk 2010-03-03 16:59:12.000000000 +0100 @@ -47,6 +47,7 @@ CXXFILES = \ tpusrlst.cxx \ tpview.cxx \ @@ -643,11 +620,8 @@ index e8a6d20..cb43db7 100644 $(SLO)$/tpprint.obj \ $(SLO)$/opredlin.obj -diff --git sc/source/ui/optdlg/tpformula.cxx sc/source/ui/optdlg/tpformula.cxx -new file mode 100644 -index 0000000..a27d5a7 ---- /dev/null -+++ sc/source/ui/optdlg/tpformula.cxx +--- sc/source/ui/optdlg/tpformula.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/optdlg/tpformula.cxx 2010-03-03 16:59:12.000000000 +0100 @@ -0,0 +1,289 @@ +/************************************************************************* + * @@ -938,10 +912,8 @@ index 0000000..a27d5a7 + return KEEP_PAGE; +} + -diff --git sc/source/ui/src/optdlg.src sc/source/ui/src/optdlg.src -index 82a1161..2ea00b8 100644 ---- sc/source/ui/src/optdlg.src -+++ sc/source/ui/src/optdlg.src +--- sc/source/ui/src/optdlg.src.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/src/optdlg.src 2010-03-03 16:59:12.000000000 +0100 @@ -176,6 +176,105 @@ TabPage RID_SCPAGE_CALC /* */ /**************************************************************************/ @@ -1047,4 +1019,4 @@ index 82a1161..2ea00b8 100644 + TabPage RID_SCPAGE_USERLISTS { - HelpId = HID_SCPAGE_USERLISTS ; + HelpId = HID_SCPAGE_USERLISTS ; diff --git a/patches/dev300/calc-html-csv-import-force-text-cell.diff b/patches/dev300/calc-html-csv-import-force-text-cell.diff index 88d28fdb2..7f78c157b 100644 --- a/patches/dev300/calc-html-csv-import-force-text-cell.diff +++ b/patches/dev300/calc-html-csv-import-force-text-cell.diff @@ -1,16 +1,14 @@ -diff --git sc/inc/column.hxx sc/inc/column.hxx -index 606602c..a39a958 100644 ---- sc/inc/column.hxx -+++ sc/inc/column.hxx -@@ -72,6 +72,7 @@ struct ScFunctionData; +--- sc/inc/column.hxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/inc/column.hxx 2010-03-03 16:59:15.000000000 +0100 +@@ -69,6 +69,7 @@ class ScPostIt; struct ScFunctionData; struct ScLineFlags; struct ScMergePatternState; +struct ScSetStringParam; - #define COLUMN_DELTA 4 -@@ -244,8 +245,7 @@ public: + #define COLUMN_DELTA 4 +@@ -240,8 +241,7 @@ public: // TRUE = Zahlformat gesetzt BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString, formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO, @@ -20,19 +18,17 @@ index 606602c..a39a958 100644 void SetValue( SCROW nRow, const double& rVal); void SetError( SCROW nRow, const USHORT nError); -diff --git sc/inc/document.hxx sc/inc/document.hxx -index 862682c..8d28d82 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx -@@ -142,6 +142,7 @@ class ScLookupCache; - struct ScLookupCacheMapImpl; - struct ScClipParam; +--- sc/inc/document.hxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:15.000000000 +0100 +@@ -138,6 +138,7 @@ class SfxUndoManager; + class ScFormulaParserPool; + struct ScClipParam; struct ScClipRangeNameData; +struct ScSetStringParam; namespace com { namespace sun { namespace star { namespace lang { -@@ -736,8 +737,7 @@ public: +@@ -726,8 +727,7 @@ public: ULONG nFormatIndex, BOOL bForceTab = FALSE); // return TRUE = Zahlformat gesetzt SC_DLLPUBLIC BOOL SetString( @@ -42,10 +38,8 @@ index 862682c..8d28d82 100644 SC_DLLPUBLIC void SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal ); void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError); -diff --git sc/inc/stringutil.hxx sc/inc/stringutil.hxx -index 4ca8629..fd2d7c3 100644 ---- sc/inc/stringutil.hxx -+++ sc/inc/stringutil.hxx +--- sc/inc/stringutil.hxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/inc/stringutil.hxx 2010-03-03 16:59:15.000000000 +0100 @@ -32,6 +32,41 @@ #define SC_STRINGUTIL_HXX @@ -88,11 +82,9 @@ index 4ca8629..fd2d7c3 100644 class ScStringUtil { -diff --git sc/inc/table.hxx sc/inc/table.hxx -index 43163c4..7f8d968 100644 ---- sc/inc/table.hxx -+++ sc/inc/table.hxx -@@ -85,7 +85,7 @@ struct ScLineFlags; +--- sc/inc/table.hxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:15.000000000 +0100 +@@ -76,7 +76,7 @@ struct RowInfo; struct ScFunctionData; struct ScLineFlags; class CollatorWrapper; @@ -101,7 +93,7 @@ index 43163c4..7f8d968 100644 class ScTable { -@@ -274,7 +274,7 @@ public: +@@ -265,7 +265,7 @@ public: void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); // TRUE = Zahlformat gesetzt BOOL SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, @@ -110,10 +102,8 @@ index 43163c4..7f8d968 100644 void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); void SetError( SCCOL nCol, SCROW nRow, USHORT nError); -diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx -index 56e7c1a..a37a53e 100644 ---- sc/source/core/data/column3.cxx -+++ sc/source/core/data/column3.cxx +--- sc/source/core/data/column3.cxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/core/data/column3.cxx 2010-03-03 16:59:15.000000000 +0100 @@ -55,6 +55,7 @@ #include "detfunc.hxx" // fuer Notizen bei DeleteRange #include "postit.hxx" @@ -122,7 +112,7 @@ index 56e7c1a..a37a53e 100644 #include <com/sun/star/i18n/LocaleDataItem.hpp> -@@ -1263,7 +1264,7 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 ) +@@ -1252,7 +1253,7 @@ void ScColumn::StartListeningInArea( SCR // TRUE = Zahlformat gesetzt BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, formula::FormulaGrammar::AddressConvention eConv, @@ -131,7 +121,7 @@ index 56e7c1a..a37a53e 100644 { BOOL bNumFmtSet = FALSE; if (VALIDROW(nRow)) -@@ -1272,11 +1273,15 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +@@ -1261,11 +1262,15 @@ BOOL ScColumn::SetString( SCROW nRow, SC BOOL bIsLoading = FALSE; if (rString.Len() > 0) { @@ -149,7 +139,7 @@ index 56e7c1a..a37a53e 100644 SfxObjectShell* pDocSh = pDocument->GetDocumentShell(); if ( pDocSh ) bIsLoading = pDocSh->IsLoading(); -@@ -1285,7 +1290,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +@@ -1274,7 +1279,7 @@ BOOL ScColumn::SetString( SCROW nRow, SC { nIndex = nOldIndex = GetNumberFormat( nRow ); if ( rString.Len() > 1 @@ -158,7 +148,7 @@ index 56e7c1a..a37a53e 100644 cFirstChar = rString.GetChar(0); else cFirstChar = 0; // Text -@@ -1341,7 +1346,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +@@ -1330,7 +1335,7 @@ BOOL ScColumn::SetString( SCROW nRow, SC } // nIndex fuer IsNumberFormat vorbelegen if ( !bIsText ) @@ -167,7 +157,7 @@ index 56e7c1a..a37a53e 100644 } do -@@ -1349,9 +1354,9 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +@@ -1338,9 +1343,9 @@ BOOL ScColumn::SetString( SCROW nRow, SC if (bIsText) break; @@ -179,7 +169,7 @@ index 56e7c1a..a37a53e 100644 break; pNewCell = new ScValueCell( nVal ); -@@ -1362,21 +1367,21 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +@@ -1351,21 +1356,21 @@ BOOL ScColumn::SetString( SCROW nRow, SC // Exception: If the new format is boolean, always apply it. BOOL bOverwrite = FALSE; @@ -204,7 +194,7 @@ index 56e7c1a..a37a53e 100644 { bOverwrite = TRUE; // overwrite anything if boolean was detected } -@@ -1392,7 +1397,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +@@ -1381,7 +1386,7 @@ BOOL ScColumn::SetString( SCROW nRow, SC else { // Only check if the string is a regular number. @@ -213,7 +203,7 @@ index 56e7c1a..a37a53e 100644 if (!pLocale) break; -@@ -1414,7 +1419,19 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, +@@ -1403,7 +1408,19 @@ BOOL ScColumn::SetString( SCROW nRow, SC while (false); if (!pNewCell) @@ -233,28 +223,24 @@ index 56e7c1a..a37a53e 100644 } } -diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx -index 3c50c24..56f2158 100644 ---- sc/source/core/data/document.cxx -+++ sc/source/core/data/document.cxx -@@ -2512,10 +2512,10 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT +--- sc/source/core/data/document.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -2615,10 +2615,10 @@ void ScDocument::PutCell( const ScAddres BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, - SvNumberFormatter* pFormatter, bool bDetectNumberFormat ) + ScSetStringParam* pParam ) { - if ( ValidTab(nTab) && pTab[nTab] ) + if ( ValidTab(nTab) && pTab[nTab] ) - return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pFormatter, bDetectNumberFormat ); + return pTab[nTab]->SetString( nCol, nRow, nTab, rString, pParam ); else return FALSE; } -diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx -index 9505877..6a373e9 100644 ---- sc/source/core/data/table2.cxx -+++ sc/source/core/data/table2.cxx -@@ -904,11 +904,11 @@ void ScTable::PutCell( const ScAddress& rPos, ULONG nFormatIndex, ScBaseCell* pC +--- sc/source/core/data/table2.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/core/data/table2.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -857,11 +857,11 @@ void ScTable::PutCell( const ScAddress& BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, @@ -268,10 +254,8 @@ index 9505877..6a373e9 100644 else return FALSE; } -diff --git sc/source/core/tool/stringutil.cxx sc/source/core/tool/stringutil.cxx -index ae6247f..d5e09a6 100644 ---- sc/source/core/tool/stringutil.cxx -+++ sc/source/core/tool/stringutil.cxx +--- sc/source/core/tool/stringutil.cxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/core/tool/stringutil.cxx 2010-03-03 16:59:15.000000000 +0100 @@ -40,6 +40,15 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -288,10 +272,8 @@ index ae6247f..d5e09a6 100644 bool ScStringUtil::parseSimpleNumber( const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal) { -diff --git sc/source/filter/rtf/eeimpars.cxx sc/source/filter/rtf/eeimpars.cxx -index e78e371..b25ad37 100644 ---- sc/source/filter/rtf/eeimpars.cxx -+++ sc/source/filter/rtf/eeimpars.cxx +--- sc/source/filter/rtf/eeimpars.cxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/filter/rtf/eeimpars.cxx 2010-03-03 16:59:15.000000000 +0100 @@ -69,6 +69,7 @@ #include "drwlayer.hxx" #include "rangenam.hxx" @@ -300,7 +282,7 @@ index e78e371..b25ad37 100644 #include "globstr.hrc" -@@ -331,12 +332,17 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu +@@ -331,12 +332,17 @@ void ScEEImport::WriteToDocument( BOOL b // Daten eintragen if (bSimple) { @@ -319,7 +301,7 @@ index e78e371..b25ad37 100644 // wenn SelRange komplett leer kann nachfolgender Text im gleichen Absatz liegen! } else -@@ -381,7 +387,10 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu +@@ -381,7 +387,10 @@ void ScEEImport::WriteToDocument( BOOL b if (bNumbersEnglishUS && !bEnUsRecognized) mpDoc->PutCell( nCol, nRow, nTab, new ScStringCell( aStr)); else @@ -331,10 +313,8 @@ index e78e371..b25ad37 100644 } } else -diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx -index d388887..573443d 100644 ---- sc/source/ui/docshell/impex.cxx -+++ sc/source/ui/docshell/impex.cxx +--- sc/source/ui/docshell/impex.cxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/ui/docshell/impex.cxx 2010-03-03 16:59:15.000000000 +0100 @@ -85,6 +85,9 @@ class StarBASIC; // ause @@ -345,7 +325,7 @@ index d388887..573443d 100644 #include "globstr.hrc" #include <vcl/msgbox.hxx> -@@ -804,6 +807,18 @@ static bool lcl_PutString( +@@ -917,6 +920,18 @@ static bool lcl_PutString( if ( nColFormat == SC_COL_TEXT ) { @@ -364,7 +344,7 @@ index d388887..573443d 100644 pDoc->PutCell( nCol, nRow, nTab, ScBaseCell::CreateTextCell( rStr, pDoc ) ); return bMultiLine; } -@@ -1016,7 +1031,13 @@ static bool lcl_PutString( +@@ -1129,7 +1144,13 @@ static bool lcl_PutString( // Standard or date not determined -> SetString / EditCell if( rStr.Search( _LF ) == STRING_NOTFOUND ) diff --git a/patches/dev300/calc-jump-on-formula-ref-offapi.diff b/patches/dev300/calc-jump-on-formula-ref-offapi.diff index cfb52f8c9..fd39c8083 100644 --- a/patches/dev300/calc-jump-on-formula-ref-offapi.diff +++ b/patches/dev300/calc-jump-on-formula-ref-offapi.diff @@ -1,11 +1,9 @@ -diff --git offapi/com/sun/star/awt/Key.idl offapi/com/sun/star/awt/Key.idl -index 7265d9d..fe2d2df 100644 ---- offapi/com/sun/star/awt/Key.idl -+++ offapi/com/sun/star/awt/Key.idl +--- offapi/com/sun/star/awt/Key.idl.old 2009-10-07 15:06:09.000000000 +0200 ++++ offapi/com/sun/star/awt/Key.idl 2010-03-03 16:59:14.000000000 +0100 @@ -461,6 +461,14 @@ published constants Key - - const short SCROLLLOCK = 1314; - + + const short DELETE_TO_BEGIN_OF_PARAGRAPH = 1538; + + //------------------------------------------------------------------------- + + const short BRACKETLEFT = 1315; @@ -14,6 +12,6 @@ index 7265d9d..fe2d2df 100644 + + const short BRACKETRIGHT = 1316; + - //------------------------------------------------------------------------- + //------------------------------------------------------------------------- - const short DELETE_TO_BEGIN_OF_LINE = 1536; + const short DELETE_TO_END_OF_PARAGRAPH = 1539; diff --git a/patches/dev300/calc-jump-on-formula-ref-sc.diff b/patches/dev300/calc-jump-on-formula-ref-sc.diff index aab1a9bdf..fc5992941 100644 --- a/patches/dev300/calc-jump-on-formula-ref-sc.diff +++ b/patches/dev300/calc-jump-on-formula-ref-sc.diff @@ -1,8 +1,6 @@ -diff --git sc/inc/cell.hxx sc/inc/cell.hxx -index 5ec1281..4c1afdb 100644 ---- sc/inc/cell.hxx -+++ sc/inc/cell.hxx -@@ -662,6 +662,7 @@ private: +--- sc/inc/cell.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/cell.hxx 2010-03-03 16:59:14.000000000 +0100 +@@ -552,6 +552,7 @@ private: public: ScDetectiveRefIter( ScFormulaCell* pCell ); BOOL GetNextRef( ScRange& rRange ); @@ -10,10 +8,8 @@ index 5ec1281..4c1afdb 100644 }; // ============================================================================ -diff --git sc/inc/detfunc.hxx sc/inc/detfunc.hxx -index 49a7938..c38150d 100644 ---- sc/inc/detfunc.hxx -+++ sc/inc/detfunc.hxx +--- sc/inc/detfunc.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/inc/detfunc.hxx 2010-03-03 16:59:14.000000000 +0100 @@ -35,6 +35,9 @@ #include <tools/gen.hxx> #include <tools/color.hxx> @@ -32,7 +28,7 @@ index 49a7938..c38150d 100644 #define SC_DET_MAXCIRCLE 1000 -@@ -146,6 +150,9 @@ public: +@@ -147,6 +151,9 @@ public: BOOL MarkInvalid(BOOL& rOverflow); @@ -42,12 +38,10 @@ index 49a7938..c38150d 100644 static void UpdateAllComments( ScDocument& rDoc ); // on all tables void UpdateAllArrowColors(); // on all tables -diff --git sc/inc/reftokenhelper.hxx sc/inc/reftokenhelper.hxx -index d7b335f..44619ab 100644 ---- sc/inc/reftokenhelper.hxx -+++ sc/inc/reftokenhelper.hxx +--- sc/inc/reftokenhelper.hxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/inc/reftokenhelper.hxx 2010-03-03 16:59:14.000000000 +0100 @@ -78,6 +78,9 @@ public: - static void join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken); + static void SC_DLLPUBLIC join(::std::vector<ScSharedTokenRef>& rTokens, const ScSharedTokenRef& pToken); static bool getDoubleRefDataFromToken(ScComplexRefData& rData, const ScSharedTokenRef& pToken); + @@ -56,10 +50,8 @@ index d7b335f..44619ab 100644 }; #endif -diff --git sc/inc/sc.hrc sc/inc/sc.hrc -index bd688c8..340416b 100644 ---- sc/inc/sc.hrc -+++ sc/inc/sc.hrc +--- sc/inc/sc.hrc.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/inc/sc.hrc 2010-03-03 16:59:14.000000000 +0100 @@ -900,6 +900,9 @@ #define SID_DETECTIVE_REFRESH (DETECTIVE_START+14) #define SID_DETECTIVE_AUTO (DETECTIVE_START+15) @@ -70,11 +62,9 @@ index bd688c8..340416b 100644 #define DETECTIVE_END (DETECTIVE_START+20) #define SID_API_SLOTS (DETECTIVE_END) -diff --git sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi -index 05ab23c..b22589b 100644 ---- sc/sdi/cellsh.sdi -+++ sc/sdi/cellsh.sdi -@@ -113,6 +113,8 @@ interface CellSelection +--- sc/sdi/cellsh.sdi.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/sdi/cellsh.sdi 2010-03-03 16:59:14.000000000 +0100 +@@ -112,6 +112,8 @@ interface CellSelection SID_DETECTIVE_ADD_ERR [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_DETECTIVE_INVALID [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] SID_DETECTIVE_REFRESH [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] @@ -83,11 +73,9 @@ index 05ab23c..b22589b 100644 FID_INS_ROW [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] FID_INS_COLUMN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] FID_INS_CELLSDOWN [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] -diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi -index 66c0a09..f8eddc2 100644 ---- sc/sdi/scalc.sdi -+++ sc/sdi/scalc.sdi -@@ -7899,4 +7899,53 @@ SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID +--- sc/sdi/scalc.sdi.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/sdi/scalc.sdi 2010-03-03 16:59:14.000000000 +0100 +@@ -7828,3 +7828,52 @@ SfxVoidItem SetTabBgColor FID_TAB_MENU_S GroupId = GID_FORMAT; ] @@ -140,12 +128,9 @@ index 66c0a09..f8eddc2 100644 + ToolBoxConfig = FALSE, + GroupId = GID_OPTIONS; +] - -diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx -index 1c3035c..4d5773d 100644 ---- sc/source/core/data/cell.cxx -+++ sc/source/core/data/cell.cxx -@@ -1954,7 +1954,7 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScToken* p ) +--- sc/source/core/data/cell.cxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/core/data/cell.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -1996,7 +1996,7 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScT if ( rRef1.IsColDeleted() || rRef1.IsRowDeleted() || rRef1.IsTabDeleted() || !rRef1.Valid() ) return TRUE; @@ -154,7 +139,7 @@ index 1c3035c..4d5773d 100644 { ScSingleRefData& rRef2 = p->GetDoubleRef().Ref2; if ( rRef2.IsColDeleted() || rRef2.IsRowDeleted() || rRef2.IsTabDeleted() -@@ -1967,7 +1967,20 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScToken* p ) +@@ -2009,7 +2009,20 @@ BOOL lcl_ScDetectiveRefIter_SkipRef( ScT BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange ) { BOOL bRet = FALSE; @@ -175,7 +160,7 @@ index 1c3035c..4d5773d 100644 ScToken* p = static_cast<ScToken*>(pCode->GetNextReferenceRPN()); if (p) p->CalcAbsIfRel( aPos ); -@@ -1978,16 +1991,7 @@ BOOL ScDetectiveRefIter::GetNextRef( ScRange& rRange ) +@@ -2020,16 +2033,7 @@ BOOL ScDetectiveRefIter::GetNextRef( ScR if (p) p->CalcAbsIfRel( aPos ); } @@ -193,10 +178,8 @@ index 1c3035c..4d5773d 100644 } // ============================================================================ -diff --git sc/source/core/tool/detfunc.cxx sc/source/core/tool/detfunc.cxx -index 7680bda..99e0e71 100644 ---- sc/source/core/tool/detfunc.cxx -+++ sc/source/core/tool/detfunc.cxx +--- sc/source/core/tool/detfunc.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/tool/detfunc.cxx 2010-03-03 16:59:14.000000000 +0100 @@ -80,6 +80,12 @@ #include "attrib.hxx" #include "scmod.hxx" @@ -210,7 +193,7 @@ index 7680bda..99e0e71 100644 //------------------------------------------------------------------------ -@@ -1407,6 +1413,52 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow) +@@ -1423,6 +1429,52 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& return ( bDeleted || nInsCount != 0 ); } @@ -263,9 +246,9 @@ index 7680bda..99e0e71 100644 void ScDetectiveFunc::UpdateAllComments( ScDocument& rDoc ) { // for all caption objects, update attributes and SpecialTextBoxShadow flag ---- sc/source/core/tool/makefile.mk -+++ sc/source/core/tool/makefile.mk -@@ -125,6 +125,7 @@ +--- sc/source/core/tool/makefile.mk.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/core/tool/makefile.mk 2010-03-03 16:59:14.000000000 +0100 +@@ -125,6 +125,7 @@ EXCEPTIONSFILES= \ $(SLO)$/chartlock.obj \ $(SLO)$/chgtrack.obj \ $(SLO)$/compiler.obj \ @@ -273,11 +256,9 @@ index 7680bda..99e0e71 100644 $(SLO)$/doubleref.obj \ $(SLO)$/formulaparserpool.obj \ $(SLO)$/interpr1.obj \ -diff --git sc/source/core/tool/reftokenhelper.cxx sc/source/core/tool/reftokenhelper.cxx -index ed196e0..635df6e 100644 ---- sc/source/core/tool/reftokenhelper.cxx -+++ sc/source/core/tool/reftokenhelper.cxx -@@ -475,3 +475,19 @@ bool ScRefTokenHelper::getDoubleRefDataFromToken(ScComplexRefData& rData, const +--- sc/source/core/tool/reftokenhelper.cxx.old 2010-01-21 00:59:54.000000000 +0100 ++++ sc/source/core/tool/reftokenhelper.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -480,3 +480,19 @@ bool ScRefTokenHelper::getDoubleRefDataF } return true; } @@ -297,10 +278,8 @@ index ed196e0..635df6e 100644 + ScSharedTokenRef pRef(new ScDoubleRefToken(aRefData)); + return pRef; +} -diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx -index f55b697..a289649 100644 ---- sc/source/ui/docshell/docfunc.cxx -+++ sc/source/ui/docshell/docfunc.cxx +--- sc/source/ui/docshell/docfunc.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/docshell/docfunc.cxx 2010-03-03 16:59:14.000000000 +0100 @@ -102,6 +102,7 @@ using namespace com::sun::star; @@ -309,7 +288,7 @@ index f55b697..a289649 100644 // STATIC DATA ----------------------------------------------------------- -@@ -524,6 +525,44 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic ) +@@ -532,6 +533,44 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL b return bDone; } @@ -354,12 +333,9 @@ index f55b697..a289649 100644 //------------------------------------------------------------------------ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags, -diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx -index 6a1bf00..302b07d 100644 ---- sc/source/ui/inc/docfunc.hxx -+++ sc/source/ui/inc/docfunc.hxx -@@ -34,7 +34,10 @@ - #include <tools/link.hxx> +--- sc/source/ui/inc/docfunc.hxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/inc/docfunc.hxx 2010-03-03 16:59:14.000000000 +0100 +@@ -35,6 +35,9 @@ #include "global.hxx" #include "formula/grammar.hxx" #include "tabbgcolor.hxx" @@ -369,7 +345,7 @@ index 6a1bf00..302b07d 100644 class ScEditEngineDefaulter; class SdrUndoAction; -@@ -42,6 +45,7 @@ class ScDocShell; +@@ -43,6 +46,7 @@ class ScDocShell; class ScMarkData; class ScPatternAttr; class ScRange; @@ -377,7 +353,7 @@ index 6a1bf00..302b07d 100644 class ScRangeName; class ScBaseCell; class ScTokenArray; -@@ -77,6 +81,8 @@ public: +@@ -78,6 +82,8 @@ public: BOOL DetectiveMarkInvalid(SCTAB nTab); BOOL DetectiveDelAll(SCTAB nTab); BOOL DetectiveRefresh(BOOL bAutomatic = FALSE); @@ -386,11 +362,9 @@ index 6a1bf00..302b07d 100644 BOOL DeleteContents( const ScMarkData& rMark, USHORT nFlags, BOOL bRecord, BOOL bApi ); -diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx -index 7bf556d..7bd9a26 100644 ---- sc/source/ui/inc/viewfunc.hxx -+++ sc/source/ui/inc/viewfunc.hxx -@@ -326,6 +326,8 @@ public: +--- sc/source/ui/inc/viewfunc.hxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/inc/viewfunc.hxx 2010-03-03 16:59:14.000000000 +0100 +@@ -331,6 +331,8 @@ public: void DetectiveMarkInvalid(); void DetectiveDelAll(); void DetectiveRefresh(); @@ -399,7 +373,7 @@ index 7bf556d..7bd9a26 100644 void ShowNote( bool bShow = true ); inline void HideNote() { ShowNote( false ); } -@@ -366,6 +368,8 @@ private: +@@ -364,6 +366,8 @@ private: BOOL TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged ); void DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged, BOOL bAddUndo ); @@ -408,11 +382,9 @@ index 7bf556d..7bd9a26 100644 }; -diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx -index 0cd4007..d6fdb75 100644 ---- sc/source/ui/view/cellsh1.cxx -+++ sc/source/ui/view/cellsh1.cxx -@@ -1584,6 +1584,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) +--- sc/source/ui/view/cellsh1.cxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/view/cellsh1.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -1551,6 +1551,13 @@ void ScCellShell::ExecuteEdit( SfxReques rReq.Done(); break; @@ -426,11 +398,9 @@ index 0cd4007..d6fdb75 100644 case SID_SPELL_DIALOG: // pTabViewShell->DoSpellingChecker(); { -diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx -index 57f1996..2b2ec31 100644 ---- sc/source/ui/view/gridwin.cxx -+++ sc/source/ui/view/gridwin.cxx -@@ -3078,6 +3078,17 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) +--- sc/source/ui/view/gridwin.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/view/gridwin.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -3101,6 +3101,17 @@ void __EXPORT ScGridWindow::KeyInput(con ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), TRUE ); return; } @@ -448,11 +418,9 @@ index 57f1996..2b2ec31 100644 } Window::KeyInput(rKEvt); -diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx -index e106539..eb4c908 100644 ---- sc/source/ui/view/tabvwsh3.cxx -+++ sc/source/ui/view/tabvwsh3.cxx -@@ -407,13 +407,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) +--- sc/source/ui/view/tabvwsh3.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/tabvwsh3.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -407,13 +407,15 @@ void ScTabViewShell::Execute( SfxRequest { pViewData->ResetOldCursor(); SetCursor( nCol, nRow ); @@ -469,10 +437,8 @@ index e106539..eb4c908 100644 rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) ); } -diff --git sc/source/ui/view/viewfun6.cxx sc/source/ui/view/viewfun6.cxx -index 43b3db1..e686cfc 100644 ---- sc/source/ui/view/viewfun6.cxx -+++ sc/source/ui/view/viewfun6.cxx +--- sc/source/ui/view/viewfun6.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/viewfun6.cxx 2010-03-03 16:59:14.000000000 +0100 @@ -50,6 +50,13 @@ #include "globstr.hrc" #include "sc.hrc" diff --git a/patches/dev300/calc-jump-on-formula-ref-vcl.diff b/patches/dev300/calc-jump-on-formula-ref-vcl.diff index 4294c8d0c..229881d48 100644 --- a/patches/dev300/calc-jump-on-formula-ref-vcl.diff +++ b/patches/dev300/calc-jump-on-formula-ref-vcl.diff @@ -1,7 +1,5 @@ -diff --git vcl/inc/vcl/keycodes.hxx vcl/inc/vcl/keycodes.hxx -index 8e7c6a4..8102826 100644 ---- vcl/inc/vcl/keycodes.hxx -+++ vcl/inc/vcl/keycodes.hxx +--- vcl/inc/vcl/keycodes.hxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/inc/vcl/keycodes.hxx 2010-03-03 16:59:14.000000000 +0100 @@ -158,6 +158,8 @@ #define KEY_DECIMAL ((USHORT)::com::sun::star::awt::Key::DECIMAL) #define KEY_TILDE ((USHORT)::com::sun::star::awt::Key::TILDE) @@ -9,13 +7,11 @@ index 8e7c6a4..8102826 100644 +#define KEY_BRACKETLEFT ((USHORT)::com::sun::star::awt::Key::BRACKETLEFT) +#define KEY_BRACKETRIGHT ((USHORT)::com::sun::star::awt::Key::BRACKETRIGHT) - #define KEY_CAPSLOCK ((USHORT)::com::sun::star::awt::Key::CAPSLOCK) - #define KEY_NUMLOCK ((USHORT)::com::sun::star::awt::Key::NUMLOCK) -diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx -index 16193c3..6f07f1c 100644 ---- vcl/unx/gtk/window/gtkframe.cxx -+++ vcl/unx/gtk/window/gtkframe.cxx -@@ -212,6 +212,8 @@ static USHORT GetKeyCode( guint keyval ) + #define KEY_CODE ((USHORT)0x0FFF) + +--- vcl/unx/gtk/window/gtkframe.cxx.old 2010-01-21 01:00:41.000000000 +0100 ++++ vcl/unx/gtk/window/gtkframe.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -214,6 +214,8 @@ static USHORT GetKeyCode( guint keyval ) case GDK_asciitilde: nCode = KEY_TILDE; break; case GDK_leftsinglequotemark: case GDK_quoteleft: nCode = KEY_QUOTELEFT; break; @@ -24,11 +20,9 @@ index 16193c3..6f07f1c 100644 // some special cases, also see saldisp.cxx // - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000 case 0x1000FF02: // apXK_Copy -diff --git vcl/unx/source/app/saldisp.cxx vcl/unx/source/app/saldisp.cxx -index f505eb5..00ab850 100644 ---- vcl/unx/source/app/saldisp.cxx -+++ vcl/unx/source/app/saldisp.cxx -@@ -1314,6 +1314,12 @@ XubString SalDisplay::GetKeyName( USHORT nKeyCode ) const +--- vcl/unx/source/app/saldisp.cxx.old 2010-01-21 01:00:41.000000000 +0100 ++++ vcl/unx/source/app/saldisp.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -1267,6 +1267,12 @@ XubString SalDisplay::GetKeyName( USHORT case KEY_QUOTELEFT: nKeySym = XK_grave; break; @@ -41,7 +35,7 @@ index f505eb5..00ab850 100644 default: nKeySym = 0; -@@ -1644,6 +1650,14 @@ USHORT SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const +@@ -1597,6 +1603,14 @@ USHORT SalDisplay::GetKeyCode( KeySym ke nKey = KEY_QUOTELEFT; *pcPrintable = '`'; break; @@ -56,14 +50,12 @@ index f505eb5..00ab850 100644 // case XK_Linefeed: // *pcPrintable = '\n'; // break; -diff --git vcl/win/source/app/salinst.cxx vcl/win/source/app/salinst.cxx -index 621d8f1..b8ad8b5 100644 ---- vcl/win/source/app/salinst.cxx -+++ vcl/win/source/app/salinst.cxx -@@ -376,6 +376,8 @@ void SalData::initKeyCodeMap() - initKey( '=', KEY_EQUAL ); - initKey( '~', KEY_TILDE ); - initKey( '`', KEY_QUOTELEFT ); +--- vcl/win/source/app/salinst.cxx.old 2009-10-19 13:28:02.000000000 +0200 ++++ vcl/win/source/app/salinst.cxx 2010-03-03 16:59:14.000000000 +0100 +@@ -378,6 +378,8 @@ void SalData::initKeyCodeMap() + initKey( '=', KEY_EQUAL ); + initKey( '~', KEY_TILDE ); + initKey( '`', KEY_QUOTELEFT ); + initKey( '[', KEY_BRACKETLEFT ); + initKey( ']', KEY_BRACKETRIGHT ); } diff --git a/patches/dev300/calc-ods-export-no-more-ushort.diff b/patches/dev300/calc-ods-export-no-more-ushort.diff index ca553510e..d436f6527 100644 --- a/patches/dev300/calc-ods-export-no-more-ushort.diff +++ b/patches/dev300/calc-ods-export-no-more-ushort.diff @@ -1,22 +1,20 @@ -diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx -index 3658d78..01cd671 100644 ---- sc/source/filter/xml/xmlexprt.cxx -+++ sc/source/filter/xml/xmlexprt.cxx -@@ -1931,7 +1931,7 @@ void ScXMLExport::_ExportAutoStyles() - } - } - sal_Int32 nOld(nColumn); +--- sc/source/filter/xml/xmlexprt.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/filter/xml/xmlexprt.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -2588,7 +2588,7 @@ void ScXMLExport::_ExportAutoStyles() + pColumnStyles->AddFieldStyleName(nTable, nColumn, nIndex, bIsVisible); + } + sal_Int32 nOld(nColumn); - nColumn = pDoc->GetNextDifferentChangedCol(sal::static_int_cast<SCTAB>(nTable), static_cast<USHORT>(nColumn)); + nColumn = pDoc->GetNextDifferentChangedCol(sal::static_int_cast<SCTAB>(nTable), static_cast<SCCOL>(nColumn)); - for (sal_Int32 i = nOld + 1; i < nColumn; ++i) - pColumnStyles->AddFieldStyleName(nTable, i, nIndex, bIsVisible); - } -@@ -1981,7 +1981,7 @@ void ScXMLExport::_ExportAutoStyles() - } - } - sal_Int32 nOld(nRow); + for (sal_Int32 i = nOld + 1; i < nColumn; ++i) + pColumnStyles->AddFieldStyleName(nTable, i, nIndex, bIsVisible); + } +@@ -2627,7 +2627,7 @@ void ScXMLExport::_ExportAutoStyles() + pRowStyles->AddFieldStyleName(nTable, nRow, nIndex); + } + sal_Int32 nOld(nRow); - nRow = pDoc->GetNextDifferentChangedRow(sal::static_int_cast<SCTAB>(nTable), static_cast<USHORT>(nRow), false); + nRow = pDoc->GetNextDifferentChangedRow(sal::static_int_cast<SCTAB>(nTable), static_cast<SCROW>(nRow), false); - for (sal_Int32 i = nOld + 1; i < nRow; ++i) - pRowStyles->AddFieldStyleName(nTable, i, nIndex); - } + for (sal_Int32 i = nOld + 1; i < nRow; ++i) + pRowStyles->AddFieldStyleName(nTable, i, nIndex); + } diff --git a/patches/dev300/calc-ods-sheet-protection-sc.diff b/patches/dev300/calc-ods-sheet-protection-sc.diff index 9c5b21b60..318b2bffc 100644 --- a/patches/dev300/calc-ods-sheet-protection-sc.diff +++ b/patches/dev300/calc-ods-sheet-protection-sc.diff @@ -1,7 +1,5 @@ -diff --git sc/inc/tabprotection.hxx sc/inc/tabprotection.hxx -index 99fec7b..b986070 100644 ---- sc/inc/tabprotection.hxx -+++ sc/inc/tabprotection.hxx +--- sc/inc/tabprotection.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/tabprotection.hxx 2010-03-03 16:59:15.000000000 +0100 @@ -35,7 +35,6 @@ #include <com/sun/star/uno/Sequence.hxx> @@ -89,10 +87,8 @@ index 99fec7b..b986070 100644 virtual bool verifyPassword(const String& aPassText) const; bool isOptionEnabled(Option eOption) const; -diff --git sc/source/core/data/tabprotection.cxx sc/source/core/data/tabprotection.cxx -index 2e51a33..463e6a8 100644 ---- sc/source/core/data/tabprotection.cxx -+++ sc/source/core/data/tabprotection.cxx +--- sc/source/core/data/tabprotection.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/data/tabprotection.cxx 2010-03-03 16:59:15.000000000 +0100 @@ -38,20 +38,27 @@ #include "svtools/PasswordHelper.hxx" #include "document.hxx" @@ -123,7 +119,7 @@ index 2e51a33..463e6a8 100644 return true; } -@@ -63,13 +70,37 @@ bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash +@@ -63,13 +70,37 @@ bool ScPassHashHelper::needsPassHashRege // Sheet not protected. Skip it. continue; @@ -162,7 +158,7 @@ index 2e51a33..463e6a8 100644 // ============================================================================ ScPassHashProtectable::~ScPassHashProtectable() -@@ -115,7 +146,8 @@ static Sequence<sal_Int8> lcl_getXLHash(const String& aPassText) +@@ -115,7 +146,8 @@ static Sequence<sal_Int8> lcl_getXLHash( class ScTableProtectionImpl { public: @@ -187,7 +183,7 @@ index 2e51a33..463e6a8 100644 + const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, + ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED); bool verifyPassword(const String& aPassText) const; - + bool isOptionEnabled(SCSIZE nOptId) const; @@ -140,7 +175,8 @@ private: ::std::vector<bool> maOptions; @@ -199,12 +195,12 @@ index 2e51a33..463e6a8 100644 }; Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText, ScPasswordHash eHash) -@@ -151,19 +187,44 @@ Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText, +@@ -151,19 +187,44 @@ Sequence<sal_Int8> ScTableProtectionImpl case PASSHASH_XL: aHash = lcl_getXLHash(aPassText); break; - case PASSHASH_OOO: -- default: +- default: + case PASSHASH_SHA1: SvPasswordHelper::GetHashPassword(aHash, aPassText); break; @@ -247,7 +243,7 @@ index 2e51a33..463e6a8 100644 { } -@@ -173,7 +234,8 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) : +@@ -173,7 +234,8 @@ ScTableProtectionImpl::ScTableProtection maOptions(r.maOptions), mbEmptyPass(r.mbEmptyPass), mbProtected(r.mbProtected), @@ -257,7 +253,7 @@ index 2e51a33..463e6a8 100644 { } -@@ -217,7 +279,7 @@ bool ScTableProtectionImpl::isPasswordEmpty() const +@@ -217,7 +279,7 @@ bool ScTableProtectionImpl::isPasswordEm return mbEmptyPass; } @@ -266,7 +262,7 @@ index 2e51a33..463e6a8 100644 { if (mbEmptyPass) return true; -@@ -225,35 +287,65 @@ bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash) const +@@ -225,35 +287,65 @@ bool ScTableProtectionImpl::hasPasswordH if (maPassText.Len()) return true; @@ -343,7 +339,7 @@ index 2e51a33..463e6a8 100644 maPassHash = aPassword; #if DEBUG_TAB_PROTECTION -@@ -277,7 +369,8 @@ bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const +@@ -277,7 +369,8 @@ bool ScTableProtectionImpl::verifyPasswo // Clear text password exists, and this one takes precedence. return aPassText.Equals(maPassText); @@ -353,7 +349,7 @@ index 2e51a33..463e6a8 100644 #if DEBUG_TAB_PROTECTION fprintf(stdout, "ScTableProtectionImpl::verifyPassword: hash = "); -@@ -353,9 +446,9 @@ bool ScDocProtection::isPasswordEmpty() const +@@ -353,9 +446,9 @@ bool ScDocProtection::isPasswordEmpty() return mpImpl->isPasswordEmpty(); } @@ -365,7 +361,7 @@ index 2e51a33..463e6a8 100644 } void ScDocProtection::setPassword(const String& aPassText) -@@ -363,14 +456,15 @@ void ScDocProtection::setPassword(const String& aPassText) +@@ -363,14 +456,15 @@ void ScDocProtection::setPassword(const mpImpl->setPassword(aPassText); } @@ -385,7 +381,7 @@ index 2e51a33..463e6a8 100644 } bool ScDocProtection::verifyPassword(const String& aPassText) const -@@ -428,9 +522,9 @@ bool ScTableProtection::isPasswordEmpty() const +@@ -428,9 +522,9 @@ bool ScTableProtection::isPasswordEmpty( return mpImpl->isPasswordEmpty(); } @@ -397,7 +393,7 @@ index 2e51a33..463e6a8 100644 } void ScTableProtection::setPassword(const String& aPassText) -@@ -438,14 +532,15 @@ void ScTableProtection::setPassword(const String& aPassText) +@@ -438,14 +532,15 @@ void ScTableProtection::setPassword(cons mpImpl->setPassword(aPassText); } @@ -417,43 +413,39 @@ index 2e51a33..463e6a8 100644 } bool ScTableProtection::verifyPassword(const String& aPassText) const -diff --git sc/source/filter/xml/xmlbodyi.cxx sc/source/filter/xml/xmlbodyi.cxx -index fa993ef..c118998 100644 ---- sc/source/filter/xml/xmlbodyi.cxx -+++ sc/source/filter/xml/xmlbodyi.cxx -@@ -77,6 +77,8 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, - const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : - SvXMLImportContext( rImport, nPrfx, rLName ), - sPassword(), +--- sc/source/filter/xml/xmlbodyi.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/xml/xmlbodyi.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -80,6 +80,8 @@ ScXMLBodyContext::ScXMLBodyContext( ScXM + const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : + SvXMLImportContext( rImport, nPrfx, rLName ), + sPassword(), + meHash1(PASSHASH_SHA1), + meHash2(PASSHASH_UNSPECIFIED), - bProtected(sal_False), + bProtected(sal_False), bHadCalculationSettings(sal_False), - pChangeTrackingImportHelper(NULL) -@@ -122,6 +124,10 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, - bProtected = IsXMLToken(sValue, XML_TRUE); - else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY)) - sPassword = sValue; + pChangeTrackingImportHelper(NULL) +@@ -125,6 +127,10 @@ ScXMLBodyContext::ScXMLBodyContext( ScXM + bProtected = IsXMLToken(sValue, XML_TRUE); + else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY)) + sPassword = sValue; + else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM)) + meHash1 = ScPassHashHelper::getHashTypeFromURI(sValue); + else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2)) + meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue); - } - } + } + } } -@@ -291,7 +297,7 @@ void ScXMLBodyContext::EndElement() - if (sPassword.getLength()) +@@ -330,7 +336,7 @@ void ScXMLBodyContext::EndElement() + if (sPassword.getLength()) { - SvXMLUnitConverter::decodeBase64(aPass, sPassword); + SvXMLUnitConverter::decodeBase64(aPass, sPassword); - pProtection->setPasswordHash(aPass, PASSHASH_OOO); + pProtection->setPasswordHash(aPass, meHash1, meHash2); } pDoc->SetDocProtection(pProtection.get()); -diff --git sc/source/filter/xml/xmlbodyi.hxx sc/source/filter/xml/xmlbodyi.hxx -index 483741e..69d5407 100644 ---- sc/source/filter/xml/xmlbodyi.hxx -+++ sc/source/filter/xml/xmlbodyi.hxx +--- sc/source/filter/xml/xmlbodyi.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/xml/xmlbodyi.hxx 2010-03-03 16:59:15.000000000 +0100 @@ -34,12 +34,16 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> @@ -465,19 +457,17 @@ index 483741e..69d5407 100644 class ScXMLBodyContext : public SvXMLImportContext { - rtl::OUString sPassword; + rtl::OUString sPassword; + ScPasswordHash meHash1; + ScPasswordHash meHash2; - sal_Bool bProtected; + sal_Bool bProtected; sal_Bool bHadCalculationSettings; -diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx -index 3658d78..089f12d 100644 ---- sc/source/filter/xml/xmlexprt.cxx -+++ sc/source/filter/xml/xmlexprt.cxx -@@ -1441,12 +1441,36 @@ void ScXMLExport::SetBodyAttributes() - AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE); - rtl::OUStringBuffer aBuffer; +--- sc/source/filter/xml/xmlexprt.cxx.old 2010-01-26 16:48:38.000000000 +0100 ++++ sc/source/filter/xml/xmlexprt.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -1517,12 +1517,36 @@ void ScXMLExport::SetBodyAttributes() + AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE); + rtl::OUStringBuffer aBuffer; uno::Sequence<sal_Int8> aPassHash; + ScPasswordHash eHashUsed = PASSHASH_UNSPECIFIED; const ScDocProtection* p = pDoc->GetDocProtection(); @@ -495,10 +485,10 @@ index 3658d78..089f12d 100644 + eHashUsed = PASSHASH_XL; + } + } - SvXMLUnitConverter::encodeBase64(aBuffer, aPassHash); - if (aBuffer.getLength()) + SvXMLUnitConverter::encodeBase64(aBuffer, aPassHash); + if (aBuffer.getLength()) + { - AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear()); + AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear()); + if (eHashUsed == PASSHASH_XL) + { + AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, @@ -510,10 +500,10 @@ index 3658d78..089f12d 100644 + AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, + ScPassHashHelper::getHashURI(PASSHASH_SHA1)); + } - } + } } -@@ -1513,18 +1537,46 @@ void ScXMLExport::_ExportContent() +@@ -1723,18 +1747,46 @@ void ScXMLExport::_ExportContent() AddAttribute(sAttrName, sOUTableName); AddAttribute(sAttrStyleName, aTableStyles[nTable]); uno::Reference<util::XProtectable> xProtectable (xTable, uno::UNO_QUERY); @@ -565,7 +555,7 @@ index 3658d78..089f12d 100644 } rtl::OUString sPrintRanges; table::CellRangeAddress aColumnHeaderRange; -@@ -1535,6 +1587,20 @@ void ScXMLExport::_ExportContent() +@@ -1745,6 +1797,20 @@ void ScXMLExport::_ExportContent() else if (!pDoc->IsPrintEntireSheet(static_cast<SCTAB>(nTable))) AddAttribute( XML_NAMESPACE_TABLE, XML_PRINT, XML_FALSE); SvXMLElementExport aElemT(*this, sElemTab, sal_True, sal_True); @@ -586,11 +576,9 @@ index 3658d78..089f12d 100644 CheckAttrList(); WriteTableSource(); WriteScenario(); -diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx -index 4517591..728373e 100644 ---- sc/source/filter/xml/xmlimprt.cxx -+++ sc/source/filter/xml/xmlimprt.cxx -@@ -637,6 +637,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() +--- sc/source/filter/xml/xmlimprt.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/filter/xml/xmlimprt.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -640,6 +640,7 @@ const SvXMLTokenMap& ScXMLImport::GetTab { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, @@ -598,7 +586,7 @@ index 4517591..728373e 100644 { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, -@@ -654,6 +655,22 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() +@@ -657,6 +658,22 @@ const SvXMLTokenMap& ScXMLImport::GetTab return *pTableElemTokenMap; } @@ -621,7 +609,7 @@ index 4517591..728373e 100644 const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap() { if( !pTableRowsElemTokenMap ) -@@ -700,9 +717,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap() +@@ -703,9 +720,11 @@ const SvXMLTokenMap& ScXMLImport::GetTab { { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_NAME }, { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME }, @@ -634,15 +622,15 @@ index 4517591..728373e 100644 { XML_NAMESPACE_TABLE, XML_PRINT, XML_TOK_TABLE_PRINT }, XML_TOKEN_MAP_END }; -@@ -1685,6 +1704,7 @@ ScXMLImport::ScXMLImport( - pLabelRangesElemTokenMap( 0 ), - pLabelRangeAttrTokenMap( 0 ), - pTableElemTokenMap( 0 ), +@@ -1665,6 +1684,7 @@ ScXMLImport::ScXMLImport( + pLabelRangesElemTokenMap( 0 ), + pLabelRangeAttrTokenMap( 0 ), + pTableElemTokenMap( 0 ), + pTableProtectionElemTokenMap(NULL), - pTableRowsElemTokenMap( 0 ), - pTableColsElemTokenMap( 0 ), - pTableScenarioAttrTokenMap( 0 ), -@@ -1811,6 +1831,7 @@ ScXMLImport::~ScXMLImport() throw() + pTableRowsElemTokenMap( 0 ), + pTableColsElemTokenMap( 0 ), + pTableScenarioAttrTokenMap( 0 ), +@@ -1789,6 +1809,7 @@ ScXMLImport::~ScXMLImport() throw() delete pLabelRangesElemTokenMap; delete pLabelRangeAttrTokenMap; delete pTableElemTokenMap; @@ -650,20 +638,18 @@ index 4517591..728373e 100644 delete pTableRowsElemTokenMap; delete pTableColsElemTokenMap; delete pTableAttrTokenMap; -diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx -index 093846a..8ff4178 100644 ---- sc/source/filter/xml/xmlimprt.hxx -+++ sc/source/filter/xml/xmlimprt.hxx +--- sc/source/filter/xml/xmlimprt.hxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/filter/xml/xmlimprt.hxx 2010-03-03 16:59:15.000000000 +0100 @@ -172,6 +172,7 @@ enum ScXMLTableTokens - XML_TOK_TABLE_COL, - XML_TOK_TABLE_ROW_GROUP, - XML_TOK_TABLE_HEADER_ROWS, + XML_TOK_TABLE_COL, + XML_TOK_TABLE_ROW_GROUP, + XML_TOK_TABLE_HEADER_ROWS, + XML_TOK_TABLE_PROTECTION, - XML_TOK_TABLE_ROWS, - XML_TOK_TABLE_ROW, - XML_TOK_TABLE_SOURCE, + XML_TOK_TABLE_ROWS, + XML_TOK_TABLE_ROW, + XML_TOK_TABLE_SOURCE, @@ -180,6 +181,12 @@ enum ScXMLTableTokens - XML_TOK_TABLE_FORMS + XML_TOK_TABLE_FORMS }; +enum ScXMLTokenProtectionTokens @@ -674,41 +660,39 @@ index 093846a..8ff4178 100644 + enum ScXMLTableRowsTokens { - XML_TOK_TABLE_ROWS_ROW_GROUP, + XML_TOK_TABLE_ROWS_ROW_GROUP, @@ -200,9 +207,11 @@ enum ScXMLTableAttrTokens { - XML_TOK_TABLE_NAME, - XML_TOK_TABLE_STYLE_NAME, -- XML_TOK_TABLE_PROTECTION, + XML_TOK_TABLE_NAME, + XML_TOK_TABLE_STYLE_NAME, +- XML_TOK_TABLE_PROTECTION, + XML_TOK_TABLE_PROTECTED, - XML_TOK_TABLE_PRINT_RANGES, - XML_TOK_TABLE_PASSWORD, + XML_TOK_TABLE_PRINT_RANGES, + XML_TOK_TABLE_PASSWORD, + XML_TOK_TABLE_PASSHASH, + XML_TOK_TABLE_PASSHASH_2, XML_TOK_TABLE_PRINT }; -@@ -699,6 +708,7 @@ class ScXMLImport: public SvXMLImport - SvXMLTokenMap *pLabelRangesElemTokenMap; - SvXMLTokenMap *pLabelRangeAttrTokenMap; - SvXMLTokenMap *pTableElemTokenMap; +@@ -700,6 +709,7 @@ class ScXMLImport: public SvXMLImport + SvXMLTokenMap *pLabelRangesElemTokenMap; + SvXMLTokenMap *pLabelRangeAttrTokenMap; + SvXMLTokenMap *pTableElemTokenMap; + SvXMLTokenMap *pTableProtectionElemTokenMap; - SvXMLTokenMap *pTableRowsElemTokenMap; - SvXMLTokenMap *pTableColsElemTokenMap; - SvXMLTokenMap *pTableScenarioAttrTokenMap; -@@ -865,6 +875,7 @@ public: - const SvXMLTokenMap& GetLabelRangesElemTokenMap(); - const SvXMLTokenMap& GetLabelRangeAttrTokenMap(); - const SvXMLTokenMap& GetTableElemTokenMap(); + SvXMLTokenMap *pTableRowsElemTokenMap; + SvXMLTokenMap *pTableColsElemTokenMap; + SvXMLTokenMap *pTableScenarioAttrTokenMap; +@@ -864,6 +874,7 @@ public: + const SvXMLTokenMap& GetLabelRangesElemTokenMap(); + const SvXMLTokenMap& GetLabelRangeAttrTokenMap(); + const SvXMLTokenMap& GetTableElemTokenMap(); + const SvXMLTokenMap& GetTableProtectionAttrTokenMap(); - const SvXMLTokenMap& GetTableRowsElemTokenMap(); - const SvXMLTokenMap& GetTableColsElemTokenMap(); - const SvXMLTokenMap& GetTableAttrTokenMap(); -diff --git sc/source/filter/xml/xmlsubti.cxx sc/source/filter/xml/xmlsubti.cxx -index 72ddec3..3a001e9 100644 ---- sc/source/filter/xml/xmlsubti.cxx -+++ sc/source/filter/xml/xmlsubti.cxx -@@ -148,6 +148,15 @@ void ScMyTableData::SetChangedCols(const sal_Int32 nValue) + const SvXMLTokenMap& GetTableRowsElemTokenMap(); + const SvXMLTokenMap& GetTableColsElemTokenMap(); + const SvXMLTokenMap& GetTableAttrTokenMap(); +--- sc/source/filter/xml/xmlsubti.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/xml/xmlsubti.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -151,6 +151,15 @@ void ScMyTableData::SetChangedCols(const /*******************************************************************************************************************************/ @@ -722,36 +706,36 @@ index 72ddec3..3a001e9 100644 +} + ScMyTables::ScMyTables(ScXMLImport& rTempImport) - : rImport(rTempImport), - aResizeShapes(rTempImport), -@@ -173,7 +182,7 @@ ScMyTables::~ScMyTables() + : rImport(rTempImport), + aResizeShapes(rTempImport), +@@ -176,7 +185,7 @@ ScMyTables::~ScMyTables() } void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, -- const sal_Bool bTempProtection, const rtl::OUString& sTempPassword) +- const sal_Bool bTempProtection, const rtl::OUString& sTempPassword) + const ScXMLTabProtectionData& rProtectData) { - if (rImport.GetModel().is()) - { -@@ -189,8 +198,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString& - } + if (rImport.GetModel().is()) + { +@@ -192,8 +201,7 @@ void ScMyTables::NewSheet(const rtl::OUS + } ++nCurrentSheet; -- bProtection = bTempProtection; -- sPassword = sTempPassword; +- bProtection = bTempProtection; +- sPassword = sTempPassword; + maProtectionData = rProtectData; - uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( rImport.GetModel(), uno::UNO_QUERY ); - if ( xSpreadDoc.is() ) - { -@@ -617,13 +625,16 @@ void ScMyTables::DeleteTable() + uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( rImport.GetModel(), uno::UNO_QUERY ); + if ( xSpreadDoc.is() ) + { +@@ -657,13 +665,16 @@ void ScMyTables::DeleteTable() aMatrixRangeList.clear(); } -- if (rImport.GetDocument() && bProtection) +- if (rImport.GetDocument() && bProtection) + if (rImport.GetDocument() && maProtectionData.mbProtected) - { -- uno::Sequence<sal_Int8> aPass; -- SvXMLUnitConverter::decodeBase64(aPass, sPassword); + { +- uno::Sequence<sal_Int8> aPass; +- SvXMLUnitConverter::decodeBase64(aPass, sPassword); + uno::Sequence<sal_Int8> aHash; + SvXMLUnitConverter::decodeBase64(aHash, maProtectionData.maPassword); + @@ -763,12 +747,10 @@ index 72ddec3..3a001e9 100644 + pProtect->setOption(ScTableProtection::SELECT_LOCKED_CELLS, maProtectionData.mbSelectProtectedCells); + pProtect->setOption(ScTableProtection::SELECT_UNLOCKED_CELLS, maProtectionData.mbSelectUnprotectedCells); rImport.GetDocument()->SetTabProtection(static_cast<SCTAB>(nCurrentSheet), pProtect.get()); - } + } -diff --git sc/source/filter/xml/xmlsubti.hxx sc/source/filter/xml/xmlsubti.hxx -index 23dc5db..349b395 100644 ---- sc/source/filter/xml/xmlsubti.hxx -+++ sc/source/filter/xml/xmlsubti.hxx +--- sc/source/filter/xml/xmlsubti.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/xml/xmlsubti.hxx 2010-03-03 16:59:15.000000000 +0100 @@ -43,6 +43,7 @@ #include <list> #include "XMLTableShapeResizer.hxx" @@ -777,7 +759,7 @@ index 23dc5db..349b395 100644 class ScXMLImport; -@@ -107,6 +108,18 @@ struct ScMatrixRange +@@ -109,6 +110,18 @@ struct ScMatrixRange } }; @@ -796,46 +778,44 @@ index 23dc5db..349b395 100644 class ScMyTables { private: -@@ -121,8 +134,8 @@ private: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; - ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; - rtl::OUString sCurrentSheetName; -- rtl::OUString sPassword; - std::vector<ScMyTableData*> aTableVec; +@@ -123,8 +136,8 @@ private: + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; + ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; + rtl::OUString sCurrentSheetName; +- rtl::OUString sPassword; + std::vector<ScMyTableData*> aTableVec; + ScXMLTabProtectionData maProtectionData; ScMyMatrixRangeList aMatrixRangeList; - com::sun::star::table::CellAddress aRealCellPos; - sal_Int32 nCurrentColStylePos; -@@ -130,7 +143,6 @@ private: - sal_Int16 nCurrentXShapes; - sal_Int32 nTableCount; - sal_Int32 nCurrentSheet; -- sal_Bool bProtection; - - sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, - const sal_Int32 nCol, const sal_Int32 nRow, -@@ -145,7 +157,7 @@ public: - ScMyTables(ScXMLImport& rImport); - ~ScMyTables(); - void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, -- const sal_Bool bProtection, const rtl::OUString& sPassword); + com::sun::star::table::CellAddress aRealCellPos; + sal_Int32 nCurrentColStylePos; +@@ -132,7 +145,6 @@ private: + sal_Int16 nCurrentXShapes; + sal_Int32 nTableCount; + sal_Int32 nCurrentSheet; +- sal_Bool bProtection; + + sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, + const sal_Int32 nCol, const sal_Int32 nRow, +@@ -147,7 +159,7 @@ public: + ScMyTables(ScXMLImport& rImport); + ~ScMyTables(); + void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, +- const sal_Bool bProtection, const rtl::OUString& sPassword); + const ScXMLTabProtectionData& rProtectData); - void AddRow(); - void SetRowStyle(const rtl::OUString& rCellStyleName); - void AddColumn(sal_Bool bIsCovered); -@@ -156,6 +168,7 @@ public: - com::sun::star::table::CellAddress GetRealCellPos(); - void AddColCount(sal_Int32 nTempColCount); - void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); + void AddRow(); + void SetRowStyle(const rtl::OUString& rCellStyleName); + void AddColumn(sal_Bool bIsCovered); +@@ -158,6 +170,7 @@ public: + com::sun::star::table::CellAddress GetRealCellPos(); + void AddColCount(sal_Int32 nTempColCount); + void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); + ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } - sal_Int32 GetCurrentSheet() const { return nCurrentSheet; } - sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); } -diff --git sc/source/filter/xml/xmltabi.cxx sc/source/filter/xml/xmltabi.cxx -index fc09927..5229085 100644 ---- sc/source/filter/xml/xmltabi.cxx -+++ sc/source/filter/xml/xmltabi.cxx -@@ -64,6 +64,9 @@ + rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } + sal_Int32 GetCurrentSheet() const { return nCurrentSheet; } + sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); } +--- sc/source/filter/xml/xmltabi.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/xml/xmltabi.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -65,6 +65,9 @@ using namespace com::sun::star; using namespace xmloff::token; @@ -845,34 +825,34 @@ index fc09927..5229085 100644 /** * Determine whether this table is an external reference cache from its -@@ -152,10 +155,9 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, - { - if (!bTempIsSubTable) - { -- sal_Bool bProtection(sal_False); +@@ -157,10 +160,9 @@ ScXMLTableContext::ScXMLTableContext( Sc + + if (!bTempIsSubTable) + { +- sal_Bool bProtection(sal_False); + ScXMLTabProtectionData aProtectData; - rtl::OUString sName; - rtl::OUString sStyleName; -- rtl::OUString sPassword; - sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap(); - for( sal_Int16 i=0; i < nAttrCount; ++i ) -@@ -174,15 +176,21 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, - case XML_TOK_TABLE_STYLE_NAME: - sStyleName = sValue; - break; -- case XML_TOK_TABLE_PROTECTION: -- bProtection = IsXMLToken(sValue, XML_TRUE); -- break; + rtl::OUString sName; + rtl::OUString sStyleName; +- rtl::OUString sPassword; + sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap(); + for( sal_Int16 i=0; i < nAttrCount; ++i ) +@@ -179,15 +181,21 @@ ScXMLTableContext::ScXMLTableContext( Sc + case XML_TOK_TABLE_STYLE_NAME: + sStyleName = sValue; + break; +- case XML_TOK_TABLE_PROTECTION: +- bProtection = IsXMLToken(sValue, XML_TRUE); +- break; + case XML_TOK_TABLE_PROTECTED: + aProtectData.mbProtected = IsXMLToken(sValue, XML_TRUE); + break; - case XML_TOK_TABLE_PRINT_RANGES: - sPrintRanges = sValue; - break; - case XML_TOK_TABLE_PASSWORD: -- sPassword = sValue; -- break; + case XML_TOK_TABLE_PRINT_RANGES: + sPrintRanges = sValue; + break; + case XML_TOK_TABLE_PASSWORD: +- sPassword = sValue; +- break; + aProtectData.maPassword = sValue; + break; + case XML_TOK_TABLE_PASSHASH: @@ -884,27 +864,27 @@ index fc09927..5229085 100644 case XML_TOK_TABLE_PRINT: { if (IsXMLToken(sValue, XML_FALSE)) -@@ -209,7 +217,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, +@@ -214,7 +222,7 @@ ScXMLTableContext::ScXMLTableContext( Sc else { // This is a regular table. - GetScImport().GetTables().NewSheet(sName, sStyleName, bProtection, sPassword); + GetScImport().GetTables().NewSheet(sName, sStyleName, aProtectData); } - } - else -@@ -271,6 +279,9 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix, - pContext = new ScXMLTableColContext( GetScImport(), nPrefix, - rLName, xAttrList ); - break; + } + else +@@ -282,6 +290,9 @@ SvXMLImportContext *ScXMLTableContext::C + pContext = new ScXMLTableColContext( GetScImport(), nPrefix, + rLName, xAttrList ); + break; + case XML_TOK_TABLE_PROTECTION: + pContext = new ScXMLTableProtectionContext( GetScImport(), nPrefix, rLName, xAttrList ); + break; - case XML_TOK_TABLE_ROW_GROUP: - pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, - rLName, xAttrList, -@@ -384,3 +395,61 @@ void ScXMLTableContext::EndElement() - GetScImport().UnlockSolarMutex(); + case XML_TOK_TABLE_ROW_GROUP: + pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix, + rLName, xAttrList, +@@ -407,3 +418,61 @@ void ScXMLTableContext::EndElement() + GetScImport().UnlockSolarMutex(); } +// ============================================================================ @@ -965,12 +945,10 @@ index fc09927..5229085 100644 +void ScXMLTableProtectionContext::EndElement() +{ +} -diff --git sc/source/filter/xml/xmltabi.hxx sc/source/filter/xml/xmltabi.hxx -index 7fc6031..bd3482c 100644 ---- sc/source/filter/xml/xmltabi.hxx -+++ sc/source/filter/xml/xmltabi.hxx -@@ -77,4 +77,26 @@ public: - virtual void EndElement(); +--- sc/source/filter/xml/xmltabi.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/xml/xmltabi.hxx 2010-03-03 16:59:15.000000000 +0100 +@@ -78,4 +78,26 @@ public: + virtual void EndElement(); }; +// ============================================================================ @@ -996,11 +974,9 @@ index 7fc6031..bd3482c 100644 +}; + #endif -diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx -index 04825b9..9caaf5f 100644 ---- sc/source/ui/docshell/docsh.cxx -+++ sc/source/ui/docshell/docsh.cxx -@@ -1440,9 +1440,14 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium ) +--- sc/source/ui/docshell/docsh.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/ui/docshell/docsh.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -1394,9 +1394,14 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMed #if ENABLE_SHEET_PROTECTION ScTabViewShell* pViewShell = GetBestViewShell(); @@ -1017,11 +993,9 @@ index 04825b9..9caaf5f 100644 // password re-type cancelled. Don't save the document. return false; } -diff --git sc/source/ui/miscdlgs/retypepassdlg.cxx sc/source/ui/miscdlgs/retypepassdlg.cxx -index 7786115..899ae0d 100644 ---- sc/source/ui/miscdlgs/retypepassdlg.cxx -+++ sc/source/ui/miscdlgs/retypepassdlg.cxx -@@ -77,7 +77,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* pParent) : +--- sc/source/ui/miscdlgs/retypepassdlg.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/miscdlgs/retypepassdlg.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -80,7 +80,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* mpDocItem(static_cast<ScDocProtection*>(NULL)), mnCurScrollPos(0), diff --git a/patches/dev300/calc-perf-flat-segment-tree.diff b/patches/dev300/calc-perf-flat-segment-tree.diff index ed61fe659..547a9907b 100644 --- a/patches/dev300/calc-perf-flat-segment-tree.diff +++ b/patches/dev300/calc-perf-flat-segment-tree.diff @@ -1,8 +1,5 @@ -diff --git sc/inc/mdds/flatsegmenttree.hxx sc/inc/mdds/flatsegmenttree.hxx -new file mode 100644 -index 0000000..40a912a ---- /dev/null -+++ sc/inc/mdds/flatsegmenttree.hxx +--- sc/inc/mdds/flatsegmenttree.hxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/inc/mdds/flatsegmenttree.hxx 2010-03-03 16:59:17.000000000 +0100 @@ -0,0 +1,956 @@ +/************************************************************************* + * @@ -960,11 +957,8 @@ index 0000000..40a912a +} + +#endif -diff --git sc/inc/mdds/node.hxx sc/inc/mdds/node.hxx -new file mode 100644 -index 0000000..59749a0 ---- /dev/null -+++ sc/inc/mdds/node.hxx +--- sc/inc/mdds/node.hxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/inc/mdds/node.hxx 2010-03-03 16:59:17.000000000 +0100 @@ -0,0 +1,307 @@ +/************************************************************************* + * @@ -1273,11 +1267,8 @@ index 0000000..59749a0 +} + +#endif -diff --git sc/inc/segmenttree.hxx sc/inc/segmenttree.hxx -new file mode 100644 -index 0000000..466f9ed ---- /dev/null -+++ sc/inc/segmenttree.hxx +--- sc/inc/segmenttree.hxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/inc/segmenttree.hxx 2010-03-03 16:59:17.000000000 +0100 @@ -0,0 +1,89 @@ +/************************************************************************* + * @@ -1368,19 +1359,17 @@ index 0000000..466f9ed + + +#endif -diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk -index b177f20..4ac58a9 100644 ---- sc/source/core/data/makefile.mk -+++ sc/source/core/data/makefile.mk -@@ -102,6 +102,7 @@ SLOFILES = \ - $(SLO)$/phonetic.obj \ +--- sc/source/core/data/makefile.mk.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/core/data/makefile.mk 2010-03-03 16:59:17.000000000 +0100 +@@ -101,6 +101,7 @@ SLOFILES = \ + $(SLO)$/pivot2.obj \ $(SLO)$/poolhelp.obj \ $(SLO)$/scimpexpmsg.obj \ + $(SLO)$/segmenttree.obj \ $(SLO)$/sortparam.obj \ $(SLO)$/stlpool.obj \ $(SLO)$/stlsheet.obj \ -@@ -147,7 +148,8 @@ EXCEPTIONSFILES= \ +@@ -148,7 +149,8 @@ EXCEPTIONSFILES= \ $(SLO)$/dbdocutl.obj \ $(SLO)$/dptabsrc.obj \ $(SLO)$/drwlayer.obj \ @@ -1390,11 +1379,8 @@ index b177f20..4ac58a9 100644 .IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCSPARC" NOOPTFILES= \ -diff --git sc/source/core/data/segmenttree.cxx sc/source/core/data/segmenttree.cxx -new file mode 100644 -index 0000000..be8e408 ---- /dev/null -+++ sc/source/core/data/segmenttree.cxx +--- sc/source/core/data/segmenttree.cxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/source/core/data/segmenttree.cxx 2010-03-03 16:59:17.000000000 +0100 @@ -0,0 +1,225 @@ +/************************************************************************* + * diff --git a/patches/dev300/calc-perf-ods-import-properties.diff b/patches/dev300/calc-perf-ods-import-properties.diff index c5332c1df..fd5189c85 100644 --- a/patches/dev300/calc-perf-ods-import-properties.diff +++ b/patches/dev300/calc-perf-ods-import-properties.diff @@ -1,7 +1,5 @@ -diff --git sc/inc/attarray.hxx sc/inc/attarray.hxx -index 2a8c515..82ea003 100644 ---- sc/inc/attarray.hxx -+++ sc/inc/attarray.hxx +--- sc/inc/attarray.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/attarray.hxx 2010-03-03 16:59:18.000000000 +0100 @@ -39,6 +39,7 @@ class ScEditDataArray; class ScMarkArray; class ScPatternAttr; @@ -10,21 +8,18 @@ index 2a8c515..82ea003 100644 class Rectangle; class SfxItemPoolCache; -@@ -162,7 +163,7 @@ public: - BOOL bRefresh, BOOL bAttrs ); - BOOL RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); +@@ -163,7 +164,7 @@ public: + BOOL bRefresh, BOOL bAttrs ); + BOOL RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); -- void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset ); +- void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset ); + void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - - void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); -diff --git sc/inc/column.hxx sc/inc/column.hxx -index babda9e..0f9586e 100644 ---- sc/inc/column.hxx -+++ sc/inc/column.hxx -@@ -71,8 +71,8 @@ class ScPostIt; - struct ScFunctionData; + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + + void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); +--- sc/inc/column.hxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/inc/column.hxx 2010-03-03 16:59:18.000000000 +0100 +@@ -70,7 +70,7 @@ struct ScFunctionData; struct ScLineFlags; struct ScMergePatternState; struct ScSetStringParam; @@ -33,19 +28,17 @@ index babda9e..0f9586e 100644 #define COLUMN_DELTA 4 -@@ -341,7 +341,7 @@ public: - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; - const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const; +@@ -336,7 +336,7 @@ public: + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; + const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const; -- void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset ); +- void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset ); + void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; /// May return -1 if not found -diff --git sc/source/core/data/attarray.cxx sc/source/core/data/attarray.cxx -index c02d595..a5f3607 100644 ---- sc/source/core/data/attarray.cxx -+++ sc/source/core/data/attarray.cxx +--- sc/source/core/data/attarray.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/attarray.cxx 2010-03-03 16:59:18.000000000 +0100 @@ -57,6 +57,7 @@ #include "rechead.hxx" #include "globstr.hrc" @@ -54,49 +47,45 @@ index c02d595..a5f3607 100644 #undef DBG_INVALIDATE #define DBGOUTPUT(s) \ -@@ -1749,8 +1750,7 @@ SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, BOOL bUp ) const - return nRet; +@@ -1761,8 +1762,7 @@ SCsROW ScAttrArray::GetNextUnprotected( + return nRet; } - -void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset ) +void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ) { - SCROW nStart = 0; - SCSIZE nPos = 0; -@@ -1762,7 +1762,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pU + SCROW nStart = 0; + SCSIZE nPos = 0; +@@ -1774,7 +1774,7 @@ void ScAttrArray::FindStyleSheet( const // for (SCROW nRow = nStart; nRow <= nEnd; nRow++) // pUsed[nRow] = TRUE; -- memset( &pUsed[nStart], TRUE, nEnd-nStart+1 ); +- memset( &pUsed[nStart], TRUE, nEnd-nStart+1 ); + rUsedRows.setTrue(nStart, nEnd); - if (bReset) - { -diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx -index 39061a7..374606a 100644 ---- sc/source/core/data/column.cxx -+++ sc/source/core/data/column.cxx -@@ -620,13 +620,11 @@ const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo - return bEqual ? pStyle : NULL; + if (bReset) + { +--- sc/source/core/data/column.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/core/data/column.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -620,13 +620,11 @@ const ScStyleSheet* ScColumn::GetAreaSty + return bEqual ? pStyle : NULL; } - -void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, BOOL* pUsed, BOOL bReset ) +void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ) { -- pAttrArray->FindStyleSheet( pStyleSheet, pUsed, bReset ); +- pAttrArray->FindStyleSheet( pStyleSheet, pUsed, bReset ); + pAttrArray->FindStyleSheet( pStyleSheet, rUsedRows, bReset ); } - BOOL ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const { - return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles ); -diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx -index 8cb6f7a..5a78469 100644 ---- sc/source/core/data/table2.cxx -+++ sc/source/core/data/table2.cxx + return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles ); +--- sc/source/core/data/table2.cxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/source/core/data/table2.cxx 2010-03-03 16:59:18.000000000 +0100 @@ -60,6 +60,7 @@ #include "bcaslot.hxx" #include "postit.hxx" @@ -105,19 +94,16 @@ index 8cb6f7a..5a78469 100644 #include <math.h> -@@ -1830,36 +1831,24 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRem - double nPPTX, double nPPTY, - const Fraction& rZoomX, const Fraction& rZoomY ) +@@ -1867,36 +1868,24 @@ void ScTable::StyleSheetChanged( const S + double nPPTX, double nPPTY, + const Fraction& rZoomX, const Fraction& rZoomY ) { -- BOOL* pUsed = new BOOL[MAXROWCOUNT]; +- BOOL* pUsed = new BOOL[MAXROWCOUNT]; - memset( pUsed, 0, sizeof(BOOL) * (MAXROWCOUNT) ); + ScFlatBoolRowSegments aUsedRows; + for (SCCOL i = 0; i <= MAXCOL; ++i) + aCol[i].FindStyleSheet(pStyleSheet, aUsedRows, bRemoved); - -- SCCOL nCol; -- for (nCol=0; nCol<=MAXCOL; nCol++) -- aCol[nCol].FindStyleSheet( pStyleSheet, pUsed, bRemoved ); ++ + SCROW nRow = 0; + while (nRow <= MAXROW) + { @@ -125,35 +111,39 @@ index 8cb6f7a..5a78469 100644 + if (!aUsedRows.getRangeData(nRow, aData)) + // search failed! + return; - -- BOOL bFound = FALSE; -- SCROW nStart = 0, nEnd = 0; -- for (SCROW i=0; i<=MAXROW; i++) -- { -- if (pUsed[i]) -- { -- if (!bFound) -- { -- nStart = i; -- bFound = TRUE; -- } -- nEnd = i; -- } -- else if (bFound) -- { -- SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE ); -- bFound = FALSE; -- } -- } -- if (bFound) -- SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE ); ++ + SCROW nEndRow = aData.mnRow2; + if (aData.mbValue) + SetOptimalHeight(nRow, nEndRow, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE); -- delete[] pUsed; +- SCCOL nCol; +- for (nCol=0; nCol<=MAXCOL; nCol++) +- aCol[nCol].FindStyleSheet( pStyleSheet, pUsed, bRemoved ); +- +- BOOL bFound = FALSE; +- SCROW nStart = 0, nEnd = 0; +- for (SCROW i=0; i<=MAXROW; i++) +- { +- if (pUsed[i]) +- { +- if (!bFound) +- { +- nStart = i; +- bFound = TRUE; +- } +- nEnd = i; +- } +- else if (bFound) +- { +- SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE ); +- bFound = FALSE; +- } + nRow = nEndRow + 1; -+ } + } +- if (bFound) +- SetOptimalHeight( nStart, nEnd, 0, pDev, nPPTX, nPPTY, rZoomX, rZoomY, FALSE ); +- +- delete[] pUsed; } diff --git a/patches/dev300/calc-perf-page-and-manual-breaks.diff b/patches/dev300/calc-perf-page-and-manual-breaks.diff index 0d23f4b27..eab9b624c 100644 --- a/patches/dev300/calc-perf-page-and-manual-breaks.diff +++ b/patches/dev300/calc-perf-page-and-manual-breaks.diff @@ -1,7 +1,5 @@ -diff --git sc/inc/document.hxx sc/inc/document.hxx -index 986bde8..c3e15ea 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx +--- sc/inc/document.hxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:18.000000000 +0100 @@ -47,6 +47,7 @@ #include <memory> @@ -10,7 +8,7 @@ index 986bde8..c3e15ea 100644 class KeyEvent; class OutputDevice; -@@ -156,6 +157,9 @@ namespace com { namespace sun { namespace star { +@@ -154,6 +155,9 @@ namespace com { namespace sun { namespac namespace embed { class XEmbeddedObject; } @@ -19,8 +17,8 @@ index 986bde8..c3e15ea 100644 + } } } } - namespace com { namespace sun { namespace star { namespace document { -@@ -1296,6 +1300,24 @@ public: + #include <svtools/zforlist.hxx> +@@ -1290,6 +1294,24 @@ public: SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const; SC_DLLPUBLIC ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab ); @@ -43,22 +41,20 @@ index 986bde8..c3e15ea 100644 + void SyncColRowFlags(); + /// @return the index of the last row with any set flags (auto-pagebreak is ignored). - SC_DLLPUBLIC SCROW GetLastFlaggedRow( SCTAB nTab ) const; + SC_DLLPUBLIC SCROW GetLastFlaggedRow( SCTAB nTab ) const; -@@ -1335,6 +1357,7 @@ public: - Size GetPageSize( SCTAB nTab ) const; - void SetPageSize( SCTAB nTab, const Size& rSize ); - void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); +@@ -1329,6 +1351,7 @@ public: + Size GetPageSize( SCTAB nTab ) const; + void SetPageSize( SCTAB nTab, const Size& rSize ); + void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); + void InvalidatePageBreaks(SCTAB nTab); - void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); - void RemoveManualBreaks( SCTAB nTab ); - BOOL HasManualBreaks( SCTAB nTab ) const; -diff --git sc/inc/global.hxx sc/inc/global.hxx -index b2d6e50..61d748d 100644 ---- sc/inc/global.hxx -+++ sc/inc/global.hxx -@@ -213,13 +213,16 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10; - // FILTERED und MANUALSIZE nur fuer Zeilen moeglich + void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); + void RemoveManualBreaks( SCTAB nTab ); + BOOL HasManualBreaks( SCTAB nTab ) const; +--- sc/inc/global.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/global.hxx 2010-03-03 16:59:18.000000000 +0100 +@@ -206,13 +206,16 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10; + // FILTERED und MANUALSIZE nur fuer Zeilen moeglich const BYTE CR_HIDDEN = 1; //const BYTE CR_MARKED = 2; -const BYTE CR_PAGEBREAK = 4; @@ -77,19 +73,17 @@ index b2d6e50..61d748d 100644 // Insert-/Delete-Flags const USHORT IDF_NONE = 0x0000; -diff --git sc/inc/table.hxx sc/inc/table.hxx -index ea24628..bfc4bf2 100644 ---- sc/inc/table.hxx -+++ sc/inc/table.hxx -@@ -40,12 +40,19 @@ +--- sc/inc/table.hxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:18.000000000 +0100 +@@ -42,12 +42,19 @@ #include "compressedarray.hxx" #include <memory> +#include <set> namespace utl { - class SearchParam; - class TextSearch; + class SearchParam; + class TextSearch; } +namespace com { namespace sun { namespace star { @@ -101,39 +95,39 @@ index ea24628..bfc4bf2 100644 class SfxItemSet; class SfxStyleSheetBase; class SvxBoxInfoItem; -@@ -115,6 +122,11 @@ private: - BYTE* pColFlags; - ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags; +@@ -119,6 +126,11 @@ private: + BYTE* pColFlags; + ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags; + ::std::set<SCROW> maRowPageBreaks; + ::std::set<SCROW> maRowManualBreaks; + ::std::set<SCCOL> maColPageBreaks; + ::std::set<SCCOL> maColManualBreaks; + - ScOutlineTable* pOutlineTable; + ScOutlineTable* pOutlineTable; - SCCOL nTableAreaX; -@@ -150,6 +162,7 @@ private: - Color aScenarioColor; - USHORT nScenarioFlags; - BOOL bActiveScenario; + SCCOL nTableAreaX; +@@ -158,6 +170,7 @@ private: + Color aScenarioColor; + USHORT nScenarioFlags; + BOOL bActiveScenario; + bool mbPageBreaksValid; friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; -@@ -337,7 +350,8 @@ public: +@@ -363,7 +376,8 @@ public: - void CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const; + void CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const; -- void InvalidateTableArea() { bTableAreaValid = FALSE; } +- void InvalidateTableArea() { bTableAreaValid = FALSE; } + void InvalidateTableArea(); + void InvalidatePageBreaks(); - BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer - BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; -@@ -598,6 +612,21 @@ public: - void RemoveManualBreaks(); - BOOL HasManualBreaks() const; + BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer + BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; +@@ -633,6 +647,21 @@ public: + void RemoveManualBreaks(); + BOOL HasManualBreaks() const; + void GetAllRowBreaks(::std::set<SCROW>& rBreaks, bool bPage, bool bManual) const; + void GetAllColBreaks(::std::set<SCCOL>& rBreaks, bool bPage, bool bManual) const; @@ -150,13 +144,11 @@ index ea24628..bfc4bf2 100644 + ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData() const; + void SyncColRowFlags(); + - void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); + void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); + void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); -diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx -index 13c9e66..98001ef 100644 ---- sc/source/core/data/document.cxx -+++ sc/source/core/data/document.cxx +--- sc/source/core/data/document.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 16:59:18.000000000 +0100 @@ -54,6 +54,7 @@ #include <tools/tenccvt.hxx> @@ -165,8 +157,8 @@ index 13c9e66..98001ef 100644 #include "document.hxx" #include "table.hxx" -@@ -103,6 +104,9 @@ - using namespace ::com::sun::star; +@@ -98,6 +99,9 @@ + #include <map> namespace WritingMode2 = ::com::sun::star::text::WritingMode2; +using ::com::sun::star::uno::Sequence; @@ -175,8 +167,8 @@ index 13c9e66..98001ef 100644 struct ScDefaultAttr { -@@ -3189,6 +3193,102 @@ const ScBitMaskCompressedArray< SCROW, BYTE> & ScDocument::GetRowFlagsArray( - return *pFlags; +@@ -3390,6 +3394,102 @@ const ScBitMaskCompressedArray< SCROW, B + return *pFlags; } +void ScDocument::GetAllRowBreaks(set<SCROW>& rBreaks, SCTAB nTab, bool bPage, bool bManual) const @@ -278,8 +270,8 @@ index 13c9e66..98001ef 100644 SCROW ScDocument::GetLastFlaggedRow( SCTAB nTab ) const { -@@ -4569,6 +4669,11 @@ void ScDocument::SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCRO - pTab[nTab]->SetRepeatArea( nStartCol, nEndCol, nStartRow, nEndRow ); +@@ -4775,6 +4875,11 @@ void ScDocument::SetRepeatArea( SCTAB nT + pTab[nTab]->SetRepeatArea( nStartCol, nEndCol, nStartRow, nEndRow ); } +void ScDocument::InvalidatePageBreaks(SCTAB nTab) @@ -290,106 +282,104 @@ index 13c9e66..98001ef 100644 void ScDocument::UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea ) { -diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx -index ddd1bbb..51c3e5e 100644 ---- sc/source/core/data/table1.cxx -+++ sc/source/core/data/table1.cxx -@@ -155,7 +155,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName, - pScenarioRanges( NULL ), - aScenarioColor( COL_LIGHTGRAY ), - nScenarioFlags( 0 ), -- bActiveScenario( FALSE ) +--- sc/source/core/data/table1.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/table1.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -156,7 +156,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTA + pScenarioRanges( NULL ), + aScenarioColor( COL_LIGHTGRAY ), + nScenarioFlags( 0 ), +- bActiveScenario( FALSE ) + bActiveScenario( FALSE ), + mbPageBreaksValid(false) { - if (bColInfo) ---- sc/source/core/data/table2.cxx -+++ sc/source/core/data/table2.cxx -@@ -137,6 +137,8 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE - aCol[j].InsertRow( nStartRow, nSize ); - if( !--nRecalcLvl ) - SetDrawPageSize(); + if (bColInfo) +--- sc/source/core/data/table2.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/core/data/table2.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -138,6 +138,8 @@ void ScTable::InsertRow( SCCOL nStartCol + aCol[j].InsertRow( nStartRow, nSize ); + if( !--nRecalcLvl ) + SetDrawPageSize(); + + InvalidatePageBreaks(); } -@@ -164,6 +166,8 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE +@@ -166,6 +168,8 @@ void ScTable::DeleteRow( SCCOL nStartCol } - if( !--nRecalcLvl ) - SetDrawPageSize(); + if( !--nRecalcLvl ) + SetDrawPageSize(); + + InvalidatePageBreaks(); } -@@ -230,6 +234,8 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE - } - if( !--nRecalcLvl ) - SetDrawPageSize(); +@@ -233,6 +237,8 @@ void ScTable::InsertCol( SCCOL nStartCol + } + if( !--nRecalcLvl ) + SetDrawPageSize(); + + InvalidatePageBreaks(); } -@@ -272,6 +278,8 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE - } - if( !--nRecalcLvl ) - SetDrawPageSize(); +@@ -276,6 +282,8 @@ void ScTable::DeleteCol( SCCOL nStartCol + } + if( !--nRecalcLvl ) + SetDrawPageSize(); + + InvalidatePageBreaks(); } -@@ -638,29 +646,39 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - if (bWidth) - for (SCCOL i=nCol1; i<=nCol2; i++) - { -- BOOL bChange = pCharts && -- ( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN ); +@@ -652,29 +660,39 @@ void ScTable::CopyToTable(SCCOL nCol1, S + if (bWidth) + for (SCCOL i=nCol1; i<=nCol2; i++) + { +- BOOL bChange = pCharts && +- ( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN ); + bool bHiddenChange = ( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN ); + bool bChange = bHiddenChange || (pDestTab->pColWidth[i] != pColWidth[i]); - pDestTab->pColWidth[i] = pColWidth[i]; - pDestTab->pColFlags[i] = pColFlags[i]; - //! Aenderungen zusammenfassen? -- if (bChange) + pDestTab->pColWidth[i] = pColWidth[i]; + pDestTab->pColFlags[i] = pColFlags[i]; + //! Aenderungen zusammenfassen? +- if (bChange) + if (bHiddenChange && pCharts) - pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab )); + pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab )); + + if (bChange) + pDestTab->InvalidatePageBreaks(); - } + } - if (bHeight) - { + if (bHeight) + { + bool bChange = pDestTab->pRowHeight->SumValues(nRow1, nRow2) != pRowHeight->SumValues(nRow1, nRow2); + + if (bChange) + pDestTab->InvalidatePageBreaks(); + - pDestTab->pRowHeight->CopyFrom( *pRowHeight, nRow1, nRow2); - for (SCROW i=nRow1; i<=nRow2; i++) - { - // TODO: might need some performance improvement, block - // operations instead of single GetValue()/SetValue() calls. - BYTE nThisRowFlags = pRowFlags->GetValue(i); -- BOOL bChange = pCharts && -- ( pDestTab->pRowFlags->GetValue(i) & CR_HIDDEN ) != ( nThisRowFlags & CR_HIDDEN ); + pDestTab->pRowHeight->CopyFrom( *pRowHeight, nRow1, nRow2); + for (SCROW i=nRow1; i<=nRow2; i++) + { + // TODO: might need some performance improvement, block + // operations instead of single GetValue()/SetValue() calls. + BYTE nThisRowFlags = pRowFlags->GetValue(i); +- BOOL bChange = pCharts && +- ( pDestTab->pRowFlags->GetValue(i) & CR_HIDDEN ) != ( nThisRowFlags & CR_HIDDEN ); + bool bHiddenChange = ( pDestTab->pRowFlags->GetValue(i) & CR_HIDDEN ) != ( nThisRowFlags & CR_HIDDEN ); - pDestTab->pRowFlags->SetValue( i, nThisRowFlags ); - //! Aenderungen zusammenfassen? -- if (bChange) + pDestTab->pRowFlags->SetValue( i, nThisRowFlags ); + //! Aenderungen zusammenfassen? +- if (bChange) + if (bHiddenChange && pCharts) - pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab )); + pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab )); + + if (bHiddenChange) + pDestTab->InvalidatePageBreaks(); - } - } - pDestTab->DecRecalcLevel(); -@@ -711,6 +729,16 @@ void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const - aCol[i].CopyUpdated( pPosTab->aCol[i], pDestTab->aCol[i] ); + } + } + pDestTab->DecRecalcLevel(); +@@ -726,6 +744,16 @@ void ScTable::CopyUpdated( const ScTable + aCol[i].CopyUpdated( pPosTab->aCol[i], pDestTab->aCol[i] ); } +void ScTable::InvalidateTableArea() @@ -404,104 +394,102 @@ index ddd1bbb..51c3e5e 100644 + void ScTable::CopyScenarioTo( ScTable* pDestTab ) const { - DBG_ASSERT( bScenario, "bScenario == FALSE" ); -@@ -1931,6 +1959,8 @@ void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth ) - pColWidth[nCol] = nNewWidth; - if( !--nRecalcLvl ) - SetDrawPageSize(); + DBG_ASSERT( bScenario, "bScenario == FALSE" ); +@@ -1969,6 +1997,8 @@ void ScTable::SetColWidth( SCCOL nCol, U + pColWidth[nCol] = nNewWidth; + if( !--nRecalcLvl ) + SetDrawPageSize(); + + InvalidatePageBreaks(); - } - } - else -@@ -1960,6 +1990,8 @@ void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight ) - pRowHeight->SetValue( nRow, nNewHeight); - if( !--nRecalcLvl ) - SetDrawPageSize(); + } + } + else +@@ -1999,6 +2029,8 @@ void ScTable::SetRowHeight( SCROW nRow, + pRowHeight->SetValue( nRow, nNewHeight); + if( !--nRecalcLvl ) + SetDrawPageSize(); + + InvalidatePageBreaks(); - } - } - else -@@ -2041,6 +2073,9 @@ BOOL ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeig - } - if( !--nRecalcLvl ) - SetDrawPageSize(); + } + } + else +@@ -2099,6 +2131,9 @@ BOOL ScTable::SetRowHeightRange( SCROW n + } + if( !--nRecalcLvl ) + SetDrawPageSize(); + + if (bChanged) + InvalidatePageBreaks(); - } - else - { -@@ -2280,6 +2315,8 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow) - ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection(); - if ( pCharts ) - pCharts->SetRangeDirty(ScRange( 0, nRow, nTab, MAXCOL, nRow, nTab )); + } + else + { +@@ -2340,6 +2375,8 @@ void ScTable::ShowRow(SCROW nRow, BOOL b + ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection(); + if ( pCharts ) + pCharts->SetRangeDirty(ScRange( 0, nRow, nTab, MAXCOL, nRow, nTab )); + + InvalidatePageBreaks(); - } - } - else -@@ -2324,6 +2361,8 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow) + } + } + else +@@ -2385,6 +2422,8 @@ void ScTable::DBShowRow(SCROW nRow, BOOL - if (pOutlineTable) - UpdateOutlineRow( nRow, nRow, bShow ); + if (pOutlineTable) + UpdateOutlineRow( nRow, nRow, bShow ); + + InvalidatePageBreaks(); - } - } - else -@@ -2421,6 +2460,8 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow) - ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection(); - if ( pCharts ) - pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab )); + } + } + else +@@ -2484,6 +2523,8 @@ void ScTable::ShowRows(SCROW nRow1, SCRO + ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection(); + if ( pCharts ) + pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab )); + + InvalidatePageBreaks(); - } + } - nStartRow = nEndRow + 1; -@@ -2496,7 +2537,7 @@ SCROW ScTable::GetLastFlaggedRow() const - if ( !pRowFlags ) - return 0; + nStartRow = nEndRow + 1; +@@ -2559,7 +2600,7 @@ SCROW ScTable::GetLastFlaggedRow() const + if ( !pRowFlags ) + return 0; - SCROW nLastFound = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) ); + SCROW nLastFound = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) ); - return ValidRow(nLastFound) ? nLastFound : 0; + return ValidRow(nLastFound) ? nLastFound : 0; } -@@ -2508,7 +2549,7 @@ SCCOL ScTable::GetLastChangedCol() const +@@ -2571,7 +2612,7 @@ SCCOL ScTable::GetLastChangedCol() const - SCCOL nLastFound = 0; - for (SCCOL nCol = 1; nCol <= MAXCOL; nCol++) -- if ((pColFlags[nCol] & ~CR_PAGEBREAK) || (pColWidth[nCol] != STD_COL_WIDTH)) + SCCOL nLastFound = 0; + for (SCCOL nCol = 1; nCol <= MAXCOL; nCol++) +- if ((pColFlags[nCol] & ~CR_PAGEBREAK) || (pColWidth[nCol] != STD_COL_WIDTH)) + if ((pColFlags[nCol] & CR_ALL) || (pColWidth[nCol] != STD_COL_WIDTH)) - nLastFound = nCol; + nLastFound = nCol; - return nLastFound; -@@ -2520,7 +2561,7 @@ SCROW ScTable::GetLastChangedRow() const - if ( !pRowFlags ) - return 0; + return nLastFound; +@@ -2583,7 +2624,7 @@ SCROW ScTable::GetLastChangedRow() const + if ( !pRowFlags ) + return 0; - SCROW nLastFlags = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) ); + SCROW nLastFlags = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) ); if (!ValidRow(nLastFlags)) nLastFlags = 0; -diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx -index 5fca4bc..95f68fc 100644 ---- sc/source/core/data/table3.cxx -+++ sc/source/core/data/table3.cxx -@@ -771,7 +771,7 @@ void ScTable::RemoveSubTotals( ScSubTotalParam& rParam ) - if ( pCell->GetCellType() == CELLTYPE_FORMULA ) - if (((ScFormulaCell*)pCell)->IsSubTotal()) - { -- SetRowFlags(nRow+1,GetRowFlags(nRow+1)&(~CR_MANUALBREAK)); +--- sc/source/core/data/table3.cxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/source/core/data/table3.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -771,7 +771,7 @@ void ScTable::RemoveSubTotals( ScSubTota + if ( pCell->GetCellType() == CELLTYPE_FORMULA ) + if (((ScFormulaCell*)pCell)->IsSubTotal()) + { +- SetRowFlags(nRow+1,GetRowFlags(nRow+1)&(~CR_MANUALBREAK)); + RemoveRowBreak(nRow+1, false, true); - pDocument->DeleteRow( 0,nTab, MAXCOL,nTab, nRow, 1 ); - --nEndRow; - aIter = ScColumnIterator( &aCol[nCol],nRow,nEndRow ); -@@ -939,9 +939,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) - bBlockVis = FALSE; + pDocument->DeleteRow( 0,nTab, MAXCOL,nTab, nRow, 1 ); + --nEndRow; + aIter = ScColumnIterator( &aCol[nCol],nRow,nEndRow ); +@@ -939,9 +939,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalPar + bBlockVis = FALSE; if ( rParam.bPagebreak && nRow < MAXROW && aRowEntry.nSubStartRow != nStartRow && nLevel == 0) - SetRowFlags( aRowEntry.nSubStartRow, @@ -509,12 +497,10 @@ index 5fca4bc..95f68fc 100644 - CR_MANUALBREAK); + SetRowBreak(aRowEntry.nSubStartRow, false, true); - if (bSpaceLeft) - { -diff --git sc/source/core/data/table5.cxx sc/source/core/data/table5.cxx -index 3bb433c..618fe75 100644 ---- sc/source/core/data/table5.cxx -+++ sc/source/core/data/table5.cxx + if (bSpaceLeft) + { +--- sc/source/core/data/table5.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/core/data/table5.cxx 2010-03-03 16:59:18.000000000 +0100 @@ -53,8 +53,13 @@ #include "brdcst.hxx" #include "tabprotection.hxx" @@ -529,116 +515,115 @@ index 3bb433c..618fe75 100644 // STATIC DATA ----------------------------------------------------------- -@@ -68,6 +73,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) - if ( !pUserArea && !bPageSizeValid ) - return; +@@ -68,6 +73,9 @@ void ScTable::UpdatePageBreaks( const Sc + if ( !pUserArea && !bPageSizeValid ) + return; + if (mbPageBreaksValid) + return; + - SfxStyleSheetBase* pStyle = pDocument->GetStyleSheetPool()-> - Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ); - if ( !pStyle ) -@@ -79,7 +87,6 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) - const SfxPoolItem* pItem; - - SCCOL nX; -- SCROW nY; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCCOL nEndCol = MAXCOL; -@@ -99,8 +106,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) - // bei mehreren Bereichen nichts anzeigen: - - for (nX=0; nX<MAXCOL; nX++) -- pColFlags[nX] &= ~CR_PAGEBREAK; + SfxStyleSheetBase* pStyle = pDocument->GetStyleSheetPool()-> + Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ); + if ( !pStyle ) +@@ -79,7 +87,6 @@ void ScTable::UpdatePageBreaks( const Sc + const SfxPoolItem* pItem; + + SCCOL nX; +- SCROW nY; + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCCOL nEndCol = MAXCOL; +@@ -99,8 +106,9 @@ void ScTable::UpdatePageBreaks( const Sc + // bei mehreren Bereichen nichts anzeigen: + + for (nX=0; nX<MAXCOL; nX++) +- pColFlags[nX] &= ~CR_PAGEBREAK; - pRowFlags->AndValue( 0, MAXROW-1, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) ); + RemoveColBreak(nX, true, false); + + RemoveRowPageBreaks(0, MAXROW-1); - return; - } -@@ -144,13 +152,13 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) - // Anfang: Breaks loeschen + return; + } +@@ -144,13 +152,13 @@ void ScTable::UpdatePageBreaks( const Sc + // Anfang: Breaks loeschen - for (nX=0; nX<nStartCol; nX++) -- pColFlags[nX] &= ~CR_PAGEBREAK; + for (nX=0; nX<nStartCol; nX++) +- pColFlags[nX] &= ~CR_PAGEBREAK; - pRowFlags->AndValue( 0, nStartRow-1, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) ); + RemoveColBreak(nX, true, false); + RemoveRowPageBreaks(0, nStartRow-1); - if (nStartCol > 0) -- pColFlags[nStartCol] |= CR_PAGEBREAK; //! AREABREAK + if (nStartCol > 0) +- pColFlags[nStartCol] |= CR_PAGEBREAK; //! AREABREAK + SetColBreak(nStartCol, true, false); // AREABREAK - if (nStartRow > 0) -- pRowFlags->OrValue( nStartRow, CR_PAGEBREAK); //! AREABREAK + if (nStartRow > 0) +- pRowFlags->OrValue( nStartRow, CR_PAGEBREAK); //! AREABREAK + SetRowBreak(nStartRow, true, false); // AREABREAK - // Mittelteil: Breaks verteilen + // Mittelteil: Breaks verteilen -@@ -161,14 +169,15 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) - { - BOOL bStartOfPage = FALSE; - long nThisX = ( pColFlags[nX] & CR_HIDDEN ) ? 0 : pColWidth[nX]; -- if ( (nSizeX+nThisX > nPageSizeX) || ((pColFlags[nX] & CR_MANUALBREAK) && !bSkipBreaks) ) +@@ -161,14 +169,15 @@ void ScTable::UpdatePageBreaks( const Sc + { + BOOL bStartOfPage = FALSE; + long nThisX = ( pColFlags[nX] & CR_HIDDEN ) ? 0 : pColWidth[nX]; +- if ( (nSizeX+nThisX > nPageSizeX) || ((pColFlags[nX] & CR_MANUALBREAK) && !bSkipBreaks) ) + bool bManualBreak = HasColManualBreak(nX); + if ( (nSizeX+nThisX > nPageSizeX) || (bManualBreak && !bSkipBreaks) ) - { -- pColFlags[nX] |= CR_PAGEBREAK; + { +- pColFlags[nX] |= CR_PAGEBREAK; + SetColBreak(nX, true, false); - nSizeX = 0; - bStartOfPage = TRUE; - } - else if (nX != nStartCol) -- pColFlags[nX] &= ~CR_PAGEBREAK; + nSizeX = 0; + bStartOfPage = TRUE; + } + else if (nX != nStartCol) +- pColFlags[nX] &= ~CR_PAGEBREAK; + RemoveColBreak(nX, true, false); - else - bStartOfPage = TRUE; - -@@ -178,7 +187,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) - for (SCCOL i=nRepeatStartX; i<=nRepeatEndX; i++) - nPageSizeX -= ( pColFlags[i] & CR_HIDDEN ) ? 0 : pColWidth[i]; - while (nX<=nRepeatEndX) -- pColFlags[++nX] &= ~CR_PAGEBREAK; + else + bStartOfPage = TRUE; + +@@ -178,7 +187,7 @@ void ScTable::UpdatePageBreaks( const Sc + for (SCCOL i=nRepeatStartX; i<=nRepeatEndX; i++) + nPageSizeX -= ( pColFlags[i] & CR_HIDDEN ) ? 0 : pColWidth[i]; + while (nX<=nRepeatEndX) +- pColFlags[++nX] &= ~CR_PAGEBREAK; + RemoveColBreak(++nX, true, false); - bColFound = TRUE; - } + bColFound = TRUE; + } -@@ -186,23 +195,21 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) - } +@@ -186,23 +195,21 @@ void ScTable::UpdatePageBreaks( const Sc + } // Remove all page breaks in range. - pRowFlags->AndValue( nStartRow+1, nEndRow, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) ); + RemoveRowPageBreaks(nStartRow+1, nEndRow); + // And set new page breaks. - BOOL bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE ); - BOOL bRowFound = FALSE; - long nSizeY = 0; + BOOL bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE ); + BOOL bRowFound = FALSE; + long nSizeY = 0; - ScCompressedArrayIterator< SCROW, BYTE> aFlagsIter( *pRowFlags, nStartRow, nEndRow); - ScCompressedArrayIterator< SCROW, USHORT> aHeightIter( *pRowHeight, nStartRow, nEndRow); - for ( ; aFlagsIter; ++aFlagsIter, ++aHeightIter) -- { -- nY = aFlagsIter.GetPos(); + for (SCROW nY = nStartRow; nY <= nEndRow; ++nY) -+ { - BOOL bStartOfPage = FALSE; + { +- nY = aFlagsIter.GetPos(); + BOOL bStartOfPage = FALSE; - BYTE nFlags = *aFlagsIter; -- long nThisY = (nFlags & CR_HIDDEN) ? 0 : *aHeightIter; -- if ( (nSizeY+nThisY > nPageSizeY) || ((nFlags & CR_MANUALBREAK) && !bSkipBreaks) ) +- long nThisY = (nFlags & CR_HIDDEN) ? 0 : *aHeightIter; +- if ( (nSizeY+nThisY > nPageSizeY) || ((nFlags & CR_MANUALBREAK) && !bSkipBreaks) ) + BYTE nFlags = pRowFlags->GetValue(nY); + long nThisY = (nFlags & CR_HIDDEN) ? 0 : pRowHeight->GetValue(nY); + bool bManualBreak = HasRowManualBreak(nY); + if ( (nSizeY+nThisY > nPageSizeY) || (bManualBreak && !bSkipBreaks) ) - { -- pRowFlags->SetValue( nY, nFlags | CR_PAGEBREAK); + { +- pRowFlags->SetValue( nY, nFlags | CR_PAGEBREAK); - aFlagsIter.Resync( nY); + SetRowBreak(nY, true, false); - nSizeY = 0; - bStartOfPage = TRUE; - } -@@ -222,12 +229,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) + nSizeY = 0; + bStartOfPage = TRUE; + } +@@ -222,12 +229,7 @@ void ScTable::UpdatePageBreaks( const Sc #endif nPageSizeY -= nHeights; if (nY <= nRepeatEndY) @@ -649,37 +634,37 @@ index 3bb433c..618fe75 100644 - aHeightIter.Resync( nY); - } + RemoveRowPageBreaks(nY, nRepeatEndY); - bRowFound = TRUE; - } + bRowFound = TRUE; + } -@@ -238,49 +240,217 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) +@@ -238,26 +240,24 @@ void ScTable::UpdatePageBreaks( const Sc - if (nEndCol < MAXCOL) - { -- pColFlags[nEndCol+1] |= CR_PAGEBREAK; //! AREABREAK + if (nEndCol < MAXCOL) + { +- pColFlags[nEndCol+1] |= CR_PAGEBREAK; //! AREABREAK + SetColBreak(nEndCol+1, true, false); // AREABREAK - for (nX=nEndCol+2; nX<=MAXCOL; nX++) -- pColFlags[nX] &= ~CR_PAGEBREAK; + for (nX=nEndCol+2; nX<=MAXCOL; nX++) +- pColFlags[nX] &= ~CR_PAGEBREAK; + RemoveColBreak(nX, true, false); - } - if (nEndRow < MAXROW) - { -- pRowFlags->OrValue( nEndRow+1, CR_PAGEBREAK); //! AREABREAK + } + if (nEndRow < MAXROW) + { +- pRowFlags->OrValue( nEndRow+1, CR_PAGEBREAK); //! AREABREAK + SetRowBreak(nEndRow+1, true, false); // AREABREAK - if (nEndRow+2 <= MAXROW) + if (nEndRow+2 <= MAXROW) - pRowFlags->AndValue( nEndRow+2, MAXROW, sal::static_int_cast<BYTE>(~CR_PAGEBREAK) ); + RemoveRowPageBreaks(nEndRow+2, MAXROW); - } + } + mbPageBreaksValid = true; } void ScTable::RemoveManualBreaks() { -- if (pColFlags) -- for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++) -- pColFlags[nCol] &= ~CR_MANUALBREAK; +- if (pColFlags) +- for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++) +- pColFlags[nCol] &= ~CR_MANUALBREAK; - -- if (pRowFlags) +- if (pRowFlags) - pRowFlags->AndValue( 0, MAXROW, sal::static_int_cast<BYTE>(~CR_MANUALBREAK) ); + maRowManualBreaks.clear(); + maColManualBreaks.clear(); @@ -687,14 +672,18 @@ index 3bb433c..618fe75 100644 if (IsStreamValid()) SetStreamValid(FALSE); - } +@@ -265,22 +265,192 @@ void ScTable::RemoveManualBreaks() BOOL ScTable::HasManualBreaks() const { -- if (pColFlags) -- for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++) -- if ( pColFlags[nCol] & CR_MANUALBREAK ) -- return TRUE; +- if (pColFlags) +- for (SCCOL nCol = 0; nCol <= MAXCOL; nCol++) +- if ( pColFlags[nCol] & CR_MANUALBREAK ) +- return TRUE; +- +- if (pRowFlags) +- if (ValidRow( pRowFlags->GetLastAnyBitAccess( 0, CR_MANUALBREAK))) +- return TRUE; + return !maRowManualBreaks.empty() || !maColManualBreaks.empty(); +} + @@ -729,16 +718,12 @@ index 3bb433c..618fe75 100644 + + return maRowPageBreaks.count(nRow) > 0; +} - -- if (pRowFlags) -- if (ValidRow( pRowFlags->GetLastAnyBitAccess( 0, CR_MANUALBREAK))) -- return TRUE; ++ +bool ScTable::HasColPageBreak(SCCOL nCol) const +{ + if (!ValidCol(nCol)) + return false; - -- return FALSE; ++ + return maColPageBreaks.count(nCol) > 0; +} + @@ -792,7 +777,8 @@ index 3bb433c..618fe75 100644 + + if (bPage) + maColPageBreaks.erase(nCol); -+ + +- return FALSE; + if (bManual) + { + maColManualBreaks.erase(nCol); @@ -880,18 +866,16 @@ index 3bb433c..618fe75 100644 void ScTable::SetPageSize( const Size& rSize ) { - if ( rSize.Width() != 0 && rSize.Height() != 0 ) - { + if ( rSize.Width() != 0 && rSize.Height() != 0 ) + { + if (aPageSizeTwips != rSize) + InvalidatePageBreaks(); + - bPageSizeValid = TRUE; - aPageSizeTwips = rSize; - } -diff --git sc/source/filter/excel/xepage.cxx sc/source/filter/excel/xepage.cxx -index 52aa775..f99b732 100644 ---- sc/source/filter/excel/xepage.cxx -+++ sc/source/filter/excel/xepage.cxx + bPageSizeValid = TRUE; + aPageSizeTwips = rSize; + } +--- sc/source/filter/excel/xepage.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/excel/xepage.cxx 2010-03-03 16:59:18.000000000 +0100 @@ -48,9 +48,14 @@ #include "xehelper.hxx" #include "xeescher.hxx" @@ -907,7 +891,7 @@ index 52aa775..f99b732 100644 // Page settings records ====================================================== -@@ -302,17 +307,23 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) : +@@ -302,17 +307,23 @@ XclExpPageSettings::XclExpPageSettings( // *** page breaks *** @@ -941,10 +925,8 @@ index 52aa775..f99b732 100644 } static void lcl_WriteHeaderFooter( XclExpXmlStream& rStrm ) -diff --git sc/source/filter/excel/xipage.cxx sc/source/filter/excel/xipage.cxx -index 2a52521..cb1aba2 100644 ---- sc/source/filter/excel/xipage.cxx -+++ sc/source/filter/excel/xipage.cxx +--- sc/source/filter/excel/xipage.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/excel/xipage.cxx 2010-03-03 16:59:18.000000000 +0100 @@ -378,14 +378,14 @@ void XclImpPageSettings::Finalize() { SCROW nScRow = static_cast< SCROW >( *aIt ); @@ -962,123 +944,113 @@ index 2a52521..cb1aba2 100644 } } -diff --git sc/source/filter/starcalc/scflt.cxx sc/source/filter/starcalc/scflt.cxx -index 444ed23..371ef48 100644 ---- sc/source/filter/starcalc/scflt.cxx -+++ sc/source/filter/starcalc/scflt.cxx +--- sc/source/filter/starcalc/scflt.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/starcalc/scflt.cxx 2010-03-03 16:59:18.000000000 +0100 @@ -1552,13 +1552,15 @@ void Sc10Import::LoadTables() - if (DataValue != 0) - { - BYTE nFlags = 0; -- if ((DataValue & crfSoftBreak) == crfSoftBreak) -- nFlags |= CR_PAGEBREAK; -- if ((DataValue & crfHardBreak) == crfHardBreak) -- nFlags |= CR_MANUALBREAK; + if (DataValue != 0) + { + BYTE nFlags = 0; +- if ((DataValue & crfSoftBreak) == crfSoftBreak) +- nFlags |= CR_PAGEBREAK; +- if ((DataValue & crfHardBreak) == crfHardBreak) +- nFlags |= CR_MANUALBREAK; + bool bPageBreak = ((DataValue & crfSoftBreak) == crfSoftBreak); + bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak); - if ((DataValue & crfHidden) == crfHidden) - nFlags |= CR_HIDDEN; -- for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) pDoc->SetColFlags(k, static_cast<SCTAB> (TabNo), nFlags); + if ((DataValue & crfHidden) == crfHidden) + nFlags |= CR_HIDDEN; +- for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) pDoc->SetColFlags(k, static_cast<SCTAB> (TabNo), nFlags); + for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) + { + pDoc->SetColFlags(k, static_cast<SCTAB> (TabNo), nFlags); + pDoc->SetColBreak(k, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak); + } - } - DataStart = DataEnd + 1; - } + } + DataStart = DataEnd + 1; + } @@ -1602,13 +1604,15 @@ void Sc10Import::LoadTables() - if (DataValue != 0) - { - BYTE nFlags = 0; -- if ((DataValue & crfSoftBreak) == crfSoftBreak) -- nFlags |= CR_PAGEBREAK; -- if ((DataValue & crfHardBreak) == crfHardBreak) -- nFlags |= CR_MANUALBREAK; + if (DataValue != 0) + { + BYTE nFlags = 0; +- if ((DataValue & crfSoftBreak) == crfSoftBreak) +- nFlags |= CR_PAGEBREAK; +- if ((DataValue & crfHardBreak) == crfHardBreak) +- nFlags |= CR_MANUALBREAK; + bool bPageBreak = ((DataValue & crfSoftBreak) == crfSoftBreak); + bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak); - if ((DataValue & crfHidden) == crfHidden) - nFlags |= CR_HIDDEN; -- for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) pDoc->SetRowFlags(l, static_cast<SCTAB> (TabNo), nFlags); + if ((DataValue & crfHidden) == crfHidden) + nFlags |= CR_HIDDEN; +- for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) pDoc->SetRowFlags(l, static_cast<SCTAB> (TabNo), nFlags); + for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) + { + pDoc->SetRowFlags(l, static_cast<SCTAB> (TabNo), nFlags); + pDoc->SetRowBreak(l, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak); + } - } - DataStart = DataEnd + 1; - } -diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx -index 089f12d..4dd19a1 100644 ---- sc/source/filter/xml/xmlexprt.cxx -+++ sc/source/filter/xml/xmlexprt.cxx -@@ -1947,6 +1947,7 @@ void ScXMLExport::_ExportAutoStyles() - { - if (pDoc) - { + } + DataStart = DataEnd + 1; + } +--- sc/source/filter/xml/xmlexprt.cxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/source/filter/xml/xmlexprt.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -2559,6 +2559,7 @@ void ScXMLExport::_ExportAutoStyles() + { + if (pDoc) + { + pDoc->SyncColRowFlags(); - uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns()); - if (xTableColumns.is()) - { -diff --git sc/source/ui/docshell/dbdocfun.cxx sc/source/ui/docshell/dbdocfun.cxx -index 9e2a647..0e670d8 100644 ---- sc/source/ui/docshell/dbdocfun.cxx -+++ sc/source/ui/docshell/dbdocfun.cxx -@@ -938,7 +938,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, - } - - if (!bCopy) + uno::Reference<table::XTableColumns> xTableColumns(xColumnRowRange->getColumns()); + if (xTableColumns.is()) + { +--- sc/source/ui/docshell/dbdocfun.cxx.old 2010-03-03 16:59:09.000000000 +0100 ++++ sc/source/ui/docshell/dbdocfun.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -939,7 +939,10 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, con + } + + if (!bCopy) + { + pDoc->InvalidatePageBreaks(nTab); - pDoc->UpdatePageBreaks( nTab ); + pDoc->UpdatePageBreaks( nTab ); + } // #i23299# because of Subtotal functions, the whole rows must be set dirty - ScRange aDirtyRange( 0 , aLocalParam.nRow1, nDestTab, -diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx -index 0d98486..1477025 100644 ---- sc/source/ui/docshell/docfunc.cxx -+++ sc/source/ui/docshell/docfunc.cxx -@@ -3033,20 +3033,22 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos, - if (nPos == 0) - return FALSE; // erste Spalte / Zeile + ScRange aDirtyRange( 0 , aLocalParam.nRow1, nDestTab, +--- sc/source/ui/docshell/docfunc.cxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/ui/docshell/docfunc.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -3212,20 +3212,22 @@ BOOL ScDocFunc::InsertPageBreak( BOOL bC + if (nPos == 0) + return FALSE; // erste Spalte / Zeile - BYTE nFlags = bColumn ? pDoc->GetColFlags( static_cast<SCCOL>(nPos), nTab ) - : pDoc->GetRowFlags( static_cast<SCROW>(nPos), nTab ); -- if (nFlags & CR_MANUALBREAK) -- return TRUE; // Umbruch schon gesetzt +- if (nFlags & CR_MANUALBREAK) +- return TRUE; // Umbruch schon gesetzt + ScBreakType nBreak = bColumn ? + pDoc->HasColBreak(static_cast<SCCOL>(nPos), nTab) : + pDoc->HasRowBreak(static_cast<SCROW>(nPos), nTab); + if (nBreak & BREAK_MANUAL) + return true; - if (bRecord) - rDocShell.GetUndoManager()->AddUndoAction( - new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, TRUE ) ); + if (bRecord) + rDocShell.GetUndoManager()->AddUndoAction( + new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, TRUE ) ); -- nFlags |= CR_MANUALBREAK; -- if (bColumn) -- pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags ); -- else -- pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags ); -+ if (bColumn) +- nFlags |= CR_MANUALBREAK; + if (bColumn) +- pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags ); + pDoc->SetColBreak(static_cast<SCCOL>(nPos), nTab, false, true); -+ else + else +- pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags ); + pDoc->SetRowBreak(static_cast<SCROW>(nPos), nTab, false, true); + + pDoc->InvalidatePageBreaks(nTab); - pDoc->UpdatePageBreaks( nTab ); + pDoc->UpdatePageBreaks( nTab ); - if (bColumn) -@@ -3089,20 +3091,25 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos, + if (pDoc->IsStreamValid(nTab)) +@@ -3271,20 +3273,25 @@ BOOL ScDocFunc::RemovePageBreak( BOOL bC SCCOLROW nPos = bColumn ? static_cast<SCCOLROW>(rPos.Col()) : static_cast<SCCOLROW>(rPos.Row()); - BYTE nFlags = bColumn ? pDoc->GetColFlags( static_cast<SCCOL>(nPos), nTab ) - : pDoc->GetRowFlags( static_cast<SCROW>(nPos), nTab ); -- if ((nFlags & CR_MANUALBREAK)==0) -- return FALSE; // kein Umbruch gesetzt +- if ((nFlags & CR_MANUALBREAK)==0) +- return FALSE; // kein Umbruch gesetzt + + ScBreakType nBreak; + if (bColumn) @@ -1089,106 +1061,98 @@ index 0d98486..1477025 100644 + // There is no manual break. + return false; - if (bRecord) - rDocShell.GetUndoManager()->AddUndoAction( - new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, FALSE ) ); + if (bRecord) + rDocShell.GetUndoManager()->AddUndoAction( + new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, FALSE ) ); -- nFlags &= ~CR_MANUALBREAK; -- if (bColumn) -- pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags ); -- else -- pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags ); -+ if (bColumn) +- nFlags &= ~CR_MANUALBREAK; + if (bColumn) +- pDoc->SetColFlags( static_cast<SCCOL>(nPos), nTab, nFlags ); + pDoc->RemoveColBreak(static_cast<SCCOL>(nPos), nTab, false, true); -+ else + else +- pDoc->SetRowFlags( static_cast<SCROW>(nPos), nTab, nFlags ); + pDoc->RemoveRowBreak(static_cast<SCROW>(nPos), nTab, false, true); + - pDoc->UpdatePageBreaks( nTab ); + pDoc->UpdatePageBreaks( nTab ); - if (bColumn) -diff --git sc/source/ui/docshell/olinefun.cxx sc/source/ui/docshell/olinefun.cxx -index ed5fb52..37023e2 100644 ---- sc/source/ui/docshell/olinefun.cxx -+++ sc/source/ui/docshell/olinefun.cxx -@@ -692,6 +692,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US + if (pDoc->IsStreamValid(nTab)) +--- sc/source/ui/docshell/olinefun.cxx.old 2009-11-20 11:38:03.000000000 +0100 ++++ sc/source/ui/docshell/olinefun.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -704,6 +704,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTA - pArray->SetVisibleBelow( nLevel, nEntry, TRUE, TRUE ); + pArray->SetVisibleBelow( nLevel, nEntry, TRUE, TRUE ); + pDoc->InvalidatePageBreaks(nTab); - pDoc->UpdatePageBreaks( nTab ); + pDoc->UpdatePageBreaks( nTab ); - if (bPaint) -@@ -757,6 +758,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US + if (bPaint) +@@ -769,6 +770,7 @@ BOOL ScOutlineDocFunc::HideOutline( SCTA - pArray->SetVisibleBelow( nLevel, nEntry, FALSE ); + pArray->SetVisibleBelow( nLevel, nEntry, FALSE ); + pDoc->InvalidatePageBreaks(nTab); - pDoc->UpdatePageBreaks( nTab ); - - if (bPaint) -diff --git sc/source/ui/undo/undocell.cxx sc/source/ui/undo/undocell.cxx -index 52c8bc0..9237578 100644 ---- sc/source/ui/undo/undocell.cxx -+++ sc/source/ui/undo/undocell.cxx -@@ -587,6 +587,8 @@ void ScUndoPageBreak::DoChange( BOOL bInsertP ) const - pViewShell->InsertPageBreak(bColumn, FALSE); - else - pViewShell->DeletePageBreak(bColumn, FALSE); + pDoc->UpdatePageBreaks( nTab ); + + if (bPaint) +--- sc/source/ui/undo/undocell.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/ui/undo/undocell.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -587,6 +587,8 @@ void ScUndoPageBreak::DoChange( BOOL bIn + pViewShell->InsertPageBreak(bColumn, FALSE); + else + pViewShell->DeletePageBreak(bColumn, FALSE); + + pDocShell->GetDocument()->InvalidatePageBreaks(nTab); - } + } } -diff --git sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx -index 36bb424..7420660 100644 ---- sc/source/ui/undo/undodat.cxx -+++ sc/source/ui/undo/undodat.cxx -@@ -1032,7 +1032,10 @@ void __EXPORT ScUndoQuery::Undo() - pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE ); +--- sc/source/ui/undo/undodat.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/ui/undo/undodat.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -1029,7 +1029,10 @@ void __EXPORT ScUndoQuery::Undo() + pDoc->SetDBCollection( new ScDBCollection( *pUndoDB ), TRUE ); - if (!bCopy) + if (!bCopy) + { + pDoc->InvalidatePageBreaks(nTab); - pDoc->UpdatePageBreaks( nTab ); + pDoc->UpdatePageBreaks( nTab ); + } ScRange aDirtyRange( 0 , aQueryParam.nRow1, nTab, MAXCOL, aQueryParam.nRow2, nTab ); ---- sc/source/ui/unoobj/cellsuno.cxx -+++ sc/source/ui/unoobj/cellsuno.cxx -@@ -7150,7 +7150,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage - SCCOL nCount = 0; - SCCOL nCol; - for (nCol=0; nCol<=MAXCOL; nCol++) -- if (pDoc->GetColFlags( nCol, nTab ) & ( CR_PAGEBREAK | CR_MANUALBREAK )) +--- sc/source/ui/unoobj/cellsuno.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/unoobj/cellsuno.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -7056,7 +7056,7 @@ uno::Sequence<sheet::TablePageBreakData> + SCCOL nCount = 0; + SCCOL nCol; + for (nCol=0; nCol<=MAXCOL; nCol++) +- if (pDoc->GetColFlags( nCol, nTab ) & ( CR_PAGEBREAK | CR_MANUALBREAK )) + if (pDoc->HasColBreak(nCol, nTab)) - ++nCount; - - sheet::TablePageBreakData aData; -@@ -7159,11 +7159,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage - USHORT nPos = 0; - for (nCol=0; nCol<=MAXCOL; nCol++) - { -- BYTE nFlags = pDoc->GetColFlags( nCol, nTab ); -- if (nFlags & ( CR_PAGEBREAK | CR_MANUALBREAK )) + ++nCount; + + sheet::TablePageBreakData aData; +@@ -7065,11 +7065,11 @@ uno::Sequence<sheet::TablePageBreakData> + USHORT nPos = 0; + for (nCol=0; nCol<=MAXCOL; nCol++) + { +- BYTE nFlags = pDoc->GetColFlags( nCol, nTab ); +- if (nFlags & ( CR_PAGEBREAK | CR_MANUALBREAK )) + ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab); + if (nBreak) - { - aData.Position = nCol; -- aData.ManualBreak = ( nFlags & CR_MANUALBREAK ) != 0; + { + aData.Position = nCol; +- aData.ManualBreak = ( nFlags & CR_MANUALBREAK ) != 0; + aData.ManualBreak = (nBreak & BREAK_MANUAL); - pAry[nPos] = aData; - ++nPos; - } -@@ -7192,33 +7192,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre - ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab ); - aPrintFunc.UpdatePages(); - } + pAry[nPos] = aData; + ++nPos; + } +@@ -7098,33 +7098,7 @@ uno::Sequence<sheet::TablePageBreakData> + ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab ); + aPrintFunc.UpdatePages(); + } - - SCROW nCount = pDoc->GetRowFlagsArray( nTab).CountForAnyBitCondition( - 0, MAXROW, (CR_PAGEBREAK | CR_MANUALBREAK)); - -- uno::Sequence<sheet::TablePageBreakData> aSeq(nCount); +- uno::Sequence<sheet::TablePageBreakData> aSeq(nCount); - if (nCount) - { - sheet::TablePageBreakData aData; @@ -1210,346 +1174,327 @@ index 36bb424..7420660 100644 - } - } while (aIter.NextRange()); - } -- return aSeq; +- return aSeq; + return pDoc->GetRowBreakData(nTab); - } - return uno::Sequence<sheet::TablePageBreakData>(0); + } + return uno::Sequence<sheet::TablePageBreakData>(0); } -@@ -8987,13 +8961,13 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertyMap* pMap, - } +@@ -8893,13 +8867,13 @@ void ScTableColumnObj::GetOnePropertyVal + } else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE ) - { -- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + { +- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab); + ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak ); - } + } else if ( pEntry->nWID == SC_WID_UNO_MANPAGE ) - { -- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + { +- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nCol, nTab ) & (CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + ScBreakType nBreak = pDoc->HasColBreak(nCol, nTab); + ScUnoHelpFunctions::SetBoolInAny(rAny, (nBreak & BREAK_MANUAL)); - } - else + } + else ScCellRangeObj::GetOnePropertyValue(pEntry, rAny); -@@ -9151,13 +9125,13 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertyMap* pMap, - } +@@ -9057,13 +9031,13 @@ void ScTableRowObj::GetOnePropertyValue( + } else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE ) - { -- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + { +- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + ScBreakType nBreak = pDoc->HasRowBreak(nRow, nTab); + ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak ); - } + } else if ( pEntry->nWID == SC_WID_UNO_MANPAGE ) - { -- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + { +- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nRow, nTab ) & (CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak ); + ScBreakType nBreak = (pDoc->HasRowBreak(nRow, nTab) & BREAK_MANUAL); + ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak ); - } - else + } + else ScCellRangeObj::GetOnePropertyValue(pEntry, rAny); -diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx -index f14ab4a..f2f1eb5 100644 ---- sc/source/ui/unoobj/docuno.cxx -+++ sc/source/ui/unoobj/docuno.cxx -@@ -2685,13 +2685,13 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro - } - else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) ) - { -- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); +--- sc/source/ui/unoobj/docuno.cxx.old 2009-12-03 13:50:47.000000000 +0100 ++++ sc/source/ui/unoobj/docuno.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -2666,13 +2666,13 @@ uno::Any SAL_CALL ScTableColumnsObj::get + } + else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) ) + { +- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); + ScBreakType nBreak = pDoc->HasColBreak(nStartCol, nTab); + ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak ); - } - else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) ) - { -- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); + } + else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) ) + { +- BOOL bBreak = ( 0 != (pDoc->GetColFlags( nStartCol, nTab ) & (CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); + ScBreakType nBreak = pDoc->HasColBreak(nStartCol, nTab); + ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) ); - } - - return aAny; -@@ -2939,13 +2939,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper - } - else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) ) - { -- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); + } + + return aAny; +@@ -2929,13 +2929,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPro + } + else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE ) ) + { +- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_PAGEBREAK|CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); + ScBreakType nBreak = pDoc->HasRowBreak(nStartRow, nTab); + ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak ); - } - else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) ) - { -- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_MANUALBREAK)) ); -- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); + } + else if ( aNameString.EqualsAscii( SC_UNONAME_MANPAGE ) ) + { +- BOOL bBreak = ( 0 != (pDoc->GetRowFlags( nStartRow, nTab ) & (CR_MANUALBREAK)) ); +- ScUnoHelpFunctions::SetBoolInAny( aAny, bBreak ); + ScBreakType nBreak = pDoc->HasRowBreak(nStartRow, nTab); + ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) ); - } + } else if ( aNameString.EqualsAscii( SC_UNONAME_CELLBACK ) || aNameString.EqualsAscii( SC_UNONAME_CELLTRAN ) ) { -diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx -index 634443a..986c376 100644 ---- sc/source/ui/vba/vbarange.cxx -+++ sc/source/ui/vba/vbarange.cxx -@@ -3719,16 +3719,16 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException) - { - ScDocument* pDoc = getDocumentFromRange( mxRange ); - -- BYTE nFlag = 0; +--- sc/source/ui/vba/vbarange.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/vba/vbarange.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -3712,16 +3712,16 @@ ScVbaRange::getPageBreak() throw (uno::R + { + ScDocument* pDoc = getDocumentFromRange( mxRange ); + +- BYTE nFlag = 0; + ScBreakType nBreak = BREAK_NONE; - if ( !bColumn ) -- nFlag = pDoc -> GetRowFlags(thisAddress.StartRow, thisAddress.Sheet); + if ( !bColumn ) +- nFlag = pDoc -> GetRowFlags(thisAddress.StartRow, thisAddress.Sheet); + nBreak = pDoc->HasRowBreak(thisAddress.StartRow, thisAddress.Sheet); - else -- nFlag = pDoc -> GetColFlags(static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.Sheet); + else +- nFlag = pDoc -> GetColFlags(static_cast<SCCOL>(thisAddress.StartColumn), thisAddress.Sheet); + nBreak = pDoc->HasColBreak(thisAddress.StartColumn, thisAddress.Sheet); - -- if ( nFlag & CR_PAGEBREAK) + +- if ( nFlag & CR_PAGEBREAK) + if (nBreak & BREAK_PAGE) - nPageBreak = excel::XlPageBreak::xlPageBreakAutomatic; - -- if ( nFlag & CR_MANUALBREAK) + nPageBreak = excel::XlPageBreak::xlPageBreakAutomatic; + +- if ( nFlag & CR_MANUALBREAK) + if (nBreak & BREAK_MANUAL) - nPageBreak = excel::XlPageBreak::xlPageBreakManual; - } - } -diff --git sc/source/ui/view/cellsh.cxx sc/source/ui/view/cellsh.cxx -index 3c047da..f228c30 100644 ---- sc/source/ui/view/cellsh.cxx -+++ sc/source/ui/view/cellsh.cxx -@@ -717,22 +717,22 @@ void ScCellShell::GetState(SfxItemSet &rSet) + nPageBreak = excel::XlPageBreak::xlPageBreakManual; + } + } +--- sc/source/ui/view/cellsh.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/cellsh.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -717,22 +717,22 @@ void ScCellShell::GetState(SfxItemSet &r break; - case FID_INS_ROWBRK: -- if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK) ) + case FID_INS_ROWBRK: +- if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK) ) + if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & BREAK_MANUAL) ) - rSet.DisableItem( nWhich ); - break; + rSet.DisableItem( nWhich ); + break; - case FID_INS_COLBRK: -- if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK) ) + case FID_INS_COLBRK: +- if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK) ) + if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & BREAK_MANUAL) ) - rSet.DisableItem( nWhich ); - break; + rSet.DisableItem( nWhich ); + break; - case FID_DEL_ROWBRK: -- if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK)==0 ) + case FID_DEL_ROWBRK: +- if ( nPosY==0 || (pDoc->GetRowFlags(nPosY,nTab) & CR_MANUALBREAK)==0 ) + if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & BREAK_MANUAL) == 0 ) - rSet.DisableItem( nWhich ); - break; + rSet.DisableItem( nWhich ); + break; - case FID_DEL_COLBRK: -- if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK)==0 ) + case FID_DEL_COLBRK: +- if ( nPosX==0 || (pDoc->GetColFlags(nPosX,nTab) & CR_MANUALBREAK)==0 ) + if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & BREAK_MANUAL) == 0 ) - rSet.DisableItem( nWhich ); - break; - -diff --git sc/source/ui/view/gridwin2.cxx sc/source/ui/view/gridwin2.cxx -index 72a6606..4434440 100644 ---- sc/source/ui/view/gridwin2.cxx -+++ sc/source/ui/view/gridwin2.cxx -@@ -1278,7 +1278,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) - BOOL bGrow = !bHide && nNew > nPagebreakBreak; - if ( bColumn ) - { -- if ( pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakBreak), nTab ) & CR_MANUALBREAK ) + rSet.DisableItem( nWhich ); + break; + +--- sc/source/ui/view/gridwin2.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/ui/view/gridwin2.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -936,7 +936,7 @@ void ScGridWindow::PagebreakMove( const + BOOL bGrow = !bHide && nNew > nPagebreakBreak; + if ( bColumn ) + { +- if ( pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakBreak), nTab ) & CR_MANUALBREAK ) + if (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakBreak), nTab) & BREAK_MANUAL) - { - ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab ); - pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE ); -@@ -1291,8 +1291,8 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) - if ( bGrow ) - { - // vorigen Break auf hart, und Skalierung aendern -- if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && -- !(pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakPrev), nTab ) & CR_MANUALBREAK) ) + { + ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab ); + pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE ); +@@ -949,8 +949,8 @@ void ScGridWindow::PagebreakMove( const + if ( bGrow ) + { + // vorigen Break auf hart, und Skalierung aendern +- if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && +- !(pDoc->GetColFlags( static_cast<SCCOL>(nPagebreakPrev), nTab ) & CR_MANUALBREAK) ) + bool bManualBreak = (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakPrev), nTab) & BREAK_MANUAL); + if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak ) - { - ScAddress aPrev( static_cast<SCCOL>(nPagebreakPrev), nPosY, nTab ); - pViewFunc->InsertPageBreak( TRUE, TRUE, &aPrev, FALSE ); -@@ -1305,7 +1305,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) - } - else - { -- if ( pDoc->GetRowFlags( nPagebreakBreak, nTab ) & CR_MANUALBREAK ) + { + ScAddress aPrev( static_cast<SCCOL>(nPagebreakPrev), nPosY, nTab ); + pViewFunc->InsertPageBreak( TRUE, TRUE, &aPrev, FALSE ); +@@ -963,7 +963,7 @@ void ScGridWindow::PagebreakMove( const + } + else + { +- if ( pDoc->GetRowFlags( nPagebreakBreak, nTab ) & CR_MANUALBREAK ) + if (pDoc->HasRowBreak(nPagebreakBreak, nTab) & BREAK_MANUAL) - { - ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab ); - pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE ); -@@ -1318,8 +1318,8 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) - if ( bGrow ) - { - // vorigen Break auf hart, und Skalierung aendern -- if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && -- !(pDoc->GetRowFlags( nPagebreakPrev, nTab ) & CR_MANUALBREAK) ) + { + ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab ); + pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE ); +@@ -976,8 +976,8 @@ void ScGridWindow::PagebreakMove( const + if ( bGrow ) + { + // vorigen Break auf hart, und Skalierung aendern +- if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && +- !(pDoc->GetRowFlags( nPagebreakPrev, nTab ) & CR_MANUALBREAK) ) + bool bManualBreak = (pDoc->HasRowBreak(nPagebreakPrev, nTab) & BREAK_MANUAL); + if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && !bManualBreak ) - { - ScAddress aPrev( nPosX, nPagebreakPrev, nTab ); - pViewFunc->InsertPageBreak( FALSE, TRUE, &aPrev, FALSE ); -diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx -index 0e0742a..2e88791 100644 ---- sc/source/ui/view/gridwin4.cxx -+++ sc/source/ui/view/gridwin4.cxx -@@ -1090,7 +1090,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, - if ( nBreak >= nX1 && nBreak <= nX2+1 ) - { - //! hidden suchen -- if ( pDoc->GetColFlags( nBreak, nTab ) & CR_MANUALBREAK ) + { + ScAddress aPrev( nPosX, nPagebreakPrev, nTab ); + pViewFunc->InsertPageBreak( FALSE, TRUE, &aPrev, FALSE ); +--- sc/source/ui/view/gridwin4.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/view/gridwin4.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -1091,7 +1091,7 @@ void ScGridWindow::DrawPagePreview( SCCO + if ( nBreak >= nX1 && nBreak <= nX2+1 ) + { + //! hidden suchen +- if ( pDoc->GetColFlags( nBreak, nTab ) & CR_MANUALBREAK ) + if (pDoc->HasColBreak(nBreak, nTab) & BREAK_MANUAL) - pContentDev->SetFillColor( aManual ); - else - pContentDev->SetFillColor( aAutomatic ); -@@ -1109,7 +1109,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, - if ( nBreak >= nY1 && nBreak <= nY2+1 ) - { - //! hidden suchen -- if ( pDoc->GetRowFlags( nBreak, nTab ) & CR_MANUALBREAK ) + pContentDev->SetFillColor( aManual ); + else + pContentDev->SetFillColor( aAutomatic ); +@@ -1110,7 +1110,7 @@ void ScGridWindow::DrawPagePreview( SCCO + if ( nBreak >= nY1 && nBreak <= nY2+1 ) + { + //! hidden suchen +- if ( pDoc->GetRowFlags( nBreak, nTab ) & CR_MANUALBREAK ) + if (pDoc->HasRowBreak(nBreak, nTab) & BREAK_MANUAL) - pContentDev->SetFillColor( aManual ); - else - pContentDev->SetFillColor( aAutomatic ); -diff --git sc/source/ui/view/output.cxx sc/source/ui/view/output.cxx -index f320558..1585791 100644 ---- sc/source/ui/view/output.cxx -+++ sc/source/ui/view/output.cxx -@@ -325,8 +325,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) - long nPosX; - long nPosY; - SCSIZE nArrY; -- BYTE nOldFlags = 0; -- BYTE nFlags; + pContentDev->SetFillColor( aManual ); + else + pContentDev->SetFillColor( aAutomatic ); +--- sc/source/ui/view/output.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/view/output.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -325,8 +325,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, + long nPosX; + long nPosY; + SCSIZE nArrY; +- BYTE nOldFlags = 0; +- BYTE nFlags; + ScBreakType nBreak = BREAK_NONE; + ScBreakType nBreakOld = BREAK_NONE; + - BOOL bSingle; - Color aPageColor; - Color aManualColor; -@@ -381,27 +382,27 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) - if ( bPage ) - { - // Seitenumbrueche auch in ausgeblendeten suchen -- nFlags = 0; - SCCOL nCol = nXplus1; - while (nCol <= MAXCOL) - { - BYTE nDocFl = pDoc->GetColFlags( nCol, nTab ); -- nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK ); -- if ( nFlags || !(nDocFl & CR_HIDDEN) ) + BOOL bSingle; + Color aPageColor; + Color aManualColor; +@@ -381,27 +382,27 @@ void ScOutputData::DrawGrid( BOOL bGrid, + if ( bPage ) + { + // Seitenumbrueche auch in ausgeblendeten suchen +- nFlags = 0; + SCCOL nCol = nXplus1; + while (nCol <= MAXCOL) + { + BYTE nDocFl = pDoc->GetColFlags( nCol, nTab ); +- nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK ); +- if ( nFlags || !(nDocFl & CR_HIDDEN) ) + nBreak = pDoc->HasColBreak(nCol, nTab); + + if ( nBreak || !(nDocFl & CR_HIDDEN) ) - break; - ++nCol; - } + break; + ++nCol; + } -- if (nFlags != nOldFlags) +- if (nFlags != nOldFlags) + if (nBreak != nBreakOld) - { - aGrid.Flush(); -- pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor : -- (nFlags) ? aPageColor : aGridColor ); -- nOldFlags = nFlags; + { + aGrid.Flush(); +- pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor : +- (nFlags) ? aPageColor : aGridColor ); +- nOldFlags = nFlags; + pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor : + nBreak ? aPageColor : aGridColor ); + nBreakOld = nBreak; - } - } + } + } -- BOOL bDraw = bGrid || nOldFlags; // einfaches Gitter nur wenn eingestellt +- BOOL bDraw = bGrid || nOldFlags; // einfaches Gitter nur wenn eingestellt + BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt - //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer - //! Umbruch mitten in den Wiederholungsspalten liegt. -@@ -412,7 +413,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) - { - if ( nX == MAXCOL ) - bDraw = FALSE; -- else if (pDoc->GetColFlags(nXplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK )) + //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer + //! Umbruch mitten in den Wiederholungsspalten liegt. +@@ -412,7 +413,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, + { + if ( nX == MAXCOL ) + bDraw = FALSE; +- else if (pDoc->GetColFlags(nXplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK )) + else if (pDoc->HasColBreak(nXplus1, nTab)) - bDraw = FALSE; - } + bDraw = FALSE; + } #endif -@@ -503,28 +504,24 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) - { - if ( bPage ) - { -- // Seitenumbrueche auch in ausgeblendeten suchen -- nFlags = 0; +@@ -503,28 +504,24 @@ void ScOutputData::DrawGrid( BOOL bGrid, + { + if ( bPage ) + { +- // Seitenumbrueche auch in ausgeblendeten suchen +- nFlags = 0; - ScCompressedArrayIterator< SCROW, BYTE > aIter( - pDoc->GetRowFlagsArray( nTab), nYplus1, MAXROW); - do +- { +- BYTE nDocFl = *aIter; +- nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK ); +- if ( nFlags || !(nDocFl & CR_HIDDEN) ) + for (SCROW i = nYplus1; i <= MAXROW; ++i) - { -- BYTE nDocFl = *aIter; -- nFlags = nDocFl & ( CR_PAGEBREAK | CR_MANUALBREAK ); -- if ( nFlags || !(nDocFl & CR_HIDDEN) ) -- break; -- } while (aIter.NextRange()); ++ { + nBreak = pDoc->HasRowBreak(i, nTab); + bool bHidden = (pDoc->GetRowFlags(i, nTab) & CR_HIDDEN); + if (nBreak || !bHidden) -+ break; + break; +- } while (aIter.NextRange()); + } -- if (nFlags != nOldFlags) +- if (nFlags != nOldFlags) + if (nBreakOld != nBreak) - { - aGrid.Flush(); -- pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor : -- (nFlags) ? aPageColor : aGridColor ); -- nOldFlags = nFlags; + { + aGrid.Flush(); +- pDev->SetLineColor( (nFlags & CR_MANUALBREAK) ? aManualColor : +- (nFlags) ? aPageColor : aGridColor ); +- nOldFlags = nFlags; + pDev->SetLineColor( (nBreak & BREAK_MANUAL) ? aManualColor : + (nBreak) ? aPageColor : aGridColor ); + nBreakOld = nBreak; - } - } + } + } -- BOOL bDraw = bGrid || nOldFlags; // einfaches Gitter nur wenn eingestellt +- BOOL bDraw = bGrid || nOldFlags; // einfaches Gitter nur wenn eingestellt + BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt - //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer - //! Umbruch mitten in den Wiederholungszeilen liegt. -@@ -535,7 +532,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) - { - if ( nY == MAXROW ) - bDraw = FALSE; -- else if (pDoc->GetRowFlags(nYplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK )) + //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer + //! Umbruch mitten in den Wiederholungszeilen liegt. +@@ -535,7 +532,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, + { + if ( nY == MAXROW ) + bDraw = FALSE; +- else if (pDoc->GetRowFlags(nYplus1,nTab) & ( CR_PAGEBREAK | CR_MANUALBREAK )) + else if (pDoc->HasRowBreak(nYplus1, nTab)) - bDraw = FALSE; - } + bDraw = FALSE; + } #endif -diff --git sc/source/ui/view/printfun.cxx sc/source/ui/view/printfun.cxx -index 020821d..2ddaa99 100644 ---- sc/source/ui/view/printfun.cxx -+++ sc/source/ui/view/printfun.cxx -@@ -2874,30 +2874,84 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom berechnen - if (aTableParam.bScalePageNum) - { - nZoom = 100; -- BOOL bFound = FALSE; - USHORT nPagesToFit = aTableParam.nScalePageNum; -- while (!bFound) -- { -- CalcPages(); -- if ( nPagesX * nPagesY <= nPagesToFit || nZoom <= ZOOM_MIN ) -- bFound = TRUE; -- else -- --nZoom; -- } +--- sc/source/ui/view/printfun.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/printfun.cxx 2010-03-03 16:59:18.000000000 +0100 +@@ -2875,30 +2875,84 @@ void ScPrintFunc::CalcZoom( USHORT nRang + if (aTableParam.bScalePageNum) + { + nZoom = 100; +- BOOL bFound = FALSE; + USHORT nPagesToFit = aTableParam.nScalePageNum; +- while (!bFound) + + sal_uInt16 nLastFitZoom = 0, nLastNonFitZoom = 0; + while (true) -+ { + { + if (nZoom <= ZOOM_MIN) + break; + -+ CalcPages(); + CalcPages(); +- if ( nPagesX * nPagesY <= nPagesToFit || nZoom <= ZOOM_MIN ) +- bFound = TRUE; + bool bFitsPage = (nPagesX * nPagesY <= nPagesToFit); + + if (bFitsPage) @@ -1565,7 +1510,8 @@ index 020821d..2ddaa99 100644 + // It converged. Use this zoom level. + break; + } -+ else + else +- --nZoom; + { + if (nZoom - nLastFitZoom <= 1) + { @@ -1577,8 +1523,8 @@ index 020821d..2ddaa99 100644 + nLastNonFitZoom = nZoom; + nZoom = (nLastFitZoom + nZoom) / 2; + } -+ } - } + } + } else if (aTableParam.bScaleTo) { nZoom = 100; @@ -1626,18 +1572,18 @@ index 020821d..2ddaa99 100644 + } } } - else if (aTableParam.bScaleAll) -@@ -3021,7 +3075,8 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten aus nZoom - for (SCCOL i=nStartCol; i<=nEndCol; i++) - { - BYTE nFlags = pDoc->GetColFlags(i,nPrintTab); -- if ( i>nStartCol && bVisCol && (nFlags & CR_PAGEBREAK) ) + else if (aTableParam.bScaleAll) +@@ -3022,7 +3076,8 @@ void ScPrintFunc::CalcPages() // bere + for (SCCOL i=nStartCol; i<=nEndCol; i++) + { + BYTE nFlags = pDoc->GetColFlags(i,nPrintTab); +- if ( i>nStartCol && bVisCol && (nFlags & CR_PAGEBREAK) ) + bool bPageBreak = (pDoc->HasColBreak(i, nPrintTab) & BREAK_PAGE); + if ( i>nStartCol && bVisCol && bPageBreak ) - { - pPageEndX[nPagesX] = i-1; - ++nPagesX; -@@ -3046,7 +3101,8 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten aus nZoom + { + pPageEndX[nPagesX] = i-1; + ++nPagesX; +@@ -3047,7 +3102,8 @@ void ScPrintFunc::CalcPages() // bere SCROW nRangeEnd = aIter.GetRangeEnd(); for (SCROW j=aIter.GetRangeStart(); j<=nRangeEnd; ++j) { diff --git a/patches/dev300/calc-perf-table-hidden-flags.diff b/patches/dev300/calc-perf-table-hidden-flags.diff index df109a0ef..ef7184b16 100644 --- a/patches/dev300/calc-perf-table-hidden-flags.diff +++ b/patches/dev300/calc-perf-table-hidden-flags.diff @@ -1,8 +1,6 @@ -diff --git sc/inc/column.hxx sc/inc/column.hxx -index 3aa524f..1d7cd5f 100644 ---- sc/inc/column.hxx -+++ sc/inc/column.hxx -@@ -213,10 +213,10 @@ public: +--- sc/inc/column.hxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/inc/column.hxx 2010-03-03 16:59:19.000000000 +0100 +@@ -214,10 +214,10 @@ public: // UpdateSelectionFunction: Mehrfachselektion void UpdateSelectionFunction( const ScMarkData& rMark, ScFunctionData& rData, @@ -15,11 +13,9 @@ index 3aa524f..1d7cd5f 100644 SCROW nStartRow, SCROW nEndRow ); void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, -diff --git sc/inc/document.hxx sc/inc/document.hxx -index 6fef3aa..9ef314f 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx -@@ -420,16 +420,11 @@ private: +--- sc/inc/document.hxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:19.000000000 +0100 +@@ -422,16 +422,11 @@ private: sal_Int16 mnNamedRangesLockCount; @@ -36,7 +32,7 @@ index 6fef3aa..9ef314f 100644 public: SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT, -@@ -1247,7 +1242,6 @@ public: +@@ -1253,7 +1248,6 @@ public: SCTAB nTab, double fScale ) const; SC_DLLPUBLIC inline USHORT FastGetRowHeight( SCROW nRow, SCTAB nTab ) const; inline SCROW FastGetRowForHeight( SCTAB nTab, ULONG nHeight ) const; @@ -44,7 +40,7 @@ index 6fef3aa..9ef314f 100644 /** No check for flags whether row is hidden, height value is returned unconditionally. */ inline USHORT FastGetOriginalRowHeight( SCROW nRow, SCTAB nTab ) const; -@@ -1299,6 +1293,26 @@ public: +@@ -1305,6 +1299,26 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData(SCTAB nTab) const; @@ -71,7 +67,7 @@ index 6fef3aa..9ef314f 100644 /** * Write all column row flags to table's flag data, because not all column * row attributes are stored in the flag data members. This is necessary -@@ -1327,8 +1341,6 @@ public: +@@ -1333,8 +1347,6 @@ public: BOOL GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); BOOL GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault); @@ -80,7 +76,7 @@ index 6fef3aa..9ef314f 100644 BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ); BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow ); -@@ -1807,58 +1819,24 @@ inline void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab ) +@@ -1813,58 +1825,24 @@ inline void ScDocument::SetSortParam( Sc inline ULONG ScDocument::FastGetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, double fScale ) const { @@ -143,10 +139,8 @@ index 6fef3aa..9ef314f 100644 #endif -diff --git sc/inc/olinetab.hxx sc/inc/olinetab.hxx -index 456d223..a71519b 100644 ---- sc/inc/olinetab.hxx -+++ sc/inc/olinetab.hxx +--- sc/inc/olinetab.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/inc/olinetab.hxx 2010-03-03 16:59:19.000000000 +0100 @@ -39,6 +39,7 @@ #define SC_OL_MAXDEPTH 7 @@ -166,10 +160,8 @@ index 456d223..a71519b 100644 void RemoveAll(); }; -diff --git sc/inc/table.hxx sc/inc/table.hxx -index 6045438..0ace618 100644 ---- sc/inc/table.hxx -+++ sc/inc/table.hxx +--- sc/inc/table.hxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:19.000000000 +0100 @@ -43,6 +43,7 @@ #include <memory> @@ -178,8 +170,7 @@ index 6045438..0ace618 100644 namespace utl { class SearchParam; -@@ -83,7 +84,9 @@ struct RowInfo; - struct ScFunctionData; +@@ -84,6 +85,8 @@ struct ScFunctionData; struct ScLineFlags; class CollatorWrapper; struct ScSetStringParam; @@ -199,7 +190,7 @@ index 6045438..0ace618 100644 ::std::set<SCROW> maRowPageBreaks; ::std::set<SCROW> maRowManualBreaks; -@@ -471,7 +478,7 @@ public: +@@ -475,7 +482,7 @@ public: SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); @@ -208,7 +199,7 @@ index 6045438..0ace618 100644 void GetBorderLines( SCCOL nCol, SCROW nRow, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, -@@ -593,19 +600,29 @@ public: +@@ -597,19 +604,29 @@ public: // nPPT fuer Test auf Veraenderung void SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ); @@ -246,7 +237,7 @@ index 6045438..0ace618 100644 void ShowCol(SCCOL nCol, BOOL bShow); void ShowRow(SCROW nRow, BOOL bShow); -@@ -626,8 +643,6 @@ public: +@@ -630,8 +647,6 @@ public: /// @return the index of the last changed row (flags and row height, auto pagebreak is ignored). SCROW GetLastChangedRow() const; @@ -255,7 +246,7 @@ index 6045438..0ace618 100644 BYTE GetColFlags( SCCOL nCol ) const; BYTE GetRowFlags( SCROW nRow ) const; -@@ -656,6 +671,34 @@ public: +@@ -660,6 +675,34 @@ public: void SetColBreak(SCCOL nCol, bool bPage, bool bManual); ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData> GetRowBreakData() const; @@ -290,7 +281,7 @@ index 6045438..0ace618 100644 void SyncColRowFlags(); void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); -@@ -786,7 +829,7 @@ private: +@@ -790,7 +833,7 @@ private: SCSIZE FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2, SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY, @@ -299,10 +290,8 @@ index 6045438..0ace618 100644 // idle calculation of OutputDevice text width for cell // also invalidates script type, broadcasts for "calc as shown" -diff --git sc/source/core/data/column2.cxx sc/source/core/data/column2.cxx -index 2291859..c97fbda 100644 ---- sc/source/core/data/column2.cxx -+++ sc/source/core/data/column2.cxx +--- sc/source/core/data/column2.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/column2.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -69,6 +69,7 @@ #include "compiler.hxx" // ScTokenArray GetCodeLen #include "dbcolect.hxx" @@ -311,7 +300,7 @@ index 2291859..c97fbda 100644 #include <math.h> -@@ -1785,7 +1786,7 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) +@@ -1785,7 +1786,7 @@ void lcl_UpdateSubTotal( ScFunctionData& // Mehrfachselektion: void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark, ScFunctionData& rData, @@ -320,7 +309,7 @@ index 2291859..c97fbda 100644 BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow ) { SCSIZE nIndex; -@@ -1793,7 +1794,8 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark, +@@ -1793,7 +1794,8 @@ void ScColumn::UpdateSelectionFunction( while (aDataIter.Next( nIndex )) { SCROW nRow = pItems[nIndex].nRow; @@ -330,7 +319,7 @@ index 2291859..c97fbda 100644 if ( !bDoExclude || nRow < nExStartRow || nRow > nExEndRow ) lcl_UpdateSubTotal( rData, pItems[nIndex].pCell ); } -@@ -1801,7 +1803,7 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark, +@@ -1801,7 +1803,7 @@ void ScColumn::UpdateSelectionFunction( // bei bNoMarked die Mehrfachselektion weglassen void ScColumn::UpdateAreaFunction( ScFunctionData& rData, @@ -339,7 +328,7 @@ index 2291859..c97fbda 100644 SCROW nStartRow, SCROW nEndRow ) { SCSIZE nIndex; -@@ -1809,7 +1811,8 @@ void ScColumn::UpdateAreaFunction( ScFunctionData& rData, +@@ -1809,7 +1811,8 @@ void ScColumn::UpdateAreaFunction( ScFun while ( nIndex<nCount && pItems[nIndex].nRow<=nEndRow ) { SCROW nRow = pItems[nIndex].nRow; @@ -349,11 +338,9 @@ index 2291859..c97fbda 100644 lcl_UpdateSubTotal( rData, pItems[nIndex].pCell ); ++nIndex; } -diff --git sc/source/core/data/dociter.cxx sc/source/core/data/dociter.cxx -index 911d473..055c64f 100644 ---- sc/source/core/data/dociter.cxx -+++ sc/source/core/data/dociter.cxx -@@ -334,7 +334,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) +--- sc/source/core/data/dociter.cxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/core/data/dociter.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -348,7 +348,7 @@ BOOL ScValueIterator::GetThis(double& rV if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow ) { nRow = pCol->pItems[nColRow].nRow + 1; @@ -362,7 +349,7 @@ index 911d473..055c64f 100644 { ScBaseCell* pCell = pCol->pItems[nColRow].pCell; ++nColRow; -@@ -725,7 +725,7 @@ ScBaseCell* ScCellIterator::GetThis() +@@ -1034,7 +1034,7 @@ ScBaseCell* ScCellIterator::GetThis() if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow ) { nRow = pCol->pItems[nColRow].nRow; @@ -371,11 +358,9 @@ index 911d473..055c64f 100644 { ScBaseCell* pCell = pCol->pItems[nColRow].pCell; -diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx -index 17ae763..4cff6f3 100644 ---- sc/source/core/data/documen3.cxx -+++ sc/source/core/data/documen3.cxx -@@ -1123,15 +1123,6 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem, +--- sc/source/core/data/documen3.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/core/data/documen3.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1124,15 +1124,6 @@ BOOL ScDocument::SearchAndReplace(const return bFound; } @@ -391,7 +376,7 @@ index 17ae763..4cff6f3 100644 // Outline anpassen BOOL ScDocument::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ) -@@ -1558,46 +1549,43 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect ) +@@ -1559,46 +1550,43 @@ ScRange ScDocument::GetRange( SCTAB nTab nTwips = (long) (aPosRect.Top() / HMM_PER_TWIPS); SCROW nY1 = 0; @@ -451,7 +436,7 @@ index 17ae763..4cff6f3 100644 return ScRange( nX1,nY1,nTab, nX2,nY2,nTab ); } -@@ -1635,24 +1623,33 @@ void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow ) +@@ -1636,24 +1624,33 @@ void lcl_SnapVer( ScTable* pTable, long& SCROW nRow = 0; long nTwips = (long) (rVal / HMM_PER_TWIPS); long nSnap = 0; @@ -493,10 +478,8 @@ index 17ae763..4cff6f3 100644 rVal = (long) ( nSnap * HMM_PER_TWIPS ); rStartRow = nRow; } -diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx -index 8151aec..9374c35 100644 ---- sc/source/core/data/document.cxx -+++ sc/source/core/data/document.cxx +--- sc/source/core/data/document.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -97,6 +97,7 @@ #include "clipparam.hxx" @@ -505,7 +488,7 @@ index 8151aec..9374c35 100644 namespace WritingMode2 = ::com::sun::star::text::WritingMode2; using ::com::sun::star::uno::Sequence; -@@ -1951,9 +1952,6 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, +@@ -1980,9 +1981,6 @@ void ScDocument::CopyNonFilteredFromClip while ( nFlagTab < MAXTAB && !ppClipTab[nFlagTab] ) ++nFlagTab; @@ -513,9 +496,9 @@ index 8151aec..9374c35 100644 - pCBFCP->pClipDoc->GetRowFlagsArray( nFlagTab); - SCROW nSourceRow = rClipStartRow; - SCROW nSourceEnd = 0; + SCROW nSourceEnd = 0; if (pCBFCP->pClipDoc->GetClipParam().maRanges.Count()) -@@ -1963,12 +1961,15 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, +@@ -1992,12 +1990,15 @@ void ScDocument::CopyNonFilteredFromClip while ( nSourceRow <= nSourceEnd && nDestRow <= nRow2 ) { // skip filtered rows @@ -533,7 +516,7 @@ index 8151aec..9374c35 100644 if (nFollow > nSourceEnd - nSourceRow) nFollow = nSourceEnd - nSourceRow; if (nFollow > nRow2 - nDestRow) -@@ -2376,8 +2377,7 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered +@@ -2405,8 +2406,7 @@ void ScDocument::GetClipArea(SCCOL& nCli while ( nCountTab < MAXTAB && !pTab[nCountTab] ) ++nCountTab; @@ -543,7 +526,7 @@ index 8151aec..9374c35 100644 if ( nResult > 0 ) nClipY = nResult - 1; -@@ -2416,8 +2416,13 @@ BOOL ScDocument::HasClipFilteredRows() +@@ -2445,8 +2445,13 @@ BOOL ScDocument::HasClipFilteredRows() if (!rClipRanges.Count()) return false; @@ -559,7 +542,7 @@ index 8151aec..9374c35 100644 } -@@ -3118,8 +3123,7 @@ ULONG ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) con +@@ -3167,8 +3172,7 @@ ULONG ScDocument::GetRowHeight( SCROW nS ULONG ScDocument::FastGetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const { @@ -569,7 +552,7 @@ index 8151aec..9374c35 100644 } ULONG ScDocument::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, -@@ -3431,6 +3435,163 @@ Sequence<TablePageBreakData> ScDocument::GetRowBreakData(SCTAB nTab) const +@@ -3480,6 +3484,163 @@ Sequence<TablePageBreakData> ScDocument: return pTab[nTab]->GetRowBreakData(); } @@ -733,11 +716,9 @@ index 8151aec..9374c35 100644 void ScDocument::SyncColRowFlags() { for (SCTAB i = 0; i <= nMaxTableNumber; ++i) -diff --git sc/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx -index 94708e1..03c48f5 100644 ---- sc/source/core/data/drwlayer.cxx -+++ sc/source/core/data/drwlayer.cxx -@@ -610,12 +610,14 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b +--- sc/source/core/data/drwlayer.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/core/data/drwlayer.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -610,12 +610,14 @@ void ScDrawLayer::RecalcPos( SdrObject* { //! nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden) @@ -754,7 +735,7 @@ index 94708e1..03c48f5 100644 aPos.Y() += pDoc->GetRowHeight( nRow1, nTab1 ) / 2; TwipsToMM( aPos.X() ); TwipsToMM( aPos.Y() ); -@@ -647,9 +649,9 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b +@@ -647,9 +649,9 @@ void ScDrawLayer::RecalcPos( SdrObject* if( bValid2 ) { Point aPos( pDoc->GetColOffset( nCol2, nTab2 ), pDoc->GetRowOffset( nRow2, nTab2 ) ); @@ -766,10 +747,8 @@ index 94708e1..03c48f5 100644 aPos.Y() += pDoc->GetRowHeight( nRow2, nTab2 ) / 2; TwipsToMM( aPos.X() ); TwipsToMM( aPos.Y() ); -diff --git sc/source/core/data/fillinfo.cxx sc/source/core/data/fillinfo.cxx -index 54ffe10..e875167 100644 ---- sc/source/core/data/fillinfo.cxx -+++ sc/source/core/data/fillinfo.cxx +--- sc/source/core/data/fillinfo.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/core/data/fillinfo.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -55,7 +55,6 @@ #include "conditio.hxx" #include "stlpool.hxx" @@ -778,7 +757,7 @@ index 54ffe10..e875167 100644 // ----------------------------------------------------------------------- const USHORT ROWINFO_MAX = 1024; -@@ -100,11 +99,13 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, +@@ -100,11 +99,13 @@ void lcl_GetMergeRange( SCsCOL nX, SCsRO rStartY = nY; BOOL bHOver = pInfo->bHOverlapped; BOOL bVOver = pInfo->bVOverlapped; @@ -793,7 +772,7 @@ index 54ffe10..e875167 100644 { bHOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bHOverlapped; bVOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bVOverlapped; -@@ -126,8 +127,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, +@@ -126,8 +127,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsRO --nArrY; // lokale Kopie ! if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 && @@ -804,7 +783,7 @@ index 54ffe10..e875167 100644 (SCsROW) pRowInfo[nArrY].nRowNo == rStartY) { bHOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bHOverlapped; -@@ -144,8 +145,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, +@@ -144,8 +145,8 @@ void lcl_GetMergeRange( SCsCOL nX, SCsRO const ScMergeAttr* pMerge; if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 && @@ -815,7 +794,7 @@ index 54ffe10..e875167 100644 (SCsROW) pRowInfo[nArrY].nRowNo == rStartY) { pMerge = (const ScMergeAttr*) &pRowInfo[nArrY].pCellInfo[rStartX+1].pPatternAttr-> -@@ -158,12 +159,6 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, +@@ -158,12 +159,6 @@ void lcl_GetMergeRange( SCsCOL nX, SCsRO rEndY = rStartY + pMerge->GetRowMerge() - 1; } @@ -828,7 +807,7 @@ index 54ffe10..e875167 100644 #define CELLINFO(x,y) pRowInfo[nArrY+y].pCellInfo[nArrX+x] void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, -@@ -359,7 +354,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX +@@ -359,7 +354,7 @@ void ScDocument::FillInfo( ScTableInfo& nX = nArrX-1; if ( ValidCol(nX) ) { @@ -837,7 +816,7 @@ index 54ffe10..e875167 100644 { USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX); if (!nThisWidth) -@@ -379,7 +374,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX +@@ -379,7 +374,8 @@ void ScDocument::FillInfo( ScTableInfo& // #i58049#, #i57939# Hidden columns must be skipped here, or their attributes // will disturb the output @@ -847,7 +826,7 @@ index 54ffe10..e875167 100644 { USHORT nThisWidth = (USHORT) (GetColWidth( nX, nTab ) * nScaleX); if (!nThisWidth) -@@ -484,7 +480,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX +@@ -484,7 +480,14 @@ void ScDocument::FillInfo( ScTableInfo& do { @@ -863,7 +842,7 @@ index 54ffe10..e875167 100644 { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; if (pBackground != pDefBackground) // Spalten-HG == Standard ? -@@ -554,6 +557,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX +@@ -554,6 +557,14 @@ void ScDocument::FillInfo( ScTableInfo& ++nArrY; } @@ -878,10 +857,8 @@ index 54ffe10..e875167 100644 ++nCurRow; } while (nCurRow <= nThisRow && nCurRow <= nYExtra); -diff --git sc/source/core/data/olinetab.cxx sc/source/core/data/olinetab.cxx -index a30065e..cc4f7f6 100644 ---- sc/source/core/data/olinetab.cxx -+++ sc/source/core/data/olinetab.cxx +--- sc/source/core/data/olinetab.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/core/data/olinetab.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -44,6 +44,7 @@ #include "global.hxx" #include "rechead.hxx" @@ -890,7 +867,7 @@ index a30065e..cc4f7f6 100644 //------------------------------------------------------------------------ -@@ -640,8 +641,7 @@ BOOL ScOutlineArray::DeleteSpace( SCCOLROW nStartPos, SCSIZE nSize ) +@@ -640,8 +641,7 @@ BOOL ScOutlineArray::DeleteSpace( SCCOLR return bNeedSave; } @@ -900,7 +877,7 @@ index a30065e..cc4f7f6 100644 { BOOL bModified = FALSE; ScSubOutlineIterator aIter( this ); -@@ -657,9 +657,7 @@ BOOL ScOutlineArray::ManualAction( SCCOLROW nStartPos, SCCOLROW nEndPos, +@@ -657,9 +657,7 @@ BOOL ScOutlineArray::ManualAction( SCCOL { // #i12341# hide if all columns/rows are hidden, show if at least one // is visible @@ -911,10 +888,8 @@ index a30065e..cc4f7f6 100644 BOOL bAllHidden = (nEntryEnd <= nEnd && nEnd < ::std::numeric_limits<SCCOLROW>::max()); -diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx -index 6a672e8..862508b 100644 ---- sc/source/core/data/table1.cxx -+++ sc/source/core/data/table1.cxx +--- sc/source/core/data/table1.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/core/data/table1.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -115,6 +115,7 @@ #include "hints.hxx" // fuer Paint-Broadcast #include "prnsave.hxx" @@ -923,7 +898,7 @@ index 6a672e8..862508b 100644 // STATIC DATA ----------------------------------------------------------- -@@ -138,6 +139,10 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName, +@@ -138,6 +139,10 @@ ScTable::ScTable( ScDocument* pDoc, SCTA pRowHeight( NULL ), pColFlags( NULL ), pRowFlags( NULL ), @@ -934,7 +909,7 @@ index 6a672e8..862508b 100644 pOutlineTable( NULL ), bTableAreaValid( FALSE ), bVisible( TRUE ), -@@ -888,9 +893,10 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, +@@ -903,9 +908,10 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, // auf der naechsten Zelle landet, auch wenn die geschuetzt/nicht markiert ist. //! per Extra-Parameter steuern, nur fuer Cursor-Bewegung ??? @@ -947,7 +922,7 @@ index 6a672e8..862508b 100644 return FALSE; } -@@ -917,8 +923,8 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, +@@ -932,8 +938,8 @@ void ScTable::GetNextPos( SCCOL& rCol, S { BOOL bUp = ( nMovY < 0 ); nRow = rMark.GetNextMarked( nCol, nRow, bUp ); @@ -958,7 +933,7 @@ index 6a672e8..862508b 100644 { // #53697# ausgeblendete ueberspringen (s.o.) nRow += nMovY; -@@ -928,7 +934,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, +@@ -943,7 +949,7 @@ void ScTable::GetNextPos( SCCOL& rCol, S while ( nRow < 0 || nRow > MAXROW ) { nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); @@ -967,7 +942,7 @@ index 6a672e8..862508b 100644 nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); // #53697# skip hidden rows (see above) if (nCol < 0) { -@@ -947,8 +953,8 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, +@@ -962,8 +968,8 @@ void ScTable::GetNextPos( SCCOL& rCol, S else if (nRow > MAXROW) nRow = 0; nRow = rMark.GetNextMarked( nCol, nRow, bUp ); @@ -978,7 +953,7 @@ index 6a672e8..862508b 100644 { // #53697# ausgeblendete ueberspringen (s.o.) nRow += nMovY; -@@ -1336,19 +1342,14 @@ void ScTable::ExtendPrintArea( OutputDevice* pDev, +@@ -1360,19 +1366,14 @@ void ScTable::ExtendPrintArea( OutputDev SCSIZE nIndex; SCCOL nPrintCol = rEndCol; @@ -1000,11 +975,9 @@ index 6a672e8..862508b 100644 { ScBaseCell* pCell = aCol[nDataCol].GetCell(nRow); if (pCell) -diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx -index 972ec16..889510f 100644 ---- sc/source/core/data/table2.cxx -+++ sc/source/core/data/table2.cxx -@@ -132,6 +132,9 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE +--- sc/source/core/data/table2.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/core/data/table2.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -132,6 +132,9 @@ void ScTable::InsertRow( SCCOL nStartCol } if (pOutlineTable) pOutlineTable->InsertRow( nStartRow, nSize ); @@ -1014,7 +987,7 @@ index 972ec16..889510f 100644 } for (SCCOL j=nStartCol; j<=nEndCol; j++) -@@ -159,6 +162,9 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE +@@ -159,6 +162,9 @@ void ScTable::DeleteRow( SCCOL nStartCol if (pOutlineTable->DeleteRow( nStartRow, nSize )) if (pUndoOutline) *pUndoOutline = TRUE; @@ -1024,7 +997,7 @@ index 972ec16..889510f 100644 } { // scope for bulk broadcast -@@ -205,6 +211,9 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE +@@ -205,6 +211,9 @@ void ScTable::InsertCol( SCCOL nStartCol } if (pOutlineTable) pOutlineTable->InsertCol( nStartCol, nSize ); @@ -1034,7 +1007,7 @@ index 972ec16..889510f 100644 } -@@ -260,6 +269,9 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE +@@ -260,6 +269,9 @@ void ScTable::DeleteCol( SCCOL nStartCol if (pOutlineTable->DeleteCol( nStartCol, nSize )) if (pUndoOutline) *pUndoOutline = TRUE; @@ -1044,7 +1017,7 @@ index 972ec16..889510f 100644 } -@@ -357,20 +369,21 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, +@@ -357,20 +369,21 @@ void ScTable::CopyToClip(SCCOL nCol1, SC // copy widths/heights, and only "hidden", "filtered" and "manual" flags // also for all preceding columns/rows, to have valid positions for drawing objects @@ -1072,7 +1045,7 @@ index 972ec16..889510f 100644 // ggf. Formeln durch Werte ersetzen -@@ -660,10 +673,12 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, +@@ -660,10 +673,12 @@ void ScTable::CopyToTable(SCCOL nCol1, S if (bWidth) for (SCCOL i=nCol1; i<=nCol2; i++) { @@ -1086,7 +1059,7 @@ index 972ec16..889510f 100644 //! Aenderungen zusammenfassen? if (bHiddenChange && pCharts) pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab )); -@@ -685,8 +700,10 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, +@@ -685,8 +700,10 @@ void ScTable::CopyToTable(SCCOL nCol1, S // TODO: might need some performance improvement, block // operations instead of single GetValue()/SetValue() calls. BYTE nThisRowFlags = pRowFlags->GetValue(i); @@ -1098,7 +1071,7 @@ index 972ec16..889510f 100644 //! Aenderungen zusammenfassen? if (bHiddenChange && pCharts) pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab )); -@@ -1299,7 +1316,7 @@ BOOL ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, +@@ -1299,7 +1316,7 @@ BOOL ScTable::IsBlockEmpty( SCCOL nCol1, SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2, SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY, @@ -1107,7 +1080,7 @@ index 972ec16..889510f 100644 { // Rueckgabe = neues nArrY -@@ -1332,7 +1349,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO +@@ -1332,7 +1349,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRo for ( SCROW nRow = nAttrRow1; nRow <= nAttrRow2; nRow++ ) { @@ -1116,7 +1089,7 @@ index 972ec16..889510f 100644 { BOOL bHitOne = TRUE; if ( nCol > nX2+1 ) -@@ -1366,7 +1383,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO +@@ -1366,7 +1383,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRo return nArrY; } @@ -1125,7 +1098,7 @@ index 972ec16..889510f 100644 { if ( !pColWidth || !pRowHeight || !pColFlags || !pRowFlags ) { -@@ -1381,7 +1398,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC +@@ -1381,7 +1398,7 @@ void ScTable::FindMaxRotCol( RowInfo* pR for (SCCOL nCol=0; nCol<=MAXCOL; nCol++) { @@ -1134,7 +1107,7 @@ index 972ec16..889510f 100644 { SCSIZE nArrY = 0; ScDocAttrIterator aIter( pDocument, nTab, nCol, nY1, nCol, nY2 ); -@@ -2160,13 +2177,13 @@ void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ) +@@ -2160,13 +2177,13 @@ void ScTable::SetManualHeight( SCROW nSt } @@ -1150,7 +1123,7 @@ index 972ec16..889510f 100644 return 0; else return pColWidth[nCol]; -@@ -2187,7 +2204,7 @@ USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte +@@ -2187,7 +2204,7 @@ USHORT ScTable::GetOriginalWidth( SCCOL } @@ -1159,7 +1132,7 @@ index 972ec16..889510f 100644 { // get the width that is used in the largest continuous column range (up to nEndCol) -@@ -2199,24 +2216,24 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const +@@ -2199,24 +2216,24 @@ USHORT ScTable::GetCommonWidth( SCCOL nE USHORT nMaxWidth = 0; USHORT nMaxCount = 0; @@ -1188,7 +1161,7 @@ index 972ec16..889510f 100644 ++nRangeEnd; } -@@ -2234,13 +2251,13 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) const +@@ -2234,13 +2251,13 @@ USHORT ScTable::GetCommonWidth( SCCOL nE } @@ -1205,7 +1178,7 @@ index 972ec16..889510f 100644 return 0; else return pRowHeight->GetValue(nRow); -@@ -2250,28 +2267,53 @@ USHORT ScTable::GetRowHeight( SCROW nRow ) const +@@ -2250,28 +2267,53 @@ USHORT ScTable::GetRowHeight( SCROW nRow } @@ -1267,7 +1240,7 @@ index 972ec16..889510f 100644 } else return (ULONG) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight * fScale); -@@ -2292,18 +2334,16 @@ USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden +@@ -2292,18 +2334,16 @@ USHORT ScTable::GetOriginalHeight( SCROW // Spalten-/Zeilen-Flags @@ -1295,7 +1268,7 @@ index 972ec16..889510f 100644 } -@@ -2311,9 +2351,9 @@ SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const +@@ -2311,9 +2351,9 @@ SCROW ScTable::GetHiddenRowCount( SCROW void ScTable::ShowCol(SCCOL nCol, BOOL bShow) { @@ -1307,7 +1280,7 @@ index 972ec16..889510f 100644 if (bWasVis != bShow) { nRecalcLvl++; -@@ -2327,10 +2367,8 @@ void ScTable::ShowCol(SCCOL nCol, BOOL bShow) +@@ -2327,10 +2367,8 @@ void ScTable::ShowCol(SCCOL nCol, BOOL b pDrawLayer->WidthChanged( nTab, nCol, -(long) pColWidth[nCol] ); } @@ -1320,7 +1293,7 @@ index 972ec16..889510f 100644 if( !--nRecalcLvl ) SetDrawPageSize(); -@@ -2350,8 +2388,7 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow) +@@ -2350,8 +2388,7 @@ void ScTable::ShowRow(SCROW nRow, BOOL b { if (VALIDROW(nRow) && pRowFlags) { @@ -1330,7 +1303,7 @@ index 972ec16..889510f 100644 if (bWasVis != bShow) { nRecalcLvl++; -@@ -2365,10 +2402,10 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow) +@@ -2365,10 +2402,10 @@ void ScTable::ShowRow(SCROW nRow, BOOL b pDrawLayer->HeightChanged( nTab, nRow, -(long) pRowHeight->GetValue(nRow) ); } @@ -1344,7 +1317,7 @@ index 972ec16..889510f 100644 if( !--nRecalcLvl ) SetDrawPageSize(); -@@ -2390,8 +2427,7 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow) +@@ -2390,8 +2427,7 @@ void ScTable::DBShowRow(SCROW nRow, BOOL { if (VALIDROW(nRow) && pRowFlags) { @@ -1354,7 +1327,7 @@ index 972ec16..889510f 100644 nRecalcLvl++; InitializeNoteCaptions(); if (bWasVis != bShow) -@@ -2407,10 +2443,10 @@ void ScTable::DBShowRow(SCROW nRow, BOOL bShow) +@@ -2407,10 +2443,10 @@ void ScTable::DBShowRow(SCROW nRow, BOOL } // Filter-Flag immer setzen, auch wenn Hidden unveraendert @@ -1369,7 +1342,7 @@ index 972ec16..889510f 100644 if( !--nRecalcLvl ) SetDrawPageSize(); -@@ -2440,12 +2476,11 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow) +@@ -2440,12 +2476,11 @@ void ScTable::DBShowRows(SCROW nRow1, SC InitializeNoteCaptions(); while (nStartRow <= nRow2) { @@ -1384,7 +1357,7 @@ index 972ec16..889510f 100644 BOOL bChanged = ( bWasVis != bShow ); if ( bChanged ) { -@@ -2460,10 +2495,8 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow) +@@ -2460,10 +2495,8 @@ void ScTable::DBShowRows(SCROW nRow1, SC } } @@ -1397,7 +1370,7 @@ index 972ec16..889510f 100644 if ( bChanged ) { -@@ -2493,12 +2526,11 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow) +@@ -2493,12 +2526,11 @@ void ScTable::ShowRows(SCROW nRow1, SCRO InitializeNoteCaptions(); while (nStartRow <= nRow2) { @@ -1412,7 +1385,7 @@ index 972ec16..889510f 100644 BOOL bChanged = ( bWasVis != bShow ); if ( bChanged ) { -@@ -2513,10 +2545,9 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow) +@@ -2513,10 +2545,9 @@ void ScTable::ShowRows(SCROW nRow1, SCRO } } @@ -1425,7 +1398,7 @@ index 972ec16..889510f 100644 if ( bChanged ) { -@@ -2534,16 +2565,6 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, BOOL bShow) +@@ -2534,16 +2565,6 @@ void ScTable::ShowRows(SCROW nRow1, SCRO } @@ -1442,7 +1415,7 @@ index 972ec16..889510f 100644 void ScTable::SetColFlags( SCCOL nCol, BYTE nNewFlags ) { if (VALIDCOL(nCol) && pColFlags) -@@ -2641,7 +2662,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow ) +@@ -2641,7 +2662,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nS if (pOutlineTable && pColFlags) { ScBitMaskCompressedArray< SCCOLROW, BYTE> aArray( MAXCOL, pColFlags, MAXCOLCOUNT); @@ -1451,7 +1424,7 @@ index 972ec16..889510f 100644 } else return FALSE; -@@ -2651,7 +2672,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow ) +@@ -2651,7 +2672,7 @@ BOOL ScTable::UpdateOutlineCol( SCCOL nS BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow ) { if (pOutlineTable && pRowFlags) @@ -1460,7 +1433,7 @@ index 972ec16..889510f 100644 else return FALSE; } -@@ -2659,54 +2680,58 @@ BOOL ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow ) +@@ -2659,54 +2680,58 @@ BOOL ScTable::UpdateOutlineRow( SCROW nS void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) { @@ -1551,7 +1524,7 @@ index 972ec16..889510f 100644 } } -@@ -2868,16 +2893,16 @@ BOOL ScTable::RefVisible(ScFormulaCell* pCell) +@@ -2868,16 +2893,16 @@ BOOL ScTable::RefVisible(ScFormulaCell* if (pCell->HasOneReference(aRef)) { @@ -1575,7 +1548,7 @@ index 972ec16..889510f 100644 } } -@@ -2914,7 +2939,7 @@ void ScTable::SetDrawPageSize() +@@ -2919,7 +2944,7 @@ void ScTable::SetDrawPageSize(bool bRese } @@ -1584,7 +1557,7 @@ index 972ec16..889510f 100644 { ULONG n = 0; if ( pRowFlags && pRowHeight ) -@@ -2924,8 +2949,7 @@ ULONG ScTable::GetRowOffset( SCROW nRow ) const +@@ -2929,8 +2954,7 @@ ULONG ScTable::GetRowOffset( SCROW nRow else if (nRow == 1) return GetRowHeight(0); @@ -1594,7 +1567,7 @@ index 972ec16..889510f 100644 #ifdef DBG_UTIL if (n == ::std::numeric_limits<unsigned long>::max()) DBG_ERRORFILE("ScTable::GetRowOffset: row heights overflow"); -@@ -2938,18 +2962,42 @@ ULONG ScTable::GetRowOffset( SCROW nRow ) const +@@ -2943,18 +2967,42 @@ ULONG ScTable::GetRowOffset( SCROW nRow return n; } @@ -1644,11 +1617,9 @@ index 972ec16..889510f 100644 } else { -diff --git sc/source/core/data/table3.cxx sc/source/core/data/table3.cxx -index 4d3b4de..cbf417b 100644 ---- sc/source/core/data/table3.cxx -+++ sc/source/core/data/table3.cxx -@@ -603,14 +603,17 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2) +--- sc/source/core/data/table3.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/core/data/table3.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -604,14 +604,17 @@ void ScTable::SwapRow(SCROW nRow1, SCROW } } } @@ -1673,7 +1644,7 @@ index 4d3b4de..cbf417b 100644 } } -@@ -991,13 +994,6 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) +@@ -992,13 +995,6 @@ BOOL ScTable::DoSubTotals( ScSubTotalPar SetString( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, nTab, aOutString ); ApplyStyle( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, *pStyle ); @@ -1687,7 +1658,7 @@ index 4d3b4de..cbf417b 100644 ++nRow; ++nEndRow; aRowEntry.nSubStartRow = nRow; -@@ -1011,11 +1007,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) +@@ -1012,11 +1008,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalPar } } } @@ -1700,7 +1671,7 @@ index 4d3b4de..cbf417b 100644 } } else -@@ -2051,8 +2043,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData, +@@ -2054,8 +2046,8 @@ void ScTable::UpdateSelectionFunction( S SCCOL nCol; if ( rMark.IsMultiMarked() ) for (nCol=0; nCol<=MAXCOL && !rData.bError; nCol++) @@ -1711,7 +1682,7 @@ index 4d3b4de..cbf417b 100644 bSingle && ( nCol >= nStartCol && nCol <= nEndCol ), nStartRow, nEndRow ); -@@ -2060,8 +2052,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData, +@@ -2063,8 +2055,8 @@ void ScTable::UpdateSelectionFunction( S if ( bSingle && !rMark.IsMarkNegative() ) for (nCol=nStartCol; nCol<=nEndCol && !rData.bError; nCol++) @@ -1722,10 +1693,8 @@ index 4d3b4de..cbf417b 100644 } void ScTable::FindConditionalFormat( ULONG nKey, ScRangeList& rList ) -diff --git sc/source/core/data/table5.cxx sc/source/core/data/table5.cxx -index 48f7110..7e7cab9 100644 ---- sc/source/core/data/table5.cxx -+++ sc/source/core/data/table5.cxx +--- sc/source/core/data/table5.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/core/data/table5.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -53,9 +53,11 @@ #include "brdcst.hxx" #include "tabprotection.hxx" @@ -1738,7 +1707,7 @@ index 48f7110..7e7cab9 100644 using ::com::sun::star::uno::Sequence; using ::com::sun::star::sheet::TablePageBreakData; -@@ -168,7 +170,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) +@@ -168,7 +170,7 @@ void ScTable::UpdatePageBreaks( const Sc for (nX=nStartCol; nX<=nEndCol; nX++) { BOOL bStartOfPage = FALSE; @@ -1747,7 +1716,7 @@ index 48f7110..7e7cab9 100644 bool bManualBreak = HasColManualBreak(nX); if ( (nSizeX+nThisX > nPageSizeX) || (bManualBreak && !bSkipBreaks) ) { -@@ -185,7 +187,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) +@@ -185,7 +187,7 @@ void ScTable::UpdatePageBreaks( const Sc { // subtract size of repeat columns from page size for (SCCOL i=nRepeatStartX; i<=nRepeatEndX; i++) @@ -1756,7 +1725,7 @@ index 48f7110..7e7cab9 100644 while (nX<=nRepeatEndX) RemoveColBreak(++nX, true, false); bColFound = TRUE; -@@ -204,8 +206,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) +@@ -204,8 +206,7 @@ void ScTable::UpdatePageBreaks( const Sc for (SCROW nY = nStartRow; nY <= nEndRow; ++nY) { BOOL bStartOfPage = FALSE; @@ -1766,7 +1735,7 @@ index 48f7110..7e7cab9 100644 bool bManualBreak = HasRowManualBreak(nY); if ( (nSizeY+nThisY > nPageSizeY) || (bManualBreak && !bSkipBreaks) ) { -@@ -221,8 +222,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) +@@ -221,8 +222,7 @@ void ScTable::UpdatePageBreaks( const Sc if ( bStartOfPage && bRepeatRow && nY>nRepeatStartY && !bRowFound ) { // subtract size of repeat rows from page size @@ -1776,7 +1745,7 @@ index 48f7110..7e7cab9 100644 #ifdef DBG_UTIL if (nHeights == ::std::numeric_limits<unsigned long>::max()) DBG_ERRORFILE("ScTable::UpdatePageBreaks: row heights overflow"); -@@ -416,12 +416,516 @@ Sequence<TablePageBreakData> ScTable::GetRowBreakData() const +@@ -419,12 +419,516 @@ Sequence<TablePageBreakData> ScTable::Ge return aSeq; } @@ -2295,7 +2264,7 @@ index 48f7110..7e7cab9 100644 pRowFlags->AndValue(0, MAXROW, static_int_cast<BYTE>(~CR_MANUALBREAK)); for (SCCOL i = 0; i <= MAXCOL; ++i) pColFlags[i] &= static_int_cast<BYTE>(~CR_MANUALBREAK); -@@ -439,6 +943,10 @@ void ScTable::SyncColRowFlags() +@@ -442,6 +946,10 @@ void ScTable::SyncColRowFlags() itr != itrEnd; ++itr) pColFlags[*itr] |= CR_MANUALBREAK; } @@ -2306,10 +2275,8 @@ index 48f7110..7e7cab9 100644 } void ScTable::SetPageSize( const Size& rSize ) -diff --git sc/source/core/tool/chartarr.cxx sc/source/core/tool/chartarr.cxx -index 5445a9d..5951957 100644 ---- sc/source/core/tool/chartarr.cxx -+++ sc/source/core/tool/chartarr.cxx +--- sc/source/core/tool/chartarr.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/core/tool/chartarr.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -47,6 +47,9 @@ #include "cell.hxx" #include "docoptio.hxx" @@ -2320,7 +2287,7 @@ index 5445a9d..5951957 100644 // ----------------------------------------------------------------------- -@@ -166,11 +169,17 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -166,11 +169,17 @@ ScMemChart* ScChartArray::CreateMemChart SCCOL nStrCol = nCol1; // fuer Beschriftung merken SCROW nStrRow = nRow1; @@ -2343,7 +2310,7 @@ index 5445a9d..5951957 100644 // falls alles hidden ist, bleibt die Beschriftung am Anfang if ( nCol1 <= nCol2 ) { -@@ -184,17 +193,33 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -184,17 +193,33 @@ ScMemChart* ScChartArray::CreateMemChart } SCSIZE nTotalCols = ( nCol1 <= nCol2 ? nCol2 - nCol1 + 1 : 0 ); @@ -2385,7 +2352,7 @@ index 5445a9d..5951957 100644 // May happen at least with more than 32k rows. if (nColCount > SHRT_MAX || nRowCount > SHRT_MAX) -@@ -208,13 +233,13 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -208,13 +233,13 @@ ScMemChart* ScChartArray::CreateMemChart { bValidData = FALSE; nColCount = 1; @@ -2401,7 +2368,7 @@ index 5445a9d..5951957 100644 } // -@@ -237,7 +262,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -237,7 +262,7 @@ ScMemChart* ScChartArray::CreateMemChart { double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen @@ -2410,7 +2377,7 @@ index 5445a9d..5951957 100644 if (pCell) { CellType eType = pCell->GetCellType(); -@@ -247,8 +272,8 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -247,8 +272,8 @@ ScMemChart* ScChartArray::CreateMemChart if ( bCalcAsShown && nVal != 0.0 ) { sal_uInt32 nFormat; @@ -2421,7 +2388,7 @@ index 5445a9d..5951957 100644 nVal = pDocument->RoundValueAsShown( nVal, nFormat ); } } -@@ -280,13 +305,13 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -280,13 +305,13 @@ ScMemChart* ScChartArray::CreateMemChart { String aString, aColStr; if (HasColHeaders()) @@ -2437,7 +2404,7 @@ index 5445a9d..5951957 100644 aPos.Format( aColStr, SCA_VALID_COL, NULL ); aString += aColStr; } -@@ -306,14 +331,14 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -306,14 +331,14 @@ ScMemChart* ScChartArray::CreateMemChart String aString; if (HasRowHeaders()) { @@ -2455,7 +2422,7 @@ index 5445a9d..5951957 100644 } pMemChart->SetRowText( static_cast<short>(nRow), aString); -@@ -349,11 +374,6 @@ ScMemChart* ScChartArray::CreateMemChartSingle() +@@ -349,11 +374,6 @@ ScMemChart* ScChartArray::CreateMemChart // SetExtraStrings( *pMemChart ); } @@ -2467,11 +2434,9 @@ index 5445a9d..5951957 100644 return pMemChart; } -diff --git sc/source/filter/excel/colrowst.cxx sc/source/filter/excel/colrowst.cxx -index 174ab20..45d3c9e 100644 ---- sc/source/filter/excel/colrowst.cxx -+++ sc/source/filter/excel/colrowst.cxx -@@ -309,7 +309,7 @@ void XclImpColRowSettings::ConvertHiddenFlags( SCTAB nScTab ) +--- sc/source/filter/excel/colrowst.cxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/filter/excel/colrowst.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -310,7 +310,7 @@ void XclImpColRowSettings::ConvertHidden rDoc.ShowRow( nScRow, nScTab, FALSE ); // #i38093# rows hidden by filter need extra flag if( (nFirstFilterScRow <= nScRow) && (nScRow <= nLastFilterScRow) ) @@ -2480,11 +2445,9 @@ index 174ab20..45d3c9e 100644 } } -diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx -index 2aef64c..2816daf 100644 ---- sc/source/filter/excel/xetable.cxx -+++ sc/source/filter/excel/xetable.cxx -@@ -1604,8 +1604,7 @@ XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot, +--- sc/source/filter/excel/xetable.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/excel/xetable.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1604,8 +1604,7 @@ XclExpColinfo::XclExpColinfo( const XclE mnWidth = XclTools::GetXclColumnWidth( nScWidth, GetCharWidth() ); // column flags @@ -2494,7 +2457,7 @@ index 2aef64c..2816daf 100644 // outline data rOutlineBfr.Update( nScCol ); -@@ -1830,7 +1829,7 @@ XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt16 nXclRow, +@@ -1830,7 +1829,7 @@ XclExpRow::XclExpRow( const XclExpRoot& BYTE nRowFlags = GetDoc().GetRowFlags( nScRow, nScTab ); bool bUserHeight = ::get_flag< BYTE >( nRowFlags, CR_MANUALSIZE ); @@ -2503,10 +2466,8 @@ index 2aef64c..2816daf 100644 ::set_flag( mnFlags, EXC_ROW_UNSYNCED, bUserHeight ); ::set_flag( mnFlags, EXC_ROW_HIDDEN, bHidden ); -diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx -index bea2ed1..98312a2 100644 ---- sc/source/filter/excel/xlescher.cxx -+++ sc/source/filter/excel/xlescher.cxx +--- sc/source/filter/excel/xlescher.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/excel/xlescher.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -136,21 +136,20 @@ void lclGetRowFromY( // rnStartH in conjunction with nXclStartRow is used as buffer for previously calculated height long nTwipsY = static_cast< long >( nY / fScale + 0.5 ); @@ -2536,10 +2497,8 @@ index bea2ed1..98312a2 100644 rnOffset = static_cast< sal_uInt16 >( nRowH ? ((nTwipsY - rnStartH) * 256.0 / nRowH + 0.5) : 0 ); } -diff --git sc/source/filter/html/htmlexp.cxx sc/source/filter/html/htmlexp.cxx -index ecb2b2a..9698b9d 100644 ---- sc/source/filter/html/htmlexp.cxx -+++ sc/source/filter/html/htmlexp.cxx +--- sc/source/filter/html/htmlexp.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/html/htmlexp.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -749,7 +749,7 @@ void ScHTMLExport::WriteTables() SCCOL nCol; for ( nCol=nStartCol; nCol<=nEndCol; nCol++ ) @@ -2585,11 +2544,9 @@ index ecb2b2a..9698b9d 100644 continue; // for if ( nCol2 == nEndCol ) -diff --git sc/source/filter/lotus/lotimpop.cxx sc/source/filter/lotus/lotimpop.cxx -index 17a48cb..8d887b0 100644 ---- sc/source/filter/lotus/lotimpop.cxx -+++ sc/source/filter/lotus/lotimpop.cxx -@@ -183,8 +183,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen ) +--- sc/source/filter/lotus/lotimpop.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/lotus/lotimpop.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -183,8 +183,7 @@ void ImportLotus::Hiddencolumn( UINT16 n { Read( nCol ); @@ -2599,11 +2556,9 @@ index 17a48cb..8d887b0 100644 nCnt--; } } -diff --git sc/source/filter/lotus/op.cxx sc/source/filter/lotus/op.cxx -index 028993b..eb7d043 100644 ---- sc/source/filter/lotus/op.cxx -+++ sc/source/filter/lotus/op.cxx -@@ -229,7 +229,7 @@ void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ ) +--- sc/source/filter/lotus/op.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/lotus/op.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -229,7 +229,7 @@ void OP_ColumnWidth( SvStream& r, UINT16 nBreite = ( UINT16 ) ( TWIPS_PER_CHAR * nWidthSpaces ); else { @@ -2612,7 +2567,7 @@ index 028993b..eb7d043 100644 nBreite = nDefWidth; } -@@ -338,7 +338,7 @@ void OP_HiddenCols( SvStream& r, UINT16 /*n*/ ) +@@ -338,7 +338,7 @@ void OP_HiddenCols( SvStream& r, UINT16 { if( nAkt & 0x01 ) // unterstes Bit gesetzt? // -> Hidden Col @@ -2621,11 +2576,9 @@ index 028993b..eb7d043 100644 nCount++; nAkt = nAkt / 2; // der Naechste bitte... -diff --git sc/source/filter/rtf/expbase.cxx sc/source/filter/rtf/expbase.cxx -index 2c2cf22..98aef5e 100644 ---- sc/source/filter/rtf/expbase.cxx -+++ sc/source/filter/rtf/expbase.cxx -@@ -78,16 +78,13 @@ BOOL ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol, +--- sc/source/filter/rtf/expbase.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/rtf/expbase.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -78,16 +78,13 @@ BOOL ScExportBase::GetDataArea( SCTAB nT BOOL ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const { @@ -2647,10 +2600,8 @@ index 2c2cf22..98aef5e 100644 return nStartCol <= nEndCol && nStartRow <= nEndRow && nEndRow != ::std::numeric_limits<SCROW>::max(); } -diff --git sc/source/filter/starcalc/scflt.cxx sc/source/filter/starcalc/scflt.cxx -index 8c98903..a456235 100644 ---- sc/source/filter/starcalc/scflt.cxx -+++ sc/source/filter/starcalc/scflt.cxx +--- sc/source/filter/starcalc/scflt.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/filter/starcalc/scflt.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -1551,14 +1551,12 @@ void Sc10Import::LoadTables() rStream >> DataValue; if (DataValue != 0) @@ -2686,11 +2637,9 @@ index 8c98903..a456235 100644 pDoc->SetRowBreak(l, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak); } } -diff --git sc/source/ui/Accessibility/AccessibleCellBase.cxx sc/source/ui/Accessibility/AccessibleCellBase.cxx -index d112ea0..046b4ce 100644 ---- sc/source/ui/Accessibility/AccessibleCellBase.cxx -+++ sc/source/ui/Accessibility/AccessibleCellBase.cxx -@@ -95,10 +95,12 @@ sal_Bool SAL_CALL ScAccessibleCellBase::isVisible( ) +--- sc/source/ui/Accessibility/AccessibleCellBase.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/Accessibility/AccessibleCellBase.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -95,10 +95,12 @@ sal_Bool SAL_CALL ScAccessibleCellBase:: sal_Bool bVisible(sal_True); if (mpDoc) { @@ -2707,11 +2656,9 @@ index d112ea0..046b4ce 100644 bVisible = sal_False; } return bVisible; -diff --git sc/source/ui/app/inputwin.cxx sc/source/ui/app/inputwin.cxx -index 80625f0..754e110 100644 ---- sc/source/ui/app/inputwin.cxx -+++ sc/source/ui/app/inputwin.cxx -@@ -294,7 +294,7 @@ sal_Bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) const +--- sc/source/ui/app/inputwin.cxx.old 2009-12-03 13:50:47.000000000 +0100 ++++ sc/source/ui/app/inputwin.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -292,7 +292,7 @@ sal_Bool ScInputWindow::UseSubTotal(ScRa SCROW nRow(pRange->aStart.Row()); while (!bSubTotal && nRow <= nRowEnd) { @@ -2720,10 +2667,8 @@ index 80625f0..754e110 100644 bSubTotal = sal_True; else ++nRow; -diff --git sc/source/ui/app/transobj.cxx sc/source/ui/app/transobj.cxx -index b35d177..87f888c 100644 ---- sc/source/ui/app/transobj.cxx -+++ sc/source/ui/app/transobj.cxx +--- sc/source/ui/app/transobj.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/ui/app/transobj.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -605,25 +605,24 @@ void ScTransferObj::InitDocShell() // widths / heights // (must be copied before CopyFromClip, for drawing objects) @@ -2757,11 +2702,9 @@ index b35d177..87f888c 100644 pDestDoc->ShowRow( nRow, 0, FALSE ); else { -diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx -index bb7cdef..6dbec45 100644 ---- sc/source/ui/docshell/docfunc.cxx -+++ sc/source/ui/docshell/docfunc.cxx -@@ -2980,7 +2980,9 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa +--- sc/source/ui/docshell/docfunc.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/docshell/docfunc.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -3106,7 +3106,9 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL b for (SCROW nRow=nStartNo; nRow<=nEndNo; nRow++) { BYTE nOld = pDoc->GetRowFlags(nRow,nTab); @@ -2772,7 +2715,7 @@ index bb7cdef..6dbec45 100644 pDoc->SetRowFlags( nRow, nTab, nOld & ~CR_MANUALSIZE ); } } -@@ -3015,8 +3017,8 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRa +@@ -3141,8 +3143,8 @@ BOOL ScDocFunc::SetWidthOrHeight( BOOL b { for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++) { @@ -2783,11 +2726,9 @@ index bb7cdef..6dbec45 100644 { USHORT nThisSize = nSizeTwips; -diff --git sc/source/ui/docshell/impex.cxx sc/source/ui/docshell/impex.cxx -index 08dfcfb..6df6637 100644 ---- sc/source/ui/docshell/impex.cxx -+++ sc/source/ui/docshell/impex.cxx -@@ -1444,7 +1444,7 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm ) +--- sc/source/ui/docshell/impex.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/ui/docshell/impex.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1465,7 +1465,7 @@ BOOL ScImportExport::Doc2Text( SvStream& for (nRow = nStartRow; nRow <= nEndRow; nRow++) { @@ -2796,11 +2737,9 @@ index 08dfcfb..6df6637 100644 { for (nCol = nStartCol; nCol <= nEndCol; nCol++) { -diff --git sc/source/ui/docshell/olinefun.cxx sc/source/ui/docshell/olinefun.cxx -index 01b4f9a..fd120a8 100644 ---- sc/source/ui/docshell/olinefun.cxx -+++ sc/source/ui/docshell/olinefun.cxx -@@ -411,7 +411,7 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel, +--- sc/source/ui/docshell/olinefun.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/docshell/olinefun.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -423,7 +423,7 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTA if ( bColumns ) pDoc->ShowCol( static_cast<SCCOL>(i), nTab, bShow ); else @@ -2809,7 +2748,7 @@ index 01b4f9a..fd120a8 100644 pDoc->ShowRow( i, nTab, bShow ); } } -@@ -509,7 +509,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, +@@ -521,7 +521,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutline } } for ( i=nMin; i<=nMax; i++ ) @@ -2818,7 +2757,7 @@ index 01b4f9a..fd120a8 100644 pDoc->ShowRow( i, nTab, TRUE ); pDoc->UpdatePageBreaks( nTab ); -@@ -669,7 +669,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTAB nTab, BOOL bColumns, USHORT nLevel, US +@@ -681,7 +681,7 @@ BOOL ScOutlineDocFunc::ShowOutline( SCTA if ( bColumns ) pDoc->ShowCol( static_cast<SCCOL>(i), nTab, TRUE ); else @@ -2827,10 +2766,8 @@ index 01b4f9a..fd120a8 100644 pDoc->ShowRow( i, nTab, TRUE ); } -diff --git sc/source/ui/inc/viewutil.hxx sc/source/ui/inc/viewutil.hxx -index 55f0039..18b4d68 100644 ---- sc/source/ui/inc/viewutil.hxx -+++ sc/source/ui/inc/viewutil.hxx +--- sc/source/ui/inc/viewutil.hxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/inc/viewutil.hxx 2010-03-03 16:59:19.000000000 +0100 @@ -71,10 +71,10 @@ public: static sal_Int32 GetTransliterationType( USHORT nSlotID ); @@ -2844,11 +2781,9 @@ index 55f0039..18b4d68 100644 static void UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc ); static void HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USHORT nSlotId ); -diff --git sc/source/ui/undo/undoblk.cxx sc/source/ui/undo/undoblk.cxx -index f92adea..002aa14 100644 ---- sc/source/ui/undo/undoblk.cxx -+++ sc/source/ui/undo/undoblk.cxx -@@ -1152,10 +1152,10 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell, +--- sc/source/ui/undo/undoblk.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/undo/undoblk.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1152,10 +1152,10 @@ ScUndoDragDrop::ScUndoDragDrop( ScDocShe BOOL bIncludeFiltered = bCut; if ( !bIncludeFiltered ) { @@ -2863,10 +2798,8 @@ index f92adea..002aa14 100644 if ( nPastedCount == 0 ) nPastedCount = 1; aDestEnd.SetRow( aNewDestPos.Row() + nPastedCount - 1 ); -diff --git sc/source/ui/undo/undoblk3.cxx sc/source/ui/undo/undoblk3.cxx -index c6dba05..cb6f62c 100644 ---- sc/source/ui/undo/undoblk3.cxx -+++ sc/source/ui/undo/undoblk3.cxx +--- sc/source/ui/undo/undoblk3.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/ui/undo/undoblk3.cxx 2010-03-03 16:59:19.000000000 +0100 @@ -1082,17 +1082,20 @@ void __EXPORT ScUndoAutoFormat::Redo() aDestMark.MarkToMulti(); @@ -2890,26 +2823,15 @@ index c6dba05..cb6f62c 100644 { USHORT nThisSize = STD_EXTRA_WIDTH + pDoc->GetOptimalColWidth( nCol, nTab, &aVirtDev, nPPTX, nPPTY, aZoomX, aZoomY, bFormula, -diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx -index 520a788..37eb67c 100644 ---- sc/source/ui/unoobj/cellsuno.cxx -+++ sc/source/ui/unoobj/cellsuno.cxx -@@ -3379,18 +3379,25 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC +--- sc/source/ui/unoobj/cellsuno.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/unoobj/cellsuno.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -3379,18 +3379,25 @@ uno::Reference<sheet::XSheetCellRanges> ScMarkData aMarkData(*GetMarkData()); ScDocument* pDoc = pDocShell->GetDocument(); - for (SCCOL nCol=0; nCol<=MAXCOL; nCol++) - if (pDoc->GetColFlags(nCol,nTab) & CR_HIDDEN) - aMarkData.SetMultiMarkArea( ScRange( nCol,0,nTab, nCol,MAXROW,nTab ), FALSE ); -- -- //! nur bis zur letzten selektierten Zeile testen? -- ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray( nTab), 0, MAXROW); -- do -- { -- if (*aIter & CR_HIDDEN) -- aMarkData.SetMultiMarkArea( ScRange( 0, aIter.GetRangeStart(), -- nTab, MAXCOL, aIter.GetRangeEnd(), nTab ), FALSE ); -- } while (aIter.NextRange()); + SCCOL nCol = 0, nLastCol; + while (nCol <= MAXCOL) + { @@ -2926,13 +2848,21 @@ index 520a788..37eb67c 100644 + if (pDoc->RowHidden(nRow, nTab, nLastRow)) + // These rows are hidden. Unselect them. + aMarkData.SetMultiMarkArea(ScRange(0, nRow, nTab, MAXCOL, nLastRow, nTab), false); -+ + +- //! nur bis zur letzten selektierten Zeile testen? +- ScCompressedArrayIterator< SCROW, BYTE> aIter( pDoc->GetRowFlagsArray( nTab), 0, MAXROW); +- do +- { +- if (*aIter & CR_HIDDEN) +- aMarkData.SetMultiMarkArea( ScRange( 0, aIter.GetRangeStart(), +- nTab, MAXCOL, aIter.GetRangeEnd(), nTab ), FALSE ); +- } while (aIter.NextRange()); + nRow = nLastRow + 1; + } ScRangeList aNewRanges; aMarkData.FillRangeListWithMarks( &aNewRanges, FALSE ); -@@ -8882,8 +8889,9 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE +@@ -8856,8 +8863,9 @@ void ScTableColumnObj::GetOnePropertyVal } else if ( pEntry->nWID == SC_WID_UNO_CELLVIS ) { @@ -2944,7 +2874,7 @@ index 520a788..37eb67c 100644 } else if ( pEntry->nWID == SC_WID_UNO_OWIDTH ) { -@@ -8985,12 +8993,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr +@@ -8959,12 +8967,7 @@ void ScTableRowObj::SetOnePropertyValue( // ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT; // aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE ); // SC_SIZE_DIRECT mit Groesse 0 blendet aus @@ -2958,7 +2888,7 @@ index 520a788..37eb67c 100644 } else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT ) { -@@ -9042,12 +9045,13 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr +@@ -9016,12 +9019,13 @@ void ScTableRowObj::GetOnePropertyValue( } else if ( pEntry->nWID == SC_WID_UNO_CELLVIS ) { @@ -2975,11 +2905,9 @@ index 520a788..37eb67c 100644 ScUnoHelpFunctions::SetBoolInAny( rAny, bVis ); } else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT ) -diff --git sc/source/ui/unoobj/chart2uno.cxx sc/source/ui/unoobj/chart2uno.cxx -index 7c1cfc6..174d213 100644 ---- sc/source/ui/unoobj/chart2uno.cxx -+++ sc/source/ui/unoobj/chart2uno.cxx -@@ -2840,14 +2840,17 @@ void ScChart2DataSequence::BuildDataCache() +--- sc/source/ui/unoobj/chart2uno.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/ui/unoobj/chart2uno.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -2856,14 +2856,17 @@ void ScChart2DataSequence::BuildDataCach if (!ScRefTokenHelper::getRangeFromToken(aRange, *itr)) continue; @@ -2999,11 +2927,9 @@ index 7c1cfc6..174d213 100644 if (bColHidden || bRowHidden) { // hidden cell -diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx -index 5c4113b..5b4a50b 100644 ---- sc/source/ui/unoobj/docuno.cxx -+++ sc/source/ui/unoobj/docuno.cxx -@@ -2613,7 +2613,8 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const rtl::OUString& aPro +--- sc/source/ui/unoobj/docuno.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/unoobj/docuno.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -2656,7 +2656,8 @@ uno::Any SAL_CALL ScTableColumnsObj::get } else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) ) { @@ -3013,7 +2939,7 @@ index 5c4113b..5b4a50b 100644 ScUnoHelpFunctions::SetBoolInAny( aAny, bVis ); } else if ( aNameString.EqualsAscii( SC_UNONAME_OWIDTH ) ) -@@ -2821,9 +2822,9 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( +@@ -2864,9 +2865,9 @@ void SAL_CALL ScTableRowsObj::setPropert { //! undo etc. if (ScUnoHelpFunctions::GetBoolFromAny( aValue )) @@ -3025,7 +2951,7 @@ index 5c4113b..5b4a50b 100644 } else if ( aNameString.EqualsAscii( SC_UNONAME_NEWPAGE) || aNameString.EqualsAscii( SC_UNONAME_MANPAGE) ) { -@@ -2871,12 +2872,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const rtl::OUString& aProper +@@ -2914,12 +2915,13 @@ uno::Any SAL_CALL ScTableRowsObj::getPro } else if ( aNameString.EqualsAscii( SC_UNONAME_CELLVIS ) ) { @@ -3041,11 +2967,9 @@ index 5c4113b..5b4a50b 100644 ScUnoHelpFunctions::SetBoolInAny( aAny, bVis ); } else if ( aNameString.EqualsAscii( SC_UNONAME_OHEIGHT ) ) -diff --git sc/source/ui/view/colrowba.cxx sc/source/ui/view/colrowba.cxx -index ecd0a37..e7613c1 100644 ---- sc/source/ui/view/colrowba.cxx -+++ sc/source/ui/view/colrowba.cxx -@@ -101,7 +101,8 @@ USHORT ScColBar::GetEntrySize( SCCOLROW nEntryNo ) +--- sc/source/ui/view/colrowba.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/ui/view/colrowba.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -101,7 +101,8 @@ USHORT ScColBar::GetEntrySize( SCCOLROW { ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); @@ -3055,7 +2979,7 @@ index ecd0a37..e7613c1 100644 return 0; else return (USHORT) ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(nEntryNo), nTab ), pViewData->GetPPTX() ); -@@ -267,7 +268,8 @@ USHORT ScRowBar::GetEntrySize( SCCOLROW nEntryNo ) +@@ -267,7 +268,8 @@ USHORT ScRowBar::GetEntrySize( SCCOLROW { ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); @@ -3065,11 +2989,9 @@ index ecd0a37..e7613c1 100644 return 0; else return (USHORT) ScViewData::ToPixel( pDoc->GetOriginalHeight( nEntryNo, -diff --git sc/source/ui/view/drawutil.cxx sc/source/ui/view/drawutil.cxx -index 48b03b5..ddb2f06 100644 ---- sc/source/ui/view/drawutil.cxx -+++ sc/source/ui/view/drawutil.cxx -@@ -69,14 +69,19 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, +--- sc/source/ui/view/drawutil.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/view/drawutil.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -69,14 +69,19 @@ void ScDrawUtil::CalcScale( ScDocument* nTwipsX += (long) nWidth; nPixelX += ScViewData::ToPixel( nWidth, nPPTX ); } @@ -3096,11 +3018,9 @@ index 48b03b5..ddb2f06 100644 } MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY ); -diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx -index ac4d80f..e591f86 100644 ---- sc/source/ui/view/gridwin.cxx -+++ sc/source/ui/view/gridwin.cxx -@@ -4601,18 +4601,17 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges +--- sc/source/ui/view/gridwin.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/view/gridwin.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -4628,18 +4628,17 @@ void lcl_PaintOneRange( ScDocShell* pDoc SCROW nTmp; ScDocument* pDoc = pDocSh->GetDocument(); @@ -3122,7 +3042,7 @@ index ac4d80f..e591f86 100644 if (!ValidRow(nTmp)) nTmp = 0; if (nTmp < nRow1) -@@ -4620,8 +4619,7 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges +@@ -4647,8 +4646,7 @@ void lcl_PaintOneRange( ScDocShell* pDoc nRow1 = nTmp; bHiddenEdge = TRUE; } @@ -3132,11 +3052,9 @@ index ac4d80f..e591f86 100644 if (!ValidRow(nTmp)) nTmp = MAXROW; if (nTmp > nRow2) -diff --git sc/source/ui/view/gridwin4.cxx sc/source/ui/view/gridwin4.cxx -index 4dfc08f..23edc22 100644 ---- sc/source/ui/view/gridwin4.cxx -+++ sc/source/ui/view/gridwin4.cxx -@@ -1378,7 +1378,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos ) +--- sc/source/ui/view/gridwin4.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/view/gridwin4.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1379,7 +1379,7 @@ Rectangle ScGridWindow::GetListValButton const ScMergeAttr* pMerge = static_cast<const ScMergeAttr*>(pDoc->GetAttr( nCol,nRow,nTab, ATTR_MERGE )); if ( pMerge->GetColMerge() > 1 ) nNextCol = nCol + pMerge->GetColMerge(); // next cell after the merged area @@ -3145,7 +3063,7 @@ index 4dfc08f..23edc22 100644 ++nNextCol; BOOL bNextCell = ( nNextCol <= MAXCOL ); if ( bNextCell ) -@@ -1581,7 +1581,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, +@@ -1582,7 +1582,7 @@ void ScGridWindow::InvertSimple( SCCOL n if ( pMergeFlag->IsVerOverlapped() && ( bDoHidden || bFirstRow ) ) { while ( pMergeFlag->IsVerOverlapped() && nThisY > 0 && @@ -3154,7 +3072,7 @@ index 4dfc08f..23edc22 100644 { --nThisY; pPattern = pDoc->GetPattern( nX, nThisY, nTab ); -@@ -1768,7 +1768,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) +@@ -1769,7 +1769,7 @@ void ScGridWindow::GetSelectionRects( :: if ( pMergeFlag->IsVerOverlapped() && ( bDoHidden || bFirstRow ) ) { while ( pMergeFlag->IsVerOverlapped() && nThisY > 0 && @@ -3163,11 +3081,9 @@ index 4dfc08f..23edc22 100644 { --nThisY; pPattern = pDoc->GetPattern( nX, nThisY, nTab ); -diff --git sc/source/ui/view/olinewin.cxx sc/source/ui/view/olinewin.cxx -index fa00785..82d66d1 100644 ---- sc/source/ui/view/olinewin.cxx -+++ sc/source/ui/view/olinewin.cxx -@@ -186,16 +186,15 @@ const ScOutlineEntry* ScOutlineWindow::GetOutlineEntry( size_t nLevel, size_t nE +--- sc/source/ui/view/olinewin.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/view/olinewin.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -186,16 +186,15 @@ const ScOutlineEntry* ScOutlineWindow::G bool ScOutlineWindow::IsHidden( SCCOLROW nColRowIndex ) const { @@ -3188,11 +3104,9 @@ index fa00785..82d66d1 100644 } bool ScOutlineWindow::IsFirstVisible( SCCOLROW nColRowIndex ) const -diff --git sc/source/ui/view/output.cxx sc/source/ui/view/output.cxx -index 9a27bb8..989ea07 100644 ---- sc/source/ui/view/output.cxx -+++ sc/source/ui/view/output.cxx -@@ -387,8 +387,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) +--- sc/source/ui/view/output.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/view/output.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -387,8 +387,9 @@ void ScOutputData::DrawGrid( BOOL bGrid, { BYTE nDocFl = pDoc->GetColFlags( nCol, nTab ); nBreak = pDoc->HasColBreak(nCol, nTab); @@ -3203,7 +3117,7 @@ index 9a27bb8..989ea07 100644 break; ++nCol; } -@@ -507,7 +508,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) +@@ -507,7 +508,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, for (SCROW i = nYplus1; i <= MAXROW; ++i) { nBreak = pDoc->HasRowBreak(i, nTab); @@ -3221,11 +3135,9 @@ index 9a27bb8..989ea07 100644 { pPattern = pDoc->GetPattern( nX, nY, nTab ); pCondSet = pDoc->GetCondResult( nX, nY, nTab ); -diff --git sc/source/ui/view/output2.cxx sc/source/ui/view/output2.cxx -index dec757a..3867c17 100644 ---- sc/source/ui/view/output2.cxx -+++ sc/source/ui/view/output2.cxx -@@ -697,7 +697,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, +--- sc/source/ui/view/output2.cxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/ui/view/output2.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -825,7 +825,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL while (bHOver) // nY konstant { --rOverX; @@ -3234,7 +3146,7 @@ index dec757a..3867c17 100644 if ( !bDoMerge && !bHidden ) return FALSE; -@@ -721,7 +721,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, +@@ -849,7 +849,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL while (bVOver) { --rOverY; @@ -3243,7 +3155,7 @@ index dec757a..3867c17 100644 if ( !bDoMerge && !bHidden ) return FALSE; -@@ -729,8 +729,8 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, +@@ -857,8 +857,8 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL --nArrY; // lokale Kopie ! if (rOverX >= nX1 && rOverY >= nY1 && @@ -3254,7 +3166,7 @@ index dec757a..3867c17 100644 pRowInfo[nArrY].nRowNo == rOverY) { // rVirtPosY -= pRowInfo[nArrY].nHeight; -@@ -2014,7 +2014,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) +@@ -2142,7 +2142,7 @@ void ScOutputData::DrawEdit(BOOL bPixelT if (bDoCell) { if ( nCellY == nY && nCellX >= nX1 && nCellX <= nX2 && @@ -3263,11 +3175,9 @@ index dec757a..3867c17 100644 { CellInfo& rCellInfo = pThisRowInfo->pCellInfo[nCellX+1]; pPattern = rCellInfo.pPatternAttr; -diff --git sc/source/ui/view/prevloc.cxx sc/source/ui/view/prevloc.cxx -index 54f7376..fb65955 100644 ---- sc/source/ui/view/prevloc.cxx -+++ sc/source/ui/view/prevloc.cxx -@@ -602,11 +602,11 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev +--- sc/source/ui/view/prevloc.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/view/prevloc.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -602,11 +602,11 @@ void ScPreviewLocationData::GetTableInfo ++nColCount; if ( bHasRepCols ) for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ ) @@ -3281,7 +3191,7 @@ index 54f7376..fb65955 100644 ++nColCount; if ( nColCount > 0 ) -@@ -623,7 +623,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev +@@ -623,7 +623,7 @@ void ScPreviewLocationData::GetTableInfo { long nPosX = 0; for ( nCol=nRepeatColStart; nCol<=nRepeatColEnd; nCol++ ) @@ -3290,7 +3200,7 @@ index 54f7376..fb65955 100644 { USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); long nNextX = nPosX + (long) (nDocW * nScaleX); -@@ -642,7 +642,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev +@@ -642,7 +642,7 @@ void ScPreviewLocationData::GetTableInfo { long nPosX = 0; for ( nCol=nMainColStart; nCol<=nMainColEnd; nCol++ ) @@ -3299,7 +3209,7 @@ index 54f7376..fb65955 100644 { USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); long nNextX = nPosX + (long) (nDocW * nScaleX); -@@ -670,11 +670,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev +@@ -670,11 +670,9 @@ void ScPreviewLocationData::GetTableInfo if ( bHasHeaderRow ) ++nRowCount; if ( bHasRepRows ) @@ -3313,7 +3223,7 @@ index 54f7376..fb65955 100644 if ( nRowCount > 0 ) { -@@ -689,58 +687,44 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev +@@ -689,58 +687,44 @@ void ScPreviewLocationData::GetTableInfo if ( bHasRepRows ) { long nPosY = 0; @@ -3404,11 +3314,9 @@ index 54f7376..fb65955 100644 } rInfo.SetRowInfo( nRowCount, pRowInfo ); } -diff --git sc/source/ui/view/printfun.cxx sc/source/ui/view/printfun.cxx -index 7c9e431..982c02e 100644 ---- sc/source/ui/view/printfun.cxx -+++ sc/source/ui/view/printfun.cxx -@@ -3073,9 +3073,10 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten aus nZoom +--- sc/source/ui/view/printfun.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/view/printfun.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -3073,9 +3073,10 @@ void ScPrintFunc::CalcPages() // bere nTotalY = 0; BOOL bVisCol = FALSE; @@ -3420,7 +3328,7 @@ index 7c9e431..982c02e 100644 bool bPageBreak = (pDoc->HasColBreak(i, nPrintTab) & BREAK_PAGE); if ( i>nStartCol && bVisCol && bPageBreak ) { -@@ -3083,7 +3084,7 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten aus nZoom +@@ -3083,7 +3084,7 @@ void ScPrintFunc::CalcPages() // bere ++nPagesX; bVisCol = FALSE; } @@ -3429,7 +3337,7 @@ index 7c9e431..982c02e 100644 bVisCol = TRUE; } if (bVisCol) // auch am Ende keine leeren Seiten -@@ -3094,38 +3095,35 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten aus nZoom +@@ -3094,38 +3095,35 @@ void ScPrintFunc::CalcPages() // bere BOOL bVisRow = FALSE; SCROW nPageStartRow = nStartRow; @@ -3446,7 +3354,14 @@ index 7c9e431..982c02e 100644 - { - pPageEndY[nTotalY] = j-1; - ++nTotalY; -- ++ for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow) ++ { ++ bool bPageBreak = (pDoc->HasRowBreak(nRow, nPrintTab) & BREAK_PAGE); ++ if (nRow > nStartRow && bVisRow && bPageBreak ) ++ { ++ pPageEndY[nTotalY] = nRow-1; ++ ++nTotalY; + - if ( !aTableParam.bSkipEmpty || - !pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, j-1 ) ) - { @@ -3457,22 +3372,6 @@ index 7c9e431..982c02e 100644 - lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX ); - ++nPagesY; - } -- -- nPageStartRow = j; -- bVisRow = FALSE; -- } -- if (!(nFlags & CR_HIDDEN)) -- bVisRow = TRUE; -- } -- } while (aIter.NextRange()); -+ for (SCROW nRow = nStartRow; nRow <= nEndRow; ++nRow) -+ { -+ bool bPageBreak = (pDoc->HasRowBreak(nRow, nPrintTab) & BREAK_PAGE); -+ if (nRow > nStartRow && bVisRow && bPageBreak ) -+ { -+ pPageEndY[nTotalY] = nRow-1; -+ ++nTotalY; -+ + if ( !aTableParam.bSkipEmpty || + !pDoc->IsPrintEmpty( nPrintTab, nStartCol, nPageStartRow, nEndCol, nRow-1 ) ) + { @@ -3483,7 +3382,14 @@ index 7c9e431..982c02e 100644 + lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX ); + ++nPagesY; + } -+ + +- nPageStartRow = j; +- bVisRow = FALSE; +- } +- if (!(nFlags & CR_HIDDEN)) +- bVisRow = TRUE; +- } +- } while (aIter.NextRange()); + nPageStartRow = nRow; + bVisRow = FALSE; + } @@ -3497,11 +3403,9 @@ index 7c9e431..982c02e 100644 if (bVisRow) { -diff --git sc/source/ui/view/select.cxx sc/source/ui/view/select.cxx -index 8ab9801..4ac0b68 100644 ---- sc/source/ui/view/select.cxx -+++ sc/source/ui/view/select.cxx -@@ -278,12 +278,12 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO +--- sc/source/ui/view/select.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/ui/view/select.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -278,12 +278,12 @@ BOOL __EXPORT ScViewFunctionSet::SetCurs ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); if ( bLeft && !bRightScroll ) @@ -3516,7 +3420,7 @@ index 8ab9801..4ac0b68 100644 if (!ValidRow(nPosY)) nPosY = -1; } -@@ -479,7 +479,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol +@@ -479,7 +479,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( { // #94321# in SetCursorAtPoint hidden columns are skipped. // They must be skipped here too, or the result will always be the first hidden column. @@ -3525,7 +3429,7 @@ index 8ab9801..4ac0b68 100644 for (SCCOL i=nPosX; i<nStartX; i++) nSizeX += pDoc->GetColWidth( i, nTab ); } -@@ -494,8 +494,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol +@@ -494,8 +494,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( // They must be skipped here too, or the result will always be the first hidden row. if (++nPosY < nStartY) { @@ -3535,11 +3439,9 @@ index 8ab9801..4ac0b68 100644 if (!ValidRow(nPosY)) nPosY = nStartY; } -diff --git sc/source/ui/view/tabview.cxx sc/source/ui/view/tabview.cxx -index f39dd17..eb6908b 100644 ---- sc/source/ui/view/tabview.cxx -+++ sc/source/ui/view/tabview.cxx -@@ -1441,7 +1441,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) +--- sc/source/ui/view/tabview.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/ui/view/tabview.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1441,7 +1441,7 @@ void ScTabView::ScrollX( long nDeltaX, S SCsCOL nDir = ( nDeltaX > 0 ) ? 1 : -1; ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -3548,7 +3450,7 @@ index f39dd17..eb6908b 100644 nNewX+nDir >= 0 && nNewX+nDir <= MAXCOL ) nNewX = sal::static_int_cast<SCsCOL>( nNewX + nDir ); -@@ -1530,7 +1530,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) +@@ -1530,7 +1530,7 @@ void ScTabView::ScrollY( long nDeltaY, S SCsROW nDir = ( nDeltaY > 0 ) ? 1 : -1; ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -3557,11 +3459,9 @@ index f39dd17..eb6908b 100644 nNewY+nDir >= 0 && nNewY+nDir <= MAXROW ) nNewY += nDir; -diff --git sc/source/ui/view/tabview2.cxx sc/source/ui/view/tabview2.cxx -index 687f936..02a2710 100644 ---- sc/source/ui/view/tabview2.cxx -+++ sc/source/ui/view/tabview2.cxx -@@ -928,13 +928,13 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom, +--- sc/source/ui/view/tabview2.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/ui/view/tabview2.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -943,13 +943,13 @@ BOOL lcl_FitsInWindow( double fScaleX, d } long nBlockY = 0; @@ -3580,7 +3480,7 @@ index 687f936..02a2710 100644 if (nRowTwips) { nBlockY += (long)(nRowTwips * fScaleY); -@@ -942,10 +942,9 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom, +@@ -957,10 +957,9 @@ BOOL lcl_FitsInWindow( double fScaleX, d return FALSE; } } @@ -3593,11 +3493,9 @@ index 687f936..02a2710 100644 if (nRowTwips) { nBlockY += (long)(nRowTwips * fScaleY); -diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx -index 5493de4..5317d0a 100644 ---- sc/source/ui/view/tabview3.cxx -+++ sc/source/ui/view/tabview3.cxx -@@ -993,8 +993,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, +--- sc/source/ui/view/tabview3.cxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/source/ui/view/tabview3.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -994,8 +994,8 @@ void ScTabView::MoveCursorRel( SCsCOL nM BOOL bHFlip = FALSE; do { @@ -3608,7 +3506,7 @@ index 5493de4..5317d0a 100644 if (bSkipProtected && !bSkipCell) bSkipCell = pDoc->HasAttrib(nCurX, nCurY, nTab, nCurX, nCurY, nTab, HASATTR_PROTECTED); if (bSkipUnprotected && !bSkipCell) -@@ -1035,8 +1035,8 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, +@@ -1036,8 +1036,8 @@ void ScTabView::MoveCursorRel( SCsCOL nM BOOL bVFlip = FALSE; do { @@ -3619,7 +3517,7 @@ index 5493de4..5317d0a 100644 if (bSkipProtected && !bSkipCell) bSkipCell = pDoc->HasAttrib(nCurX, nCurY, nTab, nCurX, nCurY, nTab, HASATTR_PROTECTED); if (bSkipUnprotected && !bSkipCell) -@@ -2058,17 +2058,18 @@ void ScTabView::PaintRangeFinder( long nNumber ) +@@ -2060,17 +2060,18 @@ void ScTabView::PaintRangeFinder( long n BOOL bHiddenEdge = FALSE; SCROW nTmp; ScDocument* pDoc = aViewData.GetDocument(); @@ -3641,7 +3539,7 @@ index 5493de4..5317d0a 100644 if (!ValidRow(nTmp)) nTmp = 0; if (nTmp < nRow1) -@@ -2076,7 +2077,7 @@ void ScTabView::PaintRangeFinder( long nNumber ) +@@ -2078,7 +2079,7 @@ void ScTabView::PaintRangeFinder( long n nRow1 = nTmp; bHiddenEdge = TRUE; } @@ -3650,11 +3548,9 @@ index 5493de4..5317d0a 100644 if (!ValidRow(nTmp)) nTmp = MAXROW; if (nTmp > nRow2) -diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx -index 344f5b6..2ca5d83 100644 ---- sc/source/ui/view/viewdata.cxx -+++ sc/source/ui/view/viewdata.cxx -@@ -1560,7 +1560,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, +--- sc/source/ui/view/viewdata.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/ui/view/viewdata.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1603,7 +1603,7 @@ Point ScViewData::GetScrPos( SCCOL nWher else if ( nY < MAXROW ) { // skip multiple hidden rows (forward only for now) @@ -3663,7 +3559,7 @@ index 344f5b6..2ca5d83 100644 if ( nNext > MAXROW ) nY = MAXROW; else -@@ -1672,7 +1672,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO +@@ -1715,7 +1715,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY else if ( nDir == 1 && nRowNo < MAXROW ) { // skip multiple hidden rows (forward only for now) @@ -3672,7 +3568,7 @@ index 344f5b6..2ca5d83 100644 if ( nNext > MAXROW ) { // same behavior as without the optimization: set bOut with nY=MAXROW+1 -@@ -1735,11 +1735,19 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r +@@ -1778,11 +1778,19 @@ BOOL ScViewData::GetMergeSizePixel( SCCO for (SCCOL i=0; i<nCountX; i++) nOutWidth += ToPixel( pDoc->GetColWidth(nX+i,nTabNo), nPPTX ); SCROW nCountY = pMerge->GetRowMerge(); @@ -3697,11 +3593,9 @@ index 344f5b6..2ca5d83 100644 rSizeXPix = nOutWidth; rSizeYPix = nOutHeight; -diff --git sc/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx -index d0d565a..af68b6b 100644 ---- sc/source/ui/view/viewfun3.cxx -+++ sc/source/ui/view/viewfun3.cxx -@@ -1727,10 +1727,10 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, +--- sc/source/ui/view/viewfun3.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/viewfun3.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -1726,10 +1726,10 @@ BOOL ScViewFunc::MoveBlockTo( const ScRa BOOL bIncludeFiltered = bCut; if ( !bIncludeFiltered ) { @@ -3716,11 +3610,9 @@ index d0d565a..af68b6b 100644 if ( nPastedCount == 0 ) nPastedCount = 1; aDestEnd.SetRow( rDestPos.Row() + nPastedCount - 1 ); -diff --git sc/source/ui/view/viewfunc.cxx sc/source/ui/view/viewfunc.cxx -index 61670e7..96132fc 100644 ---- sc/source/ui/view/viewfunc.cxx -+++ sc/source/ui/view/viewfunc.cxx -@@ -2215,28 +2215,19 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR +--- sc/source/ui/view/viewfunc.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/ui/view/viewfunc.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -2218,28 +2218,19 @@ void ScViewFunc::SetWidthOrHeight( BOOL { // fuer alle eingeblendeten CR_MANUALSIZE loeschen, // dann SetOptimalHeight mit bShrink = FALSE @@ -3759,7 +3651,7 @@ index 61670e7..96132fc 100644 } double nPPTX = GetViewData()->GetPPTX(); -@@ -2278,8 +2269,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR +@@ -2281,8 +2272,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL { for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++) { @@ -3769,11 +3661,9 @@ index 61670e7..96132fc 100644 { USHORT nThisSize = nSizeTwips; -diff --git sc/source/ui/view/viewutil.cxx sc/source/ui/view/viewutil.cxx -index 964695c..4215562 100644 ---- sc/source/ui/view/viewutil.cxx -+++ sc/source/ui/view/viewutil.cxx -@@ -264,20 +264,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc ) +--- sc/source/ui/view/viewutil.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/viewutil.cxx 2010-03-03 16:59:19.000000000 +0100 +@@ -264,20 +264,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkD for (SCTAB nTab=0; nTab<nTabCount; nTab++) if ( rMark.GetTableSelect(nTab ) ) { @@ -3800,7 +3690,7 @@ index 964695c..4215562 100644 } if ( bChanged && !rMark.HasAnyMultiMarks() ) -@@ -288,13 +287,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc ) +@@ -288,13 +287,19 @@ void ScViewUtil::UnmarkFiltered( ScMarkD // static @@ -3821,7 +3711,7 @@ index 964695c..4215562 100644 // FillArrayForCondition() usually is the fastest to determine such a set // in one pass, even if the array isn't used but the last element. SCROW* pArr = new SCROW[nRows]; -@@ -303,19 +308,19 @@ bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, const ScDocument * pDoc, +@@ -303,19 +308,19 @@ bool ScViewUtil::FitToUnfilteredRows( Sc if (nCount) rRange.aEnd.SetRow( pArr[nCount-1]); delete [] pArr; diff --git a/patches/dev300/calc-selection-fixed-cursor.diff b/patches/dev300/calc-selection-fixed-cursor.diff index f67b63d74..2257778fc 100644 --- a/patches/dev300/calc-selection-fixed-cursor.diff +++ b/patches/dev300/calc-selection-fixed-cursor.diff @@ -1,8 +1,6 @@ -diff --git sc/inc/document.hxx sc/inc/document.hxx -index 96b6809..cc91c1a 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx -@@ -824,6 +824,7 @@ public: +--- sc/inc/document.hxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:15.000000000 +0100 +@@ -820,6 +820,7 @@ public: ScRange* pLastRange = NULL, Rectangle* pLastMM = NULL ) const; @@ -10,11 +8,9 @@ index 96b6809..cc91c1a 100644 BOOL IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; BOOL IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; -diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx -index de89b1b..8ba6dfa 100644 ---- sc/source/core/data/document.cxx -+++ sc/source/core/data/document.cxx -@@ -4534,6 +4534,13 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, +--- sc/source/core/data/document.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -4457,6 +4457,13 @@ BOOL ScDocument::RefreshAutoFilter( SCCO return bChange; } @@ -28,10 +24,8 @@ index de89b1b..8ba6dfa 100644 BOOL ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { -diff --git sc/source/ui/inc/cellsh.hxx sc/source/ui/inc/cellsh.hxx -index 97f6d0d..a42a336 100644 ---- sc/source/ui/inc/cellsh.hxx -+++ sc/source/ui/inc/cellsh.hxx +--- sc/source/ui/inc/cellsh.hxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/inc/cellsh.hxx 2010-03-03 16:59:15.000000000 +0100 @@ -37,6 +37,7 @@ #include <svx/svdmark.hxx> #include <tools/link.hxx> @@ -40,19 +34,17 @@ index 97f6d0d..a42a336 100644 class SvxClipboardFmtItem; class TransferableDataHelper; -diff --git sc/source/ui/inc/tabview.hxx sc/source/ui/inc/tabview.hxx -index 437b95b..804fbff 100644 ---- sc/source/ui/inc/tabview.hxx -+++ sc/source/ui/inc/tabview.hxx +--- sc/source/ui/inc/tabview.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/inc/tabview.hxx 2010-03-03 16:59:15.000000000 +0100 @@ -179,7 +179,6 @@ private: BOOL bInActivatePart; BOOL bInZoomUpdate; BOOL bMoveIsShift; - BOOL bNewStartIfMarking; - BOOL bOldSelection; // old style (inverting) of selection + void Init(); -@@ -203,6 +202,10 @@ private: +@@ -200,6 +199,10 @@ private: static void SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ); static long GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL ); @@ -63,7 +55,7 @@ index 437b95b..804fbff 100644 protected: void UpdateHeaderWidth( const ScVSplitPos* pWhich = NULL, const SCROW* pPosY = NULL ); -@@ -391,8 +394,6 @@ public: +@@ -388,8 +391,6 @@ public: void FindNextUnprot( BOOL bShift, BOOL bInSelection = TRUE ); @@ -72,7 +64,7 @@ index 437b95b..804fbff 100644 void SetTabNo( SCTAB nTab, BOOL bNew = FALSE, BOOL bExtendSelection = FALSE ); void SelectNextTab( short nDir, BOOL bExtendSelection = FALSE ); -@@ -483,6 +484,10 @@ public: +@@ -482,6 +483,10 @@ public: BOOL IsBlockMode() const { return bIsBlockMode; } @@ -83,10 +75,8 @@ index 437b95b..804fbff 100644 void MarkColumns(); void MarkRows(); void MarkDataArea( BOOL bIncludeCursor = TRUE ); -diff --git sc/source/ui/view/cellsh4.cxx sc/source/ui/view/cellsh4.cxx -index 4cb00fb..3f80397 100644 ---- sc/source/ui/view/cellsh4.cxx -+++ sc/source/ui/view/cellsh4.cxx +--- sc/source/ui/view/cellsh4.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/view/cellsh4.cxx 2010-03-03 16:59:15.000000000 +0100 @@ -52,6 +52,7 @@ #include "document.hxx" #include "sc.hrc" @@ -95,7 +85,7 @@ index 4cb00fb..3f80397 100644 //------------------------------------------------------------------ -@@ -88,10 +88,56 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) +@@ -88,10 +89,56 @@ void ScCellShell::ExecuteCursor( SfxRequ { // ADD mode: keep the selection, start a new block when marking with shift again bKeep = TRUE; @@ -153,7 +143,7 @@ index 4cb00fb..3f80397 100644 SCsCOLROW nRTLSign = 1; if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) ) { -@@ -172,38 +218,64 @@ void ScCellShell::GetStateCursor( SfxItemSet& /* rSet */ ) +@@ -172,38 +219,64 @@ void ScCellShell::GetStateCursor( SfxIte void ScCellShell::ExecuteCursorSel( SfxRequest& rReq ) { @@ -162,20 +152,18 @@ index 4cb00fb..3f80397 100644 - short nRepeat = 1; - - if ( pReqArgs != NULL ) -- { -- const SfxPoolItem* pItem; -- if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) -- nRepeat = ((const SfxInt16Item*)pItem)->GetValue(); -- } + sal_uInt16 nSlotId = rReq.GetSlot(); + ScTabViewShell* pViewShell = GetViewData()->GetViewShell(); + ScInputHandler* pInputHdl = pViewShell->GetInputHandler(); + pViewShell->HideAllCursors(); + if (pInputHdl && pInputHdl->IsInputMode()) -+ { + { +- const SfxPoolItem* pItem; +- if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) +- nRepeat = ((const SfxInt16Item*)pItem)->GetValue(); + // the current cell is in edit mode. Commit the text before moving on. + pViewShell->ExecuteInputDirect(); -+ } + } - switch ( nSlotId ) + // Horizontal direction depends on whether or not the UI language is RTL. @@ -246,7 +234,7 @@ index 4cb00fb..3f80397 100644 } void ScCellShell::ExecuteMove( SfxRequest& rReq ) -@@ -348,7 +406,6 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) +@@ -348,7 +421,6 @@ void ScCellShell::ExecutePage( SfxReques { // ADD mode: keep the selection, start a new block when marking with shift again bKeep = TRUE; @@ -254,11 +242,9 @@ index 4cb00fb..3f80397 100644 } } -diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx -index ad12e86..b5bb7c6 100644 ---- sc/source/ui/view/gridwin.cxx -+++ sc/source/ui/view/gridwin.cxx -@@ -2200,8 +2200,12 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) +--- sc/source/ui/view/gridwin.cxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/ui/view/gridwin.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -2179,8 +2179,12 @@ void __EXPORT ScGridWindow::MouseButtonU } SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); @@ -272,7 +258,7 @@ index ad12e86..b5bb7c6 100644 pViewData->GetView()->InvalidateAttribs(); } -@@ -3960,7 +3960,10 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos +@@ -3961,7 +3965,10 @@ sal_Int8 ScGridWindow::DropTransferObj( if ( bDone ) { pView->MarkRange( aDest, FALSE, FALSE ); @@ -284,7 +270,7 @@ index ad12e86..b5bb7c6 100644 } pDocSh->GetUndoManager()->LeaveListAction(); -@@ -4068,7 +4071,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos +@@ -4069,7 +4076,7 @@ sal_Int8 ScGridWindow::DropTransferObj( pView->EnterMatrix( aFormula ); pView->MarkRange( aDest, FALSE, FALSE ); @@ -293,7 +279,7 @@ index ad12e86..b5bb7c6 100644 } pDocSh->GetUndoManager()->LeaveListAction(); -@@ -4102,7 +4105,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos +@@ -4103,7 +4110,7 @@ sal_Int8 ScGridWindow::DropTransferObj( if ( bDone ) { pView->MarkRange( aDest, FALSE, FALSE ); @@ -302,11 +288,9 @@ index ad12e86..b5bb7c6 100644 } } -diff --git sc/source/ui/view/select.cxx sc/source/ui/view/select.cxx -index d41fe45..e983ca9 100644 ---- sc/source/ui/view/select.cxx -+++ sc/source/ui/view/select.cxx -@@ -667,7 +667,10 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol +--- sc/source/ui/view/select.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/select.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -587,7 +587,10 @@ BOOL ScViewFunctionSet::SetCursorAtCell( } } if (bStarted) @@ -317,7 +301,7 @@ index d41fe45..e983ca9 100644 } else { -@@ -703,9 +706,9 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol +@@ -623,9 +626,9 @@ BOOL ScViewFunctionSet::SetCursorAtCell( bStarted = TRUE; } @@ -328,23 +312,20 @@ index d41fe45..e983ca9 100644 pViewData->SetRefStart( nPosX, nPosY, nTab ); if (bHideCur) pView->ShowAllCursors(); -diff --git sc/source/ui/view/tabview.cxx sc/source/ui/view/tabview.cxx -index dacaee8..5274b50 100644 ---- sc/source/ui/view/tabview.cxx -+++ sc/source/ui/view/tabview.cxx -@@ -384,7 +384,6 @@ BOOL lcl_HasRowOutline( const ScViewData& rViewData ) +--- sc/source/ui/view/tabview.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/ui/view/tabview.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -387,8 +387,7 @@ BOOL lcl_HasRowOutline( const ScViewData + bInUpdateHeader( FALSE ), \ bInActivatePart( FALSE ), \ bInZoomUpdate( FALSE ), \ -- bMoveIsShift( FALSE ), \ +- bMoveIsShift( FALSE ), \ - bNewStartIfMarking( FALSE ) + bMoveIsShift( FALSE ) ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : -diff --git sc/source/ui/view/tabview2.cxx sc/source/ui/view/tabview2.cxx -index bd9515c..bd744e4 100644 ---- sc/source/ui/view/tabview2.cxx -+++ sc/source/ui/view/tabview2.cxx +--- sc/source/ui/view/tabview2.cxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/view/tabview2.cxx 2010-03-03 16:59:15.000000000 +0100 @@ -62,6 +62,7 @@ #include "waitoff.hxx" #include "globstr.hrc" @@ -353,7 +334,7 @@ index bd9515c..bd744e4 100644 #define SC_BLOCKMODE_NONE 0 #define SC_BLOCKMODE_NORMAL 1 -@@ -178,16 +179,9 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, +@@ -178,16 +179,9 @@ void ScTabView::InitBlockMode( SCCOL nCu InvertBlockMark( nBlockStartX,nBlockStartY,nBlockEndX,nBlockEndY ); #endif UpdateSelectionOverlay(); @@ -370,8 +351,8 @@ index bd9515c..bd744e4 100644 void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE { // Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird, -@@ -414,6 +408,305 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, - aHdrFunc.SetAnchorFlag( FALSE ); +@@ -421,6 +415,305 @@ void ScTabView::UpdateCopySourceOverlay( + pGridWin[i]->UpdateCopySourceOverlay(); } +void ScTabView::GetPageMoveEndPosition(SCsCOL nMovX, SCsROW nMovY, SCsCOL& rPageX, SCsROW& rPageY) @@ -676,11 +657,9 @@ index bd9515c..bd744e4 100644 void ScTabView::UpdateSelectionOverlay() { for (USHORT i=0; i<4; i++) -diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx -index 1b4879c..da85e44 100644 ---- sc/source/ui/view/tabview3.cxx -+++ sc/source/ui/view/tabview3.cxx -@@ -125,10 +125,7 @@ void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ) +--- sc/source/ui/view/tabview3.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/view/tabview3.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -121,10 +121,7 @@ void ScTabView::ClickCursor( SCCOL nPosX { ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); @@ -692,7 +671,7 @@ index 1b4879c..da85e44 100644 BOOL bRefMode = SC_MOD()->IsFormulaMode(); -@@ -921,22 +918,36 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, +@@ -907,22 +904,36 @@ void ScTabView::MoveCursorAbs( SCsCOL nC HideAllCursors(); @@ -736,7 +715,7 @@ index 1b4879c..da85e44 100644 BOOL bSame = ( nCurX == aViewData.GetCurX() && nCurY == aViewData.GetCurY() ); bMoveIsShift = bShift; pSelEngine->CursorPosChanging( bShift, bControl ); -@@ -1080,68 +1091,18 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, +@@ -1066,68 +1077,18 @@ void ScTabView::MoveCursorRel( SCsCOL nM void ScTabView::MoveCursorPage( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel ) { @@ -810,7 +789,7 @@ index 1b4879c..da85e44 100644 } void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, BOOL bShift, BOOL bKeepSel ) -@@ -1206,14 +1167,8 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode +@@ -1192,14 +1153,8 @@ void ScTabView::MoveCursorScreen( SCsCOL else if (nMovY>0) nNewY=nPosY+nAddY; @@ -826,7 +805,7 @@ index 1b4879c..da85e44 100644 MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE ); } -@@ -1497,11 +1452,7 @@ void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinu +@@ -1483,11 +1438,7 @@ void ScTabView::MarkRange( const ScRange SCCOL nPosX = rRange.aStart.Col(); SCROW nPosY = rRange.aStart.Row(); ScDocument* pDoc = aViewData.GetDocument(); @@ -839,11 +818,9 @@ index 1b4879c..da85e44 100644 aViewData.ResetOldCursor(); SetCursor( nPosX, nPosY ); -diff --git sc/source/ui/view/tabvwsh3.cxx sc/source/ui/view/tabvwsh3.cxx -index caea267..74505f4 100644 ---- sc/source/ui/view/tabvwsh3.cxx -+++ sc/source/ui/view/tabvwsh3.cxx -@@ -276,6 +276,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) +--- sc/source/ui/view/tabvwsh3.cxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/ui/view/tabvwsh3.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -269,6 +269,10 @@ void ScTabViewShell::Execute( SfxRequest if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET ) bUnmark = ((const SfxBoolItem*)pItem)->GetValue(); @@ -854,7 +831,7 @@ index caea267..74505f4 100644 if ( nSlot == SID_JUMPTOMARK ) { // #106586# URL has to be decoded for escaped characters (%20) -@@ -396,10 +396,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) +@@ -389,10 +393,7 @@ void ScTabViewShell::Execute( SfxRequest // und Cursor setzen // zusammengefasste Zellen beruecksichtigen: @@ -866,7 +843,7 @@ index caea267..74505f4 100644 // Navigator-Aufrufe sind nicht API!!! -@@ -417,9 +421,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) +@@ -413,9 +414,13 @@ void ScTabViewShell::Execute( SfxRequest if (!rReq.IsAPI()) rReq.Done(); } @@ -883,11 +860,9 @@ index caea267..74505f4 100644 rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) ); } -diff --git sc/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx -index f69ab24..66c07c4 100644 ---- sc/source/ui/view/viewdata.cxx -+++ sc/source/ui/view/viewdata.cxx -@@ -1891,12 +1891,11 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, +--- sc/source/ui/view/viewdata.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/view/viewdata.cxx 2010-03-03 16:59:15.000000000 +0100 +@@ -1883,12 +1883,11 @@ BOOL ScViewData::GetPosFromPixel( long n { //! public Methode um Position anzupassen diff --git a/patches/dev300/calc-string-number-decimal.diff b/patches/dev300/calc-string-number-decimal.diff index a2f7ed4aa..9448f0f44 100644 --- a/patches/dev300/calc-string-number-decimal.diff +++ b/patches/dev300/calc-string-number-decimal.diff @@ -1,10 +1,8 @@ -diff --git sc/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx -index b1ef2ef..2bf9e62 100644 ---- sc/source/core/inc/interpre.hxx -+++ sc/source/core/inc/interpre.hxx -@@ -190,6 +190,9 @@ private: - - VolatileType meVolaileType; +--- sc/source/core/inc/interpre.hxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/core/inc/interpre.hxx 2010-03-03 16:59:16.000000000 +0100 +@@ -179,6 +179,9 @@ private: + BOOL bCalcAsShown; // precision as shown + BOOL bMatrixFormula; // formula cell is a matrix formula + sal_Unicode cDecSep; // decimal separator + sal_Unicode cGrpSep; // group separator @@ -12,11 +10,9 @@ index b1ef2ef..2bf9e62 100644 //---------------------------------Funktionen in interpre.cxx--------- // nMust <= nAct <= nMax ? ok : PushError inline BOOL MustHaveParamCount( short nAct, short nMust ); -diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx -index 70540d1..d738dcf 100644 ---- sc/source/core/tool/interpr4.cxx -+++ sc/source/core/tool/interpr4.cxx -@@ -257,7 +257,7 @@ double ScInterpreter::ConvertStringToValue( const String& rStr ) +--- sc/source/core/tool/interpr4.cxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/core/tool/interpr4.cxx 2010-03-03 16:59:16.000000000 +0100 +@@ -249,7 +249,7 @@ double ScInterpreter::ConvertStringToVal sal_Int32 nParseEnd; // Decimal and group separator 0 => only integer and possibly exponent, // stops at first non-digit non-sign. @@ -25,7 +21,7 @@ index 70540d1..d738dcf 100644 sal_Int32 nLen; if (eStatus == rtl_math_ConversionStatus_Ok && nParseEnd < (nLen = aStr.getLength())) { -@@ -3652,6 +3652,10 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, +@@ -3586,6 +3586,10 @@ ScInterpreter::ScInterpreter( ScFormulaC pStackObj = new ScTokenStack; } pStack = pStackObj->pPointer; diff --git a/patches/dev300/calc-subtotal-function-update.diff b/patches/dev300/calc-subtotal-function-update.diff index 9d2b9f994..444eabe12 100644 --- a/patches/dev300/calc-subtotal-function-update.diff +++ b/patches/dev300/calc-subtotal-function-update.diff @@ -1,7 +1,5 @@ -diff --git sc/inc/document.hxx sc/inc/document.hxx -index 82b1582..237e3f8 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx +--- sc/inc/document.hxx.old 2010-03-03 17:00:15.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 17:00:16.000000000 +0100 @@ -436,6 +436,7 @@ private: // for worksheet calculate event @@ -10,12 +8,10 @@ index 82b1582..237e3f8 100644 public: SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen -@@ -1783,8 +1784,12 @@ public: - { return eStorageGrammar; } - +@@ -1788,6 +1789,10 @@ public: SfxUndoManager* GetUndoManager(); bool IsInVBAMode() const; - + + void AddSubTotalCell(ScFormulaCell* pCell); + void RemoveSubTotalCell(ScFormulaCell* pCell); + void SetSubTotalCellsDirty(const ScRange& rDirtyRange); @@ -23,11 +19,9 @@ index 82b1582..237e3f8 100644 private: // CLOOK-Impl-Methoden /** -diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx -index 7643365..312ad38 100644 ---- sc/source/core/data/cell.cxx -+++ sc/source/core/data/cell.cxx -@@ -728,6 +728,9 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, +--- sc/source/core/data/cell.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/core/data/cell.cxx 2010-03-03 17:00:16.000000000 +0100 +@@ -728,6 +728,9 @@ ScFormulaCell::ScFormulaCell( ScDocument if ( pCode->GetNextOpCodeRPN( ocSubTotal ) ) bSubTotal = TRUE; } @@ -37,7 +31,7 @@ index 7643365..312ad38 100644 } ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, const ScAddress& rPos, int nCloneFlags ) : -@@ -818,11 +821,15 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons +@@ -818,11 +821,15 @@ ScFormulaCell::ScFormulaCell( const ScFo if( nCloneFlags & SC_CLONECELL_STARTLISTENING ) StartListeningTo( &rDoc ); @@ -53,7 +47,7 @@ index 7643365..312ad38 100644 if (pCode->HasOpCode(ocMacro)) pDocument->GetMacroManager()->RemoveDependentCell(this); -@@ -988,6 +995,9 @@ void ScFormulaCell::CompileTokenArray( BOOL bNoListening ) +@@ -988,6 +995,9 @@ void ScFormulaCell::CompileTokenArray( B } if ( bWasInFormulaTree ) pDocument->PutInFormulaTree( this ); @@ -63,7 +57,7 @@ index 7643365..312ad38 100644 } } -@@ -1031,6 +1041,9 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress ) +@@ -1031,6 +1041,9 @@ void ScFormulaCell::CompileXML( ScProgre bCompile = FALSE; StartListeningTo( pDocument ); } @@ -83,11 +77,9 @@ index 7643365..312ad38 100644 } // irgendwie koennen unter os/2 mit rotter FPU-Exception /0 ohne Err503 // gespeichert werden, woraufhin spaeter im NumberFormatter die BLC Lib -diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx -index 40df826..148648f 100644 ---- sc/source/core/data/document.cxx -+++ sc/source/core/data/document.cxx -@@ -5245,6 +5245,54 @@ SfxUndoManager* ScDocument::GetUndoManager() +--- sc/source/core/data/document.cxx.old 2010-03-03 17:00:15.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 17:00:16.000000000 +0100 +@@ -5249,6 +5249,54 @@ SfxUndoManager* ScDocument::GetUndoManag return mpUndoManager; } @@ -142,11 +134,9 @@ index 40df826..148648f 100644 void ScDocument::EnableUndo( bool bVal ) { -diff --git sc/source/ui/docshell/dbdocfun.cxx sc/source/ui/docshell/dbdocfun.cxx -index 4180060..5e90946 100644 ---- sc/source/ui/docshell/dbdocfun.cxx -+++ sc/source/ui/docshell/dbdocfun.cxx -@@ -944,10 +944,9 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, +--- sc/source/ui/docshell/dbdocfun.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/docshell/dbdocfun.cxx 2010-03-03 17:00:16.000000000 +0100 +@@ -944,10 +944,9 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, con pDoc->UpdatePageBreaks( nTab ); } diff --git a/patches/dev300/calc-xls-import-slanted-border-oox.diff b/patches/dev300/calc-xls-import-slanted-border-oox.diff index 64aa417b0..ca211e1d4 100644 --- a/patches/dev300/calc-xls-import-slanted-border-oox.diff +++ b/patches/dev300/calc-xls-import-slanted-border-oox.diff @@ -1,8 +1,6 @@ -diff --git oox/inc/oox/xls/stylesbuffer.hxx oox/inc/oox/xls/stylesbuffer.hxx -index e9d17db..4f288f5 100644 ---- oox/inc/oox/xls/stylesbuffer.hxx -+++ oox/inc/oox/xls/stylesbuffer.hxx -@@ -552,6 +552,8 @@ public: +--- oox/inc/oox/xls/stylesbuffer.hxx.old 2009-10-19 13:27:41.000000000 +0200 ++++ oox/inc/oox/xls/stylesbuffer.hxx 2010-03-03 16:59:17.000000000 +0100 +@@ -550,6 +550,8 @@ public: /** Writes all border attributes to the passed property map. */ void writeToPropertyMap( PropertyMap& rPropMap ) const; @@ -11,28 +9,25 @@ index e9d17db..4f288f5 100644 private: /** Returns the border line struct specified by the passed XML token identifier. */ BorderLineModel* getBorderLine( sal_Int32 nElement ); -@@ -1009,6 +1011,7 @@ public: +@@ -1006,6 +1008,7 @@ public: /** Writes the cell formatting attributes of the specified style XF to the passed property set. */ void writeStyleXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const; + bool hasBorder( sal_Int32 nBorderId ) const; private: typedef RefVector< Font > FontVector; - typedef RefVector< Border > BorderVector; -diff --git oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesbuffer.cxx -index 5627c78..00411bb 100644 ---- oox/source/xls/stylesbuffer.cxx -+++ oox/source/xls/stylesbuffer.cxx -@@ -40,6 +40,7 @@ + typedef RefVector< Border > BorderVector; +--- oox/source/xls/stylesbuffer.cxx.old 2009-10-19 13:27:41.000000000 +0200 ++++ oox/source/xls/stylesbuffer.cxx 2010-03-03 16:59:17.000000000 +0100 +@@ -45,6 +45,7 @@ #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/XText.hpp> +#include <com/sun/star/table/CellVertJustify.hpp> #include <rtl/tencinfo.h> #include <rtl/ustrbuf.hxx> - #include "oox/helper/attributelist.hxx" -@@ -1699,7 +1700,35 @@ void Border::writeToPropertyMap( PropertyMap& rPropMap ) const - rPropMap[ PROP_DiagonalBLTR ] <<= maApiData.maBLtoTR; + #include "properties.hxx" +@@ -1709,6 +1710,34 @@ void Border::writeToPropertyMap( Propert } } @@ -67,7 +62,7 @@ index 5627c78..00411bb 100644 BorderLineModel* Border::getBorderLine( sal_Int32 nElement ) { switch( nElement ) -@@ -2325,6 +2354,11 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const +@@ -2360,6 +2389,11 @@ void Xf::writeToPropertyMap( PropertyMap rStyles.writeBorderToPropertyMap( rPropMap, maModel.mnBorderId ); if( maModel.mbAreaUsed ) rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId ); @@ -79,7 +74,7 @@ index 5627c78..00411bb 100644 } void Xf::writeToPropertySet( PropertySet& rPropSet ) const -@@ -3150,6 +3184,12 @@ void StylesBuffer::writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nX +@@ -3301,6 +3335,12 @@ void StylesBuffer::writeCellXfToProperty pXf->writeToPropertySet( rPropSet ); } diff --git a/patches/dev300/calc-xls-import-slanted-border-sc.diff b/patches/dev300/calc-xls-import-slanted-border-sc.diff index c4d90cb03..c32cc00e2 100644 --- a/patches/dev300/calc-xls-import-slanted-border-sc.diff +++ b/patches/dev300/calc-xls-import-slanted-border-sc.diff @@ -1,8 +1,6 @@ -diff --git sc/source/filter/excel/xistyle.cxx sc/source/filter/excel/xistyle.cxx -index 9f38dda..ac5e956 100644 ---- sc/source/filter/excel/xistyle.cxx -+++ sc/source/filter/excel/xistyle.cxx -@@ -765,7 +765,6 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFo +--- sc/source/filter/excel/xistyle.cxx.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/source/filter/excel/xistyle.cxx 2010-03-03 16:59:16.000000000 +0100 +@@ -704,7 +704,6 @@ void XclImpCellAlign::FillToItemSet( Sfx sal_uInt8 nXclRot = (mnOrient == EXC_ORIENT_NONE) ? mnRotation : XclTools::GetXclRotFromOrient( mnOrient ); bool bStacked = (nXclRot == EXC_ROT_STACKED); ScfTools::PutItem( rItemSet, SfxBoolItem( ATTR_STACKED, bStacked ), bSkipPoolDefs ); @@ -10,7 +8,7 @@ index 9f38dda..ac5e956 100644 // set an angle in the range from -90 to 90 degrees sal_Int32 nAngle = XclTools::GetScRotation( nXclRot, 0 ); ScfTools::PutItem( rItemSet, SfxInt32Item( ATTR_ROTATE_VALUE, nAngle ), bSkipPoolDefs ); -@@ -863,6 +862,15 @@ void XclImpCellBorder::FillFromCF8( sal_uInt16 nLineStyle, sal_uInt32 nLineColor +@@ -802,6 +801,15 @@ void XclImpCellBorder::FillFromCF8( sal_ mbDiagUsed = false; } @@ -26,7 +24,7 @@ index 9f38dda..ac5e956 100644 namespace { /** Converts the passed line style to a SvxBorderLine, or returns false, if style is "no line". */ -@@ -1094,11 +1102,12 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs ) +@@ -1094,12 +1102,13 @@ const ScPatternAttr& XclImpXF::CreatePat // create new pattern attribute set mpPattern.reset( new ScPatternAttr( GetDoc().GetPool() ) ); SfxItemSet& rItemSet = mpPattern->GetItemSet(); @@ -40,7 +38,8 @@ index 9f38dda..ac5e956 100644 + if (pParentXF) UpdateUsedFlags( *pParentXF ); } -@@ -1292,6 +1301,20 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs ) + +@@ -1140,6 +1149,20 @@ const ScPatternAttr& XclImpXF::CreatePat maArea.mnPattern != EXC_PATT_SOLID); } @@ -61,11 +60,9 @@ index 9f38dda..ac5e956 100644 return *mpPattern; } -diff --git sc/source/filter/inc/xistyle.hxx sc/source/filter/inc/xistyle.hxx -index 91d9265..92ceca6 100644 ---- sc/source/filter/inc/xistyle.hxx -+++ sc/source/filter/inc/xistyle.hxx -@@ -321,6 +321,9 @@ struct XclImpCellBorder : public XclCellBorder +--- sc/source/filter/inc/xistyle.hxx.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/source/filter/inc/xistyle.hxx 2010-03-03 16:59:16.000000000 +0100 +@@ -319,6 +319,9 @@ struct XclImpCellBorder : public XclCell /** Fills this struct with BIFF8 CF (conditional format) record data. */ void FillFromCF8( sal_uInt16 nLineStyle, sal_uInt32 nLineColor, sal_uInt32 nFlags ); diff --git a/patches/dev300/chart-highlight-selection-fix.diff b/patches/dev300/chart-highlight-selection-fix.diff index 540cd1a26..0348b578a 100644 --- a/patches/dev300/chart-highlight-selection-fix.diff +++ b/patches/dev300/chart-highlight-selection-fix.diff @@ -1,7 +1,5 @@ -diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx -index 80e0fd7..651723f 100644 ---- sc/source/ui/view/tabview3.cxx -+++ sc/source/ui/view/tabview3.cxx +--- sc/source/ui/view/tabview3.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/ui/view/tabview3.cxx 2010-03-03 16:59:17.000000000 +0100 @@ -80,6 +80,7 @@ #include "rangeutl.hxx" #include "client.hxx" @@ -9,8 +7,8 @@ index 80e0fd7..651723f 100644 +#include "formula/FormulaCompiler.hxx" #include <com/sun/star/chart2/data/HighlightedRange.hpp> - #include <com/sun/star/document/XVbaEventsHelper.hpp> -@@ -2178,6 +2179,7 @@ void ScTabView::DoChartSelection( + +@@ -2145,6 +2146,7 @@ void ScTabView::DoChartSelection( const uno::Sequence< chart2::data::HighlightedRange > & rHilightRanges ) { ClearHighlightRanges(); @@ -18,7 +16,7 @@ index 80e0fd7..651723f 100644 for( sal_Int32 i=0; i<rHilightRanges.getLength(); ++i ) { -@@ -2185,7 +2187,7 @@ void ScTabView::DoChartSelection( +@@ -2152,7 +2154,7 @@ void ScTabView::DoChartSelection( ScRangeList aRangeList; ScDocument* pDoc = aViewData.GetDocShell()->GetDocument(); if( ScRangeStringConverter::GetRangeListFromString( diff --git a/patches/dev300/chart-subtitle-xls-export.diff b/patches/dev300/chart-subtitle-xls-export.diff index 88f04bb3b..dad1a46ef 100644 --- a/patches/dev300/chart-subtitle-xls-export.diff +++ b/patches/dev300/chart-subtitle-xls-export.diff @@ -1,5 +1,5 @@ ---- sc/source/filter/excel/xechart.cxx -+++ sc/source/filter/excel/xechart.cxx +--- sc/source/filter/excel/xechart.cxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/filter/excel/xechart.cxx 2010-03-03 16:59:13.000000000 +0100 @@ -36,6 +36,7 @@ #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> @@ -8,7 +8,7 @@ #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> #include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> -@@ -876,6 +877,13 @@ void XclExpChSourceLink::ConvertNumFmt( +@@ -975,6 +976,13 @@ void XclExpChSourceLink::ConvertNumFmt( } } @@ -22,7 +22,7 @@ void XclExpChSourceLink::Save( XclExpStream& rStrm ) { // CHFORMATRUNS record -@@ -977,7 +985,7 @@ void XclExpChText::SetRotation( sal_uInt +@@ -1104,7 +1112,7 @@ void XclExpChText::SetRotation( sal_uInt ::insert_value( maData.mnFlags, XclTools::GetXclOrientFromRot( nRotation ), 8, 3 ); } @@ -31,7 +31,7 @@ { switch( nTarget ) { -@@ -991,6 +999,14 @@ void XclExpChText::ConvertTitle( Referen +@@ -1126,6 +1134,14 @@ void XclExpChText::ConvertTitle( Referen // string sequence mxSrcLink.reset( new XclExpChSourceLink( GetChRoot(), EXC_CHSRCLINK_TITLE ) ); sal_uInt16 nFontIdx = mxSrcLink->ConvertStringSequence( xTitle->getText() ); @@ -46,7 +46,7 @@ ConvertFontBase( GetChRoot(), nFontIdx ); // rotation -@@ -1140,14 +1156,15 @@ void XclExpChText::WriteBody( XclExpStre +@@ -1301,14 +1317,15 @@ void XclExpChText::WriteBody( XclExpStre namespace { /** Creates and returns an Excel text object from the passed title. */ @@ -64,7 +64,7 @@ /* Do not delete the CHTEXT group for the main title. A missing CHTEXT will be interpreted as auto-generated title showing the series title in charts that contain exactly one data series. */ -@@ -2742,6 +2759,23 @@ void XclExpChAxesSet::WriteBody( XclExpS +@@ -2969,6 +2986,23 @@ void XclExpChAxesSet::WriteBody( XclExpS // The chart object =========================================================== @@ -87,8 +87,8 @@ + XclExpChChart::XclExpChChart( const XclExpRoot& rRoot, Reference< XChartDocument > xChartDoc, const Size& rSize ) : - XclExpChGroupBase( EXC_ID_CHCHART, 16 ), -@@ -2780,7 +2814,10 @@ XclExpChChart::XclExpChChart( const XclE + XclExpChGroupBase( XclExpChRoot( rRoot, this ), EXC_CHFRBLOCK_TYPE_CHART, EXC_ID_CHCHART, 16 ) +@@ -3006,7 +3040,10 @@ XclExpChChart::XclExpChChart( const XclE // chart title Reference< XTitled > xTitled( xChartDoc, UNO_QUERY ); @@ -100,9 +100,9 @@ // diagrams (axes sets) sal_uInt16 nFreeGroupIdx = mxPrimAxesSet->Convert( xDiagram, 0 ); ---- sc/source/filter/inc/xechart.hxx.old 2009-04-06 16:41:51.000000000 +0000 -+++ sc/source/filter/inc/xechart.hxx 2009-04-06 16:42:05.000000000 +0000 -@@ -348,6 +348,8 @@ public: +--- sc/source/filter/inc/xechart.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/filter/inc/xechart.hxx 2010-03-03 16:59:13.000000000 +0100 +@@ -383,6 +383,8 @@ public: /** Converts the number format from the passed property set. */ void ConvertNumFmt( const ScfPropertySet& rPropSet, bool bPercent ); @@ -111,7 +111,7 @@ /** Returns true, if this source link contains explicit string data. */ inline bool HasString() const { return mxString.is() && !mxString->IsEmpty(); } -@@ -436,7 +438,7 @@ public: +@@ -494,7 +496,7 @@ public: virtual void SetRotation( sal_uInt16 nRotation ); /** Converts all text settings of the passed title text object. */ diff --git a/patches/dev300/configure-fix-lpsolve-depends.diff b/patches/dev300/configure-fix-lpsolve-depends.diff index c6e26d1d9..863ed91b4 100644 --- a/patches/dev300/configure-fix-lpsolve-depends.diff +++ b/patches/dev300/configure-fix-lpsolve-depends.diff @@ -1,11 +1,11 @@ ---- configure.in-old 2009-10-23 10:36:09.000000000 +0200 -+++ configure.in 2009-10-23 10:36:44.000000000 +0200 -@@ -5378,6 +5378,8 @@ +--- configure.in.old 2010-03-03 17:00:03.000000000 +0100 ++++ configure.in 2010-03-03 17:00:12.000000000 +0100 +@@ -5257,6 +5257,8 @@ if test -n "$with_system_lpsolve" -o -n SYSTEM_LPSOLVE=YES AC_CHECK_HEADER(lpsolve/lp_lib.h, [], [ AC_MSG_ERROR(lpsolve headers not found.)], []) + AC_CHECK_LIB(m, floor) + AC_CHECK_LIB(dl, dlopen) AC_CHECK_LIB(lpsolve55, make_lp, , - [ AC_MSG_ERROR(lpsolve library not found or too old.)], [-L/usr/lib/lp_solve]) + [ AC_MSG_ERROR(lpsolve library not found or too old.)], []) else diff --git a/patches/dev300/cws-koheicsvimport-sc.diff b/patches/dev300/cws-koheicsvimport-sc.diff index e6e0bcf77..fd474ffd5 100644 --- a/patches/dev300/cws-koheicsvimport-sc.diff +++ b/patches/dev300/cws-koheicsvimport-sc.diff @@ -115,8 +115,8 @@ index de99888..f5a40ee 100644 #include "pivot.hxx" +#include "i18npool/lang.h" - #include <tabvwsh.hxx> - + class ScAsciiOptions; + class ScAutoFormat; @@ -297,6 +298,14 @@ class AbstractScImportOptionsDlg : public VclAbstractDialog //add for ScImportO public: virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0; diff --git a/patches/dev300/default-no-startup-wizard.diff b/patches/dev300/default-no-startup-wizard.diff index 67054b1a1..7159ca7c4 100644 --- a/patches/dev300/default-no-startup-wizard.diff +++ b/patches/dev300/default-no-startup-wizard.diff @@ -1,5 +1,5 @@ ---- desktop/source/migration/wizard.cxx.old 2009-04-02 10:56:43.000000000 +0000 -+++ desktop/source/migration/wizard.cxx 2009-04-06 16:41:54.000000000 +0000 +--- desktop/source/migration/wizard.cxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ desktop/source/migration/wizard.cxx 2010-03-03 16:59:24.000000000 +0100 @@ -116,6 +116,8 @@ FirstStartWizard::FirstStartWizard( Wind ,m_bAutomaticUpdChk(sal_True) ,m_aLicensePath( rLicensePath ) @@ -22,11 +22,11 @@ } static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False) ---- scp2/source/ooo/common_brand.scp.old 2009-04-06 16:41:54.000000000 +0000 -+++ scp2/source/ooo/common_brand.scp 2009-04-06 16:41:54.000000000 +0000 -@@ -924,19 +924,14 @@ ProfileItem gid_Brand_ProfileItem_Soffic +--- scp2/source/ooo/common_brand.scp.old 2010-03-03 16:59:22.000000000 +0100 ++++ scp2/source/ooo/common_brand.scp 2010-03-03 16:59:24.000000000 +0100 +@@ -949,19 +949,14 @@ ProfileItem gid_Brand_Profileitem_Soffic + Value = "${PROGRESSFRAMECOLOR}"; End - #endif -#ifdef WNT ProfileItem gid_Brand_Profileitem_Soffice_Hideeula diff --git a/patches/dev300/desktop-disable-startup-registration.diff b/patches/dev300/desktop-disable-startup-registration.diff index 904b1978c..41ff1daea 100644 --- a/patches/dev300/desktop-disable-startup-registration.diff +++ b/patches/dev300/desktop-disable-startup-registration.diff @@ -1,7 +1,5 @@ -diff --git desktop/source/app/app.cxx desktop/source/app/app.cxx -index b1645eb..d3a3fc8 100644 ---- desktop/source/app/app.cxx -+++ desktop/source/app/app.cxx +--- desktop/source/app/app.cxx.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/source/app/app.cxx 2010-03-03 16:59:21.000000000 +0100 @@ -47,6 +47,7 @@ #include "desktopcontext.hxx" #include "exithelper.hxx" @@ -10,19 +8,19 @@ index b1645eb..d3a3fc8 100644 #include <svtools/javacontext.hxx> #include <com/sun/star/frame/XSessionManagerListener.hpp> -@@ -1394,6 +1395,7 @@ void Desktop::Main() - tools::InitTestToolLib(); - RTL_LOGFILE_CONTEXT_TRACE( aLog, "} tools::InitTestToolLib" ); +@@ -1424,6 +1425,7 @@ void Desktop::Main() + if ( bAbort ) + return; +#if 0 // ooo-build doesn't use First Start Wizard at all. // First Start Wizard allowed ? if ( ! pCmdLineArgs->IsNoFirstStartWizard()) { -@@ -1425,6 +1427,7 @@ void Desktop::Main() +@@ -1455,6 +1457,7 @@ void Desktop::Main() RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" ); } +#endif - // keep a language options instance... - pLanguageOptions.reset( new SvtLanguageOptions(sal_True)); + // keep a language options instance... + pLanguageOptions.reset( new SvtLanguageOptions(sal_True)); diff --git a/patches/dev300/external-apm-header.diff b/patches/dev300/external-apm-header.diff index 2319c46d5..fa5e46762 100644 --- a/patches/dev300/external-apm-header.diff +++ b/patches/dev300/external-apm-header.diff @@ -1,7 +1,5 @@ -diff --git svtools/inc/svtools/filter.hxx svtools/inc/svtools/filter.hxx -index 4f33b66..177db61 100644 ---- svtools/inc/svtools/filter.hxx -+++ svtools/inc/svtools/filter.hxx +--- svtools/inc/svtools/filter.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/inc/svtools/filter.hxx 2010-03-03 17:00:09.000000000 +0100 @@ -41,6 +41,7 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> @@ -11,27 +9,25 @@ index 4f33b66..177db61 100644 // - GraphicFilter-Types - // ----------------------- @@ -392,13 +393,15 @@ public: - USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, - SvStream& rStream, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, -- USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); + USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, + SvStream& rStream, + USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, +- USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); + USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 + , WMF_APMFILEHEADER *pAPMHeader = NULL); - USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, - SvStream& rStream, - USHORT nFormat, - USHORT * pDeterminedFormat, sal_uInt32 nImportFlags, -- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ); + USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, + SvStream& rStream, + USHORT nFormat, + USHORT * pDeterminedFormat, sal_uInt32 nImportFlags, +- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ); + com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData + , WMF_APMFILEHEADER *pAPMHeader = NULL); - BOOL Setup( USHORT nFormat ); + BOOL Setup( USHORT nFormat ); -diff --git svtools/inc/svtools/wmf.hxx svtools/inc/svtools/wmf.hxx -index 68a4c4f..d3dc61d 100644 ---- svtools/inc/svtools/wmf.hxx -+++ svtools/inc/svtools/wmf.hxx +--- svtools/inc/svtools/wmf.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/inc/svtools/wmf.hxx 2010-03-03 17:00:09.000000000 +0100 @@ -34,7 +34,30 @@ #include "svtools/svtdllapi.h" #include <svtools/fltcall.hxx> @@ -64,75 +60,69 @@ index 68a4c4f..d3dc61d 100644 SVT_DLLPUBLIC BOOL ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); -diff --git svtools/source/filter.vcl/filter/filter.cxx svtools/source/filter.vcl/filter/filter.cxx -index db14402..14c9ea4 100644 ---- svtools/source/filter.vcl/filter/filter.cxx -+++ svtools/source/filter.vcl/filter/filter.cxx -@@ -1276,17 +1276,17 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPa - return nRetValue; +--- svtools/source/filter.vcl/filter/filter.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ svtools/source/filter.vcl/filter/filter.cxx 2010-03-03 17:00:09.000000000 +0100 +@@ -1281,17 +1281,17 @@ USHORT GraphicFilter::ImportGraphic( Gra + return nRetValue; } -USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream, -- USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags ) +- USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags ) +USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream, USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, WMF_APMFILEHEADER *pAPMHeader ) { -- return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL ); +- return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL ); + return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pAPMHeader ); } //------------------------------------------------------------------------- USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream, - USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, -- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) + USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, +- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) + com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData + , WMF_APMFILEHEADER *pAPMHeader) { - String aFilterName; - ULONG nStmBegin; -@@ -1483,7 +1483,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS - aFilterName.EqualsIgnoreCaseAscii( IMP_EMF ) ) - { - GDIMetaFile aMtf; -- if( !ConvertWMFToGDIMetaFile( rIStream, aMtf, NULL ) ) + String aFilterName; + ULONG nStmBegin; +@@ -1488,7 +1488,7 @@ USHORT GraphicFilter::ImportGraphic( Gra + aFilterName.EqualsIgnoreCaseAscii( IMP_EMF ) ) + { + GDIMetaFile aMtf; +- if( !ConvertWMFToGDIMetaFile( rIStream, aMtf, NULL ) ) + if( !ConvertWMFToGDIMetaFile( rIStream, aMtf, NULL, pAPMHeader ) ) - nStatus = GRFILTER_FORMATERROR; - else - { -diff --git svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/winmtf.hxx -index f4ac2d4..9253169 100644 ---- svtools/source/filter.vcl/wmf/winmtf.hxx -+++ svtools/source/filter.vcl/wmf/winmtf.hxx + nStatus = GRFILTER_FORMATERROR; + else + { +--- svtools/source/filter.vcl/wmf/winmtf.hxx.old 2010-03-03 16:59:57.000000000 +0100 ++++ svtools/source/filter.vcl/wmf/winmtf.hxx 2010-03-03 17:00:09.000000000 +0100 @@ -162,6 +162,7 @@ struct LOGFONTW - BYTE lfPitchAndFamily; - String alfFaceName; + BYTE lfPitchAndFamily; + String alfFaceName; }; +struct WMF_APMFILEHEADER; #define TA_NOUPDATECP 0x0000 #define TA_UPDATECP 0x0001 -@@ -765,7 +766,7 @@ private: - sal_uInt32 nUnicodeEscapeAction; +@@ -762,7 +763,7 @@ private: + sal_uInt32 nUnicodeEscapeAction; - // Liesst den Kopf der WMF-Datei -- BOOL ReadHeader(); + // Liesst den Kopf der WMF-Datei +- BOOL ReadHeader(); + BOOL ReadHeader(WMF_APMFILEHEADER *pAPMHeader); - // Liesst die Parameter des Rocords mit der Funktionsnummer nFunction. - void ReadRecordParams( USHORT nFunction ); -@@ -782,7 +783,7 @@ public: - : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ) {}; + // Liesst die Parameter des Rocords mit der Funktionsnummer nFunction. + void ReadRecordParams( USHORT nFunction ); +@@ -779,7 +780,7 @@ public: + : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ) {}; - // Liesst aus dem Stream eine WMF-Datei und fuellt das GDIMetaFile -- void ReadWMF(); + // Liesst aus dem Stream eine WMF-Datei und fuellt das GDIMetaFile +- void ReadWMF(); + void ReadWMF(WMF_APMFILEHEADER *pAPMHeader=NULL); }; #endif -diff --git svtools/source/filter.vcl/wmf/winwmf.cxx svtools/source/filter.vcl/wmf/winwmf.cxx -index 9db828c..fda0b81 100644 ---- svtools/source/filter.vcl/wmf/winwmf.cxx -+++ svtools/source/filter.vcl/wmf/winwmf.cxx +--- svtools/source/filter.vcl/wmf/winwmf.cxx.old 2010-03-03 16:59:48.000000000 +0100 ++++ svtools/source/filter.vcl/wmf/winwmf.cxx 2010-03-03 17:00:09.000000000 +0100 @@ -32,6 +32,7 @@ #include "precompiled_svtools.hxx" @@ -141,24 +131,24 @@ index 9db828c..fda0b81 100644 #include <rtl/crc.h> #include <rtl/tencinfo.h> #include <osl/endian.h> -@@ -938,7 +939,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) +@@ -943,7 +944,7 @@ void WMFReader::ReadRecordParams( USHORT // ------------------------------------------------------------------------ -BOOL WMFReader::ReadHeader() +BOOL WMFReader::ReadHeader(WMF_APMFILEHEADER *pAPMHeader) { - Rectangle aPlaceableBound; - sal_uInt32 nl, nStrmPos = pWMF->Tell(); -@@ -971,11 +972,18 @@ BOOL WMFReader::ReadHeader() + Rectangle aPlaceableBound; + sal_uInt32 nl, nStrmPos = pWMF->Tell(); +@@ -976,11 +977,18 @@ BOOL WMFReader::ReadHeader() } - else - { -- nUnitsPerInch = 96; + else + { +- nUnitsPerInch = 96; - pWMF->Seek( nStrmPos + 18 ); // set the streampos to the start of the the metaactions - GetPlaceableBound( aPlaceableBound, pWMF ); - pWMF->Seek( nStrmPos ); -- } +- } + nUnitsPerInch = (pAPMHeader!=NULL?pAPMHeader->inch:96); + pWMF->Seek( nStrmPos + 18 ); // set the streampos to the start of the the metaactions + GetPlaceableBound( aPlaceableBound, pWMF ); @@ -172,30 +162,28 @@ index 9db828c..fda0b81 100644 + } + } - pOut->SetUnitsPerInch( nUnitsPerInch ); pOut->SetWinOrg( aPlaceableBound.TopLeft() ); -@@ -1010,7 +1018,7 @@ BOOL WMFReader::ReadHeader() - return TRUE; + aWMFSize = Size( labs( aPlaceableBound.GetWidth() ), labs( aPlaceableBound.GetHeight() ) ); +@@ -1014,7 +1022,7 @@ BOOL WMFReader::ReadHeader() + return TRUE; } -void WMFReader::ReadWMF() +void WMFReader::ReadWMF(WMF_APMFILEHEADER *pAPMHeader) { - USHORT nFunction; - ULONG nPos, nPercent, nLastPercent; -@@ -1028,7 +1036,7 @@ void WMFReader::ReadWMF() - pWMF->Seek( nStartPos ); - Callback( (USHORT) ( nLastPercent = 0 ) ); + USHORT nFunction; + ULONG nPos, nPercent, nLastPercent; +@@ -1032,7 +1040,7 @@ void WMFReader::ReadWMF() + pWMF->Seek( nStartPos ); + Callback( (USHORT) ( nLastPercent = 0 ) ); -- if ( ReadHeader() ) +- if ( ReadHeader() ) + if ( ReadHeader( pAPMHeader ) ) - { + { - nPos = pWMF->Tell(); -diff --git svtools/source/filter.vcl/wmf/wmf.cxx svtools/source/filter.vcl/wmf/wmf.cxx -index 4654864..9e3e258 100644 ---- svtools/source/filter.vcl/wmf/wmf.cxx -+++ svtools/source/filter.vcl/wmf/wmf.cxx + nPos = pWMF->Tell(); +--- svtools/source/filter.vcl/wmf/wmf.cxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/source/filter.vcl/wmf/wmf.cxx 2010-03-03 17:00:09.000000000 +0100 @@ -38,7 +38,7 @@ // ----------------------------------------------------------------------------- @@ -203,21 +191,19 @@ index 4654864..9e3e258 100644 -BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem ) +BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_APMFILEHEADER *pAPMHeader ) { - UINT32 nMetaType; - UINT32 nOrgPos = rStreamWMF.Tell(); -@@ -54,7 +54,7 @@ BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, - } - else - { -- WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF(); + UINT32 nMetaType; + UINT32 nOrgPos = rStreamWMF.Tell(); +@@ -54,7 +54,7 @@ BOOL ConvertWMFToGDIMetaFile( SvStream & + } + else + { +- WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF(); + WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF( pAPMHeader ); - } - rStreamWMF.SetNumberFormatInt( nOrigNumberFormat ); - return !rStreamWMF.GetError(); -diff --git svx/source/svrtf/rtfgrf.cxx svx/source/svrtf/rtfgrf.cxx -index ddddab8..587a4ce 100644 ---- svx/source/svrtf/rtfgrf.cxx -+++ svx/source/svrtf/rtfgrf.cxx + } + rStreamWMF.SetNumberFormatInt( nOrigNumberFormat ); + return !rStreamWMF.GetError(); +--- svx/source/svrtf/rtfgrf.cxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ svx/source/svrtf/rtfgrf.cxx 2010-03-03 17:00:09.000000000 +0100 @@ -39,6 +39,7 @@ #include <svtools/rtfkeywd.hxx> #include <svtools/rtftoken.h> @@ -226,10 +212,10 @@ index ddddab8..587a4ce 100644 #include "impgrf.hxx" #include "svxrtf.hxx" -@@ -508,9 +509,15 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType ) - } +@@ -508,9 +509,15 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& + } - String sTmpStr; + String sTmpStr; + WMF_APMFILEHEADER aAPMHeader; + aAPMHeader.left=0; + aAPMHeader.top=0; @@ -237,10 +223,10 @@ index ddddab8..587a4ce 100644 + aAPMHeader.bottom=rPicType.nHeight; + + WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right>0 && aAPMHeader.bottom>0?&aAPMHeader:NULL); - pTmpFile->Seek( STREAM_SEEK_TO_BEGIN ); -- bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile, -- nImportFilter ); + pTmpFile->Seek( STREAM_SEEK_TO_BEGIN ); +- bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile, +- nImportFilter ); + bValidBmp = 0 == pGF->ImportGraphic( rGrf, sTmpStr, *pTmpFile, nImportFilter, NULL, 0, pAPMHeader ); - } - delete pTmpFile; - } + } + delete pTmpFile; + } diff --git a/patches/dev300/fit-list-to-size-popup.diff b/patches/dev300/fit-list-to-size-popup.diff index a18a9e49c..e08dbe3cc 100644 --- a/patches/dev300/fit-list-to-size-popup.diff +++ b/patches/dev300/fit-list-to-size-popup.diff @@ -1,21 +1,5 @@ - sd/inc/app.hrc | 1 - sd/sdi/_drvwsh.sdi | 5 ++ - sd/sdi/sdraw.sdi | 27 +++++++++++++ - sd/source/ui/app/menuids_tmpl.src | 8 ++++ - sd/source/ui/app/popup2_tmpl.src | 43 ++++++++++++++++++++ - sd/source/ui/inc/res_bmp.hrc | 2 + - sd/source/ui/view/drviews2.cxx | 25 ++++++++++++ - sd/source/ui/view/drviews4.cxx | 6 ++- - sd/source/ui/view/drviewsj.cxx | 19 ++++++--- - .../Linux_X86_64rc | 2 - - .../unorc | 2 - - 11 files changed, 130 insertions(+), 10 deletions(-) - - -diff --git sd/inc/app.hrc sd/inc/app.hrc -index 83cfa86..9bd8aee 100644 ---- sd/inc/app.hrc -+++ sd/inc/app.hrc +--- sd/inc/app.hrc.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/inc/app.hrc 2010-03-03 16:59:59.000000000 +0100 @@ -459,11 +459,12 @@ #define SID_DISPLAY_MASTER_OBJECTS (SID_SD_START+437) #define SID_INSERTPAGE_LAYOUT_MENU (SID_SD_START+438) @@ -32,10 +16,8 @@ index 83cfa86..9bd8aee 100644 +#define SID_TABLE_TOOLBOX (SID_SD_START+443) #endif -diff --git sd/sdi/_drvwsh.sdi sd/sdi/_drvwsh.sdi -index c895d2e..44a6ae0 100644 ---- sd/sdi/_drvwsh.sdi -+++ sd/sdi/_drvwsh.sdi +--- sd/sdi/_drvwsh.sdi.old 2010-03-03 16:59:59.000000000 +0100 ++++ sd/sdi/_drvwsh.sdi 2010-03-03 16:59:59.000000000 +0100 @@ -665,6 +665,11 @@ interface DrawView ExecMethod = FuPermanent ; StateMethod = GetMenuState ; @@ -48,11 +30,9 @@ index c895d2e..44a6ae0 100644 SID_TEXT_FITTOSIZE_VERTICAL // ole : no, status : ? [ ExecMethod = FuPermanent ; -diff --git sd/sdi/sdraw.sdi sd/sdi/sdraw.sdi -index c4d7bad..fae94ab 100644 ---- sd/sdi/sdraw.sdi -+++ sd/sdi/sdraw.sdi -@@ -6377,6 +6377,33 @@ SfxBoolItem TextFitToSizeTool SID_TEXT_FITTOSIZE +--- sd/sdi/sdraw.sdi.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/sdi/sdraw.sdi 2010-03-03 16:59:59.000000000 +0100 +@@ -6351,6 +6351,33 @@ SfxBoolItem TextFitToSizeTool SID_TEXT_F ] //-------------------------------------------------------------------------- @@ -86,13 +66,11 @@ index c4d7bad..fae94ab 100644 TbxImageItem TextToolbox SID_DRAWTBX_TEXT [ -diff --git sd/source/ui/app/menuids_tmpl.src sd/source/ui/app/menuids_tmpl.src -index feb34df..d35dc60 100644 ---- sd/source/ui/app/menuids_tmpl.src -+++ sd/source/ui/app/menuids_tmpl.src +--- sd/source/ui/app/menuids_tmpl.src.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/app/menuids_tmpl.src 2010-03-03 16:59:59.000000000 +0100 @@ -307,6 +307,14 @@ Text [ en-US ] = "~Text..." ; \ - }; + }; +#define MN_OUTLINE_TEXT_AUTOFIT \ + MenuItem\ @@ -105,10 +83,8 @@ index feb34df..d35dc60 100644 #define MN_CONNECTION \ MenuItem\ {\ -diff --git sd/source/ui/app/popup2_tmpl.src sd/source/ui/app/popup2_tmpl.src -index 63ad153..c5340a9 100644 ---- sd/source/ui/app/popup2_tmpl.src -+++ sd/source/ui/app/popup2_tmpl.src +--- sd/source/ui/app/popup2_tmpl.src.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/app/popup2_tmpl.src 2010-03-03 16:59:59.000000000 +0100 @@ -82,6 +82,49 @@ }; @@ -159,13 +135,11 @@ index 63ad153..c5340a9 100644 // GEOMOBJ_POPUP // #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP -diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc -index d4914a3..8565e1b 100644 ---- sd/source/ui/inc/res_bmp.hrc -+++ sd/source/ui/inc/res_bmp.hrc -@@ -301,6 +301,9 @@ +--- sd/source/ui/inc/res_bmp.hrc.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/inc/res_bmp.hrc 2010-03-03 16:59:59.000000000 +0100 +@@ -311,6 +311,9 @@ - #define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP RID_APP_START+93 + #define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94 +#define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95 +#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96 @@ -173,14 +147,12 @@ index d4914a3..8565e1b 100644 /* * Pointer (Mauszeiger) */ -diff --git sd/source/ui/view/drviews2.cxx sd/source/ui/view/drviews2.cxx -index f55b303..605716f 100644 ---- sd/source/ui/view/drviews2.cxx -+++ sd/source/ui/view/drviews2.cxx -@@ -175,6 +175,31 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) +--- sd/source/ui/view/drviews2.cxx.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/view/drviews2.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -175,6 +175,31 @@ void DrawViewShell::FuTemporary(SfxReque - switch ( nSId ) - { + switch ( nSId ) + { + case SID_OUTLINE_TEXT_AUTOFIT: + { + SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager(); @@ -206,46 +178,42 @@ index f55b303..605716f 100644 + } + break; + - // Flaechen und Linien-Attribute: - // Sollten (wie StateMethode) eine eigene - // Execute-Methode besitzen -diff --git sd/source/ui/view/drviews4.cxx sd/source/ui/view/drviews4.cxx -index 66482d4..8a9b122 100644 ---- sd/source/ui/view/drviews4.cxx -+++ sd/source/ui/view/drviews4.cxx -@@ -669,9 +669,13 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) - { - switch ( nId ) - { + // Flaechen und Linien-Attribute: + // Sollten (wie StateMethode) eine eigene + // Execute-Methode besitzen +--- sd/source/ui/view/drviews4.cxx.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/view/drviews4.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -682,9 +682,13 @@ void DrawViewShell::Command(const Comman + { + switch ( nId ) + { + case OBJ_OUTLINETEXT: + nSdResId = bGraphicShell ? RID_GRAPHIC_OUTLINETEXTOBJ_POPUP : + RID_DRAW_OUTLINETEXTOBJ_POPUP; + break; + - case OBJ_CAPTION: - case OBJ_TITLETEXT: -- case OBJ_OUTLINETEXT: - case OBJ_TEXT: - nSdResId = bGraphicShell ? RID_GRAPHIC_TEXTOBJ_POPUP : - RID_DRAW_TEXTOBJ_POPUP; -diff --git sd/source/ui/view/drviewsj.cxx sd/source/ui/view/drviewsj.cxx -index 5892f63..eceea7a 100644 ---- sd/source/ui/view/drviewsj.cxx -+++ sd/source/ui/view/drviewsj.cxx -@@ -213,9 +213,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) - rSet.DisableItem( SID_CHANGEPOLYGON ); - } + case OBJ_CAPTION: + case OBJ_TITLETEXT: +- case OBJ_OUTLINETEXT: + case OBJ_TEXT: + nSdResId = bGraphicShell ? RID_GRAPHIC_TEXTOBJ_POPUP : + RID_DRAW_TEXTOBJ_POPUP; +--- sd/source/ui/view/drviewsj.cxx.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/view/drviewsj.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -211,9 +211,6 @@ void DrawViewShell::GetMenuStateSel( Sfx + rSet.DisableItem( SID_CHANGEPOLYGON ); + } -- if(nInv == SdrInventor && (nId == OBJ_TITLETEXT || nId == OBJ_OUTLINETEXT)) -- rSet.DisableItem( SID_TEXTATTR_DLG ); +- if(nInv == SdrInventor && (nId == OBJ_TITLETEXT || nId == OBJ_OUTLINETEXT)) +- rSet.DisableItem( SID_TEXTATTR_DLG ); - - if(nInv == SdrInventor && nId == OBJ_TABLE ) - { - rSet.DisableItem( SID_TEXTATTR_DLG ); -@@ -308,6 +305,17 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) - else - rSet.DisableItem( SID_MODIFY_FIELD ); - } + if(nInv == SdrInventor && nId == OBJ_TABLE ) + { + rSet.DisableItem( SID_TEXTATTR_DLG ); +@@ -306,6 +303,17 @@ void DrawViewShell::GetMenuStateSel( Sfx + else + rSet.DisableItem( SID_MODIFY_FIELD ); + } + if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OUTLINE_TEXT_AUTOFIT ) ) + { + bool bSet = false; @@ -258,31 +226,31 @@ index 5892f63..eceea7a 100644 + rSet.Put(SfxBoolItem(SID_OUTLINE_TEXT_AUTOFIT, bSet)); + } - rSet.DisableItem( SID_GROUP ); - rSet.DisableItem( SID_COMBINE ); -@@ -357,7 +365,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) - BOOL bGraf = FALSE; - BOOL bDrawObj = FALSE; - BOOL b3dObj = FALSE; -- BOOL bTitOutText = FALSE; - bool bTable = false; - BOOL bMeasureObj = FALSE; - BOOL bEdgeObj = FALSE; // Connector -@@ -397,8 +404,6 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) + rSet.DisableItem( SID_GROUP ); + rSet.DisableItem( SID_COMBINE ); +@@ -355,7 +363,6 @@ void DrawViewShell::GetMenuStateSel( Sfx + BOOL bGraf = FALSE; + BOOL bDrawObj = FALSE; + BOOL b3dObj = FALSE; +- BOOL bTitOutText = FALSE; + bool bTable = false; + BOOL bMeasureObj = FALSE; + BOOL bEdgeObj = FALSE; // Connector +@@ -395,8 +402,6 @@ void DrawViewShell::GetMenuStateSel( Sfx - case OBJ_GRAF: bGraf = TRUE; break; + case OBJ_GRAF: bGraf = TRUE; break; -- case OBJ_TITLETEXT: -- case OBJ_OUTLINETEXT: bTitOutText = TRUE; break; - case OBJ_TABLE: bTable = true; break; - } - } -@@ -446,7 +451,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) - { - rSet.DisableItem( SID_UNGROUP ); - } -- if( bTitOutText || bTable ) +- case OBJ_TITLETEXT: +- case OBJ_OUTLINETEXT: bTitOutText = TRUE; break; + case OBJ_TABLE: bTable = true; break; + } + } +@@ -444,7 +449,7 @@ void DrawViewShell::GetMenuStateSel( Sfx + { + rSet.DisableItem( SID_UNGROUP ); + } +- if( bTitOutText || bTable ) + if( bTable ) - rSet.DisableItem( SID_TEXTATTR_DLG ); + rSet.DisableItem( SID_TEXTATTR_DLG ); - if( !bMeasureObj ) + if( !bMeasureObj ) diff --git a/patches/dev300/g++44-debug.diff b/patches/dev300/g++44-debug.diff index 69815c714..de0db51e2 100644 --- a/patches/dev300/g++44-debug.diff +++ b/patches/dev300/g++44-debug.diff @@ -1,7 +1,5 @@ -diff --git sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/dbgoutsw.cxx -index 2fb1676..61a20d6 100644 ---- sw/source/core/doc/dbgoutsw.cxx -+++ sw/source/core/doc/dbgoutsw.cxx +--- sw/source/core/doc/dbgoutsw.cxx.old 2009-10-21 11:49:24.000000000 +0200 ++++ sw/source/core/doc/dbgoutsw.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -54,7 +54,7 @@ #include <SwNodeNum.hxx> #include <dbgoutsw.hxx> @@ -11,10 +9,8 @@ index 2fb1676..61a20d6 100644 using namespace std; -diff --git sw/source/core/text/inftxt.cxx sw/source/core/text/inftxt.cxx -index 2333592..dae2a39 100644 ---- sw/source/core/text/inftxt.cxx -+++ sw/source/core/text/inftxt.cxx +--- sw/source/core/text/inftxt.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/core/text/inftxt.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -87,6 +87,10 @@ #include <unomid.h> @@ -26,10 +22,8 @@ index 2333592..dae2a39 100644 using namespace ::com::sun::star; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::uno; -diff --git sw/source/filter/ww8/WW8Sttbf.cxx sw/source/filter/ww8/WW8Sttbf.cxx -index 946147a..8787b87 100644 ---- sw/source/filter/ww8/WW8Sttbf.cxx -+++ sw/source/filter/ww8/WW8Sttbf.cxx +--- sw/source/filter/ww8/WW8Sttbf.cxx.old 2009-10-21 11:49:24.000000000 +0200 ++++ sw/source/filter/ww8/WW8Sttbf.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -33,6 +33,10 @@ #include <dbgoutsw.hxx> #include "WW8Sttbf.hxx" @@ -41,10 +35,8 @@ index 946147a..8787b87 100644 namespace ww8 { WW8Struct::WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize) -diff --git sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/wrtw8nds.cxx -index 2280b2b..4828bfd 100644 ---- sw/source/filter/ww8/wrtw8nds.cxx -+++ sw/source/filter/ww8/wrtw8nds.cxx +--- sw/source/filter/ww8/wrtw8nds.cxx.old 2010-03-03 16:44:12.000000000 +0100 ++++ sw/source/filter/ww8/wrtw8nds.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -106,6 +106,10 @@ #include <ndgrf.hxx> #include <ndole.hxx> @@ -56,10 +48,8 @@ index 2280b2b..4828bfd 100644 using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace sw::util; -diff --git sw/source/filter/ww8/wrtww8gr.cxx sw/source/filter/ww8/wrtww8gr.cxx -index e3e6c31..348df39 100644 ---- sw/source/filter/ww8/wrtww8gr.cxx -+++ sw/source/filter/ww8/wrtww8gr.cxx +--- sw/source/filter/ww8/wrtww8gr.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/filter/ww8/wrtww8gr.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -77,6 +77,10 @@ #include "docsh.hxx" @@ -71,10 +61,8 @@ index e3e6c31..348df39 100644 using namespace ::com::sun::star; using namespace nsFieldFlags; -diff --git writerfilter/source/dmapper/DomainMapperTableHandler.cxx writerfilter/source/dmapper/DomainMapperTableHandler.cxx -index 5f2efa4..be4d96e 100644 ---- writerfilter/source/dmapper/DomainMapperTableHandler.cxx -+++ writerfilter/source/dmapper/DomainMapperTableHandler.cxx +--- writerfilter/source/dmapper/DomainMapperTableHandler.cxx.old 2009-11-20 11:38:33.000000000 +0100 ++++ writerfilter/source/dmapper/DomainMapperTableHandler.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -34,7 +34,7 @@ #include <com/sun/star/table/TableBorder.hpp> #include <com/sun/star/text/HoriOrientation.hpp> @@ -84,22 +72,18 @@ index 5f2efa4..be4d96e 100644 #endif namespace writerfilter { -diff --git writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx -index 586b002..4a2394e 100644 ---- writerfilter/source/dmapper/DomainMapper_Impl.cxx -+++ writerfilter/source/dmapper/DomainMapper_Impl.cxx +--- writerfilter/source/dmapper/DomainMapper_Impl.cxx.old 2009-11-20 11:38:33.000000000 +0100 ++++ writerfilter/source/dmapper/DomainMapper_Impl.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -81,6 +81,7 @@ #include <ooxml/OOXMLFastTokens.hxx> #if DEBUG +#include <stdio.h> #include <com/sun/star/lang/XServiceInfo.hpp> - #include <com/sun/star/style/TabStop.hpp> #endif -diff --git writerfilter/source/dmapper/SettingsTable.cxx writerfilter/source/dmapper/SettingsTable.cxx -index 70d9b13..05b43d3 100644 ---- writerfilter/source/dmapper/SettingsTable.cxx -+++ writerfilter/source/dmapper/SettingsTable.cxx + +--- writerfilter/source/dmapper/SettingsTable.cxx.old 2009-11-20 11:38:33.000000000 +0100 ++++ writerfilter/source/dmapper/SettingsTable.cxx 2010-03-03 16:59:22.000000000 +0100 @@ -6,7 +6,7 @@ #include <com/sun/star/text/XTextDocument.hpp> diff --git a/patches/dev300/go-oo-team.diff b/patches/dev300/go-oo-team.diff index f19deb22f..1ce6b97fa 100644 --- a/patches/dev300/go-oo-team.diff +++ b/patches/dev300/go-oo-team.diff @@ -1,11 +1,6 @@ -Index: sw/source/ui/dochdl/dochdl.src -=================================================================== -RCS file: /cvs/sw/sw/source/ui/dochdl/dochdl.src,v -retrieving revision 1.42 -diff -u -r1.42 dochdl.src ---- sw/source/ui/dochdl/dochdl.src 26 Jun 2004 03:25:18 -0000 1.42 -+++ sw/source/ui/dochdl/dochdl.src 4 Jan 2005 06:23:49 -0000 -@@ -149,3 +149,13 @@ +--- sw/source/ui/dochdl/dochdl.src.old 2009-10-08 16:17:19.000000000 +0200 ++++ sw/source/ui/dochdl/dochdl.src 2010-03-03 16:59:21.000000000 +0100 +@@ -86,3 +86,13 @@ String STR_SW_TEAM_NAMES Text = "Back row: Aidan Butler, Hans-Peter Burow, Caolan McNamara, Michael Brauer, Martin Maher, Gunnar Timm\nFront row: Thomas Lange, Oliver-Rainer Duesterhoeft, Henning Brinkmann, Andreas Martens, Oliver Specht, Frank Meies, Daniel Vogelheim"; }; @@ -19,17 +14,12 @@ diff -u -r1.42 dochdl.src + TEXT = "From top left: Andreas, Bernhard, David, Dhananjay, Eric, Federico, Fong\nFridrich, Giuseppe, Hubert, Jakub, Jan, Jan, Jiao\nJody, Kai, Kalman, Kohei, Martin, Matthias, Michael\nMike, Miklos, Noel, Petr, Radek, Rene, Silvan\nThorsten, Tor, Volker, Yin, ZhangYun.\n"; +}; + -Index: sw/source/ui/dochdl/gloshdl.cxx -=================================================================== -RCS file: /cvs/sw/sw/source/ui/dochdl/gloshdl.cxx,v -retrieving revision 1.19 -diff -u -r1.19 gloshdl.cxx ---- sw/source/ui/dochdl/gloshdl.cxx 4 Oct 2004 19:26:10 -0000 1.19 -+++ sw/source/ui/dochdl/gloshdl.cxx 4 Jan 2005 06:25:50 -0000 -@@ -738,6 +738,41 @@ - pWrtShell->EndAllAction(); - pWrtShell->EndUndo( UNDO_INSGLOSSARY ); - } +--- sw/source/ui/dochdl/gloshdl.cxx.old 2009-10-08 16:17:19.000000000 +0200 ++++ sw/source/ui/dochdl/gloshdl.cxx 2010-03-03 16:59:21.000000000 +0100 +@@ -645,6 +645,41 @@ BOOL SwGlossaryHdl::Expand( const String + pWrtShell->EndAllAction(); + pWrtShell->EndUndo( UNDO_INSGLOSSARY ); + } + else if ( aShortName.EqualsAscii ( "GoOOTeam", 0, 14 ) ) + { + String sGraphicName ( RTL_CONSTASCII_USTRINGPARAM ( "Go-oo Team photo" ) ); @@ -65,17 +55,12 @@ diff -u -r1.19 gloshdl.cxx + pWrtShell->EndAllAction(); + pWrtShell->EndUndo( UNDO_INSGLOSSARY ); + } - else - { - String aTmp( SW_RES(STR_NOGLOS1)); -Index: sw/inc/dochdl.hrc -=================================================================== -RCS file: /cvs/sw/sw/inc/dochdl.hrc,v -retrieving revision 1.2 -diff -u -r1.2 dochdl.hrc ---- sw/inc/dochdl.hrc 10 May 2004 16:14:19 -0000 1.2 -+++ sw/inc/dochdl.hrc 4 Jan 2005 06:27:14 -0000 -@@ -81,7 +81,10 @@ + else + { + String aTmp( SW_RES(STR_NOGLOS)); +--- sw/inc/dochdl.hrc.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/inc/dochdl.hrc 2010-03-03 16:59:21.000000000 +0100 +@@ -49,7 +49,10 @@ #define BMP_SW_TEAM_MUGSHOT (RC_DOCHDL_BEGIN + 12) #define STR_SW_TEAM_NAMES (RC_DOCHDL_BEGIN + 13) diff --git a/patches/dev300/ia64-nss.diff b/patches/dev300/ia64-nss.diff index 1f685157d..ac9928dcc 100644 --- a/patches/dev300/ia64-nss.diff +++ b/patches/dev300/ia64-nss.diff @@ -1,26 +1,20 @@ -Index: solenv/inc/unxfbsdx.mk -=================================================================== ---- solenv/inc/unxfbsdx.mk (revision 276718) -+++ solenv/inc/unxfbsdx.mk (working copy) -@@ -50,3 +50,4 @@ +--- solenv/inc/unxfbsdx.mk.old 2009-10-07 15:06:50.000000000 +0200 ++++ solenv/inc/unxfbsdx.mk 2010-03-03 16:59:23.000000000 +0100 +@@ -50,3 +50,4 @@ CFLAGSOPT= # no optimizing for no # platform specific identifier for shared libs DLLPOSTFIX=fx +BUILD64=1 -Index: solenv/inc/unxlnga.mk -=================================================================== ---- solenv/inc/unxlnga.mk (revision 276792) -+++ solenv/inc/unxlnga.mk (working copy) -@@ -34,3 +34,4 @@ - .INCLUDE : unxlng.mk +--- solenv/inc/unxlnga.mk.old 2009-10-19 13:27:59.000000000 +0200 ++++ solenv/inc/unxlnga.mk 2010-03-03 16:59:23.000000000 +0100 +@@ -35,3 +35,4 @@ CFLAGS+=-DIA64 + CFLAGSCXX+=-fno-use-cxa-atexit DLLPOSTFIX=la +BUILD64=1 -Index: nss/makefile.mk -=================================================================== ---- nss/makefile.mk (revision 276718) -+++ nss/makefile.mk (working copy) -@@ -58,7 +58,7 @@ +--- nss/makefile.mk.old 2010-01-21 01:01:04.000000000 +0100 ++++ nss/makefile.mk 2010-03-03 16:59:23.000000000 +0100 +@@ -60,7 +60,7 @@ BUILD_OPT=1 .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" diff --git a/patches/dev300/kde4-oxygen-icons.diff b/patches/dev300/kde4-oxygen-icons.diff index ecd8fb3ac..5f51ed95e 100644 --- a/patches/dev300/kde4-oxygen-icons.diff +++ b/patches/dev300/kde4-oxygen-icons.diff @@ -1,11 +1,9 @@ -diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs -index 6645930..a36dc74 100644 ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -5727,6 +5727,11 @@ Dymamic border coloring means that when the mouse is hovered over a control, and +--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2010-03-03 16:59:29.000000000 +0100 ++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-03 16:59:44.000000000 +0100 +@@ -5784,6 +5784,11 @@ Dymamic border coloring means that when <desc>Classic - the OpenOffice.org 2.0 default theme</desc> - </info> - </enumeration> + </info> + </enumeration> + <enumeration oor:value="oxygen"> + <info> + <desc>Oxygen - the KDE4 default theme</desc> @@ -14,10 +12,8 @@ index 6645930..a36dc74 100644 </constraints> <value>auto</value> </prop> -diff --git packimages/pack/makefile.mk packimages/pack/makefile.mk -index a9e1089..2a29b04 100644 ---- packimages/pack/makefile.mk -+++ packimages/pack/makefile.mk +--- packimages/pack/makefile.mk.old 2009-10-07 15:07:27.000000000 +0200 ++++ packimages/pack/makefile.mk 2010-03-03 16:59:44.000000000 +0100 @@ -41,13 +41,14 @@ RSCCUSTOMIMG*=$(PRJ) IMAGES := $(COMMONBIN)$/images.zip SORTED_LIST=$(RES)$/img$/sorted.lst @@ -34,10 +30,10 @@ index a9e1089..2a29b04 100644 ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip -@@ -88,6 +89,14 @@ $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL) - chmod -R g+w $(MISC)$/crystal +@@ -88,6 +89,14 @@ $(MISC)$/crystal.flag : $(CRYSTAL_TARBAL + chmod -R g+w $(MISC)$/crystal .ENDIF - @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed" + @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed" + +# unpack the Oxygen icon set +$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL) @@ -49,17 +45,15 @@ index a9e1089..2a29b04 100644 # unpack the classic icon set $(MISC)$/classic.flag : $(CLASSIC_TARBALL) -@@ -104,3 +113,5 @@ images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst +@@ -104,3 +113,5 @@ images_crystal : $(MISC)$/crystal.flag $ images_classic : $(MISC)$/classic.flag $(RES)$/img$/commandimagelist.ilst +images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst + -diff --git scp2/source/ooo/file_ooo.scp scp2/source/ooo/file_ooo.scp -index 1c7465f..5857d16 100644 ---- scp2/source/ooo/file_ooo.scp -+++ scp2/source/ooo/file_ooo.scp -@@ -2917,6 +2917,13 @@ File gid_File_ImagesCrystal_Zip +--- scp2/source/ooo/file_ooo.scp.old 2010-01-21 01:00:35.000000000 +0100 ++++ scp2/source/ooo/file_ooo.scp 2010-03-03 16:59:44.000000000 +0100 +@@ -2903,6 +2903,13 @@ File gid_File_ImagesCrystal_Zip Styles = (PACKED); End @@ -73,11 +67,9 @@ index 1c7465f..5857d16 100644 File gid_File_ImagesHicontrast_Zip TXT_FILE_BODY; Dir = gid_Dir_Share_Config; -diff --git scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp -index 51942be..e311c74 100644 ---- scp2/source/ooo/module_hidden_ooo.scp -+++ scp2/source/ooo/module_hidden_ooo.scp -@@ -857,6 +857,7 @@ Module gid_Module_Root_Files_Images +--- scp2/source/ooo/module_hidden_ooo.scp.old 2010-01-21 01:00:35.000000000 +0100 ++++ scp2/source/ooo/module_hidden_ooo.scp 2010-03-03 16:59:44.000000000 +0100 +@@ -867,6 +867,7 @@ Module gid_Module_Root_Files_Images Styles = (HIDDEN_ROOT); Files = (gid_File_Images_Zip, gid_File_ImagesCrystal_Zip, @@ -85,11 +77,10 @@ index 51942be..e311c74 100644 gid_File_ImagesHicontrast_Zip, gid_File_ImagesIndustrial_Zip, gid_File_ImagesTango_Zip, -diff --git svtools/inc/imgdef.hxx svtools/inc/imgdef.hxx -index 6698e0e..1d38b88 100644 ---- svtools/inc/imgdef.hxx -+++ svtools/inc/imgdef.hxx -@@ -47,5 +47,6 @@ enum SfxSymbolsStyle +--- svtools/inc/imgdef.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/inc/imgdef.hxx 2010-03-03 16:59:44.000000000 +0100 +@@ -46,7 +46,8 @@ enum SfxSymbolsStyle + SFX_SYMBOLS_STYLE_INDUSTRIAL, SFX_SYMBOLS_STYLE_CRYSTAL, SFX_SYMBOLS_STYLE_TANGO, - SFX_SYMBOLS_STYLE_CLASSIC @@ -98,62 +89,64 @@ index 6698e0e..1d38b88 100644 }; #define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001 -diff --git svtools/source/config/miscopt.cxx svtools/source/config/miscopt.cxx -index 99a225c..03239dc 100644 ---- svtools/source/config/miscopt.cxx -+++ svtools/source/config/miscopt.cxx -@@ -308,5 +308,6 @@ static sal_Int16 implSymbolsStyleFromVCL( ULONG nStyle ) - case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO; - case STYLE_SYMBOLS_CLASSIC: return SFX_SYMBOLS_STYLE_CLASSIC; +--- svtools/source/config/miscopt.cxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/source/config/miscopt.cxx 2010-03-03 16:59:44.000000000 +0100 +@@ -275,6 +275,7 @@ static sal_Int16 implSymbolsStyleFromVCL + case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL; + case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO; + case STYLE_SYMBOLS_CLASSIC: return SFX_SYMBOLS_STYLE_CLASSIC; + case STYLE_SYMBOLS_OXYGEN: return SFX_SYMBOLS_STYLE_OXYGEN; - } + } - return SFX_SYMBOLS_STYLE_AUTO; -@@ -325,5 +326,6 @@ static ULONG implSymbolsStyleToVCL( sal_Int16 nStyle ) - case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO; - case SFX_SYMBOLS_STYLE_CLASSIC: return STYLE_SYMBOLS_CLASSIC; + return SFX_SYMBOLS_STYLE_AUTO; +@@ -291,6 +292,7 @@ static ULONG implSymbolsStyleToVCL( sal_ + case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL; + case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO; + case SFX_SYMBOLS_STYLE_CLASSIC: return STYLE_SYMBOLS_CLASSIC; + case SFX_SYMBOLS_STYLE_OXYGEN: return STYLE_SYMBOLS_OXYGEN; - } + } - return STYLE_SYMBOLS_AUTO; ---- svx/source/cui/optgdlg.cxx -+++ svx/source/cui/optgdlg.cxx -@@ -818,5 +818,6 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : + return STYLE_SYMBOLS_AUTO; +--- svx/source/cui/optgdlg.cxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/cui/optgdlg.cxx 2010-03-03 16:59:44.000000000 +0100 +@@ -796,6 +796,7 @@ OfaViewTabPage::OfaViewTabPage(Window* p + case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 4 ); break; case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break; case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break; + case STYLE_SYMBOLS_OXYGEN: aAutoStr += aIconStyleLB.GetEntry( 7 ); break; } aIconStyleLB.RemoveEntry( 0 ); -@@ -880,5 +881,6 @@ +@@ -889,6 +890,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxIte + case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break; case 5: eSet = SFX_SYMBOLS_STYLE_TANGO; break; case 6: eSet = SFX_SYMBOLS_STYLE_CLASSIC; break; + case 7: eSet = SFX_SYMBOLS_STYLE_OXYGEN; break; default: DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" ); } -@@ -1052,5 +1054,6 @@ +@@ -1073,6 +1075,7 @@ void OfaViewTabPage::Reset( const SfxIte + case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 4; break; case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 5; break; case SFX_SYMBOLS_STYLE_CLASSIC: nStyleLB_InitialSelection = 6; break; + case SFX_SYMBOLS_STYLE_OXYGEN: nStyleLB_InitialSelection = 7; break; default: nStyleLB_InitialSelection = 0; break; } } - ---- svx/source/cui/optgdlg.src -+++ svx/source/cui/optgdlg.src -@@ -259,5 +259,6 @@ TabPage OFA_TP_VIEW +--- svx/source/cui/optgdlg.src.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/cui/optgdlg.src 2010-03-03 16:59:44.000000000 +0100 +@@ -251,6 +251,7 @@ TabPage OFA_TP_VIEW + < "Crystal" ; > ; < "Tango" ; > ; < "Classic" ; > ; + < "Oxygen" ; > ; }; }; - CheckBox CB_SYSTEM_FONT -diff --git vcl/inc/vcl/settings.hxx vcl/inc/vcl/settings.hxx -index 2cba172..19848c8 100644 ---- vcl/inc/vcl/settings.hxx -+++ vcl/inc/vcl/settings.hxx -@@ -519,6 +519,7 @@ private: + CheckBox CB_SYSTEM_FONT +--- vcl/inc/vcl/settings.hxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/inc/vcl/settings.hxx 2010-03-03 16:59:44.000000000 +0100 +@@ -523,7 +523,8 @@ private: + #define STYLE_SYMBOLS_CRYSTAL ((ULONG)4) #define STYLE_SYMBOLS_TANGO ((ULONG)5) #define STYLE_SYMBOLS_CLASSIC ((ULONG)6) -#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)6) @@ -162,26 +155,27 @@ index 2cba172..19848c8 100644 #define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF) -diff --git vcl/source/app/settings.cxx vcl/source/app/settings.cxx -index f6fcb3e..6ec27f7 100644 ---- vcl/source/app/settings.cxx -+++ vcl/source/app/settings.cxx -@@ -711,5 +711,6 @@ void StyleSettings::Set3DColors( const Color& rColor ) - case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" ); - case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" ); +--- vcl/source/app/settings.cxx.old 2010-03-03 16:59:29.000000000 +0100 ++++ vcl/source/app/settings.cxx 2010-03-03 16:59:44.000000000 +0100 +@@ -707,6 +707,7 @@ void StyleSettings::Set3DColors( const C + case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString::createFromAscii( "crystal" ); + case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" ); + case STYLE_SYMBOLS_CLASSIC: return ::rtl::OUString::createFromAscii( "classic" ); + case STYLE_SYMBOLS_OXYGEN: return ::rtl::OUString::createFromAscii( "oxygen" ); - } + } - return ::rtl::OUString::createFromAscii( "auto" ); -@@ -734,4 +735,6 @@ ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) cons - return STYLE_SYMBOLS_CLASSIC; + return ::rtl::OUString::createFromAscii( "auto" ); +@@ -728,6 +729,8 @@ ULONG StyleSettings::ImplNameToSymbolsSt + return STYLE_SYMBOLS_TANGO; + else if ( rName == ::rtl::OUString::createFromAscii( "classic" ) ) + return STYLE_SYMBOLS_CLASSIC; + else if ( rName == ::rtl::OUString::createFromAscii( "oxygen" ) ) + return STYLE_SYMBOLS_OXYGEN; - return STYLE_SYMBOLS_AUTO; + return STYLE_SYMBOLS_AUTO; } -@@ -856,6 +860,8 @@ ULONG StyleSettings::GetAutoSymbolsStyle() const - nRet = STYLE_SYMBOLS_HUMAN; +@@ -823,6 +826,8 @@ ULONG StyleSettings::GetAutoSymbolsStyle + nRet = STYLE_SYMBOLS_TANGO; else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) ) nRet = STYLE_SYMBOLS_CRYSTAL; + else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde4" ) ) diff --git a/patches/dev300/kde4_vcl_fixes.diff b/patches/dev300/kde4_vcl_fixes.diff index badb24b54..119dc8200 100644 --- a/patches/dev300/kde4_vcl_fixes.diff +++ b/patches/dev300/kde4_vcl_fixes.diff @@ -1,50 +1,35 @@ -diff --git vcl/unx/kde4/KDESalGraphics.cxx vcl/unx/kde4/KDESalGraphics.cxx -index 35b9330..d3baf56 100644 ---- vcl/unx/kde4/KDESalGraphics.cxx -+++ vcl/unx/kde4/KDESalGraphics.cxx -@@ -94,52 +94,35 @@ QRect region2QRect( const Region& rControlRegion ) +--- vcl/unx/kde4/KDESalGraphics.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/unx/kde4/KDESalGraphics.cxx 2010-03-03 16:59:44.000000000 +0100 +@@ -94,53 +94,36 @@ QRect region2QRect( const Region& rContr BOOL KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) { + //don't do a catch all incase new controls are added - if (type == CTRL_PUSHBUTTON) return true; -- -- if (type == CTRL_MENUBAR) return true; -- -- if (type == CTRL_MENU_POPUP) return true; -- -- if (type == CTRL_EDITBOX) return true; -- -- if (type == CTRL_COMBOBOX) return true; -- -- if (type == CTRL_TOOLBAR) return true; -- -- if (type == CTRL_CHECKBOX) return true; -- -- if (type == CTRL_LISTBOX) return true; -- -- if (type == CTRL_LISTNODE) return true; -- -- if (type == CTRL_FRAME) return true; -- -- if (type == CTRL_SCROLLBAR) return true; -- -- if (type == CTRL_WINDOW_BACKGROUND) return true; -- -- if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true; -- -- // no spinbuttons for KDE, paint spinbox complete -- //if (type == CTRL_SPINBUTTONS) return true; -- -- if (type == CTRL_GROUPBOX) return true; -- -- if (type == CTRL_FIXEDLINE) return true; -- -- if (type == CTRL_FIXEDBORDER) return true; -- -- if (type == CTRL_TOOLTIP) return true; -- -- if (type == CTRL_RADIOBUTTON) return true; + if (type == CTRL_PUSHBUTTON) return true; +- +- if (type == CTRL_MENUBAR) return true; +- +- if (type == CTRL_MENU_POPUP) return true; +- +- if (type == CTRL_EDITBOX) return true; +- +- if (type == CTRL_COMBOBOX) return true; +- +- if (type == CTRL_TOOLBAR) return true; +- +- if (type == CTRL_CHECKBOX) return true; +- +- if (type == CTRL_LISTBOX) return true; +- +- if (type == CTRL_LISTNODE) return true; +- +- if (type == CTRL_FRAME) return true; +- +- if (type == CTRL_SCROLLBAR) return true; +- +- if (type == CTRL_WINDOW_BACKGROUND) return true; +- +- if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true; + else if (type == CTRL_MENUBAR) return true; + else if (type == CTRL_MENU_POPUP) return true; + else if (type == CTRL_EDITBOX) return true; @@ -57,40 +42,53 @@ index 35b9330..d3baf56 100644 + else if (type == CTRL_SCROLLBAR) return true; + else if (type == CTRL_WINDOW_BACKGROUND) return true; + else if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true; -+ -+ // no spinbuttons for KDE, paint spinbox complete -+ //if (type == CTRL_SPINBUTTONS) return true; + + // no spinbuttons for KDE, paint spinbox complete + //if (type == CTRL_SPINBUTTONS) return true; +- +- if (type == CTRL_GROUPBOX) return true; +- +- if (type == CTRL_FIXEDLINE) return true; +- +- if (type == CTRL_FIXEDBORDER) return true; +- +- if (type == CTRL_TOOLTIP) return true; +- +- if (type == CTRL_RADIOBUTTON) return true; + + else if (type == CTRL_GROUPBOX) return true; + else if (type == CTRL_FIXEDLINE) return true; + else if (type == CTRL_FIXEDBORDER) return true; + else if (type == CTRL_TOOLTIP) return true; + else if (type == CTRL_RADIOBUTTON) return true; - - return false; - -- if ( (type == CTRL_TAB_ITEM) && (part == PART_ENTIRE_CONTROL) ) return true; -- if ( (type == CTRL_TAB_PANE) && (part == PART_ENTIRE_CONTROL) ) return true; + + return false; + +- if ( (type == CTRL_TAB_ITEM) && (part == PART_ENTIRE_CONTROL) ) return true; +- if ( (type == CTRL_TAB_PANE) && (part == PART_ENTIRE_CONTROL) ) return true; + //if ( (type == CTRL_TAB_ITEM) && (part == PART_ENTIRE_CONTROL) ) return true; + //if ( (type == CTRL_TAB_PANE) && (part == PART_ENTIRE_CONTROL) ) return true; - // no CTRL_TAB_BODY for KDE -- if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true; -- -- return false; + // no CTRL_TAB_BODY for KDE +- if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true; +- +- return false; + //if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true; } -@@ -182,14 +180,15 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, + +@@ -180,19 +163,20 @@ BOOL KDESalGraphics::drawNativeControl( + const ImplControlValue& value, SalControlHandle&, + const OUString& ) { -- // put not implemented types here -- if (type == CTRL_SPINBUTTONS) -- { -- return false; -- } - +- // put not implemented types here +- if (type == CTRL_SPINBUTTONS) +- { +- return false; +- } ++ + if (!IsNativeControlSupported(type, part)) + return false; -+ + BOOL returnVal = true; + SelectFont(); @@ -99,91 +97,102 @@ index 35b9330..d3baf56 100644 Display* dpy = GetXDisplay(); XLIB_Window drawable = GetDrawable(); GC gc = SelectPen(); - -- QRect widgetRect = region2QRect(rControlRegion); + +- QRect widgetRect = region2QRect(rControlRegion); + QRect widgetRect = region2QRect(rControlRegion.GetBoundRect()); -@@ -205,29 +180,12 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, + if( type == CTRL_SPINBOX && part == PART_ALL_BUTTONS ) + type = CTRL_SPINBUTTONS; + if( type == CTRL_SPINBUTTONS ) +@@ -204,30 +188,13 @@ BOOL KDESalGraphics::drawNativeControl( + aButtonRect.Right(), aButtonRect.Bottom() ); } - -- //draw right onto the window - QPixmap pixmap(widgetRect.width(), widgetRect.height()); - -- if (pixmap.isNull()) -- { -- return false; -- } + +- //draw right onto the window + QPixmap pixmap(widgetRect.width(), widgetRect.height()); + +- if (pixmap.isNull()) +- { +- return false; +- } + // always fill the background + // this way we avoid copying the screen contents over to our pixmap + pixmap.fill(KApplication::palette().color(QPalette::Window)); - - QPainter painter(&pixmap); -- // painter.setBackgroundMode(Qt::OpaqueMode); -- -- //copy previous screen contents for proper blending -- #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) ) -- QPixmap screen = QPixmap::fromX11Pixmap(drawable); -- painter.drawPixmap(0,0, screen, widgetRect.left(), widgetRect.top(), widgetRect.width(), widgetRect.height()); -- #else -- const QX11Info& rX11Info( pixmap.x11Info() ); -- X11SalGraphics::CopyScreenArea( dpy, -- drawable, GetScreenNumber(), GetBitCount(), -- pixmap.handle(), rX11Info.screen(), rX11Info.depth(), -- GetDisplay()->GetCopyGC( GetScreenNumber() ), -- widgetRect.left(), widgetRect.top(), widgetRect.width(), widgetRect.height(), -- 0, 0 ); -- #endif - - if (type == CTRL_PUSHBUTTON) - { -@@ -248,9 +222,8 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - - kapp->style()->drawControl( QStyle::CE_MenuBarItem, &styleOption, &painter); - } -- else + + QPainter painter(&pixmap); +- // painter.setBackgroundMode(Qt::OpaqueMode); +- +- //copy previous screen contents for proper blending +- #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) ) +- QPixmap screen = QPixmap::fromX11Pixmap(drawable); +- painter.drawPixmap(0,0, screen, widgetRect.left(), widgetRect.top(), widgetRect.width(), widgetRect.height()); +- #else +- const QX11Info& rX11Info( pixmap.x11Info() ); +- X11SalGraphics::CopyScreenArea( dpy, +- drawable, GetScreenNumber(), GetBitCount(), +- pixmap.handle(), rX11Info.screen(), rX11Info.depth(), +- GetDisplay()->GetCopyGC( GetScreenNumber() ), +- widgetRect.left(), widgetRect.top(), widgetRect.width(), widgetRect.height(), +- 0, 0 ); +- #endif + + if (type == CTRL_PUSHBUTTON) + { +@@ -249,9 +216,8 @@ BOOL KDESalGraphics::drawNativeControl( + + kapp->style()->drawControl( QStyle::CE_MenuBarItem, &styleOption, &painter); + } +- else + else if (part == PART_ENTIRE_CONTROL) - { -- pixmap.fill(KApplication::palette().color(QPalette::Window)); - } - } - else if (type == CTRL_MENU_POPUP) -@@ -239,7 +263,6 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - } - else - { -- pixmap.fill(KApplication::palette().color(QPalette::Window)); - - #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) ) - QStyleOptionFrameV3 styleOption; -@@ -310,39 +263,45 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - } -- else if ( (type == CTRL_TOOLBAR) && (part == PART_BUTTON) ) + { +- pixmap.fill(KApplication::palette().color(QPalette::Window)); + } + } + else if (type == CTRL_MENU_POPUP) +@@ -291,7 +257,6 @@ BOOL KDESalGraphics::drawNativeControl( + } + else + { +- pixmap.fill(KApplication::palette().color(QPalette::Window)); + + #if ( QT_VERSION >= QT_VERSION_CHECK( 4, 5, 0 ) ) + QStyleOptionFrameV3 styleOption; +@@ -308,42 +273,48 @@ BOOL KDESalGraphics::drawNativeControl( + kapp->style()->drawPrimitive( QStyle::PE_FrameMenu, &styleOption, &painter); + } + } +- else if ( (type == CTRL_TOOLBAR) && (part == PART_BUTTON) ) - { -- QStyleOptionToolButton styleOption; -- -- styleOption.arrowType = Qt::NoArrow; -- styleOption.subControls = QStyle::SC_ToolButton; -- -- styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); -- styleOption.state = vclStateValue2StateFlag( nControlState, value ); -- styleOption.state |= QStyle::State_Raised | QStyle::State_Enabled | QStyle::State_AutoRaise; -- -- kapp->style()->drawComplexControl( QStyle::CC_ToolButton, &styleOption, &painter); +- QStyleOptionToolButton styleOption; +- +- styleOption.arrowType = Qt::NoArrow; +- styleOption.subControls = QStyle::SC_ToolButton; +- +- styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); +- styleOption.state = vclStateValue2StateFlag( nControlState, value ); +- styleOption.state |= QStyle::State_Raised | QStyle::State_Enabled | QStyle::State_AutoRaise; +- +- kapp->style()->drawComplexControl( QStyle::CC_ToolButton, &styleOption, &painter); - } -- else if ( (type == CTRL_TOOLBAR) && (part == PART_ENTIRE_CONTROL) ) +- else if ( (type == CTRL_TOOLBAR) && (part == PART_ENTIRE_CONTROL) ) +- { +- QStyleOptionToolBar styleOption; +- +- styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); +- styleOption.state = vclStateValue2StateFlag( nControlState, value ); +- +- kapp->style()->drawControl( QStyle::CE_ToolBar, &styleOption, &painter); +- } +- else if ( (type == CTRL_TOOLBAR) && (part == PART_THUMB_VERT) ) + else if (type == CTRL_TOOLBAR) { -- QStyleOptionToolBar styleOption; -- -- styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); -- styleOption.state = vclStateValue2StateFlag( nControlState, value ); -- -- kapp->style()->drawControl( QStyle::CE_ToolBar, &styleOption, &painter); -- } -- else if ( (type == CTRL_TOOLBAR) && (part == PART_THUMB_VERT) ) -- { - QStyleOption styleOption; -- -- int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent); +- +- int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent); +- +- styleOption.rect = QRect(0, 0, width, widgetRect.height()); +- styleOption.state = QStyle::State_Horizontal; +- +- kapp->style()->drawPrimitive( QStyle::PE_IndicatorToolBarHandle, &styleOption, &painter); + if (part == PART_BUTTON) + { + QStyleOptionToolButton styleOption; @@ -200,9 +209,7 @@ index 35b9330..d3baf56 100644 + else if (part == PART_THUMB_VERT) + { + QStyleOption styleOption; - -- styleOption.rect = QRect(0, 0, width, widgetRect.height()); -- styleOption.state = QStyle::State_Horizontal; ++ + int width = kapp->style()->pixelMetric(QStyle::PM_ToolBarHandleExtent); + + styleOption.rect = QRect(0, 0, width, widgetRect.height()); @@ -213,8 +220,7 @@ index 35b9330..d3baf56 100644 + else if (part == PART_ENTIRE_CONTROL) + { + QStyleOptionToolBar styleOption; - -- kapp->style()->drawPrimitive( QStyle::PE_IndicatorToolBarHandle, &styleOption, &painter); ++ + styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); + styleOption.state = vclStateValue2StateFlag( nControlState, value ); + @@ -225,105 +231,87 @@ index 35b9330..d3baf56 100644 + returnVal = false; + } } - else if (type == CTRL_EDITBOX) - { -- pixmap.fill(KApplication::palette().color(QPalette::Window)); - - //TODO hover?? OO does not seem to do this for line edits -@@ -302,7 +342,6 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - } - else if (type == CTRL_COMBOBOX) - { -- pixmap.fill(KApplication::palette().color(QPalette::Window)); - - QStyleOptionComboBox styleOption; - -@@ -315,19 +354,26 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - } - else if (type == CTRL_LISTBOX) - { -- QStyleOptionComboBox styleOption; -- -- styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); -- styleOption.state = vclStateValue2StateFlag( nControlState, value ); -- -- if (part == PART_SUB_EDIT) -- { -- kapp->style()->drawControl(QStyle::CE_ComboBoxLabel, &styleOption, &painter); -- } -- else -- { -- kapp->style()->drawComplexControl(QStyle::CC_ComboBox, &styleOption, &painter); -- } + else if (type == CTRL_EDITBOX) + { +- pixmap.fill(KApplication::palette().color(QPalette::Window)); + + //TODO hover?? OO does not seem to do this for line edits + +@@ -364,7 +335,6 @@ BOOL KDESalGraphics::drawNativeControl( + } + else if (type == CTRL_COMBOBOX) + { +- pixmap.fill(KApplication::palette().color(QPalette::Window)); + + QStyleOptionComboBox styleOption; + +@@ -383,6 +353,12 @@ BOOL KDESalGraphics::drawNativeControl( + } + else + { + if( part == PART_WINDOW ) + { + lcl_drawFrame( widgetRect, painter, QStyle::PE_Frame, nControlState, value ); + } + else + { -+ QStyleOptionComboBox styleOption; -+ -+ styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); -+ styleOption.state = vclStateValue2StateFlag( nControlState, value ); -+ -+ if (part == PART_SUB_EDIT) -+ { -+ kapp->style()->drawControl(QStyle::CE_ComboBoxLabel, &styleOption, &painter); -+ } -+ else -+ { -+ kapp->style()->drawComplexControl(QStyle::CC_ComboBox, &styleOption, &painter); -+ } + QStyleOptionComboBox styleOption; + + styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); +@@ -397,6 +373,7 @@ BOOL KDESalGraphics::drawNativeControl( + kapp->style()->drawComplexControl(QStyle::CC_ComboBox, &styleOption, &painter); + } + } + } - } - else if (type == CTRL_LISTNODE) - { -@@ -357,8 +403,6 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - } - else if (type == CTRL_SCROLLBAR) - { -- pixmap.fill(KApplication::palette().color(QPalette::Window)); -- - if ((part == PART_DRAW_BACKGROUND_VERT) || (part == PART_DRAW_BACKGROUND_HORZ)) - { - ScrollbarValue* sbVal = static_cast<ScrollbarValue *> ( value.getOptionalVal() ); -@@ -401,7 +445,5 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - } - else if (type == CTRL_SPINBOX) - { -- pixmap.fill(KApplication::palette().color(QPalette::Window)); -- - QStyleOptionSpinBox styleOption; - styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); -@@ -448,6 +486,5 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - else if (type == CTRL_WINDOW_BACKGROUND) - { -- pixmap.fill(KApplication::palette().color(QPalette::Window)); - } - else if (type == CTRL_FIXEDLINE) - { -@@ -491,7 +518,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - drawable, GetScreenNumber(), GetVisual().GetDepth(), gc, - 0, 0, widgetRect.width(), widgetRect.height(), widgetRect.left(), widgetRect.top() ); - } + } + else if (type == CTRL_LISTNODE) + { +@@ -426,8 +403,6 @@ BOOL KDESalGraphics::drawNativeControl( + } + else if (type == CTRL_SCROLLBAR) + { +- pixmap.fill(KApplication::palette().color(QPalette::Window)); +- + if ((part == PART_DRAW_BACKGROUND_VERT) || (part == PART_DRAW_BACKGROUND_HORZ)) + { + ScrollbarValue* sbVal = static_cast<ScrollbarValue *> ( value.getOptionalVal() ); +@@ -470,8 +445,6 @@ BOOL KDESalGraphics::drawNativeControl( + } + else if (type == CTRL_SPINBOX) + { +- pixmap.fill(KApplication::palette().color(QPalette::Window)); +- + QStyleOptionSpinBox styleOption; + styleOption.rect = QRect(0, 0, widgetRect.width(), widgetRect.height()); + styleOption.state = vclStateValue2StateFlag( nControlState, value ); +@@ -521,7 +494,6 @@ BOOL KDESalGraphics::drawNativeControl( + } + else if (type == CTRL_WINDOW_BACKGROUND) + { +- pixmap.fill(KApplication::palette().color(QPalette::Window)); + } + else if (type == CTRL_FIXEDLINE) + { +@@ -546,7 +518,7 @@ BOOL KDESalGraphics::drawNativeControl( + drawable, GetScreenNumber(), GetVisual().GetDepth(), gc, + 0, 0, widgetRect.width(), widgetRect.height(), widgetRect.left(), widgetRect.top() ); + } - + return returnVal; } -@@ -503,7 +530,7 @@ BOOL KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, +@@ -558,7 +530,7 @@ BOOL KDESalGraphics::getNativeControlReg { bool retVal = false; - + - QRect boundingRect = region2QRect( controlRegion ); + QRect boundingRect = region2QRect( controlRegion.GetBoundRect() ); QRect contentRect = boundingRect; QStyleOptionComplex styleOption; - -diff --git vcl/unx/kde4/KDEXLib.cxx vcl/unx/kde4/KDEXLib.cxx -index 1e4e367..f7bf04f 100644 ---- vcl/unx/kde4/KDEXLib.cxx -+++ vcl/unx/kde4/KDEXLib.cxx + +--- vcl/unx/kde4/KDEXLib.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/unx/kde4/KDEXLib.cxx 2010-03-03 16:59:44.000000000 +0100 @@ -34,6 +34,7 @@ #include <kaboutdata.h> #include <kcmdlineargs.h> @@ -336,24 +324,22 @@ index 1e4e367..f7bf04f 100644 KDEXLib::~KDEXLib() { -- delete (VCLKDEApplication*)m_pApplication; +- delete (VCLKDEApplication*)m_pApplication; + delete m_pApplication; - + // free the faked cmdline arguments no longer needed by KApplication for( int i = 0; i < m_nFakeCmdLineArgs; i++ ) -@@ -146,7 +147,7 @@ void KDEXLib::Init() - Display* pDisp = QX11Info::display(); - SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp); - -- ((VCLKDEApplication*)m_pApplication)->disp = pSalDisplay; +@@ -139,7 +140,7 @@ void KDEXLib::Init() + Display* pDisp = QX11Info::display(); + SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp); + +- ((VCLKDEApplication*)m_pApplication)->disp = pSalDisplay; + m_pApplication->disp = pSalDisplay; - XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl ); - XSetErrorHandler ( (XErrorHandler)X11SalData::XErrorHdl ); -diff --git vcl/unx/kde4/KDEXLib.hxx vcl/unx/kde4/KDEXLib.hxx -index 09a6197..7cd341f 100644 ---- vcl/unx/kde4/KDEXLib.hxx -+++ vcl/unx/kde4/KDEXLib.hxx + XSetIOErrorHandler ( (XIOErrorHandler)X11SalData::XIOErrorHdl ); + XSetErrorHandler ( (XErrorHandler)X11SalData::XErrorHdl ); +--- vcl/unx/kde4/KDEXLib.hxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/unx/kde4/KDEXLib.hxx 2010-03-03 16:59:44.000000000 +0100 @@ -29,11 +29,13 @@ #include <saldisp.hxx> @@ -362,17 +348,15 @@ index 09a6197..7cd341f 100644 + class KDEXLib : public SalXLib { - private: - bool m_bStartupDone; -- void* m_pApplication; + private: + bool m_bStartupDone; +- void* m_pApplication; + VCLKDEApplication* m_pApplication; - char** m_pFreeCmdLineArgs; - char** m_pAppCmdLineArgs; - int m_nFakeCmdLineArgs; -diff --git vcl/unx/kde4/VCLKDEApplication.cxx vcl/unx/kde4/VCLKDEApplication.cxx -index ff44d1b..4c4587b 100644 ---- vcl/unx/kde4/VCLKDEApplication.cxx -+++ vcl/unx/kde4/VCLKDEApplication.cxx + char** m_pFreeCmdLineArgs; + char** m_pAppCmdLineArgs; + int m_nFakeCmdLineArgs; +--- vcl/unx/kde4/VCLKDEApplication.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/unx/kde4/VCLKDEApplication.cxx 2010-03-03 16:59:44.000000000 +0100 @@ -41,6 +41,9 @@ VCLKDEApplication::VCLKDEApplication() : bool VCLKDEApplication::x11EventFilter(XEvent* event) @@ -380,6 +364,6 @@ index ff44d1b..4c4587b 100644 + disp->DispatchInternalEvent(); + disp->GetXLib()->CheckTimeout(true); + - //if we have a display and the display consumes the event - //do not process the event in qt - if (disp && disp->Dispatch(event) > 0) + //if we have a display and the display consumes the event + //do not process the event in qt + if (disp && disp->Dispatch(event) > 0) diff --git a/patches/dev300/layout-disable-experimental.diff b/patches/dev300/layout-disable-experimental.diff index 7cd679727..992e3d15e 100644 --- a/patches/dev300/layout-disable-experimental.diff +++ b/patches/dev300/layout-disable-experimental.diff @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- configure.in.old 2010-03-03 16:59:48.000000000 +0100 ++++ configure.in 2010-03-03 16:59:48.000000000 +0100 @@ -248,6 +248,10 @@ AC_ARG_ENABLE(static-gtk, AC_ARG_ENABLE(layout, [ --disable-layout Disable the compilation and use of layout dialogs @@ -11,7 +11,7 @@ AC_ARG_ENABLE(build-mozilla, [ --disable-build-mozilla Use this option if you do not want to build the mozilla components from the mozilla source code but -@@ -6650,6 +6654,16 @@ else +@@ -6947,6 +6951,16 @@ else fi AC_SUBST(ENABLE_LAYOUT) @@ -28,13 +28,13 @@ # =================================================================== # De- or increase default verbosity of build process # =================================================================== ---- set_soenv.in -+++ set_soenv.in -@@ -1906,6 +1906,7 @@ +--- set_soenv.in.old 2010-03-03 16:59:46.000000000 +0100 ++++ set_soenv.in 2010-03-03 16:59:48.000000000 +0100 +@@ -1830,6 +1830,7 @@ ToFile( "ENABLE_RANDR", "@ENABLE_RA ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" ); ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" ); ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" ); +ToFile( "ENABLE_LAYOUT_EXPERIMENTAL", "@ENABLE_LAYOUT_EXPERIMENTAL@", "e" ); ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" ); ToFile( "NO_HIDS", "@NO_HIDS@", "e" ); - ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" ); + ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e"); diff --git a/patches/dev300/link-as-needed.diff b/patches/dev300/link-as-needed.diff index 626dbb3c0..fd3cb9c1a 100644 --- a/patches/dev300/link-as-needed.diff +++ b/patches/dev300/link-as-needed.diff @@ -1,7 +1,7 @@ ---- configure.in.old 2009-06-24 21:13:57.000000000 +0200 -+++ configure.in 2009-06-25 15:05:45.000000000 +0200 -@@ -1622,6 +1622,26 @@ fi - AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS) +--- configure.in.old 2010-03-03 16:59:27.000000000 +0100 ++++ configure.in 2010-03-03 16:59:28.000000000 +0100 +@@ -1661,6 +1661,26 @@ AC_SUBST(HAVE_LD_HASH_STYLE) + AC_SUBST(WITH_LINKER_HASH_STYLE) dnl =================================================================== +dnl Check for -Wl,--as-needed linker support @@ -27,20 +27,19 @@ dnl Test the IRIX SGI Mips pro compiler dnl =================================================================== if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then ---- set_soenv.in.old 2009-06-24 18:41:31.000000000 +0200 -+++ set_soenv.in 2009-06-24 21:21:56.000000000 +0200 -@@ -1894,6 +1894,8 @@ ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_H +--- set_soenv.in.old 2010-03-03 16:59:27.000000000 +0100 ++++ set_soenv.in 2010-03-03 16:59:28.000000000 +0100 +@@ -1805,6 +1805,8 @@ ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_H ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" ); ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS", "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" ); +ToFile( "HAVE_WORKING_LD_AS_NEEDED", + "@HAVE_WORKING_LD_AS_NEEDED@","e" ); ToFile( "CXX", $CXX, "e" ); + ToFile( "USE_CCACHE", "@USE_CCACHE@", "e" ); ToFile( "MINGWCXX", "@MINGWCXX@", "e" ); - ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" ); -diff -purN solenv.old/inc/unxbsdi2.mk solenv/inc/unxbsdi2.mk ---- solenv.old/inc/unxbsdi2.mk 2008-07-11 16:43:37.000000000 +0200 -+++ solenv/inc/unxbsdi2.mk 2009-06-24 21:38:44.000000000 +0200 +--- solenv/inc/unxbsdi2.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/unxbsdi2.mk 2010-03-03 16:59:28.000000000 +0100 @@ -128,6 +128,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= @@ -51,9 +50,8 @@ diff -purN solenv.old/inc/unxbsdi2.mk solenv/inc/unxbsdi2.mk # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -diff -purN solenv.old/inc/unxbsdi.mk solenv/inc/unxbsdi.mk ---- solenv.old/inc/unxbsdi.mk 2008-04-10 19:45:44.000000000 +0200 -+++ solenv/inc/unxbsdi.mk 2009-06-24 21:29:07.000000000 +0200 +--- solenv/inc/unxbsdi.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/unxbsdi.mk 2010-03-03 16:59:28.000000000 +0100 @@ -108,6 +108,9 @@ DYNAMIC = -Wl,-Bdynamic LINK*=gcc # default linker flags @@ -64,9 +62,8 @@ diff -purN solenv.old/inc/unxbsdi.mk solenv/inc/unxbsdi.mk # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -diff -purN solenv.old/inc/unxfbsd.mk solenv/inc/unxfbsd.mk ---- solenv.old/inc/unxfbsd.mk 2008-07-11 16:43:50.000000000 +0200 -+++ solenv/inc/unxfbsd.mk 2009-06-24 21:26:25.000000000 +0200 +--- solenv/inc/unxfbsd.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/unxfbsd.mk 2010-03-03 16:59:28.000000000 +0100 @@ -150,6 +150,9 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$O LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= @@ -77,9 +74,8 @@ diff -purN solenv.old/inc/unxfbsd.mk solenv/inc/unxfbsd.mk # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -diff -purN solenv.old/inc/unxirgm.mk solenv/inc/unxirgm.mk ---- solenv.old/inc/unxirgm.mk 2008-04-10 19:47:57.000000000 +0200 -+++ solenv/inc/unxirgm.mk 2009-06-24 21:33:53.000000000 +0200 +--- solenv/inc/unxirgm.mk.old 2009-10-07 15:06:50.000000000 +0200 ++++ solenv/inc/unxirgm.mk 2010-03-03 16:59:28.000000000 +0100 @@ -96,6 +96,9 @@ DYNAMIC= -Wl,-Bdynamic # LINK= g++ @@ -90,9 +86,8 @@ diff -purN solenv.old/inc/unxirgm.mk solenv/inc/unxirgm.mk LINKVERSIONMAPFLAG= -Wl,-exports_file LINKFLAGSAPPGUI= $(THREADLIB) -diff -purN solenv.old/inc/unxirxm3.mk solenv/inc/unxirxm3.mk ---- solenv.old/inc/unxirxm3.mk 2008-04-10 19:48:32.000000000 +0200 -+++ solenv/inc/unxirxm3.mk 2009-06-24 21:33:59.000000000 +0200 +--- solenv/inc/unxirxm3.mk.old 2009-10-07 15:06:50.000000000 +0200 ++++ solenv/inc/unxirxm3.mk 2010-03-03 16:59:28.000000000 +0100 @@ -96,6 +96,9 @@ DYNAMIC= -Wl,-Bdynamic # LINK= CC @@ -103,11 +98,9 @@ diff -purN solenv.old/inc/unxirxm3.mk solenv/inc/unxirxm3.mk LINKVERSIONMAPFLAG= -Wl,-exports_file LINKFLAGSAPPGUI= $(THREADLIB) -Index: unxlng.mk -=================================================================== ---- solenv/inc/unxlng.mk (Revision 276754) -+++ solenv/inc/unxlng.mk (Arbeitskopie) -@@ -161,6 +161,9 @@ +--- solenv/inc/unxlng.mk.old 2010-03-03 16:59:27.000000000 +0100 ++++ solenv/inc/unxlng.mk 2010-03-03 16:59:28.000000000 +0100 +@@ -161,6 +161,9 @@ LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,comb .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE" LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo .ENDIF @@ -117,10 +110,9 @@ Index: unxlng.mk # linker flags for linking applications LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ -diff -purN solenv.old/inc/unxmacx.mk solenv/inc/unxmacx.mk ---- solenv.old/inc/unxmacx.mk 2009-06-24 18:41:22.000000000 +0200 -+++ solenv/inc/unxmacx.mk 2009-06-24 21:38:13.000000000 +0200 -@@ -206,6 +206,10 @@ LINKFLAGSRUNPATH_OXT= +--- solenv/inc/unxmacx.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/unxmacx.mk 2010-03-03 16:59:28.000000000 +0100 +@@ -213,6 +213,10 @@ LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= LINKFLAGS=$(LINKFLAGSDEFS) @@ -130,10 +122,9 @@ diff -purN solenv.old/inc/unxmacx.mk solenv/inc/unxmacx.mk + # [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line .IF "$(GUIBASE)" == "aqua" - LINKFLAGS+=-lobjc -diff -purN solenv.old/inc/unxsogi.mk solenv/inc/unxsogi.mk ---- solenv.old/inc/unxsogi.mk 2008-04-10 19:53:35.000000000 +0200 -+++ solenv/inc/unxsogi.mk 2009-06-24 21:34:31.000000000 +0200 + LINKFLAGS+=-lobjc +--- solenv/inc/unxsogi.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/unxsogi.mk 2010-03-03 16:59:28.000000000 +0100 @@ -82,6 +82,10 @@ LINK*=$(CXX) LINKC*=$(CC) @@ -145,9 +136,8 @@ diff -purN solenv.old/inc/unxsogi.mk solenv/inc/unxsogi.mk LINKFLAGSAPPGUI=-Wl,-export-dynamic LINKFLAGSSHLGUI=-shared LINKFLAGSAPPCUI=-Wl,-export-dynamic -diff -purN solenv.old/inc/unxsoli4.mk solenv/inc/unxsoli4.mk ---- solenv.old/inc/unxsoli4.mk 2008-12-30 15:48:34.000000000 +0100 -+++ solenv/inc/unxsoli4.mk 2009-06-24 21:27:02.000000000 +0200 +--- solenv/inc/unxsoli4.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/unxsoli4.mk 2010-03-03 16:59:28.000000000 +0100 @@ -144,6 +144,9 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$O LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= @@ -158,9 +148,8 @@ diff -purN solenv.old/inc/unxsoli4.mk solenv/inc/unxsoli4.mk LINKCFLAGS=-w -mt -z combreloc -norunpath # -z text force fatal error if non PIC code is linked into shared library. Such code -diff -purN solenv.old/inc/unxsols4.mk solenv/inc/unxsols4.mk ---- solenv.old/inc/unxsols4.mk 2008-12-30 15:48:34.000000000 +0100 -+++ solenv/inc/unxsols4.mk 2009-06-24 21:34:43.000000000 +0200 +--- solenv/inc/unxsols4.mk.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/inc/unxsols4.mk 2010-03-03 16:59:28.000000000 +0100 @@ -150,6 +150,9 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$O LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_NONE= @@ -171,9 +160,8 @@ diff -purN solenv.old/inc/unxsols4.mk solenv/inc/unxsols4.mk LINKCFLAGS=-w -mt -z combreloc -norunpath # -z text force fatal error if non PIC code is linked into shared library. Such code -diff -purN solenv.old/inc/unxsolu4.mk solenv/inc/unxsolu4.mk ---- solenv.old/inc/unxsolu4.mk 2008-08-27 15:38:26.000000000 +0200 -+++ solenv/inc/unxsolu4.mk 2009-06-24 21:25:30.000000000 +0200 +--- solenv/inc/unxsolu4.mk.old 2009-10-19 13:27:59.000000000 +0200 ++++ solenv/inc/unxsolu4.mk 2010-03-03 16:59:28.000000000 +0100 @@ -143,6 +143,9 @@ LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$O LINKFLAGSRUNPATH_OXT= LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=stlport4 @@ -184,35 +172,33 @@ diff -purN solenv.old/inc/unxsolu4.mk solenv/inc/unxsolu4.mk # -z text force fatal error if non PIC code is linked into shared library. Such code # would be expensive on startup ---- unodevtools/source/skeletonmaker/makefile.mk 11 Apr 2008 12:33:12 -0000 1.5 -+++ unodevtools/source/skeletonmaker/makefile.mk 22 May 2008 15:46:32 -0000 -@@ -51,8 +51,9 @@ +--- unodevtools/source/skeletonmaker/makefile.mk.old 2009-10-07 15:06:07.000000000 +0200 ++++ unodevtools/source/skeletonmaker/makefile.mk 2010-03-03 16:59:28.000000000 +0100 +@@ -53,8 +53,9 @@ APP1OBJS = $(OBJ)$/skeletonmaker.obj \ APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \ - $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN) + $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN) -APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \ -- $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST) +- $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST) +APP1STDLIBS =\ + $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)\ + $(REGLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(SALLIB) OBJFILES = $(APP1OBJS) -diff --git svx/util/makefile.mk svx/util/makefile.mk -index 4598098..d5de0b6 100644 ---- svx/util/makefile.mk -+++ svx/util/makefile.mk -@@ -172,7 +172,6 @@ SHL2STDLIBS= \ +--- svx/util/makefile.mk.old 2009-10-08 16:17:56.000000000 +0200 ++++ svx/util/makefile.mk 2010-03-03 16:59:28.000000000 +0100 +@@ -234,7 +234,6 @@ SHL3STDLIBS= \ $(I18NISOLANGLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ -- $(CPPUHELPERLIB) \ - $(CPPULIB) \ + $(COMPHELPERLIB) \ + $(UCBHELPERLIB) \ +- $(CPPUHELPERLIB) \ + $(CPPULIB) \ $(VOSLIB) \ $(SALLIB) \ -@@ -181,6 +181,7 @@ +@@ -248,6 +247,7 @@ SHL2STDLIBS += $(CPPUHELPERLIB) .IF "$(GUI)"=="WNT" - SHL2STDLIBS+= \ + SHL3STDLIBS+= \ $(SHLWAPILIB) \ + $(CPPUHELPERLIB) \ $(ADVAPI32LIB) diff --git a/patches/dev300/linkoo-dev300.diff b/patches/dev300/linkoo-dev300.diff index 5c3d4b667..e640cb58b 100644 --- a/patches/dev300/linkoo-dev300.diff +++ b/patches/dev300/linkoo-dev300.diff @@ -90,5 +90,5 @@ index fab6f23..40db374 100755 + print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n"; + open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!"; print $ooenv $env_script; + print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n"; close ($ooenv); - } diff --git a/patches/dev300/novell-win32-agfa-monotype-fonts.diff b/patches/dev300/novell-win32-agfa-monotype-fonts.diff index 4e72d0365..6a997afaf 100644 --- a/patches/dev300/novell-win32-agfa-monotype-fonts.diff +++ b/patches/dev300/novell-win32-agfa-monotype-fonts.diff @@ -1,6 +1,6 @@ ---- configure.in -+++ configure.in -@@ -75,6 +75,11 @@ +--- configure.in.old 2010-03-03 16:59:08.000000000 +0100 ++++ configure.in 2010-03-03 16:59:22.000000000 +0100 +@@ -90,6 +90,11 @@ AC_ARG_WITH(afms, distributions where AFM files or TrueType Fonts are known to be available. ],,) @@ -12,7 +12,7 @@ AC_ARG_ENABLE(epm, [ --disable-epm OO.o includes self-packaging code, that requires epm, however epm is useless for large scale -@@ -4317,6 +4322,18 @@ +@@ -6347,6 +6352,18 @@ else fi AC_SUBST(WITH_FONTS) @@ -31,8 +31,8 @@ dnl =================================================================== dnl Test whether to include ppds dnl =================================================================== ---- agfa_monotype_fonts/makefile.mk.OLD 1970-01-01 02:00:00.000000000 +0200 -+++ agfa_monotype_fonts/makefile.mk 2005-11-23 05:07:41.015625000 +0200 +--- agfa_monotype_fonts/makefile.mk.old 2010-03-03 16:59:22.000000000 +0100 ++++ agfa_monotype_fonts/makefile.mk 2010-03-03 16:59:22.000000000 +0100 @@ -0,0 +1,78 @@ +#************************************************************************* +# @@ -112,20 +112,20 @@ +$(MISC)$/remove_build.flag : $(PATCH_FILE_NAME) + $(REMOVE_PACKAGE_COMMAND) + +$(TOUCH) $(MISC)$/remove_build.flag ---- agfa_monotype_fonts/prj/d.lst.OLD 1970-01-01 02:00:00.000000000 +0200 -+++ agfa_monotype_fonts/prj/d.lst 2005-11-23 04:52:41.531250000 +0200 +--- agfa_monotype_fonts/prj/d.lst.old 2010-03-03 16:59:22.000000000 +0100 ++++ agfa_monotype_fonts/prj/d.lst 2010-03-03 16:59:22.000000000 +0100 @@ -0,0 +1,2 @@ +mkdir: %_DEST%\pck%_EXT% +..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf ---- agfa_monotype_fonts/prj/build.lst.OLD 1970-01-01 02:00:00.000000000 +0200 -+++ agfa_monotype_fonts/prj/build.lst 2005-11-22 12:05:42.843750000 +0200 +--- agfa_monotype_fonts/prj/build.lst.old 2010-03-03 16:59:22.000000000 +0100 ++++ agfa_monotype_fonts/prj/build.lst 2010-03-03 16:59:22.000000000 +0100 @@ -0,0 +1,3 @@ +bs agfa_monotype_fonts : solenv NULL +bs agfa_monotype_fonts usr1 - all amt_mkout NULL +bs agfa_monotype_fonts nmake - all amt_fonts NULL ---- scp2/source/ooo/file_font_ooo.scp.OLD 2005-09-09 04:37:10.000000000 +0300 -+++ scp2/source/ooo/file_font_ooo.scp 2005-11-23 05:08:35.375000000 +0200 -@@ -209,3 +209,30 @@ +--- scp2/source/ooo/file_font_ooo.scp.old 2009-10-08 16:17:46.000000000 +0200 ++++ scp2/source/ooo/file_font_ooo.scp 2010-03-03 16:59:22.000000000 +0100 +@@ -209,3 +209,30 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookB STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic) #endif @@ -156,11 +156,11 @@ +STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT) +#endif +#endif ---- postprocess/prj/build.lst 2005-11-23 05:56:34.703125000 +0200 -+++ postprocess/prj/build.lst 2005-11-23 05:56:48.812500000 +0200 +--- postprocess/prj/build.lst.old 2009-11-20 11:39:32.000000000 +0100 ++++ postprocess/prj/build.lst 2010-03-03 16:59:22.000000000 +0100 @@ -1,4 +1,4 @@ -po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL +po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL - po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL + po postprocess\checkdeliver nmake - all po_checkdlv NULL diff --git a/patches/dev300/novell-win32-odma.diff b/patches/dev300/novell-win32-odma.diff index 6a5c25b2d..a3d529964 100644 --- a/patches/dev300/novell-win32-odma.diff +++ b/patches/dev300/novell-win32-odma.diff @@ -1,12 +1,12 @@ ---- ucb/prj/build.lst.old 2009-04-06 16:42:15.000000000 +0000 -+++ ucb/prj/build.lst 2009-04-06 16:42:16.000000000 +0000 +--- ucb/prj/build.lst.old 2010-03-03 16:59:55.000000000 +0100 ++++ ucb/prj/build.lst 2010-03-03 16:59:55.000000000 +0100 @@ -14,3 +14,4 @@ uc ucb\source\ucp\webdav nmake - all uc uc ucb\source\ucp\package nmake - all uc_package uc_inc NULL uc ucb\source\ucp\tdoc nmake - all uc_tdoc uc_inc NULL uc ucb\source\ucp\expand nmake - all uc_expand uc_inc NULL +uc ucb\source\ucp\odma nmake - w uc_odma uc_inc NULL ---- ucb/prj/d.lst.old 2009-04-02 11:01:40.000000000 +0000 -+++ ucb/prj/d.lst 2009-04-06 16:42:16.000000000 +0000 +--- ucb/prj/d.lst.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/prj/d.lst 2010-03-03 16:59:55.000000000 +0100 @@ -23,6 +23,11 @@ ..\%__SRC%\lib\ucp*.uno.dylib %_DEST%\lib%_EXT%\ucp*.uno.dylib ..\%__SRC%\misc\ucp*.map %_DEST%\bin%_EXT%\ucp*.map @@ -19,19 +19,19 @@ ..\source\ucp\file\ucpfile.xml %_DEST%\xml%_EXT%\ucpfile.xml ..\source\ucp\ftp\ucpftp.xml %_DEST%\xml%_EXT%\ucpftp.xml ..\source\ucp\hierarchy\ucphier.xml %_DEST%\xml%_EXT%\ucphier.xml ---- ucb/source/ucp/odma/makefile.mk.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/makefile.mk 2009-04-06 16:42:16.000000000 +0000 +--- ucb/source/ucp/odma/makefile.mk.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/makefile.mk 2010-03-03 16:59:55.000000000 +0100 @@ -51,7 +51,7 @@ LIBTARGET=NO # --- General ----------------------------------------------------- -SLOFILES=\ +SLO1FILES=\ - $(SLO)$/odma_lib.obj \ - $(SLO)$/odma_services.obj \ - $(SLO)$/odma_provider.obj \ + $(SLO)$/odma_lib.obj \ + $(SLO)$/odma_services.obj \ + $(SLO)$/odma_provider.obj \ @@ -62,7 +62,7 @@ SLOFILES=\ - $(SLO)$/odma_contentcaps.obj + $(SLO)$/odma_contentcaps.obj LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) @@ -53,88 +53,81 @@ # --- Targets ---------------------------------------------------------- .INCLUDE: target.mk ---- ucb/source/ucp/odma/odma_content.cxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_content.cxx 2009-04-06 16:42:16.000000000 +0000 +--- ucb/source/ucp/odma/odma_content.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_content.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -474,6 +474,12 @@ uno::Any SAL_CALL Content::execute( } - else if( ! aCommand.Name.compareToAscii( "transfer" ) ) - { + else if( ! aCommand.Name.compareToAscii( "transfer" ) ) + { + // So far I have determined that this command is called when + // doing "Save As" to copy an already written backup copy of + // the document in the file system into the DMS. + + // Maybe also in other situations. + - ucb::TransferInfo aTransferInfo; - if( ! ( aCommand.Argument >>= aTransferInfo ) ) - { + ucb::TransferInfo aTransferInfo; + if( ! ( aCommand.Argument >>= aTransferInfo ) ) + { @@ -489,84 +495,21 @@ uno::Any SAL_CALL Content::execute( - ::rtl::Reference<ContentProperties> aProp = m_aProps; - if(aProp->m_bIsFolder) - { -- aProp = getContentProvider()->getContentPropertyWithTitle(aTransferInfo.NewTitle); + ::rtl::Reference<ContentProperties> aProp = m_aProps; + if(aProp->m_bIsFolder) + { +- aProp = getContentProvider()->getContentPropertyWithTitle(aTransferInfo.NewTitle); + aProp = getContentProvider()->getContentPropertyWithDocumentId(aTransferInfo.NewTitle); - if(!aProp.is()) - aProp = getContentProvider()->getContentPropertyWithSavedAsName(aTransferInfo.NewTitle); - sal_Bool bError = !aProp.is(); -- if(bError) -- { -- sal_Char* pExtension = NULL; -- ::rtl::OString sExt; -- sal_Int32 nPos = aTransferInfo.NewTitle.lastIndexOf('.'); -- if(nPos != -1) -- { -- sExt = ::rtl::OUStringToOString(aTransferInfo.NewTitle.copy(nPos+1),RTL_TEXTENCODING_ASCII_US); -- if(sExt.equalsIgnoreAsciiCase("txt")) -- pExtension = ODM_FORMAT_TEXT; -- else if(sExt.equalsIgnoreAsciiCase("rtf")) -- pExtension = ODM_FORMAT_RTF; -- else if(sExt.equalsIgnoreAsciiCase("ps")) -- pExtension = ODM_FORMAT_PS; -- else -- pExtension = const_cast<sal_Char*>(sExt.getStr()); -- } -- else -- pExtension = ODM_FORMAT_TEXT; -- -- sal_Char* lpszNewDocId = new sal_Char[ODM_DOCID_MAX]; -- void *pData = NULL; -- DWORD dwFlags = ODM_SILENT; -- ODMSTATUS odm = NODMSaveAsEx(ContentProvider::getHandle(), -- NULL, // means it is saved the first time -- lpszNewDocId, -- pExtension, -- NULL, // no callback function here -- pData, -- &dwFlags); + if(!aProp.is()) + aProp = getContentProvider()->getContentPropertyWithSavedAsName(aTransferInfo.NewTitle); + sal_Bool bError = !aProp.is(); +- if(bError) +- { +- sal_Char* pExtension = NULL; +- ::rtl::OString sExt; +- sal_Int32 nPos = aTransferInfo.NewTitle.lastIndexOf('.'); +- if(nPos != -1) +- { +- sExt = ::rtl::OUStringToOString(aTransferInfo.NewTitle.copy(nPos+1),RTL_TEXTENCODING_ASCII_US); +- if(sExt.equalsIgnoreAsciiCase("txt")) +- pExtension = ODM_FORMAT_TEXT; +- else if(sExt.equalsIgnoreAsciiCase("rtf")) +- pExtension = ODM_FORMAT_RTF; +- else if(sExt.equalsIgnoreAsciiCase("ps")) +- pExtension = ODM_FORMAT_PS; +- else +- pExtension = const_cast<sal_Char*>(sExt.getStr()); +- } +- else +- pExtension = ODM_FORMAT_TEXT; - -- // check if we have to call the DMS dialog -- if(odm == ODM_E_USERINT) -- { -- dwFlags = 0; -- odm = NODMSaveAsEx(ContentProvider::getHandle(), -- NULL, // means it is saved the first time -- lpszNewDocId, -- pExtension, -- NULL, // no callback function here -- pData, -- &dwFlags); -- } -- bError = odm != ODM_SUCCESS; -- if(!bError) -- { -- aProp = new ContentProperties(); -- aProp->m_sDocumentId = ::rtl::OString(lpszNewDocId); -- aProp->m_sContentType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_TYPE)); -- aProp->m_sSavedAsName = aTransferInfo.NewTitle; -- getContentProvider()->append(aProp); - -- // now set the title -- WORD nDocInfo = ODM_NAME; -- ::rtl::OUString sFileName = aTransferInfo.NewTitle; -- sal_Int32 nIndex = aTransferInfo.NewTitle.lastIndexOf( sal_Unicode('.') ); -- if(nIndex != -1) -- sFileName = aTransferInfo.NewTitle.copy(0,nIndex); +- sal_Char* lpszNewDocId = new sal_Char[ODM_DOCID_MAX]; +- void *pData = NULL; +- DWORD dwFlags = ODM_SILENT; +- ODMSTATUS odm = NODMSaveAsEx(ContentProvider::getHandle(), +- NULL, // means it is saved the first time +- lpszNewDocId, +- pExtension, +- NULL, // no callback function here +- pData, +- &dwFlags); + +- // check if we have to call the DMS dialog +- if(odm == ODM_E_USERINT) +- { +- dwFlags = 0; +- odm = NODMSaveAsEx(ContentProvider::getHandle(), +- NULL, // means it is saved the first time +- lpszNewDocId, +- pExtension, +- NULL, // no callback function here +- pData, +- &dwFlags); +- } +- bError = odm != ODM_SUCCESS; +- if(!bError) +- { +- aProp = new ContentProperties(); +- aProp->m_sDocumentId = ::rtl::OString(lpszNewDocId); +- aProp->m_sContentType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_TYPE)); +- aProp->m_sSavedAsName = aTransferInfo.NewTitle; +- getContentProvider()->append(aProp); + // There used to be code below that called ODMSaveAsEx, + // but that was very broken. We have already called + // ODMSaveAsEx in the ODMA file picker when selecting the @@ -145,70 +138,78 @@ + // getContentPropertyWithDocumentId() call above should + // succeed. -- ::rtl::OString sDocInfoValue = ::rtl::OUStringToOString(sFileName,RTL_TEXTENCODING_ASCII_US); -- odm = NODMSetDocInfo( ContentProvider::getHandle(), -- lpszNewDocId, -- nDocInfo, -- const_cast<sal_Char*>(sDocInfoValue.getStr()) -- ); +- // now set the title +- WORD nDocInfo = ODM_NAME; +- ::rtl::OUString sFileName = aTransferInfo.NewTitle; +- sal_Int32 nIndex = aTransferInfo.NewTitle.lastIndexOf( sal_Unicode('.') ); +- if(nIndex != -1) +- sFileName = aTransferInfo.NewTitle.copy(0,nIndex); +- +- ::rtl::OString sDocInfoValue = ::rtl::OUStringToOString(sFileName,RTL_TEXTENCODING_ASCII_US); +- odm = NODMSetDocInfo( ContentProvider::getHandle(), +- lpszNewDocId, +- nDocInfo, +- const_cast<sal_Char*>(sDocInfoValue.getStr()) +- ); - -- } -- else if ( odm == ODM_E_CANCEL) +- } +- else if ( odm == ODM_E_CANCEL) - NODMActivate(ContentProvider::getHandle(), - ODM_DELETE, - lpszNewDocId); - -- delete lpszNewDocId; -- } - if(bError) - ucbhelper::cancelCommandExecution( - uno::makeAny( lang::IllegalArgumentException( -@@ -578,11 +521,22 @@ uno::Any SAL_CALL Content::execute( - rtl::OUString sFileURL = ContentProvider::openDoc(aProp); - - sal_Int32 nLastIndex = sFileURL.lastIndexOf( sal_Unicode('/') ); +- delete lpszNewDocId; +- } + if(bError) + ucbhelper::cancelCommandExecution( + uno::makeAny( lang::IllegalArgumentException( +@@ -578,12 +521,23 @@ uno::Any SAL_CALL Content::execute( + rtl::OUString sFileURL = ContentProvider::openDoc(aProp); + + sal_Int32 nLastIndex = sFileURL.lastIndexOf( sal_Unicode('/') ); + // Create a new Content object for the "shadow" file + // corresponding to the opened document from the DMS. - ::ucbhelper::Content aContent(sFileURL.copy(0,nLastIndex),NULL); - // aTransferInfo.NameClash = ucb::NameClash::OVERWRITE; - aTransferInfo.NewTitle = sFileURL.copy( 1 + nLastIndex ); + ::ucbhelper::Content aContent(sFileURL.copy(0,nLastIndex),NULL); + // aTransferInfo.NameClash = ucb::NameClash::OVERWRITE; + aTransferInfo.NewTitle = sFileURL.copy( 1 + nLastIndex ); + // Copy our saved backup copy to the "shadow" file. - aContent.executeCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),uno::makeAny(aTransferInfo)); + aContent.executeCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),uno::makeAny(aTransferInfo)); + // Tell the DMS that the "shadow" file is done and can be + // imported. - getContentProvider()->saveDocument(aProp->m_sDocumentId); -+ } + getContentProvider()->saveDocument(aProp->m_sDocumentId); + } + else if ( aCommand.Name.equalsAsciiL( + RTL_CONSTASCII_STRINGPARAM( "getCasePreservingURL" ) ) ) + { + rtl::OUString CasePreservingURL = openDoc(); + aRet <<= CasePreservingURL; - } - else - { ---- ucb/source/ucp/odma/odma_content.hxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_content.hxx 2009-04-06 16:42:16.000000000 +0000 ++ } + else + { + ////////////////////////////////////////////////////////////////// +--- ucb/source/ucp/odma/odma_content.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_content.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -62,7 +62,7 @@ namespace odma // UNO service name for the content. #define ODMA_CONTENT_SERVICE_NAME \ -- "com.sun.star.ucb.OdmaContent" +- "com.sun.star.ucb.OdmaContent" + "com.sun.star.ucb.ODMAContent" //========================================================================= class ContentProvider; ---- ucb/source/ucp/odma/odma_contentprops.hxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_contentprops.hxx 2009-04-06 16:42:16.000000000 +0000 +--- ucb/source/ucp/odma/odma_contentprops.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_contentprops.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -67,6 +67,7 @@ namespace odma - {} + {} - inline ::rtl::OUString getTitle() const { return m_sTitle; } + inline ::rtl::OUString getTitle() const { return m_sTitle; } + inline ::rtl::OUString getDocumentId() const { return ::rtl::OStringToOUString( m_sDocumentId, RTL_TEXTENCODING_ASCII_US ); } - inline ::rtl::OUString getSavedAsName() const { return m_sSavedAsName; } - }; - typedef ::std::binary_function< ::rtl::Reference<ContentProperties>, ::rtl::OUString,bool> TContentPropertiesFunctorBase; ---- ucb/source/ucp/odma/odma_datasupplier.cxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_datasupplier.cxx 2009-04-06 16:42:16.000000000 +0000 + inline ::rtl::OUString getSavedAsName() const { return m_sSavedAsName; } + }; + typedef ::std::binary_function< ::rtl::Reference<ContentProperties>, ::rtl::OUString,bool> TContentPropertiesFunctorBase; +--- ucb/source/ucp/odma/odma_datasupplier.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_datasupplier.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -44,7 +44,6 @@ #include "odma_content.hxx" #include "odma_contentprops.hxx" @@ -218,16 +219,16 @@ using namespace com::sun::star::beans; using namespace com::sun::star::lang; @@ -287,7 +286,7 @@ sal_Bool DataSupplier::getResult( sal_uI - ODMSTATUS odm = NODMGetDMS(ODMA_ODMA_REGNAME, lpszDMSList); - lpszDMSList[strlen(lpszDMSList)+1] = '\0'; + ODMSTATUS odm = NODMGetDMS(ODMA_ODMA_REGNAME, lpszDMSList); + lpszDMSList[strlen(lpszDMSList)+1] = '\0'; -- ::rtl::OString sQuery("SELECT ODM_DOCID, ODM_NAME"); +- ::rtl::OString sQuery("SELECT ODM_DOCID, ODM_NAME"); + ::rtl::OString sQuery("SELECT ODM_DOCID_LATEST, ODM_NAME"); - - DWORD dwFlags = ODM_SPECIFIC; - odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery,dwFlags, lpszDMSList, pQueryId ); ---- ucb/source/ucp/odma/odma_lib.cxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_lib.cxx 2009-04-06 16:42:16.000000000 +0000 + + DWORD dwFlags = ODM_SPECIFIC; + odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery,dwFlags, lpszDMSList, pQueryId ); +--- ucb/source/ucp/odma/odma_lib.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_lib.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -35,6 +35,8 @@ //#endif #include <osl/module.h> @@ -239,39 +240,39 @@ @@ -73,17 +75,18 @@ namespace odma - sal_Bool LoadFunctions(oslModule _pODMA); + sal_Bool LoadFunctions(oslModule _pODMA); -- sal_Bool LoadLibrary() +- sal_Bool LoadLibrary() + sal_Bool DMSsAvailable() - { - static sal_Bool bLoaded = sal_False; -- static oslModule pODMA = NULL; + { + static sal_Bool bLoaded = sal_False; +- static oslModule pODMA = NULL; + static sal_Bool bBeenHere = sal_False; + oslModule pODMA = NULL; - -- if (bLoaded) -- return sal_True; + +- if (bLoaded) +- return sal_True; + if (bBeenHere) + return bLoaded; + - ::rtl::OUString sPath; - #ifdef WIN - sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA.DLL")); -- - #endif - #ifdef WNT - sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA32.DLL")); + ::rtl::OUString sPath; + #ifdef WIN + sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA.DLL")); +- + #endif + #ifdef WNT + sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODMA32.DLL")); @@ -92,11 +95,21 @@ namespace odma - sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodma.so")); - #endif + sPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("libodma.so")); + #endif + bBeenHere = sal_True; + - pODMA = osl_loadModule( sPath.pData,SAL_LOADMODULE_NOW ); - if( !pODMA) - return sal_False; + pODMA = osl_loadModule( sPath.pData,SAL_LOADMODULE_NOW ); + if( !pODMA) + return sal_False; -- return bLoaded = LoadFunctions(pODMA); +- return bLoaded = LoadFunctions(pODMA); + if (!LoadFunctions(pODMA)) + return sal_False; + @@ -281,18 +282,18 @@ + bLoaded = sal_False; + + return bLoaded; - } - // ------------------------------------------------------------------------- + } + // ------------------------------------------------------------------------- ---- ucb/source/ucp/odma/odma_lib.hxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_lib.hxx 2009-04-06 16:42:16.000000000 +0000 +--- ucb/source/ucp/odma/odma_lib.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_lib.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -30,19 +30,7 @@ #ifndef ODMA_LIB_HXX #define ODMA_LIB_HXX -typedef void *LPVOID; -typedef char *LPSTR, -- *PSTR; +- *PSTR; -typedef const char *LPCSTR; -typedef unsigned long DWORD; -typedef unsigned short WORD; @@ -309,37 +310,37 @@ { @@ -208,37 +196,37 @@ namespace odma - // now we define some macros - -- #define NODMRegisterApp(a,b,c,d,e) (*(pODMRegisterApp))(a,b,c,d,e) -- #define NODMUnRegisterApp(a) (*(pODMUnRegisterApp))(a) -- #define NODMSelectDoc(a,b,c) (*(pODMSelectDoc))(a,b,c) -- #define NODMOpenDoc(a,b,c,d) (*(pODMOpenDoc))(a,b,c,d) -- #define NODMSaveDoc(a,b,c) (*(pODMSaveDoc))(a,b,c) -- #define NODMCloseDoc(a,b,c,d,e,f) (*(pODMCloseDoc))(a,b,c,d,e,f) -- #define NODMNewDoc(a,b,c,d,e) (*(pODMNewDoc))(a,b,c,d,e) -- #define NODMSaveAs(a,b,c,d,e,f) (*(pODMSaveAs))(a,b,c,d,e,f) -- #define NODMActivate(a,b,c) (*(pODMActivate))(a,b,c) -- #define NODMGetDocInfo(a,b,c,d,e) (*(pODMGetDocInfo))(a,b,c,d,e) -- #define NODMSetDocInfo(a,b,c,d) (*(pODMSetDocInfo))(a,b,c,d) -- #define NODMGetDMSInfo(a,b,c,d) (*(pODMGetDMSInfo))(a,b,c,d) -- #define NODMGetDMSCount() (*(pODMGetDMSCount))() -- #define NODMGetDMSList(a,b) (*(pODMGetDMSList))(a,b) -- #define NODMGetDMS(a,b) (*(pODMGetDMS))(a,b) -- #define NODMSetDMS(a,b) (*(pODMSetDMS))(a,b) -- #define NODMQueryExecute(a,b,c,d,e) (*(pODMQueryExecute))(a,b,c,d,e) -- #define NODMQueryGetResults(a,b,c,d,e,f) (*(pODMQueryGetResults))(a,b,c,d,e,f) -- #define NODMQueryClose(a,b) (*(pODMQueryClose))(a,b) -- #define NODMCloseDocEx(a,b,c,d,e,f,g) (*(pODMCloseDocEx))(a,b,c,d,e,f,g) -- #define NODMSaveAsEx(a,b,c,d,e,f,g) (*(pODMSaveAsEx))(a,b,c,d,e,f,g) -- #define NODMSaveDocEx(a,b,c,d) (*(pODMSaveDocEx))(a,b,c,d) -- #define NODMSelectDocEx(a,b,c,d,e,f) (*(pODMSelectDocEx))(a,b,c,d,e,f) -- #define NODMQueryCapability(a,b,c,d,e) (*(pODMQueryCapability))(a,b,c,d,e) -- #define NODMSetDocEvent(a,b,c,d,e,f,g) (*(pODMSetDocEvent))(a,b,c,d,e,f,g) -- #define NODMGetAlternateContent(a,b,c,d,e) (*(pODMGetAlternateContent))(a,b,c,d,e) -- #define NODMSetAlternateContent(a,b,c,d,e) (*(pODMSetAlternateContent))(a,b,c,d,e) -- #define NODMGetDocRelation(a,b,c,d,e,f) (*(pODMGetDocRelation))(a,b,c,d,e,f) -- #define NODMSetDocRelation(a,b,c,d,e,f) (*(pODMSetDocRelation))(a,b,c,d,e,f) + // now we define some macros + +- #define NODMRegisterApp(a,b,c,d,e) (*(pODMRegisterApp))(a,b,c,d,e) +- #define NODMUnRegisterApp(a) (*(pODMUnRegisterApp))(a) +- #define NODMSelectDoc(a,b,c) (*(pODMSelectDoc))(a,b,c) +- #define NODMOpenDoc(a,b,c,d) (*(pODMOpenDoc))(a,b,c,d) +- #define NODMSaveDoc(a,b,c) (*(pODMSaveDoc))(a,b,c) +- #define NODMCloseDoc(a,b,c,d,e,f) (*(pODMCloseDoc))(a,b,c,d,e,f) +- #define NODMNewDoc(a,b,c,d,e) (*(pODMNewDoc))(a,b,c,d,e) +- #define NODMSaveAs(a,b,c,d,e,f) (*(pODMSaveAs))(a,b,c,d,e,f) +- #define NODMActivate(a,b,c) (*(pODMActivate))(a,b,c) +- #define NODMGetDocInfo(a,b,c,d,e) (*(pODMGetDocInfo))(a,b,c,d,e) +- #define NODMSetDocInfo(a,b,c,d) (*(pODMSetDocInfo))(a,b,c,d) +- #define NODMGetDMSInfo(a,b,c,d) (*(pODMGetDMSInfo))(a,b,c,d) +- #define NODMGetDMSCount() (*(pODMGetDMSCount))() +- #define NODMGetDMSList(a,b) (*(pODMGetDMSList))(a,b) +- #define NODMGetDMS(a,b) (*(pODMGetDMS))(a,b) +- #define NODMSetDMS(a,b) (*(pODMSetDMS))(a,b) +- #define NODMQueryExecute(a,b,c,d,e) (*(pODMQueryExecute))(a,b,c,d,e) +- #define NODMQueryGetResults(a,b,c,d,e,f) (*(pODMQueryGetResults))(a,b,c,d,e,f) +- #define NODMQueryClose(a,b) (*(pODMQueryClose))(a,b) +- #define NODMCloseDocEx(a,b,c,d,e,f,g) (*(pODMCloseDocEx))(a,b,c,d,e,f,g) +- #define NODMSaveAsEx(a,b,c,d,e,f,g) (*(pODMSaveAsEx))(a,b,c,d,e,f,g) +- #define NODMSaveDocEx(a,b,c,d) (*(pODMSaveDocEx))(a,b,c,d) +- #define NODMSelectDocEx(a,b,c,d,e,f) (*(pODMSelectDocEx))(a,b,c,d,e,f) +- #define NODMQueryCapability(a,b,c,d,e) (*(pODMQueryCapability))(a,b,c,d,e) +- #define NODMSetDocEvent(a,b,c,d,e,f,g) (*(pODMSetDocEvent))(a,b,c,d,e,f,g) +- #define NODMGetAlternateContent(a,b,c,d,e) (*(pODMGetAlternateContent))(a,b,c,d,e) +- #define NODMSetAlternateContent(a,b,c,d,e) (*(pODMSetAlternateContent))(a,b,c,d,e) +- #define NODMGetDocRelation(a,b,c,d,e,f) (*(pODMGetDocRelation))(a,b,c,d,e,f) +- #define NODMSetDocRelation(a,b,c,d,e,f) (*(pODMSetDocRelation))(a,b,c,d,e,f) + #define NODMRegisterApp(a,b,c,d,e) (*(::odma::pODMRegisterApp))(a,b,c,d,e) + #define NODMUnRegisterApp(a) (*(::odma::pODMUnRegisterApp))(a) + #define NODMSelectDoc(a,b,c) (*(::odma::pODMSelectDoc))(a,b,c) @@ -370,24 +371,24 @@ + #define NODMGetDocRelation(a,b,c,d,e,f) (*(::odma::pODMGetDocRelation))(a,b,c,d,e,f) + #define NODMSetDocRelation(a,b,c,d,e,f) (*(::odma::pODMSetDocRelation))(a,b,c,d,e,f) -- sal_Bool LoadLibrary(); +- sal_Bool LoadLibrary(); + sal_Bool DMSsAvailable(); - extern TODMRegisterApp pODMRegisterApp; - extern TODMUnRegisterApp pODMUnRegisterApp; ---- ucb/source/ucp/odma/odma_provider.cxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_provider.cxx 2009-04-06 16:42:16.000000000 +0000 + extern TODMRegisterApp pODMRegisterApp; + extern TODMUnRegisterApp pODMUnRegisterApp; +--- ucb/source/ucp/odma/odma_provider.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_provider.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -437,7 +437,7 @@ void ContentProvider::append(const ::rtl - lpszDMSList[strlen(lpszDMSList)+1] = '\0'; + lpszDMSList[strlen(lpszDMSList)+1] = '\0'; - ::rtl::OString sTitleText(::rtl::OUStringToOString(_sDocumentName,RTL_TEXTENCODING_ASCII_US)); -- ::rtl::OString sQuery("SELECT ODM_DOCID, ODM_NAME WHERE ODM_TITLETEXT = '"); + ::rtl::OString sTitleText(::rtl::OUStringToOString(_sDocumentName,RTL_TEXTENCODING_ASCII_US)); +- ::rtl::OString sQuery("SELECT ODM_DOCID, ODM_NAME WHERE ODM_TITLETEXT = '"); + ::rtl::OString sQuery("SELECT ODM_DOCID_LATEST, ODM_NAME WHERE ODM_TITLETEXT = '"); - sQuery += sTitleText; - sQuery += "'"; - + sQuery += sTitleText; + sQuery += "'"; + @@ -525,6 +525,12 @@ void ContentProvider::append(const ::rtl - return getContentProperty(_sTitle,aFunc); + return getContentProperty(_sTitle,aFunc); } // ----------------------------------------------------------------------------- +::rtl::Reference<ContentProperties> ContentProvider::getContentPropertyWithDocumentId(const ::rtl::OUString& _sDocumentId) const @@ -398,9 +399,9 @@ +// ----------------------------------------------------------------------------- ::rtl::OUString ContentProvider::openDoc(const ::rtl::Reference<ContentProperties>& _rProp) throw (uno::Exception) { - OSL_ENSURE(_rProp.is(),"No valid content properties!"); ---- ucb/source/ucp/odma/odma_provider.hxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_provider.hxx 2009-04-06 16:42:16.000000000 +0000 + OSL_ENSURE(_rProp.is(),"No valid content properties!"); +--- ucb/source/ucp/odma/odma_provider.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_provider.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -32,6 +32,8 @@ #define ODMA_PROVIDER_HXX @@ -414,24 +415,24 @@ // UNO service name for the provider. This name will be used by the UCB to // create instances of the provider. #define ODMA_CONTENT_PROVIDER_SERVICE_NAME \ -- "com.sun.star.ucb.OdmaContentProvider" +- "com.sun.star.ucb.OdmaContentProvider" + "com.sun.star.ucb.ODMAContentProvider" // #define ODMA_CONTENT_PROVIDER_SERVICE_NAME_LENGTH 34 // URL scheme. This is the scheme the provider will be able to create @@ -136,14 +138,21 @@ public: - */ - ::rtl::Reference<ContentProperties> queryContentProperty(const ::rtl::OUString& _sDocumentName); + */ + ::rtl::Reference<ContentProperties> queryContentProperty(const ::rtl::OUString& _sDocumentName); -- /** getContentProperty returns the ContentProperties for the first content with that title +- /** getContentProperty returns the ContentProperties for the first content with that title + /** getContentPropertyWithTitle returns the ContentProperties for the first content with that title - @param _sTitle the title of the document + @param _sTitle the title of the document - @return the content properties - */ - ::rtl::Reference<ContentProperties> getContentPropertyWithTitle(const ::rtl::OUString& _sTitle) const; + @return the content properties + */ + ::rtl::Reference<ContentProperties> getContentPropertyWithTitle(const ::rtl::OUString& _sTitle) const; -- /** getContentProperty returns the ContentProperties for the first content with that SavedAsName +- /** getContentProperty returns the ContentProperties for the first content with that SavedAsName + /** getContentPropertyWithDocumentId returns the ContentProperties for the first content with that title + @param _sTitle the title of the document + @@ -440,11 +441,11 @@ + ::rtl::Reference<ContentProperties> getContentPropertyWithDocumentId(const ::rtl::OUString& _sDocumentId) const; + + /** getContentPropertyWithSavedAsName returns the ContentProperties for the first content with that SavedAsName - @param _sSaveAsName the SavedAsName of the document + @param _sSaveAsName the SavedAsName of the document - @return the content properties ---- ucb/source/ucp/odma/odma_services.cxx.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/odma_services.cxx 2009-04-06 16:42:16.000000000 +0000 + @return the content properties +--- ucb/source/ucp/odma/odma_services.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/odma_services.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -35,21 +35,19 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include "odma_contentprops.hxx" @@ -458,33 +459,33 @@ //========================================================================= static sal_Bool writeInfo( void * pRegistryKey, -- const OUString & rImplementationName, -- Sequence< OUString > const & rServiceNames ) +- const OUString & rImplementationName, +- Sequence< OUString > const & rServiceNames ) + const rtl::OUString & rImplementationName, + Sequence< rtl::OUString > const & rServiceNames ) { -- OUString aKeyName( OUString::createFromAscii( "/" ) ); +- OUString aKeyName( OUString::createFromAscii( "/" ) ); + rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) ); - aKeyName += rImplementationName; -- aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); + aKeyName += rImplementationName; +- aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); + aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" ); - Reference< XRegistryKey > xKey; - try + Reference< XRegistryKey > xKey; + try @@ -122,10 +120,8 @@ extern "C" void * SAL_CALL component_get - if ( ::odma::ContentProvider::getImplementationName_Static(). - compareToAscii( pImplName ) == 0 ) - { -- if(::odma::LoadLibrary()) + if ( ::odma::ContentProvider::getImplementationName_Static(). + compareToAscii( pImplName ) == 0 ) + { +- if(::odma::LoadLibrary()) + if(::odma::DMSsAvailable()) - xFactory = ::odma::ContentProvider::createServiceFactory( xSMgr ); -- else -- OSL_ASSERT(!"Could not load library!"); - } - - ////////////////////////////////////////////////////////////////////// ---- ucb/source/ucp/odma/ucpodma.xml.old 2009-04-02 11:01:38.000000000 +0000 -+++ ucb/source/ucp/odma/ucpodma.xml 2009-04-06 16:42:16.000000000 +0000 + xFactory = ::odma::ContentProvider::createServiceFactory( xSMgr ); +- else +- OSL_ASSERT(!"Could not load library!"); + } + + ////////////////////////////////////////////////////////////////////// +--- ucb/source/ucp/odma/ucpodma.xml.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/odma/ucpodma.xml 2010-03-03 16:59:55.000000000 +0100 @@ -11,7 +11,7 @@ Ocke Janssen </author> @@ -493,9 +494,9 @@ + com.sun.star.comp.ucb.ODMAContentProvider </name> <description> - This component implements a Content Provider for the Universal ---- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu.old 2009-04-06 16:41:46.000000000 +0000 -+++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 2009-04-06 16:42:16.000000000 +0000 + This component implements a Content Provider for the Universal +--- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu.old 2010-03-03 16:59:07.000000000 +0100 ++++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 2010-03-03 16:59:55.000000000 +0100 @@ -200,6 +200,17 @@ <value/> </prop> @@ -514,9 +515,9 @@ <!-- We want the Provider to be the final fallback provider --> <node oor:name="Provider999" oor:op="replace" install:module="gio"> <prop oor:name="ServiceName"> ---- scp2/source/ooo/file_library_ooo.scp -+++ scp2/source/ooo/file_library_ooo.scp -@@ -661,6 +661,10 @@ End +--- scp2/source/ooo/file_library_ooo.scp.old 2010-03-03 16:59:46.000000000 +0100 ++++ scp2/source/ooo/file_library_ooo.scp 2010-03-03 16:59:55.000000000 +0100 +@@ -708,6 +708,10 @@ End #endif #endif @@ -527,7 +528,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno ) SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno ) -@@ -1548,6 +1552,10 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_ +@@ -1647,6 +1651,10 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) @@ -538,12 +539,12 @@ File gid_File_Lib_Lnth TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT,PATCH); ---- desktop/source/app/cmdlineargs.cxx.old 2009-04-06 16:41:47.000000000 +0000 -+++ desktop/source/app/cmdlineargs.cxx 2009-04-06 16:42:16.000000000 +0000 +--- desktop/source/app/cmdlineargs.cxx.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/source/app/cmdlineargs.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -297,6 +297,15 @@ void CommandLineArgs::ParseCommandLine_I - } - else - { + } + else + { + if( bOpenEvent || bViewEvent || bForceNewEvent || bForceOpenEvent ) + { + if( ::rtl::OUString(aArgStr).matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("::ODMA")) ) @@ -553,31 +554,31 @@ + aArgStr = sArg; + } + } - // handle this argument as a filename - if ( bOpenEvent ) - AddStringListParam_Impl( CMD_STRINGPARAM_OPENLIST, aArgStr ); ---- fpicker/prj/build.lst.old 2009-04-06 16:41:56.000000000 +0000 -+++ fpicker/prj/build.lst 2009-04-06 16:42:16.000000000 +0000 -@@ -2,6 +2,7 @@ fp fpicker : rdbmaker svtools NULL + // handle this argument as a filename + if ( bOpenEvent ) + AddStringListParam_Impl( CMD_STRINGPARAM_OPENLIST, aArgStr ); +--- fpicker/prj/build.lst.old 2010-03-03 16:59:29.000000000 +0100 ++++ fpicker/prj/build.lst 2010-03-03 16:59:55.000000000 +0100 +@@ -2,6 +2,7 @@ fp fpicker : l10n rdbmaker svtools NU fp fpicker\inc nmake - all fp_inc NULL fp fpicker\source\generic nmake - all fp_generic fp_inc NULL fp fpicker\source\office nmake - all fp_office fp_inc NULL +fp fpicker\source\odma nmake - w fp_odma NULL fp fpicker\source\unx\gnome nmake - u fp_gnome_filepicker fp_inc NULL + fp fpicker\source\unx\kde4 nmake - u fp_kde4_filepicker fp_inc NULL fp fpicker\source\unx\kde_unx nmake - u fp_unx_common fp_inc NULL - fp fpicker\source\unx\kde nmake - u fp_unx_kde_filepicker fp_inc NULL ---- fpicker/source/generic/makefile.mk.old 2009-04-02 10:52:25.000000000 +0000 -+++ fpicker/source/generic/makefile.mk 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/generic/makefile.mk.old 2009-10-07 15:06:59.000000000 +0200 ++++ fpicker/source/generic/makefile.mk 2010-03-03 16:59:55.000000000 +0100 @@ -50,6 +50,7 @@ SHL1TARGET= $(TARGET) SHL1IMPLIB= i$(TARGET) SHL1OBJS= $(SLOFILES) SHL1STDLIBS=\ + $(ODMA_LIB_LIB) \ - $(VCLLIB) \ - $(SVLLIB) \ + $(VCLLIB) \ + $(SVLLIB) \ $(SVTOOLLIB) \ ---- fpicker/source/generic/fpicker.cxx.old 2009-04-02 10:52:25.000000000 +0000 -+++ fpicker/source/generic/fpicker.cxx 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/generic/fpicker.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ fpicker/source/generic/fpicker.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -37,6 +37,13 @@ #include "cppuhelper/implementationentry.hxx" #endif @@ -597,11 +598,11 @@ static OUString FilePicker_getSystemPickerServiceName() { +#ifdef UNX - OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); - if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("gnome")) - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.GtkFilePicker")); -@@ -62,8 +70,14 @@ static OUString FilePicker_getSystemPick - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker")); + OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); + if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("gnome")) + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.GtkFilePicker")); +@@ -64,8 +72,14 @@ static OUString FilePicker_getSystemPick + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker")); else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("macosx")) return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFilePicker")); - else @@ -617,19 +618,19 @@ } static Reference< css::uno::XInterface > FilePicker_createInstance ( -@@ -124,14 +138,20 @@ static Sequence< OUString > FilePicker_g +@@ -126,14 +140,20 @@ static Sequence< OUString > FilePicker_g static OUString FolderPicker_getSystemPickerServiceName() { - OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); + OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); +#ifdef UNX - if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("gnome")) - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.GtkFolderPicker")); - else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("kde")) - return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker")); + if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("gnome")) + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.GtkFolderPicker")); + else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("kde")) + return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker")); else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii ("macosx")) return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker")); -- else -- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFolderPicker")); +- else +- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFolderPicker")); +#endif +#ifdef WNT + if (SvtMiscOptions().TryODMADialog() && ::odma::DMSsAvailable()) { @@ -640,8 +641,8 @@ } static Reference< css::uno::XInterface > FolderPicker_createInstance ( ---- fpicker/source/odma/ODMAFilePicker.cxx.old 1970-01-01 00:00:00.000000000 +0000 -+++ fpicker/source/odma/ODMAFilePicker.cxx 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/odma/ODMAFilePicker.cxx.old 2010-03-03 16:59:55.000000000 +0100 ++++ fpicker/source/odma/ODMAFilePicker.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,565 @@ +/************************************************************************* + * @@ -1208,8 +1209,8 @@ + Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); + return Reference< XInterface >( *new ODMAFilePicker( xServiceManager ) ); +} ---- fpicker/source/odma/ODMAFilePicker.hxx.old 1970-01-01 00:00:00.000000000 +0000 -+++ fpicker/source/odma/ODMAFilePicker.hxx 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/odma/ODMAFilePicker.hxx.old 2010-03-03 16:59:55.000000000 +0100 ++++ fpicker/source/odma/ODMAFilePicker.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,242 @@ +/************************************************************************* + * @@ -1453,8 +1454,8 @@ +}; + +#endif // INCLUDED_ODMA_FILEPICKER_HXX ---- fpicker/source/odma/ODMAFolderPicker.cxx.old 1970-01-01 00:00:00.000000000 +0000 -+++ fpicker/source/odma/ODMAFolderPicker.cxx 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/odma/ODMAFolderPicker.cxx.old 2010-03-03 16:59:55.000000000 +0100 ++++ fpicker/source/odma/ODMAFolderPicker.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,202 @@ +/************************************************************************* + * @@ -1658,8 +1659,8 @@ + Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); + return Reference< XInterface >( *new ODMAFolderPicker( xServiceManager ) ); +} ---- fpicker/source/odma/ODMAFolderPicker.hxx.old 1970-01-01 00:00:00.000000000 +0000 -+++ fpicker/source/odma/ODMAFolderPicker.hxx 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/odma/ODMAFolderPicker.hxx.old 2010-03-03 16:59:55.000000000 +0100 ++++ fpicker/source/odma/ODMAFolderPicker.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,118 @@ +/************************************************************************* + * @@ -1779,8 +1780,8 @@ +}; + +#endif // INCLUDED_ODMA_FOLDERPICKER_HXX ---- fpicker/source/odma/exports.map.old 1970-01-01 00:00:00.000000000 +0000 -+++ fpicker/source/odma/exports.map 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/odma/exports.map.old 2010-03-03 16:59:55.000000000 +0100 ++++ fpicker/source/odma/exports.map 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,8 @@ +UDK_3_0_0 { + global: @@ -1790,8 +1791,8 @@ + local: + *; +}; ---- fpicker/source/odma/fps_odma.cxx.old 1970-01-01 00:00:00.000000000 +0000 -+++ fpicker/source/odma/fps_odma.cxx 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/odma/fps_odma.cxx.old 2010-03-03 16:59:55.000000000 +0100 ++++ fpicker/source/odma/fps_odma.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,90 @@ +/************************************************************************* + * @@ -1883,8 +1884,8 @@ +} + +} // extern "C" ---- fpicker/source/odma/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000 -+++ fpicker/source/odma/makefile.mk 2009-04-06 16:42:16.000000000 +0000 +--- fpicker/source/odma/makefile.mk.old 2010-03-03 16:59:55.000000000 +0100 ++++ fpicker/source/odma/makefile.mk 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,79 @@ +#************************************************************************* +# @@ -1965,8 +1966,8 @@ +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk ---- solenv/inc/libs.mk.old 2009-04-06 16:42:01.000000000 +0000 -+++ solenv/inc/libs.mk 2009-04-06 16:42:16.000000000 +0000 +--- solenv/inc/libs.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ solenv/inc/libs.mk 2010-03-03 16:59:55.000000000 +0100 @@ -32,6 +32,9 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$" .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -1977,7 +1978,7 @@ # #externe libs in plattform.mk # -@@ -357,6 +360,7 @@ UNOPKGAPPLIB=-lunopkgapp +@@ -346,6 +349,7 @@ UNOPKGAPPLIB=-lunopkgapp .ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" @@ -1985,8 +1986,8 @@ AWTLIB*=jawt.lib AVMEDIALIB=iavmedia.lib ICUINLIB=icuin.lib ---- svtools/inc/svtools/miscopt.hxx.old 2009-04-02 11:06:22.000000000 +0000 -+++ svtools/inc/svtools/miscopt.hxx 2009-04-06 16:42:16.000000000 +0000 +--- svtools/inc/svtools/miscopt.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/inc/svtools/miscopt.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -113,6 +113,10 @@ class SVT_DLLPUBLIC SvtMiscOptions: publ void SetUseSystemFileDialog( sal_Bool bSet ); sal_Bool IsUseSystemFileDialogReadOnly() const; @@ -1998,8 +1999,8 @@ sal_Bool IsPluginsEnabled() const; void SetPluginsEnabled( sal_Bool bEnable ); sal_Bool IsPluginsEnabledReadOnly() const; ---- svtools/source/config/miscopt.cxx.old 2009-04-02 11:06:16.000000000 +0000 -+++ svtools/source/config/miscopt.cxx 2009-04-06 16:42:16.000000000 +0000 +--- svtools/source/config/miscopt.cxx.old 2010-03-03 16:59:44.000000000 +0100 ++++ svtools/source/config/miscopt.cxx 2010-03-03 16:59:55.000000000 +0100 @@ -85,8 +85,10 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_SYMBOLSTYLE 4 #define PROPERTYNAME_USESYSTEMPRINTDIALOG ASCII_STR("UseSystemPrintDialog") @@ -2037,7 +2038,7 @@ inline sal_Bool IsPluginsEnabled() const { return m_bPluginsEnabled; } -@@ -305,6 +318,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl +@@ -307,6 +320,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl , m_bUseSystemFileDialog( sal_False ) , m_bIsUseSystemFileDialogRO( sal_False ) @@ -2046,7 +2047,7 @@ , m_bPluginsEnabled( sal_False ) , m_bIsPluginsEnabledRO( sal_False ) , m_nSymbolsSize( 0 ) -@@ -386,6 +401,16 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl +@@ -388,6 +403,16 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl break; } @@ -2063,7 +2064,7 @@ case PROPERTYHANDLE_SYMBOLSTYLE : { ::rtl::OUString aSymbolsStyle; -@@ -489,6 +514,13 @@ void SvtMiscOptions_Impl::Load( const Se +@@ -491,6 +516,13 @@ void SvtMiscOptions_Impl::Load( const Se } } break; @@ -2077,7 +2078,7 @@ case PROPERTYHANDLE_SYMBOLSTYLE : { ::rtl::OUString aSymbolsStyle; if( seqValues[nProperty] >>= aSymbolsStyle ) -@@ -635,6 +667,13 @@ void SvtMiscOptions_Impl::Commit() +@@ -637,6 +669,13 @@ void SvtMiscOptions_Impl::Commit() break; } @@ -2091,17 +2092,17 @@ case PROPERTYHANDLE_SYMBOLSTYLE : { if ( !m_bIsSymbolsStyleRO ) -@@ -667,7 +706,8 @@ Sequence< OUString > SvtMiscOptions_Impl +@@ -669,7 +708,8 @@ Sequence< OUString > SvtMiscOptions_Impl PROPERTYNAME_TOOLBOXSTYLE, PROPERTYNAME_USESYSTEMFILEDIALOG, PROPERTYNAME_SYMBOLSTYLE, - PROPERTYNAME_USESYSTEMPRINTDIALOG + PROPERTYNAME_USESYSTEMPRINTDIALOG, + PROPERTYNAME_TRYODMADIALOG - }; + }; - // Initialize return sequence with these list ... -@@ -735,6 +775,21 @@ sal_Bool SvtMiscOptions::IsUseSystemFile + // Initialize return sequence with these list ... +@@ -737,6 +777,21 @@ sal_Bool SvtMiscOptions::IsUseSystemFile return m_pDataContainer->IsUseSystemFileDialogReadOnly(); } @@ -2123,9 +2124,9 @@ sal_Bool SvtMiscOptions::IsPluginsEnabled() const { return m_pDataContainer->IsPluginsEnabled(); ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2009-04-06 16:42:14.000000000 +0000 -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2009-04-06 16:42:16.000000000 +0000 -@@ -5638,6 +5638,13 @@ Dymamic border coloring means that when +--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2010-03-03 16:59:50.000000000 +0100 ++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-03 16:59:55.000000000 +0100 +@@ -5731,6 +5731,13 @@ Dymamic border coloring means that when </info> <value>false</value> </prop> @@ -2139,12 +2140,12 @@ <prop oor:name="SymbolSet" oor:type="xs:short"> <!-- UIHints: Tools Options General View --> <info> ---- svx/source/cui/optgdlg.src -+++ svx/source/cui/optgdlg.src +--- svx/source/cui/optgdlg.src.old 2010-03-03 16:59:44.000000000 +0100 ++++ svx/source/cui/optgdlg.src 2010-03-03 16:59:55.000000000 +0100 @@ -115,34 +115,41 @@ TabPage OFA_TP_MISC - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; - }; + Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; + }; + CheckBox CB_ODMADLG + { + Pos = MAP_APPFONT( COL1, ROW8 ); @@ -2156,49 +2157,49 @@ { - Pos = MAP_APPFONT( COL0, ROW8 ); + Pos = MAP_APPFONT( COL0, ROW9 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Document status"; - }; + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); + Text [ en-US ] = "Document status"; + }; CheckBox CB_DOCSTATUS - { + { - Pos = MAP_APPFONT( COL1, ROW9 ); + Pos = MAP_APPFONT( COL1, ROW10 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Printing sets \"document modified\" status"; - }; - FixedLine FL_TWOFIGURE - { -- Pos = MAP_APPFONT( COL0, ROW10 ); + Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Text [ en-US ] = "~Printing sets \"document modified\" status"; + }; + FixedLine FL_TWOFIGURE + { +- Pos = MAP_APPFONT( COL0, ROW10 ); + Pos = MAP_APPFONT( COL0, ROW11 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Year (two digits)" ; - }; - FixedText FT_INTERPRET - { -- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); + Text [ en-US ] = "Year (two digits)" ; + }; + FixedText FT_INTERPRET + { +- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); - Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); - Text [ en-US ] = "Interpret as years between"; - }; - NumericField NF_YEARVALUE - { - Border = TRUE ; -- Pos = MAP_APPFONT( COL4, ROW11 ); + Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); + Text [ en-US ] = "Interpret as years between"; + }; + NumericField NF_YEARVALUE + { + Border = TRUE ; +- Pos = MAP_APPFONT( COL4, ROW11 ); + Pos = MAP_APPFONT( COL4, ROW12 ); - Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); - Minimum = 1583 ; - Maximum = 9857 ; + Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); + Minimum = 1583 ; + Maximum = 9857 ; @@ -151,7 +158,7 @@ TabPage OFA_TP_MISC - }; - FixedText FT_TOYEAR - { -- Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + }; + FixedText FT_TOYEAR + { +- Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ); + Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); - Text [ en-US ] = "and " ; - }; ---- svx/source/cui/optgdlg.hrc -+++ svx/source/cui/optgdlg.hrc + Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); + Text [ en-US ] = "and " ; + }; +--- svx/source/cui/optgdlg.hrc.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/cui/optgdlg.hrc 2010-03-03 16:59:55.000000000 +0100 @@ -56,9 +56,10 @@ #define ROW6 (ROW5+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) #define ROW7 (ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) @@ -2213,7 +2214,7 @@ #define DIFF(v1,v2) (v2-v1) #define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) -@@ -190,6 +191,7 @@ +@@ -202,6 +203,7 @@ #define FT_HELPAGENT_TIME_UNIT 59 #define FL_DOCSTATUS 60 #define CB_DOCSTATUS 61 @@ -2221,37 +2222,37 @@ #endif // #ifndef _SVX_OPTGDLG_HRC // ******************************************************************* EOF ---- svx/source/cui/optgdlg.hxx -+++ svx/source/cui/optgdlg.hxx +--- svx/source/cui/optgdlg.hxx.old 2010-03-03 16:59:45.000000000 +0100 ++++ svx/source/cui/optgdlg.hxx 2010-03-03 16:59:55.000000000 +0100 @@ -59,6 +59,7 @@ private: FixedLine aFileDlgFL; ReadOnlyImage aFileDlgROImage; - CheckBox aFileDlgCB; + CheckBox aFileDlgCB; + CheckBox aODMADlgCB; FixedLine aPrintDlgFL; - CheckBox aPrintDlgCB; + CheckBox aPrintDlgCB; @@ -77,6 +78,9 @@ private: - DECL_LINK( TwoFigureConfigHdl, NumericField* ); - DECL_LINK( HelpCheckHdl_Impl, CheckBox* ); - DECL_LINK( HelpAgentResetHdl_Impl, PushButton* ); + DECL_LINK( TwoFigureConfigHdl, NumericField* ); + DECL_LINK( HelpCheckHdl_Impl, CheckBox* ); + DECL_LINK( HelpAgentResetHdl_Impl, PushButton* ); +#ifdef WNT + DECL_LINK( OnFileDlgToggled, CheckBox* ); +#endif protected: - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ); ---- svx/source/cui/optgdlg.cxx -+++ svx/source/cui/optgdlg.cxx -@@ -198,6 +198,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p - aFileDlgFL ( this, SVX_RES( FL_FILEDLG ) ), +--- svx/source/cui/optgdlg.cxx.old 2010-03-03 16:59:45.000000000 +0100 ++++ svx/source/cui/optgdlg.cxx 2010-03-03 16:59:55.000000000 +0100 +@@ -218,6 +218,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p + aFileDlgFL ( this, SVX_RES( FL_FILEDLG ) ), aFileDlgROImage ( this, SVX_RES( FI_FILEDLG_RO ) ), - aFileDlgCB ( this, SVX_RES( CB_FILEDLG ) ), + aFileDlgCB ( this, SVX_RES( CB_FILEDLG ) ), + aODMADlgCB ( this, SVX_RES( CB_ODMADLG ) ), - aPrintDlgFL ( this, SVX_RES( FL_PRINTDLG ) ), - aPrintDlgCB ( this, SVX_RES( CB_PRINTDLG ) ), - aDocStatusFL ( this, SVX_RES( FL_DOCSTATUS ) ), -@@ -228,6 +229,31 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p + aPrintDlgFL ( this, SVX_RES( FL_PRINTDLG ) ), + aPrintDlgCB ( this, SVX_RES( CB_PRINTDLG ) ), + aDocStatusFL ( this, SVX_RES( FL_DOCSTATUS ) ), +@@ -241,6 +242,31 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p aPrintDlgCB.Hide(); #endif @@ -2283,7 +2284,7 @@ if ( !aFileDlgCB.IsVisible() ) { // rearrange the following controls -@@ -317,6 +343,14 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p +@@ -330,6 +356,14 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p } } @@ -2298,7 +2299,7 @@ // ----------------------------------------------------------------------- OfaMiscTabPage::~OfaMiscTabPage() -@@ -371,6 +405,13 @@ BOOL OfaMiscTabPage::FillItemSet( SfxIte +@@ -384,6 +418,13 @@ BOOL OfaMiscTabPage::FillItemSet( SfxIte bModified = TRUE; } @@ -2309,10 +2310,10 @@ + bModified = TRUE; + } + - if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() ) + if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() ) { SvtPrintWarningOptions aPrintOptions; -@@ -420,6 +461,9 @@ void OfaMiscTabPage::Reset( const SfxIte +@@ -433,6 +474,9 @@ void OfaMiscTabPage::Reset( const SfxIte aPrintDlgCB.Check( !aMiscOpt.UseSystemPrintDialog() ); aPrintDlgCB.SaveValue(); @@ -2322,37 +2323,37 @@ SvtPrintWarningOptions aPrintOptions; aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed()); aDocStatusCB.SaveValue(); ---- solenv/bin/modules/installer/windows/component.pm.old 2009-04-02 10:53:07.000000000 +0000 -+++ solenv/bin/modules/installer/windows/component.pm 2009-04-06 16:42:16.000000000 +0000 +--- solenv/bin/modules/installer/windows/component.pm.old 2009-10-07 15:06:49.000000000 +0200 ++++ solenv/bin/modules/installer/windows/component.pm 2010-03-03 16:59:55.000000000 +0100 @@ -132,6 +132,11 @@ sub get_file_component_directory - return $installer::globals::templatefolder; - } + return $installer::globals::templatefolder; + } + if ( $destdir =~ /\bPREDEFINED_OSWINSHELLNEWDIR\b/ ) + { + return "WindowsShellNewFolder"; + } + - my $destination = $onefile->{'destination'}; - - installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination); ---- solenv/bin/modules/installer/windows/directory.pm.old 2009-04-02 10:53:07.000000000 +0000 -+++ solenv/bin/modules/installer/windows/directory.pm 2009-04-06 16:42:16.000000000 +0000 + my $destination = $onefile->{'destination'}; + + installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination); +--- solenv/bin/modules/installer/windows/directory.pm.old 2009-10-07 15:06:49.000000000 +0200 ++++ solenv/bin/modules/installer/windows/directory.pm 2010-03-03 16:59:55.000000000 +0100 @@ -273,6 +273,12 @@ sub add_root_directories - my $oneline = "TARGETDIR\t\tSourceDir\n"; - push(@{$directorytableref}, $oneline); - + my $oneline = "TARGETDIR\t\tSourceDir\n"; + push(@{$directorytableref}, $oneline); + + $oneline = "WindowsFolder\tTARGETDIR\tWindows\n"; + push(@{$directorytableref}, $oneline); + + $oneline = "WindowsShellNewFolder\tWindowsFolder\tShellNew\n"; + push(@{$directorytableref}, $oneline); + - my $sourcediraddon = ""; - if (($installer::globals::addchildprojects) || - ($installer::globals::patch) || ---- scp2/source/ooo/directory_ooo.scp.old 2009-04-06 16:41:55.000000000 +0000 -+++ scp2/source/ooo/directory_ooo.scp 2009-04-06 16:42:16.000000000 +0000 + my $sourcediraddon = ""; + if (($installer::globals::addchildprojects) || + ($installer::globals::patch) || +--- scp2/source/ooo/directory_ooo.scp.old 2010-03-03 16:59:25.000000000 +0100 ++++ scp2/source/ooo/directory_ooo.scp 2010-03-03 16:59:55.000000000 +0100 @@ -166,6 +166,11 @@ Directory gid_Dir_Shellnew DosName = "shellnew"; End @@ -2365,9 +2366,9 @@ #endif Directory gid_Dir_User ---- scp2/source/ooo/file_ooo.scp.old 2009-04-02 10:51:54.000000000 +0000 -+++ scp2/source/ooo/file_ooo.scp 2009-04-06 16:42:16.000000000 +0000 -@@ -2294,24 +2294,56 @@ End +--- scp2/source/ooo/file_ooo.scp.old 2010-03-03 16:59:44.000000000 +0100 ++++ scp2/source/ooo/file_ooo.scp 2010-03-03 16:59:55.000000000 +0100 +@@ -2319,24 +2319,56 @@ End STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods) @@ -2424,17 +2425,17 @@ #endif #ifdef UNX ---- framework/prj/build.lst -+++ framework/prj/build.lst +--- framework/prj/build.lst.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/prj/build.lst 2010-03-03 16:59:55.000000000 +0100 @@ -1,4 +1,4 @@ -fr framework : l10n svtools NULL +fr framework : l10n svtools ucb NULL fr framework usr1 - all fr_mkout NULL fr framework\inc nmake - all fr_inc NULL fr framework\source\constant nmake - all fr_constant fr_inc NULL ---- framework/source/uielement/recentfilesmenucontroller.cxx.old 2009-04-02 10:56:25.000000000 +0000 -+++ framework/source/uielement/recentfilesmenucontroller.cxx 2009-04-06 16:42:16.000000000 +0000 -@@ -66,6 +66,11 @@ +--- framework/source/uielement/recentfilesmenucontroller.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/source/uielement/recentfilesmenucontroller.cxx 2010-03-03 16:59:55.000000000 +0100 +@@ -65,6 +65,11 @@ #include <svtools/historyoptions.hxx> #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> @@ -2447,9 +2448,9 @@ #include <dispatch/uieventloghelper.hxx> @@ -213,6 +218,41 @@ void RecentFilesMenuController::fillPopu - else - aMenuTitle = aSystemPath; - } + else + aMenuTitle = aSystemPath; + } +#ifdef WNT + else if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_ODMA && ::odma::DMSsAvailable ()) + { @@ -2485,12 +2486,12 @@ + aTipHelpText = aURLString; + } +#endif - else - { - // Use INetURLObject to abbreviate all other URLs ---- framework/util/makefile.mk.old 2009-04-02 10:56:31.000000000 +0000 -+++ framework/util/makefile.mk 2009-04-06 16:42:16.000000000 +0000 -@@ -335,6 +335,7 @@ SHL4OBJS= \ + else + { + // Use INetURLObject to abbreviate all other URLs +--- framework/util/makefile.mk.old 2009-10-21 11:50:10.000000000 +0200 ++++ framework/util/makefile.mk 2010-03-03 16:59:56.000000000 +0100 +@@ -344,6 +344,7 @@ SHL4OBJS= \ $(SLO)$/startmoduledispatcher.obj SHL4STDLIBS= \ diff --git a/patches/dev300/oox-calc-export-sotstorage-init.diff b/patches/dev300/oox-calc-export-sotstorage-init.diff index 119a03550..fe05e5a79 100644 --- a/patches/dev300/oox-calc-export-sotstorage-init.diff +++ b/patches/dev300/oox-calc-export-sotstorage-init.diff @@ -1,21 +1,5 @@ -From 798f07e9c716329339fe7b51ab7a82cf3b83ebcb Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen <janneke@gnu.org> -Date: Thu, 30 Jul 2009 15:53:47 +0200 -Subject: [PATCH] OOXML: calc export: init SotStorage from shell.GetMedium. Fixes NULL init. - -While moving xlsx export to uno filter, SotStorage init code had to -be added. While it compiled, it always produced a NULL pointer. -This inhibits any export using rStorage, such as pivotCache. - - * Modified sc/source/filter/xlsx/xlsx-xestream.cxx ---- - sc/source/filter/xlsx/xlsx-xestream.cxx | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -diff --git sc/source/filter/xlsx/xlsx-xestream.cxx sc/source/filter/xlsx/xlsx-xestream.cxx -index 0568512..84d038c 100644 ---- sc/source/filter/xlsx/xlsx-xestream.cxx -+++ sc/source/filter/xlsx/xlsx-xestream.cxx +--- sc/source/filter/xlsx/xlsx-xestream.cxx.old 2010-03-03 17:00:07.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xestream.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -58,6 +58,10 @@ #include <formula/grammar.hxx> #include <oox/export/drawingml.hxx> @@ -26,8 +10,8 @@ index 0568512..84d038c 100644 + #define DEBUG_XL_ENCRYPTION 0 - using ::std::vector; -@@ -1116,7 +1120,9 @@ bool XclExpXmlStream::exportDocument() throw() + using ::com::sun::star::beans::PropertyValue; +@@ -1124,7 +1128,9 @@ bool XclExpXmlStream::exportDocument() t { ScDocShell* pShell = getDocShell(); ScDocument* pDoc = pShell->GetDocument(); @@ -38,6 +22,3 @@ index 0568512..84d038c 100644 XclExpRootData aData( EXC_BIFF8, *pShell->GetMedium (), rStorage, *pDoc, RTL_TEXTENCODING_DONTKNOW ); aData.meOutput = EXC_OUTPUT_XML_2007; --- -1.6.0.rc1.49.g98a8 - diff --git a/patches/dev300/oox-custom-shape-polygons.diff b/patches/dev300/oox-custom-shape-polygons.diff index 69531a97d..9108d33bb 100644 --- a/patches/dev300/oox-custom-shape-polygons.diff +++ b/patches/dev300/oox-custom-shape-polygons.diff @@ -1,6 +1,5 @@ -diff -rup oox-orig-1/inc/oox/drawingml/customshapegeometry.hxx oox/inc/oox/drawingml/customshapegeometry.hxx ---- oox-orig-1/inc/oox/drawingml/customshapegeometry.hxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/inc/oox/drawingml/customshapegeometry.hxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/inc/oox/drawingml/customshapegeometry.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/drawingml/customshapegeometry.hxx 2010-03-03 16:59:43.000000000 +0100 @@ -44,11 +44,11 @@ namespace oox { namespace drawingml { class CustomShapeGeometryContext : public ::oox::core::ContextHandler { @@ -15,9 +14,8 @@ diff -rup oox-orig-1/inc/oox/drawingml/customshapegeometry.hxx oox/inc/oox/drawi }; // --------------------------------------------------------------------- -diff -rup oox-orig-1/inc/oox/drawingml/customshapeproperties.hxx oox/inc/oox/drawingml/customshapeproperties.hxx ---- oox-orig-1/inc/oox/drawingml/customshapeproperties.hxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/inc/oox/drawingml/customshapeproperties.hxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/inc/oox/drawingml/customshapeproperties.hxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/inc/oox/drawingml/customshapeproperties.hxx 2010-03-03 16:59:43.000000000 +0100 @@ -35,6 +35,7 @@ #include "oox/drawingml/color.hxx" #include <com/sun/star/graphic/XGraphic.hpp> @@ -40,9 +38,8 @@ diff -rup oox-orig-1/inc/oox/drawingml/customshapeproperties.hxx oox/inc/oox/dra }; } } -diff -rup oox-orig-1/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx ---- oox-orig-1/inc/oox/drawingml/shape.hxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/inc/oox/drawingml/shape.hxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/inc/oox/drawingml/shape.hxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/inc/oox/drawingml/shape.hxx 2010-03-03 16:59:43.000000000 +0100 @@ -33,7 +33,7 @@ #include "oox/helper/propertymap.hxx" @@ -62,9 +59,8 @@ diff -rup oox-orig-1/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx typedef ::std::map< ::rtl::OUString, ShapePtr > ShapeIdMap; struct ShapeStyleRef -diff -rup oox-orig-1/source/drawingml/chart/plotareaconverter.cxx oox/source/drawingml/chart/plotareaconverter.cxx ---- oox-orig-1/source/drawingml/chart/plotareaconverter.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/chart/plotareaconverter.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/chart/plotareaconverter.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/chart/plotareaconverter.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -31,6 +31,7 @@ #include "oox/drawingml/chart/plotareaconverter.hxx" @@ -73,9 +69,8 @@ diff -rup oox-orig-1/source/drawingml/chart/plotareaconverter.cxx oox/source/dra #include <com/sun/star/drawing/ShadeMode.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -diff -rup oox-orig-1/source/drawingml/customshapegeometry.cxx oox/source/drawingml/customshapegeometry.cxx ---- oox-orig-1/source/drawingml/customshapegeometry.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/customshapegeometry.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/customshapegeometry.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/customshapegeometry.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -29,10 +29,12 @@ ************************************************************************/ @@ -209,9 +204,8 @@ diff -rup oox-orig-1/source/drawingml/customshapegeometry.cxx oox/source/drawing } Reference< XFastContextHandler > xEmpty; -diff -rup oox-orig-1/source/drawingml/diagram/diagramdefinitioncontext.cxx oox/source/drawingml/diagram/diagramdefinitioncontext.cxx ---- oox-orig-1/source/drawingml/diagram/diagramdefinitioncontext.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/diagram/diagramdefinitioncontext.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/diagram/diagramdefinitioncontext.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/diagram/diagramdefinitioncontext.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -33,6 +33,7 @@ #include "oox/helper/helper.hxx" #include "layoutnodecontext.hxx" @@ -220,9 +214,8 @@ diff -rup oox-orig-1/source/drawingml/diagram/diagramdefinitioncontext.cxx oox/s using namespace ::oox::core; using namespace ::com::sun::star::uno; -diff -rup oox-orig-1/source/drawingml/diagram/diagramfragmenthandler.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx ---- oox-orig-1/source/drawingml/diagram/diagramfragmenthandler.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/diagram/diagramfragmenthandler.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/diagram/diagramfragmenthandler.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/diagram/diagramfragmenthandler.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -34,7 +34,7 @@ #include "oox/drawingml/diagram/datamodelcontext.hxx" #include "oox/core/namespaces.hxx" @@ -232,9 +225,8 @@ diff -rup oox-orig-1/source/drawingml/diagram/diagramfragmenthandler.cxx oox/sou using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; -diff -rup oox-orig-1/source/drawingml/graphicshapecontext.cxx oox/source/drawingml/graphicshapecontext.cxx ---- oox-orig-1/source/drawingml/graphicshapecontext.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/graphicshapecontext.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/graphicshapecontext.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/graphicshapecontext.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -33,6 +33,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> @@ -243,9 +235,8 @@ diff -rup oox-orig-1/source/drawingml/graphicshapecontext.cxx oox/source/drawing #include "oox/drawingml/diagram/diagramfragmenthandler.hxx" #include "oox/drawingml/table/tablecontext.hxx" #include "oox/core/namespaces.hxx" -diff -rup oox-orig-1/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx ---- oox-orig-1/source/drawingml/shape.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/shape.cxx 2009-10-05 18:19:24.000000000 +0200 +--- oox/source/drawingml/shape.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/shape.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -29,6 +29,7 @@ ************************************************************************/ @@ -254,7 +245,7 @@ diff -rup oox-orig-1/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx #include "oox/drawingml/theme.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/lineproperties.hxx" -@@ -217,8 +218,8 @@ void Shape::addChildren( +@@ -218,8 +219,8 @@ void Shape::addChildren( aIter = rMaster.maChildren.begin(); while( aIter != rMaster.maChildren.end() ) { @@ -265,7 +256,7 @@ diff -rup oox-orig-1/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx if ( ( nGlobalLeft != SAL_MAX_INT32 ) && ( nGlobalRight != SAL_MIN_INT32 ) && ( nGlobalTop != SAL_MAX_INT32 ) && ( nGlobalBottom != SAL_MIN_INT32 ) ) { sal_Int32 nGlobalWidth = nGlobalRight - nGlobalLeft; -@@ -297,6 +298,35 @@ Reference< XShape > Shape::createAndInse +@@ -298,6 +299,35 @@ Reference< XShape > Shape::createAndInse aTransformation.translate( aPosition.X / 360.0, aPosition.Y / 360.0 ); } @@ -301,9 +292,8 @@ diff -rup oox-orig-1/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx // special for lineshape if ( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.LineShape" ) ) { -diff -rup oox-orig-1/source/drawingml/shapepropertiescontext.cxx oox/source/drawingml/shapepropertiescontext.cxx ---- oox-orig-1/source/drawingml/shapepropertiescontext.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/shapepropertiescontext.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/shapepropertiescontext.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/shapepropertiescontext.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -77,7 +77,7 @@ Reference< XFastContextHandler > ShapePr // GeometryGroup @@ -313,9 +303,8 @@ diff -rup oox-orig-1/source/drawingml/shapepropertiescontext.cxx oox/source/draw break; -diff -rup oox-orig-1/source/drawingml/table/tablerowcontext.cxx oox/source/drawingml/table/tablerowcontext.cxx ---- oox-orig-1/source/drawingml/table/tablerowcontext.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/table/tablerowcontext.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/table/tablerowcontext.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/table/tablerowcontext.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -34,6 +34,7 @@ #include "oox/drawingml/table/tablecellcontext.hxx" #include "oox/drawingml/table/tablerow.hxx" @@ -324,9 +313,8 @@ diff -rup oox-orig-1/source/drawingml/table/tablerowcontext.cxx oox/source/drawi using namespace ::oox::core; using namespace ::com::sun::star; -diff -rup oox-orig-1/source/drawingml/theme.cxx oox/source/drawingml/theme.cxx ---- oox-orig-1/source/drawingml/theme.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/drawingml/theme.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/drawingml/theme.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/theme.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -29,6 +29,7 @@ ************************************************************************/ @@ -335,20 +323,18 @@ diff -rup oox-orig-1/source/drawingml/theme.cxx oox/source/drawingml/theme.cxx using ::rtl::OUString; -diff -rup oox-orig-1/source/shape/ShapeContextHandler.cxx oox/source/shape/ShapeContextHandler.cxx ---- oox-orig-1/source/shape/ShapeContextHandler.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/shape/ShapeContextHandler.cxx 2009-10-05 18:18:01.000000000 +0200 +--- oox/source/shape/ShapeContextHandler.cxx.old 2010-03-03 16:59:42.000000000 +0100 ++++ oox/source/shape/ShapeContextHandler.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -32,6 +32,7 @@ #include "oox/vml/vmldrawingfragment.hxx" #include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshapecontainer.hxx" +#include "tokens.hxx" - namespace oox { namespace shape { - -diff -rup oox-orig-1/source/xls/themebuffer.cxx oox/source/xls/themebuffer.cxx ---- oox-orig-1/source/xls/themebuffer.cxx 2009-10-05 18:17:28.000000000 +0200 -+++ oox/source/xls/themebuffer.cxx 2009-10-05 18:18:01.000000000 +0200 + #if DEBUG + #include <iostream> +--- oox/source/xls/themebuffer.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/xls/themebuffer.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -30,6 +30,7 @@ #include "oox/xls/themebuffer.hxx" diff --git a/patches/dev300/oox-fix-list-style-apply.diff b/patches/dev300/oox-fix-list-style-apply.diff index 7b87ef873..ce18c1c03 100644 --- a/patches/dev300/oox-fix-list-style-apply.diff +++ b/patches/dev300/oox-fix-list-style-apply.diff @@ -1,15 +1,14 @@ -diff -rup oox-orig/source/ppt/pptshape.cxx oox/source/ppt/pptshape.cxx ---- oox-orig/source/ppt/pptshape.cxx 2009-03-20 10:32:46.000000000 +0100 -+++ oox/source/ppt/pptshape.cxx 2009-03-20 10:36:24.000000000 +0100 -@@ -153,8 +153,10 @@ void PPTShape::addShape( - break; - } - } +--- oox/source/ppt/pptshape.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/ppt/pptshape.cxx 2010-03-03 16:59:43.000000000 +0100 +@@ -158,8 +158,10 @@ void PPTShape::addShape( + break; + } + } + + // use style from master slide for placeholders only, otherwise use slide's style, which might be the default style from presentation - if ( !aMasterTextListStyle.get() ) -- aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle(); + if ( !aMasterTextListStyle.get() ) +- aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle(); + aMasterTextListStyle = ( mnSubType && rSlidePersist.getMasterPersist().get() ) ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle(); - setMasterTextListStyle( aMasterTextListStyle ); + setMasterTextListStyle( aMasterTextListStyle ); - Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, rxTheme, rxShapes, pShapeRect ) ); + Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, rxTheme, rxShapes, pShapeRect, bClearText ) ); diff --git a/patches/dev300/oox-pptx-export-para-linespacing.diff b/patches/dev300/oox-pptx-export-para-linespacing.diff index 054ba3f25..0ed769bcb 100644 --- a/patches/dev300/oox-pptx-export-para-linespacing.diff +++ b/patches/dev300/oox-pptx-export-para-linespacing.diff @@ -1,6 +1,5 @@ -diff -rup oox-orig-4/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.hxx ---- oox-orig-4/inc/oox/export/drawingml.hxx 2009-06-04 11:55:03.000000000 +0200 -+++ oox/inc/oox/export/drawingml.hxx 2009-06-04 12:36:30.000000000 +0200 +--- oox/inc/oox/export/drawingml.hxx.old 2010-03-03 17:00:10.000000000 +0100 ++++ oox/inc/oox/export/drawingml.hxx 2010-03-03 17:00:10.000000000 +0100 @@ -20,6 +20,9 @@ namespace beans { namespace drawing { class XShape; @@ -19,9 +18,8 @@ diff -rup oox-orig-4/inc/oox/export/drawingml.hxx oox/inc/oox/export/drawingml.h ::rtl::OUString WriteBlip( ::rtl::OUString& rURL ); void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet ); -diff -rup oox-orig-4/source/export/drawingml.cxx oox/source/export/drawingml.cxx ---- oox-orig-4/source/export/drawingml.cxx 2009-06-04 11:55:07.000000000 +0200 -+++ oox/source/export/drawingml.cxx 2009-06-04 16:11:34.000000000 +0200 +--- oox/source/export/drawingml.cxx.old 2010-03-03 17:00:10.000000000 +0100 ++++ oox/source/export/drawingml.cxx 2010-03-03 17:00:10.000000000 +0100 @@ -42,6 +42,8 @@ #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -29,10 +27,10 @@ diff -rup oox-orig-4/source/export/drawingml.cxx oox/source/export/drawingml.cxx +#include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> + #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> - #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> -@@ -52,6 +54,8 @@ - #include <com/sun/star/drawing/TextVerticalAdjust.hpp> +@@ -54,6 +56,8 @@ + #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/style/LineSpacing.hpp> @@ -40,7 +38,7 @@ diff -rup oox-orig-4/source/export/drawingml.cxx oox/source/export/drawingml.cxx #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/text/WritingMode.hpp> #include <com/sun/star/text/XText.hpp> -@@ -71,10 +75,12 @@ +@@ -73,10 +77,12 @@ #include <svx/svxenum.hxx> using namespace ::com::sun::star; @@ -55,7 +53,7 @@ diff -rup oox-orig-4/source/export/drawingml.cxx oox/source/export/drawingml.cxx using ::com::sun::star::beans::PropertyState; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::XPropertySet; -@@ -83,6 +89,7 @@ using ::com::sun::star::container::XEnum +@@ -85,6 +91,7 @@ using ::com::sun::star::container::XEnum using ::com::sun::star::container::XEnumerationAccess; using ::com::sun::star::container::XIndexAccess; using ::com::sun::star::io::XOutputStream; @@ -63,7 +61,7 @@ diff -rup oox-orig-4/source/export/drawingml.cxx oox/source/export/drawingml.cxx using ::com::sun::star::text::XText; using ::com::sun::star::text::XTextContent; using ::com::sun::star::text::XTextField; -@@ -107,6 +114,44 @@ namespace drawingml { +@@ -109,6 +116,44 @@ namespace drawingml { #define GET(variable, propName) \ if ( GETA(propName) ) \ mAny >>= variable; @@ -108,7 +106,7 @@ diff -rup oox-orig-4/source/export/drawingml.cxx oox/source/export/drawingml.cxx // not thread safe int DrawingML::mnImageCounter = 1; -@@ -1084,14 +1129,30 @@ const char* DrawingML::GetAlignment( sal +@@ -1086,14 +1131,30 @@ const char* DrawingML::GetAlignment( sal return sAlignment; } @@ -139,7 +137,7 @@ diff -rup oox-orig-4/source/export/drawingml.cxx oox/source/export/drawingml.cxx sal_Int16 nLevel = -1; GET( nLevel, NumberingLevel ); -@@ -1102,15 +1163,27 @@ void DrawingML::WriteParagraphProperties +@@ -1104,15 +1165,27 @@ void DrawingML::WriteParagraphProperties sal_Int16 nAlignment( style::ParagraphAdjust_LEFT ); GET( nAlignment, ParaAdjust ); diff --git a/patches/dev300/oox-pptx-import-fix-layout.diff b/patches/dev300/oox-pptx-import-fix-layout.diff index 900c57220..bdc3b23a6 100644 --- a/patches/dev300/oox-pptx-import-fix-layout.diff +++ b/patches/dev300/oox-pptx-import-fix-layout.diff @@ -1,10 +1,9 @@ -diff -rup ../../build-orig/ooo310-m10/oox/inc/oox/ppt/pptshape.hxx oox/inc/oox/ppt/pptshape.hxx ---- ../../build-orig/ooo310-m10/oox/inc/oox/ppt/pptshape.hxx 2008-04-10 16:45:28.000000000 +0200 -+++ oox/inc/oox/ppt/pptshape.hxx 2009-04-24 12:33:35.000000000 +0200 +--- oox/inc/oox/ppt/pptshape.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/ppt/pptshape.hxx 2010-03-03 16:59:43.000000000 +0100 @@ -64,9 +64,11 @@ public: - ShapeLocation getShapeLocation() const { return meShapeLocation; }; - sal_Bool isReferenced() const { return mbReferenced; }; - void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; }; + ShapeLocation getShapeLocation() const { return meShapeLocation; }; + sal_Bool isReferenced() const { return mbReferenced; }; + void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; }; + void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; } protected: @@ -13,20 +12,18 @@ diff -rup ../../build-orig/ooo310-m10/oox/inc/oox/ppt/pptshape.hxx oox/inc/oox/p }; } } -diff -rup ../../build-orig/ooo310-m10/oox/source/ppt/pptshapecontext.cxx oox/source/ppt/pptshapecontext.cxx ---- ../../build-orig/ooo310-m10/oox/source/ppt/pptshapecontext.cxx 2009-04-24 13:53:44.000000000 +0200 -+++ oox/source/ppt/pptshapecontext.cxx 2009-04-24 12:37:44.000000000 +0200 -@@ -203,6 +203,7 @@ Reference< XFastContextHandler > PPTShap +--- oox/source/ppt/pptshapecontext.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/ppt/pptshapecontext.cxx 2010-03-03 16:59:43.000000000 +0100 +@@ -204,6 +204,7 @@ Reference< XFastContextHandler > PPTShap PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); if ( pPPTShape ) pPPTShape->setReferenced( sal_True ); + pPPTShapePtr->setPlaceholder( pPlaceholder ); } - } - } -diff -rup ../../build-orig/ooo310-m10/oox/source/ppt/pptshape.cxx oox/source/ppt/pptshape.cxx ---- ../../build-orig/ooo310-m10/oox/source/ppt/pptshape.cxx 2009-04-24 13:53:45.000000000 +0200 -+++ oox/source/ppt/pptshape.cxx 2009-04-24 12:38:41.000000000 +0200 + } + } +--- oox/source/ppt/pptshape.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/ppt/pptshape.cxx 2010-03-03 16:59:43.000000000 +0100 @@ -31,6 +31,7 @@ #include "oox/ppt/pptshape.hxx" #include "oox/core/namespaces.hxx" @@ -43,11 +40,11 @@ diff -rup ../../build-orig/ooo310-m10/oox/source/ppt/pptshape.cxx oox/source/ppt using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; -@@ -158,7 +160,19 @@ void PPTShape::addShape( +@@ -162,7 +164,19 @@ void PPTShape::addShape( // use style from master slide for placeholders only, otherwise use slide's style, which might be the default style from presentation - if ( !aMasterTextListStyle.get() ) + if ( !aMasterTextListStyle.get() ) aMasterTextListStyle = ( mnSubType && rSlidePersist.getMasterPersist().get() ) ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getOtherTextStyle(); -- setMasterTextListStyle( aMasterTextListStyle ); +- setMasterTextListStyle( aMasterTextListStyle ); + + if( aMasterTextListStyle.get() && getTextBody().get() ) { + TextListStylePtr aCombinedTextListStyle (new TextListStyle()); @@ -62,5 +59,5 @@ diff -rup ../../build-orig/ooo310-m10/oox/source/ppt/pptshape.cxx oox/source/ppt + } else + setMasterTextListStyle( aMasterTextListStyle ); - Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, rxTheme, rxShapes, pShapeRect ) ); - + Reference< XShape > xShape( createAndInsert( rFilterBase, sServiceName, rxTheme, rxShapes, pShapeRect, bClearText ) ); + if ( !rSlidePersist.isMasterPage() && rSlidePersist.getPage().is() && ( (sal_Int32)mnSubType == XML_title ) ) diff --git a/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff b/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff index 627839959..e5d3556d5 100644 --- a/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff +++ b/patches/dev300/oox-pptx-import-fix-transition-auto-advance.diff @@ -1,6 +1,5 @@ -diff -rup oox-orig/inc/oox/ppt/slidetransition.hxx oox/inc/oox/ppt/slidetransition.hxx ---- oox-orig/inc/oox/ppt/slidetransition.hxx 2009-10-05 17:12:59.000000000 +0200 -+++ oox/inc/oox/ppt/slidetransition.hxx 2009-10-05 17:13:29.000000000 +0200 +--- oox/inc/oox/ppt/slidetransition.hxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/inc/oox/ppt/slidetransition.hxx 2010-03-03 16:59:44.000000000 +0100 @@ -54,6 +54,8 @@ namespace oox { namespace ppt { { mnFadeColor = nColor; } void setMode( sal_Bool bMode ) @@ -18,9 +17,8 @@ diff -rup oox-orig/inc/oox/ppt/slidetransition.hxx oox/inc/oox/ppt/slidetransiti }; } } -diff -rup oox-orig/source/ppt/slidetransitioncontext.cxx oox/source/ppt/slidetransitioncontext.cxx ---- oox-orig/source/ppt/slidetransitioncontext.cxx 2009-10-05 17:13:00.000000000 +0200 -+++ oox/source/ppt/slidetransitioncontext.cxx 2009-10-05 17:13:29.000000000 +0200 +--- oox/source/ppt/slidetransitioncontext.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/ppt/slidetransitioncontext.cxx 2010-03-03 16:59:44.000000000 +0100 @@ -70,12 +70,9 @@ SlideTransitionContext::SlideTransitionC attribs.getBool( XML_advClick, true ); @@ -28,17 +26,16 @@ diff -rup oox-orig/source/ppt/slidetransitioncontext.cxx oox/source/ppt/slidetra - // for auto advance + // for auto advance if(attribs.hasAttribute( XML_advTm )) -- { -- // TODO -- xAttribs->getOptionalValue( XML_advTm ); -- } +- { +- // TODO +- xAttribs->getOptionalValue( XML_advTm ); +- } + maTransition.setOoxAdvanceTime( attribs.getInteger( XML_advTm, -1 ) ); } SlideTransitionContext::~SlideTransitionContext() throw() -diff -rup oox-orig/source/ppt/slidetransition.cxx oox/source/ppt/slidetransition.cxx ---- oox-orig/source/ppt/slidetransition.cxx 2009-10-05 17:13:00.000000000 +0200 -+++ oox/source/ppt/slidetransition.cxx 2009-10-05 17:17:56.000000000 +0200 +--- oox/source/ppt/slidetransition.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/ppt/slidetransition.cxx 2010-03-03 16:59:44.000000000 +0100 @@ -59,6 +59,7 @@ namespace oox { namespace ppt { , mnAnimationSpeed( AnimationSpeed_FAST ) , mnFadeColor( 0 ) @@ -75,9 +72,8 @@ diff -rup oox-orig/source/ppt/slidetransition.cxx oox/source/ppt/slidetransition sal_Int16 SlideTransition::ooxToOdpEightDirections( ::sal_Int32 nOoxType ) { sal_Int16 nOdpDirection; -diff -rup oox-orig/source/token/properties.txt oox/source/token/properties.txt ---- oox-orig/source/token/properties.txt 2009-10-05 17:13:00.000000000 +0200 -+++ oox/source/token/properties.txt 2009-10-05 17:16:55.000000000 +0200 +--- oox/source/token/properties.txt.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/token/properties.txt 2010-03-03 16:59:44.000000000 +0100 @@ -37,6 +37,7 @@ CellProtection CellStyle CenterHorizontally @@ -86,11 +82,11 @@ diff -rup oox-orig/source/token/properties.txt oox/source/token/properties.txt CharCaseMap CharColor CharContoured -@@ -106,6 +107,7 @@ DiagonalTLBR +@@ -107,6 +108,7 @@ DiagonalTLBR DisplayLabels DrillDownOnDoubleClick Dropdown +Duration EchoChar + EdgeKind Enabled - EndPosition diff --git a/patches/dev300/oox-smartart-import.diff b/patches/dev300/oox-smartart-import.diff index cc6369128..56f17b85a 100644 --- a/patches/dev300/oox-smartart-import.diff +++ b/patches/dev300/oox-smartart-import.diff @@ -1,103 +1,6 @@ -Smart art import patches - -From: Thorsten Behrens <thb@openoffice.org> - - ---- - - oox/inc/oox/core/filterbase.hxx | 5 - oox/inc/oox/core/xmlfilterbase.hxx | 29 + - oox/inc/oox/drawingml/chart/converterbase.hxx | 2 - oox/inc/oox/drawingml/customshapeproperties.hxx | 5 - oox/inc/oox/drawingml/diagram/datamodelcontext.hxx | 57 -- - oox/inc/oox/drawingml/diagram/diagram.hxx | 242 +------ - .../drawingml/diagram/diagramfragmenthandler.hxx | 103 --- - .../oox/drawingml/diagram/diagramlayoutatoms.hxx | 212 ------ - oox/inc/oox/drawingml/drawingmltypes.hxx | 3 - oox/inc/oox/drawingml/graphicshapecontext.hxx | 5 - oox/inc/oox/drawingml/scene3dcontext.hxx | 56 ++ - oox/inc/oox/drawingml/shape.hxx | 29 + - oox/inc/oox/drawingml/shape3dproperties.hxx | 135 ++++ - oox/inc/oox/drawingml/theme.hxx | 8 - oox/inc/oox/ppt/dgmimport.hxx | 71 ++ - oox/inc/oox/ppt/dgmlayout.hxx | 72 ++ - oox/inc/oox/ppt/pptimport.hxx | 2 - oox/inc/oox/xls/excelfilter.hxx | 2 - oox/inc/oox/xls/workbookhelper.hxx | 2 - oox/source/core/facreg.cxx | 6 - oox/source/core/filterbase.cxx | 9 - oox/source/core/xmlfilterbase.cxx | 155 ++++ - oox/source/drawingml/chart/chartspaceconverter.cxx | 5 - oox/source/drawingml/chart/converterbase.cxx | 4 - oox/source/drawingml/chart/datasourceconverter.cxx | 13 - oox/source/drawingml/clrscheme.cxx | 2 - oox/source/drawingml/color.cxx | 1 - oox/source/drawingml/customshapegeometry.cxx | 6 - .../drawingml/diagram/constraintlistcontext.cxx | 102 +++ - .../drawingml/diagram/constraintlistcontext.hxx | 54 ++ - oox/source/drawingml/diagram/datamodelcontext.cxx | 234 +++++-- - oox/source/drawingml/diagram/datamodelcontext.hxx | 57 ++ - oox/source/drawingml/diagram/diagram.cxx | 506 ++++++++++++--- - oox/source/drawingml/diagram/diagram.hxx | 320 +++++++++ - .../drawingml/diagram/diagramdefinitioncontext.cxx | 13 - .../drawingml/diagram/diagramdefinitioncontext.hxx | 2 - .../drawingml/diagram/diagramfragmenthandler.cxx | 183 +++-- - .../drawingml/diagram/diagramfragmenthandler.hxx | 117 +++ - .../drawingml/diagram/diagramlayoutatoms.cxx | 689 +++++++++++++++++++- - .../drawingml/diagram/diagramlayoutatoms.hxx | 318 +++++++++ - oox/source/drawingml/diagram/layoutnodecontext.cxx | 146 +++- - oox/source/drawingml/diagram/layoutnodecontext.hxx | 3 - oox/source/drawingml/diagram/makefile.mk | 1 - oox/source/drawingml/drawingmltypes.cxx | 4 - oox/source/drawingml/fillproperties.cxx | 3 - oox/source/drawingml/graphicshapecontext.cxx | 58 -- - oox/source/drawingml/lineproperties.cxx | 5 - oox/source/drawingml/makefile.mk | 1 - oox/source/drawingml/scene3dcontext.cxx | 189 +++++ - oox/source/drawingml/shape.cxx | 39 + - oox/source/drawingml/shape3dproperties.cxx | 67 ++ - oox/source/drawingml/shapepropertiescontext.cxx | 6 - oox/source/drawingml/textparagraph.cxx | 9 - oox/source/drawingml/textparagraphproperties.cxx | 1 - oox/source/helper/storagebase.cxx | 20 - - oox/source/ppt/dgmimport.cxx | 134 ++++ - oox/source/ppt/dgmlayout.cxx | 193 ++++++ - oox/source/ppt/makefile.mk | 2 - oox/source/ppt/pptimport.cxx | 4 - oox/source/ppt/presentationfragmenthandler.cxx | 13 - oox/source/ppt/slidepersist.cxx | 11 - oox/source/shape/ShapeFilterBase.cxx | 4 - oox/source/shape/ShapeFilterBase.hxx | 2 - oox/source/token/makefile.mk | 16 - oox/source/xls/excelfilter.cxx | 2 - oox/source/xls/workbookhelper.cxx | 4 - sc/source/filter/excel/xestream.cxx | 5 - sc/source/filter/inc/xestream.hxx | 2 - 68 files changed, 3774 insertions(+), 1006 deletions(-) - delete mode 100644 oox/inc/oox/drawingml/diagram/datamodelcontext.hxx - delete mode 100644 oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx - delete mode 100644 oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx - create mode 100644 oox/inc/oox/drawingml/scene3dcontext.hxx - create mode 100644 oox/inc/oox/drawingml/shape3dproperties.hxx - create mode 100644 oox/inc/oox/ppt/dgmimport.hxx - create mode 100644 oox/inc/oox/ppt/dgmlayout.hxx - create mode 100644 oox/source/drawingml/diagram/constraintlistcontext.cxx - create mode 100644 oox/source/drawingml/diagram/constraintlistcontext.hxx - create mode 100644 oox/source/drawingml/diagram/datamodelcontext.hxx - create mode 100644 oox/source/drawingml/diagram/diagram.hxx - create mode 100644 oox/source/drawingml/diagram/diagramfragmenthandler.hxx - create mode 100644 oox/source/drawingml/diagram/diagramlayoutatoms.hxx - create mode 100644 oox/source/drawingml/scene3dcontext.cxx - create mode 100644 oox/source/drawingml/shape3dproperties.cxx - create mode 100644 oox/source/ppt/dgmimport.cxx - create mode 100644 oox/source/ppt/dgmlayout.cxx - - -diff --git oox/inc/oox/core/filterbase.hxx oox/inc/oox/core/filterbase.hxx -index adfb8d6..b719488 100644 ---- oox/inc/oox/core/filterbase.hxx -+++ oox/inc/oox/core/filterbase.hxx -@@ -52,6 +52,7 @@ namespace com { namespace sun { namespace star { +--- oox/inc/oox/core/filterbase.hxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/inc/oox/core/filterbase.hxx 2010-03-03 17:00:08.000000000 +0100 +@@ -52,6 +52,7 @@ namespace com { namespace sun { namespac namespace frame { class XModel; } namespace task { class XStatusIndicator; } namespace task { class XInteractionHandler; } @@ -116,10 +19,8 @@ index adfb8d6..b719488 100644 /** Returns the status indicator (may be null). */ const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& getStatusIndicator() const; -diff --git oox/inc/oox/core/xmlfilterbase.hxx oox/inc/oox/core/xmlfilterbase.hxx -index 510b00e..dfd4f5c 100644 ---- oox/inc/oox/core/xmlfilterbase.hxx -+++ oox/inc/oox/core/xmlfilterbase.hxx +--- oox/inc/oox/core/xmlfilterbase.hxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/inc/oox/core/xmlfilterbase.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -45,8 +45,10 @@ namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } @@ -172,10 +73,8 @@ index 510b00e..dfd4f5c 100644 /** Imports the relations fragment associated with the specified fragment. @return The relations collection of the specified fragment. -diff --git oox/inc/oox/drawingml/chart/converterbase.hxx oox/inc/oox/drawingml/chart/converterbase.hxx -index f456d95..35fa990 100644 ---- oox/inc/oox/drawingml/chart/converterbase.hxx -+++ oox/inc/oox/drawingml/chart/converterbase.hxx +--- oox/inc/oox/drawingml/chart/converterbase.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/drawingml/chart/converterbase.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -79,7 +79,7 @@ protected: /** Returns the filter object of the imported/exported document. */ ::oox::core::XmlFilterBase& getFilter() const; @@ -185,10 +84,8 @@ index f456d95..35fa990 100644 /** Returns the API chart document model. */ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > getChartDocument() const; -diff --git oox/inc/oox/drawingml/customshapeproperties.hxx oox/inc/oox/drawingml/customshapeproperties.hxx -index 65ee7d3..b0151d7 100644 ---- oox/inc/oox/drawingml/customshapeproperties.hxx -+++ oox/inc/oox/drawingml/customshapeproperties.hxx +--- oox/inc/oox/drawingml/customshapeproperties.hxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/inc/oox/drawingml/customshapeproperties.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -77,8 +77,9 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape) const; @@ -201,11 +98,8 @@ index 65ee7d3..b0151d7 100644 double getValue( const std::vector< CustomShapeGuide >&, sal_uInt32 nIndex ) const; ::basegfx::B2DPolyPolygon& getPolygon() { return maPolygon; } -diff --git oox/inc/oox/drawingml/diagram/datamodelcontext.hxx oox/inc/oox/drawingml/diagram/datamodelcontext.hxx -deleted file mode 100644 -index fb8a3d3..0000000 ---- oox/inc/oox/drawingml/diagram/datamodelcontext.hxx -+++ /dev/null +--- oox/inc/oox/drawingml/diagram/datamodelcontext.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/drawingml/diagram/datamodelcontext.hxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -/************************************************************************* - * @@ -264,10 +158,8 @@ index fb8a3d3..0000000 -} } - -#endif // OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX -diff --git oox/inc/oox/drawingml/diagram/diagram.hxx oox/inc/oox/drawingml/diagram/diagram.hxx -index e26a2de..732959b 100644 ---- oox/inc/oox/drawingml/diagram/diagram.hxx -+++ oox/inc/oox/drawingml/diagram/diagram.hxx +--- oox/inc/oox/drawingml/diagram/diagram.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/drawingml/diagram/diagram.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -28,232 +28,40 @@ * ************************************************************************/ @@ -283,11 +175,14 @@ index e26a2de..732959b 100644 +#include <rtl/ustring.hxx> #include "oox/drawingml/shape.hxx" -#include "oox/drawingml/diagram/diagramlayoutatoms.hxx" -- --namespace oox { namespace drawingml { -- --namespace dgm { +#include "oox/core/xmlfilterbase.hxx" ++ ++#include <com/sun/star/xml/dom/XDocument.hpp> + + namespace oox { namespace drawingml { + +-namespace dgm { ++/** load diagram data, and put resulting graphic into shape -/** A Connection - */ @@ -300,8 +195,7 @@ index e26a2de..732959b 100644 - , mnDestOrder( 0 ) - { - } -+#include <com/sun/star/xml/dom/XDocument.hpp> - +- - void dump(); - - sal_Int32 mnType; @@ -318,11 +212,9 @@ index e26a2de..732959b 100644 - -typedef boost::shared_ptr< Connection > ConnectionPtr; -typedef std::vector< ConnectionPtr > Connections; -+namespace oox { namespace drawingml { - +- -class Point; -+/** load diagram data, and put resulting graphic into shape - +- -typedef boost::shared_ptr< Point > PointPtr; -typedef std::vector< PointPtr > Points; -/** A point @@ -526,11 +418,8 @@ index e26a2de..732959b 100644 } } #endif -diff --git oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx -deleted file mode 100644 -index ede8fec..0000000 ---- oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx -+++ /dev/null +--- oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/drawingml/diagram/diagramfragmenthandler.hxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -/************************************************************************* - * @@ -635,11 +524,8 @@ index ede8fec..0000000 - - -#endif -diff --git oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx -deleted file mode 100644 -index db37c9c..0000000 ---- oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx -+++ /dev/null +--- oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/drawingml/diagram/diagramlayoutatoms.hxx 1970-01-01 01:00:00.000000000 +0100 @@ -1,212 +0,0 @@ -/************************************************************************* - * @@ -853,11 +739,9 @@ index db37c9c..0000000 -} } - -#endif -diff --git oox/inc/oox/drawingml/drawingmltypes.hxx oox/inc/oox/drawingml/drawingmltypes.hxx -index 5a2a74b..de80530 100644 ---- oox/inc/oox/drawingml/drawingmltypes.hxx -+++ oox/inc/oox/drawingml/drawingmltypes.hxx -@@ -61,6 +61,9 @@ typedef ::boost::shared_ptr< FillProperties > FillPropertiesPtr; +--- oox/inc/oox/drawingml/drawingmltypes.hxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/inc/oox/drawingml/drawingmltypes.hxx 2010-03-03 17:00:08.000000000 +0100 +@@ -61,6 +61,9 @@ typedef ::boost::shared_ptr< FillPropert struct GraphicProperties; typedef ::boost::shared_ptr< GraphicProperties > GraphicPropertiesPtr; @@ -867,10 +751,8 @@ index 5a2a74b..de80530 100644 struct TextCharacterProperties; typedef ::boost::shared_ptr< TextCharacterProperties > TextCharacterPropertiesPtr; -diff --git oox/inc/oox/drawingml/graphicshapecontext.hxx oox/inc/oox/drawingml/graphicshapecontext.hxx -index 2e3a3e1..c9cb55d 100644 ---- oox/inc/oox/drawingml/graphicshapecontext.hxx -+++ oox/inc/oox/drawingml/graphicshapecontext.hxx +--- oox/inc/oox/drawingml/graphicshapecontext.hxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/inc/oox/drawingml/graphicshapecontext.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -33,7 +33,6 @@ #include "oox/drawingml/shape.hxx" @@ -897,11 +779,8 @@ index 2e3a3e1..c9cb55d 100644 ::rtl::OUString msDm; ::rtl::OUString msLo; ::rtl::OUString msQs; -diff --git oox/inc/oox/drawingml/scene3dcontext.hxx oox/inc/oox/drawingml/scene3dcontext.hxx -new file mode 100644 -index 0000000..e134288 ---- /dev/null -+++ oox/inc/oox/drawingml/scene3dcontext.hxx +--- oox/inc/oox/drawingml/scene3dcontext.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/inc/oox/drawingml/scene3dcontext.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,56 @@ +/************************************************************************* + * @@ -959,10 +838,8 @@ index 0000000..e134288 +} } + +#endif // OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP -diff --git oox/inc/oox/drawingml/shape.hxx oox/inc/oox/drawingml/shape.hxx -index 6a19761..7b42b1a 100644 ---- oox/inc/oox/drawingml/shape.hxx -+++ oox/inc/oox/drawingml/shape.hxx +--- oox/inc/oox/drawingml/shape.hxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/inc/oox/drawingml/shape.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -35,6 +35,7 @@ #include "oox/drawingml/drawingmltypes.hxx" //#include "oox/drawingml/customshapeproperties.hxx" @@ -1036,11 +913,8 @@ index 6a19761..7b42b1a 100644 } } -diff --git oox/inc/oox/drawingml/shape3dproperties.hxx oox/inc/oox/drawingml/shape3dproperties.hxx -new file mode 100644 -index 0000000..2fe82aa ---- /dev/null -+++ oox/inc/oox/drawingml/shape3dproperties.hxx +--- oox/inc/oox/drawingml/shape3dproperties.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/inc/oox/drawingml/shape3dproperties.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,135 @@ +/************************************************************************* + * @@ -1177,10 +1051,8 @@ index 0000000..2fe82aa + +#endif + -diff --git oox/inc/oox/drawingml/theme.hxx oox/inc/oox/drawingml/theme.hxx -index 17f23e5..2f34a33 100644 ---- oox/inc/oox/drawingml/theme.hxx -+++ oox/inc/oox/drawingml/theme.hxx +--- oox/inc/oox/drawingml/theme.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/inc/oox/drawingml/theme.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -35,6 +35,7 @@ #include "oox/drawingml/clrscheme.hxx" #include "oox/drawingml/shape.hxx" @@ -1210,11 +1082,8 @@ index 17f23e5..2f34a33 100644 }; // ============================================================================ -diff --git oox/inc/oox/ppt/dgmimport.hxx oox/inc/oox/ppt/dgmimport.hxx -new file mode 100644 -index 0000000..779a274 ---- /dev/null -+++ oox/inc/oox/ppt/dgmimport.hxx +--- oox/inc/oox/ppt/dgmimport.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/inc/oox/ppt/dgmimport.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,71 @@ +/************************************************************************* + * @@ -1287,11 +1156,8 @@ index 0000000..779a274 +} } + +#endif // OOX_POWERPOINT_QUICKDIAGRAMMINGIMPORT_HXX -diff --git oox/inc/oox/ppt/dgmlayout.hxx oox/inc/oox/ppt/dgmlayout.hxx -new file mode 100644 -index 0000000..4f90023 ---- /dev/null -+++ oox/inc/oox/ppt/dgmlayout.hxx +--- oox/inc/oox/ppt/dgmlayout.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/inc/oox/ppt/dgmlayout.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,72 @@ +/************************************************************************* + * @@ -1365,10 +1231,8 @@ index 0000000..4f90023 +} } + +#endif // OOX_POWERPOINT_QUICKDIAGRAMMINGLAYOUT_HXX -diff --git oox/inc/oox/ppt/pptimport.hxx oox/inc/oox/ppt/pptimport.hxx -index 0b94c7a..e0c62b1 100644 ---- oox/inc/oox/ppt/pptimport.hxx -+++ oox/inc/oox/ppt/pptimport.hxx +--- oox/inc/oox/ppt/pptimport.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ oox/inc/oox/ppt/pptimport.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -61,7 +61,7 @@ public: virtual const ::oox::drawingml::Theme* getCurrentTheme() const; virtual ::oox::vml::Drawing* getVmlDrawing(); @@ -1378,10 +1242,8 @@ index 0b94c7a..e0c62b1 100644 void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; }; std::map< rtl::OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; }; -diff --git oox/inc/oox/xls/excelfilter.hxx oox/inc/oox/xls/excelfilter.hxx -index 28059fe..a4656e2 100644 ---- oox/inc/oox/xls/excelfilter.hxx -+++ oox/inc/oox/xls/excelfilter.hxx +--- oox/inc/oox/xls/excelfilter.hxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ oox/inc/oox/xls/excelfilter.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -73,7 +73,7 @@ public: virtual const ::oox::drawingml::Theme* getCurrentTheme() const; virtual ::oox::vml::Drawing* getVmlDrawing(); @@ -1389,12 +1251,10 @@ index 28059fe..a4656e2 100644 - virtual ::oox::drawingml::chart::ChartConverter& getChartConverter(); + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); - private: - virtual ::rtl::OUString implGetImplementationName() const; -diff --git oox/inc/oox/xls/workbookhelper.hxx oox/inc/oox/xls/workbookhelper.hxx -index cd2d9cf..7aaad16 100644 ---- oox/inc/oox/xls/workbookhelper.hxx -+++ oox/inc/oox/xls/workbookhelper.hxx + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException ); + +--- oox/inc/oox/xls/workbookhelper.hxx.old 2009-10-19 13:27:41.000000000 +0200 ++++ oox/inc/oox/xls/workbookhelper.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -335,7 +335,7 @@ public: /** Returns the converter for string to cell address/range conversion. */ AddressConverter& getAddressConverter() const; @@ -1404,11 +1264,9 @@ index cd2d9cf..7aaad16 100644 /** Returns the page and print settings converter. */ PageSettingsConverter& getPageSettingsConverter() const; -diff --git oox/source/core/facreg.cxx oox/source/core/facreg.cxx -index 8d3846f..9c00d0f 100644 ---- oox/source/core/facreg.cxx -+++ oox/source/core/facreg.cxx -@@ -60,6 +60,8 @@ extern uno::Reference< uno::XInterface > SAL_CALL className##_createInstance( +--- oox/source/core/facreg.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/core/facreg.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -60,6 +60,8 @@ extern uno::Reference< uno::XInterface > namespace oox { namespace core { SERVICE( FilterDetect ); } namespace ppt { SERVICE( PowerPointImport ); } @@ -1417,7 +1275,7 @@ index 8d3846f..9c00d0f 100644 namespace xls { SERVICE( BiffDetector ); } namespace xls { SERVICE( ExcelFilter ); } namespace xls { SERVICE( ExcelBiffFilter ); } -@@ -103,6 +105,8 @@ OOX_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void * , void * pRegistryKe +@@ -103,6 +105,8 @@ OOX_DLLPUBLIC sal_Bool SAL_CALL componen WRITEINFO( ::oox::core::FilterDetect ); WRITEINFO( ::oox::ppt::PowerPointImport ); @@ -1426,7 +1284,7 @@ index 8d3846f..9c00d0f 100644 WRITEINFO( ::oox::xls::BiffDetector ); WRITEINFO( ::oox::xls::ExcelFilter ); WRITEINFO( ::oox::xls::ExcelBiffFilter ); -@@ -151,6 +155,8 @@ OOX_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, +@@ -151,6 +155,8 @@ OOX_DLLPUBLIC void * SAL_CALL component_ SINGLEFACTORY( ::oox::core::FilterDetect ) else SINGLEFACTORY( oox::ppt::PowerPointImport ) @@ -1435,10 +1293,8 @@ index 8d3846f..9c00d0f 100644 else SINGLEFACTORY( ::oox::xls::BiffDetector ) else SINGLEFACTORY( ::oox::xls::ExcelFilter ) else SINGLEFACTORY( ::oox::xls::ExcelBiffFilter ) -diff --git oox/source/core/filterbase.cxx oox/source/core/filterbase.cxx -index f2f9ef0..b390702 100644 ---- oox/source/core/filterbase.cxx -+++ oox/source/core/filterbase.cxx +--- oox/source/core/filterbase.cxx.old 2009-11-20 11:38:33.000000000 +0100 ++++ oox/source/core/filterbase.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -35,6 +35,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> @@ -1447,7 +1303,7 @@ index f2f9ef0..b390702 100644 #include <osl/mutex.hxx> #include <rtl/instance.hxx> #include <rtl/uri.hxx> -@@ -69,6 +70,7 @@ using ::com::sun::star::io::XInputStream; +@@ -69,6 +70,7 @@ using ::com::sun::star::io::XInputStream using ::com::sun::star::io::XOutputStream; using ::com::sun::star::io::XStream; using ::com::sun::star::task::XStatusIndicator; @@ -1463,7 +1319,7 @@ index f2f9ef0..b390702 100644 explicit FilterBaseImpl( const Reference< XMultiServiceFactory >& rxGlobalFactory ); -@@ -320,6 +323,11 @@ const Reference< XMultiServiceFactory >& FilterBase::getModelFactory() const +@@ -320,6 +323,11 @@ const Reference< XMultiServiceFactory >& return mxImpl->mxModelFactory; } @@ -1475,7 +1331,7 @@ index f2f9ef0..b390702 100644 const Reference< XStatusIndicator >& FilterBase::getStatusIndicator() const { return mxImpl->mxStatusIndicator; -@@ -669,6 +677,7 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc +@@ -669,6 +677,7 @@ void FilterBase::setMediaDescriptor( con mxImpl->maFileUrl = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_URL(), OUString() ); mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() ); mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() ); @@ -1483,10 +1339,8 @@ index f2f9ef0..b390702 100644 } -diff --git oox/source/core/xmlfilterbase.cxx oox/source/core/xmlfilterbase.cxx -index c404002..fe9f639 100644 ---- oox/source/core/xmlfilterbase.cxx -+++ oox/source/core/xmlfilterbase.cxx +--- oox/source/core/xmlfilterbase.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/core/xmlfilterbase.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -34,10 +34,14 @@ #include <rtl/strbuf.hxx> @@ -1510,7 +1364,7 @@ index c404002..fe9f639 100644 using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Exception; -@@ -77,11 +82,14 @@ using ::com::sun::star::xml::sax::XFastTokenHandler; +@@ -77,11 +82,14 @@ using ::com::sun::star::xml::sax::XFastT using ::com::sun::star::xml::sax::XFastDocumentHandler; using ::com::sun::star::xml::sax::InputSource; using ::com::sun::star::xml::sax::SAXException; @@ -1590,7 +1444,7 @@ index c404002..fe9f639 100644 XmlFilterBase::XmlFilterBase( const Reference< XMultiServiceFactory >& rxGlobalFactory ) : FilterBase( rxGlobalFactory ), mxImpl( new XmlFilterBaseImpl ), -@@ -186,26 +252,10 @@ bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& r +@@ -186,26 +252,10 @@ bool XmlFilterBase::importFragment( cons xParser->setTokenHandler( mxImpl->mxTokenHandler ); // register XML namespaces @@ -1621,7 +1475,7 @@ index c404002..fe9f639 100644 // create the input source and parse the stream InputSource aSource; -@@ -229,6 +279,66 @@ bool XmlFilterBase::importFragment( const ::rtl::Reference< FragmentHandler >& r +@@ -229,6 +279,66 @@ bool XmlFilterBase::importFragment( cons return false; } @@ -1688,7 +1542,7 @@ index c404002..fe9f639 100644 RelationsRef XmlFilterBase::importRelations( const OUString& rFragmentPath ) { // try to find cached relations -@@ -492,6 +602,11 @@ XmlFilterBase& XmlFilterBase::exportDocumentProperties( Reference< XDocumentProp +@@ -492,6 +602,11 @@ XmlFilterBase& XmlFilterBase::exportDocu return *this; } @@ -1700,11 +1554,9 @@ index c404002..fe9f639 100644 // protected ------------------------------------------------------------------ Reference< XInputStream > XmlFilterBase::implGetInputStream( MediaDescriptor& rMediaDesc ) const -diff --git oox/source/drawingml/chart/chartspaceconverter.cxx oox/source/drawingml/chart/chartspaceconverter.cxx -index e6e62af..5bf584e 100644 ---- oox/source/drawingml/chart/chartspaceconverter.cxx -+++ oox/source/drawingml/chart/chartspaceconverter.cxx -@@ -69,9 +69,12 @@ ChartSpaceConverter::~ChartSpaceConverter() +--- oox/source/drawingml/chart/chartspaceconverter.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/chart/chartspaceconverter.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -69,9 +69,12 @@ ChartSpaceConverter::~ChartSpaceConverte void ChartSpaceConverter::convertFromModel() { @@ -1718,11 +1570,9 @@ index e6e62af..5bf584e 100644 // attach number formatter of container document to data receiver try -diff --git oox/source/drawingml/chart/converterbase.cxx oox/source/drawingml/chart/converterbase.cxx -index c9b91e3..c5509c2 100644 ---- oox/source/drawingml/chart/converterbase.cxx -+++ oox/source/drawingml/chart/converterbase.cxx -@@ -145,9 +145,9 @@ XmlFilterBase& ConverterRoot::getFilter() const +--- oox/source/drawingml/chart/converterbase.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/chart/converterbase.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -145,9 +145,9 @@ XmlFilterBase& ConverterRoot::getFilter( return mxData->mrFilter; } @@ -1734,11 +1584,9 @@ index c9b91e3..c5509c2 100644 } Reference< XChartDocument > ConverterRoot::getChartDocument() const -diff --git oox/source/drawingml/chart/datasourceconverter.cxx oox/source/drawingml/chart/datasourceconverter.cxx -index 56a0cda..f3d2c96 100644 ---- oox/source/drawingml/chart/datasourceconverter.cxx -+++ oox/source/drawingml/chart/datasourceconverter.cxx -@@ -57,12 +57,15 @@ DataSequenceConverter::~DataSequenceConverter() +--- oox/source/drawingml/chart/datasourceconverter.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/chart/datasourceconverter.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -57,12 +57,15 @@ DataSequenceConverter::~DataSequenceConv Reference< XDataSequence > DataSequenceConverter::createDataSequence( const OUString& rRole ) { // create data sequence from data source model (virtual call at chart converter) @@ -1759,10 +1607,8 @@ index 56a0cda..f3d2c96 100644 return xDataSeq; } -diff --git oox/source/drawingml/clrscheme.cxx oox/source/drawingml/clrscheme.cxx -index 131fdb5..9f2582c 100644 ---- oox/source/drawingml/clrscheme.cxx -+++ oox/source/drawingml/clrscheme.cxx +--- oox/source/drawingml/clrscheme.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/clrscheme.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -28,6 +28,7 @@ * ************************************************************************/ @@ -1779,11 +1625,9 @@ index 131fdb5..9f2582c 100644 switch( nSchemeClrToken ) { case XML_bg1 : nSchemeClrToken = XML_lt1; break; -diff --git oox/source/drawingml/color.cxx oox/source/drawingml/color.cxx -index 009be55..56821fd 100644 ---- oox/source/drawingml/color.cxx -+++ oox/source/drawingml/color.cxx -@@ -384,6 +384,7 @@ sal_Int32 Color::getColor( const ::oox::core::FilterBase& rFilter, sal_Int32 nPh +--- oox/source/drawingml/color.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/color.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -384,6 +384,7 @@ sal_Int32 Color::getColor( const ::oox:: { for( TransformVec::const_iterator aIt = maTransforms.begin(), aEnd = maTransforms.end(); aIt != aEnd; ++aIt ) { @@ -1791,11 +1635,9 @@ index 009be55..56821fd 100644 switch( aIt->mnToken ) { case XML_red: toCrgb(); lclSetValue( mnC1, aIt->mnValue ); break; -diff --git oox/source/drawingml/customshapegeometry.cxx oox/source/drawingml/customshapegeometry.cxx -index 7de6adb..0c6dc42 100644 ---- oox/source/drawingml/customshapegeometry.cxx -+++ oox/source/drawingml/customshapegeometry.cxx -@@ -268,8 +268,9 @@ void PathListContext::endFastElement( sal_Int32 aElementToken ) throw (SAXExcept +--- oox/source/drawingml/customshapegeometry.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/customshapegeometry.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -268,8 +268,9 @@ void PathListContext::endFastElement( sa // --------------------------------------------------------------------- @@ -1814,7 +1656,7 @@ index 7de6adb..0c6dc42 100644 OUString sType; switch( nType ) { -@@ -1103,7 +1105,7 @@ PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler& rParent, +@@ -1103,7 +1105,7 @@ PresetShapeGeometryContext::PresetShapeG OUString sShapeType; sal_Int32 nShapeType = xAttribs->getOptionalValueToken( XML_prst, FastToken::DONTKNOW ); if ( nShapeType != FastToken::DONTKNOW ) @@ -1823,11 +1665,8 @@ index 7de6adb..0c6dc42 100644 OSL_ENSURE( sShapeType.getLength(), "oox::drawingml::CustomShapeCustomGeometryContext::CustomShapeCustomGeometryContext(), unknown shape type" ); mrCustomShapeProperties.setShapePresetType( sShapeType ); } -diff --git oox/source/drawingml/diagram/constraintlistcontext.cxx oox/source/drawingml/diagram/constraintlistcontext.cxx -new file mode 100644 -index 0000000..6ef7f18 ---- /dev/null -+++ oox/source/drawingml/diagram/constraintlistcontext.cxx +--- oox/source/drawingml/diagram/constraintlistcontext.cxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/diagram/constraintlistcontext.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,102 @@ +/************************************************************************* + * @@ -1931,11 +1770,8 @@ index 0000000..6ef7f18 + + +} } -diff --git oox/source/drawingml/diagram/constraintlistcontext.hxx oox/source/drawingml/diagram/constraintlistcontext.hxx -new file mode 100644 -index 0000000..7d48811 ---- /dev/null -+++ oox/source/drawingml/diagram/constraintlistcontext.hxx +--- oox/source/drawingml/diagram/constraintlistcontext.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/diagram/constraintlistcontext.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,54 @@ +/************************************************************************* + * @@ -1991,10 +1827,8 @@ index 0000000..7d48811 +} } + +#endif -diff --git oox/source/drawingml/diagram/datamodelcontext.cxx oox/source/drawingml/diagram/datamodelcontext.cxx -index c4260b5..f11c7bf 100644 ---- oox/source/drawingml/diagram/datamodelcontext.cxx -+++ oox/source/drawingml/diagram/datamodelcontext.cxx +--- oox/source/drawingml/diagram/datamodelcontext.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/diagram/datamodelcontext.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -28,7 +28,7 @@ * ************************************************************************/ @@ -2347,11 +2181,8 @@ index c4260b5..f11c7bf 100644 }; // CT_BackgroundFormatting -diff --git oox/source/drawingml/diagram/datamodelcontext.hxx oox/source/drawingml/diagram/datamodelcontext.hxx -new file mode 100644 -index 0000000..526385b ---- /dev/null -+++ oox/source/drawingml/diagram/datamodelcontext.hxx +--- oox/source/drawingml/diagram/datamodelcontext.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/diagram/datamodelcontext.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,57 @@ +/************************************************************************* + * @@ -2410,10 +2241,8 @@ index 0000000..526385b +} } + +#endif // OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX -diff --git oox/source/drawingml/diagram/diagram.cxx oox/source/drawingml/diagram/diagram.cxx -index b65195a..0e17cba 100644 ---- oox/source/drawingml/diagram/diagram.cxx -+++ oox/source/drawingml/diagram/diagram.cxx +--- oox/source/drawingml/diagram/diagram.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/diagram/diagram.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -34,10 +34,22 @@ #include <com/sun/star/awt/Point.hpp> @@ -2530,7 +2359,7 @@ index b65195a..0e17cba 100644 setPosition( pTree->getPoint(), pt ); awt::Point nextPt = pt; nextPt.Y += 50; -@@ -139,6 +111,7 @@ void DiagramLayout::layout( const dgm::PointsTreePtr & pTree, const awt::Point & +@@ -139,6 +111,7 @@ void DiagramLayout::layout( const dgm::P layout( *iter, nextPt ); nextPt.X += 50; } @@ -2538,7 +2367,7 @@ index b65195a..0e17cba 100644 } void Diagram::setData( const DiagramDataPtr & pData) -@@ -152,19 +125,244 @@ void Diagram::setLayout( const DiagramLayoutPtr & pLayout) +@@ -152,19 +125,244 @@ void Diagram::setLayout( const DiagramLa mpLayout = pLayout; } @@ -2839,7 +2668,7 @@ index b65195a..0e17cba 100644 for( aPointsIter = aPoints.begin(); aPointsIter != aPoints.end(); ++aPointsIter ) { -@@ -286,6 +487,7 @@ void Diagram::addTo( const ShapePtr & pParentShape ) +@@ -286,6 +487,7 @@ void Diagram::addTo( const ShapePtr & pP { OSL_TRACE( "Dgm: shape name %s", OUSTRING_TO_CSTR( (*iter)->getName() ) ); } @@ -3003,11 +2832,8 @@ index b65195a..0e17cba 100644 +} } } -diff --git oox/source/drawingml/diagram/diagram.hxx oox/source/drawingml/diagram/diagram.hxx -new file mode 100644 -index 0000000..c7518ac ---- /dev/null -+++ oox/source/drawingml/diagram/diagram.hxx +--- oox/source/drawingml/diagram/diagram.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/diagram/diagram.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,320 @@ +/************************************************************************* + * @@ -3329,10 +3155,8 @@ index 0000000..c7518ac +} } + +#endif -diff --git oox/source/drawingml/diagram/diagramdefinitioncontext.cxx oox/source/drawingml/diagram/diagramdefinitioncontext.cxx -index 9c512dc..5829685 100644 ---- oox/source/drawingml/diagram/diagramdefinitioncontext.cxx -+++ oox/source/drawingml/diagram/diagramdefinitioncontext.cxx +--- oox/source/drawingml/diagram/diagramdefinitioncontext.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/diagram/diagramdefinitioncontext.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -30,9 +30,8 @@ #include "diagramdefinitioncontext.hxx" @@ -3344,7 +3168,7 @@ index 9c512dc..5829685 100644 #include "tokens.hxx" using namespace ::oox::core; -@@ -90,9 +89,15 @@ DiagramDefinitionContext::createFastChildContext( ::sal_Int32 aElement, +@@ -90,9 +89,15 @@ DiagramDefinitionContext::createFastChil mpLayout->setDesc( xAttribs->getOptionalValue( XML_val ) ); break; case NMSP_DIAGRAM|XML_layoutNode: @@ -3362,10 +3186,8 @@ index 9c512dc..5829685 100644 case NMSP_DIAGRAM|XML_clrData: // TODO, does not matter for the UI. skip. return xRet; -diff --git oox/source/drawingml/diagram/diagramdefinitioncontext.hxx oox/source/drawingml/diagram/diagramdefinitioncontext.hxx -index bfe44ca..ed0ec6a 100644 ---- oox/source/drawingml/diagram/diagramdefinitioncontext.hxx -+++ oox/source/drawingml/diagram/diagramdefinitioncontext.hxx +--- oox/source/drawingml/diagram/diagramdefinitioncontext.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/diagram/diagramdefinitioncontext.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -32,7 +32,7 @@ #define OOX_DRAWINGML_DIAGRAMDEFINITIONCONTEXT_HXX @@ -3375,10 +3197,8 @@ index bfe44ca..ed0ec6a 100644 namespace oox { namespace drawingml { -diff --git oox/source/drawingml/diagram/diagramfragmenthandler.cxx oox/source/drawingml/diagram/diagramfragmenthandler.cxx -index 537c5ad..8aad4e9 100644 ---- oox/source/drawingml/diagram/diagramfragmenthandler.cxx -+++ oox/source/drawingml/diagram/diagramfragmenthandler.cxx +--- oox/source/drawingml/diagram/diagramfragmenthandler.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/diagram/diagramfragmenthandler.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -30,11 +30,11 @@ #include <osl/diagnose.h> @@ -3394,7 +3214,7 @@ index 537c5ad..8aad4e9 100644 using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; -@@ -134,94 +134,143 @@ DiagramLayoutFragmentHandler::createFastChildContext( ::sal_Int32 aElement, +@@ -134,94 +134,143 @@ DiagramLayoutFragmentHandler::createFast /////////////////////// DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFilter, @@ -3403,6 +3223,11 @@ index 537c5ad..8aad4e9 100644 - throw( ) - : FragmentHandler( rFilter, rFragmentPath ) - , mpDataPtr( pDataPtr ) +-{ +-} +- +-DiagramQStylesFragmentHandler::~DiagramQStylesFragmentHandler( ) throw () +-{ + const OUString& rFragmentPath, + DiagramQStyleMap& rStylesMap ) : + FragmentHandler2( rFilter, rFragmentPath ), @@ -3415,22 +3240,15 @@ index 537c5ad..8aad4e9 100644 + sal_Int32 nElement, + const AttributeList& rAttribs, + ShapeStyleRef& o_rStyle ) - { ++{ + o_rStyle.mnThemedIdx = (nElement == (NMSP_DRAWINGML|XML_fontRef)) ? + rAttribs.getToken( XML_idx, XML_none ) : rAttribs.getInteger( XML_idx, 0 ); + return new ColorContext( *this, o_rStyle.maPhClr ); - } - --DiagramQStylesFragmentHandler::~DiagramQStylesFragmentHandler( ) throw () --{ -- --} -- --void SAL_CALL DiagramQStylesFragmentHandler::endDocument() -- throw (SAXException, RuntimeException) ++} ++ +::oox::core::ContextHandlerRef DiagramQStylesFragmentHandler::onCreateContext( sal_Int32 nElement, + const AttributeList& rAttribs ) - { ++{ + // state-table like way of navigating the color fragment. we + // currently ignore everything except styleLbl in the colorsDef + // element @@ -3466,13 +3284,19 @@ index 537c5ad..8aad4e9 100644 + return 0; } +-void SAL_CALL DiagramQStylesFragmentHandler::endDocument() +- throw (SAXException, RuntimeException) ++void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttribs ) + { +- +-} +- - -Reference< XFastContextHandler > SAL_CALL -DiagramQStylesFragmentHandler::createFastChildContext( ::sal_Int32 aElement, - const Reference< XFastAttributeList >& ) - throw ( SAXException, RuntimeException) -+void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttribs ) - { +-{ - Reference< XFastContextHandler > xRet; - - switch( aElement ) @@ -3515,6 +3339,7 @@ index 537c5ad..8aad4e9 100644 -void SAL_CALL DiagramColorsFragmentHandler::endDocument() - throw (SAXException, RuntimeException) +-{ +ColorFragmentHandler::ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter, + const ::rtl::OUString& rFragmentPath, + DiagramColorMap& rColorsMap ) : @@ -3526,7 +3351,7 @@ index 537c5ad..8aad4e9 100644 + +::oox::core::ContextHandlerRef ColorFragmentHandler::onCreateContext( sal_Int32 nElement, + const AttributeList& /*rAttribs*/ ) - { ++{ + // state-table like way of navigating the color fragment. we + // currently ignore everything except styleLbl in the colorsDef + // element @@ -3602,11 +3427,8 @@ index 537c5ad..8aad4e9 100644 +} } } -diff --git oox/source/drawingml/diagram/diagramfragmenthandler.hxx oox/source/drawingml/diagram/diagramfragmenthandler.hxx -new file mode 100644 -index 0000000..f2dbd16 ---- /dev/null -+++ oox/source/drawingml/diagram/diagramfragmenthandler.hxx +--- oox/source/drawingml/diagram/diagramfragmenthandler.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/diagram/diagramfragmenthandler.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,117 @@ +/************************************************************************* + * @@ -3725,10 +3547,8 @@ index 0000000..f2dbd16 + + +#endif -diff --git oox/source/drawingml/diagram/diagramlayoutatoms.cxx oox/source/drawingml/diagram/diagramlayoutatoms.cxx -index 8e73676..b867951 100644 ---- oox/source/drawingml/diagram/diagramlayoutatoms.cxx -+++ oox/source/drawingml/diagram/diagramlayoutatoms.cxx +--- oox/source/drawingml/diagram/diagramlayoutatoms.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/diagram/diagramlayoutatoms.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -28,14 +28,24 @@ * ************************************************************************/ @@ -3764,7 +3584,7 @@ index 8e73676..b867951 100644 , mbHideLastTrans( false ) , mnPtType( 0 ) , mnSt( 0 ) -@@ -57,7 +67,7 @@ void IteratorAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr ) +@@ -57,7 +67,7 @@ void IteratorAttr::loadFromXAttr( const { AttributeList attr( xAttr ); mnAxis = xAttr->getOptionalValueToken( XML_axis, 0 ); @@ -3824,23 +3644,18 @@ index 8e73676..b867951 100644 +void ConditionAtom::accept( LayoutAtomVisitor& rVisitor ) +{ + rVisitor.visit(*this); -+} -+ + } + +void ConditionAtom::addChild( const LayoutAtomPtr & pNode ) +{ + if( mbElse ) + mpElseChildNodes.push_back( pNode ); + else + mpChildNodes.push_back( pNode ); - } - -+void ConstraintAtom::accept( LayoutAtomVisitor& rVisitor ) -+{ -+ rVisitor.visit(*this); +} -void ForEachAtom::processAtom() -+void AlgAtom::accept( LayoutAtomVisitor& rVisitor ) ++void ConstraintAtom::accept( LayoutAtomVisitor& rVisitor ) { - // TODO there is likely some conditions - std::for_each( mpChildNodes.begin(), mpChildNodes.end(), @@ -3852,14 +3667,19 @@ index 8e73676..b867951 100644 - * if it is not a ConditionAtom, then return false. - */ -static bool _test_atom( const LayoutAtomPtr & pAtom) -+void AlgAtom::layoutShape( const ShapePtr& rShape, -+ const Diagram& /*rDgm*/, -+ const rtl::OUString& rName ) const ++void AlgAtom::accept( LayoutAtomVisitor& rVisitor ) { - try { - bool bResult = false; - const ConditionAtomPtr pCond = boost::dynamic_pointer_cast< ConditionAtom >(pAtom); - if( pCond ) ++ rVisitor.visit(*this); ++} ++ ++void AlgAtom::layoutShape( const ShapePtr& rShape, ++ const Diagram& /*rDgm*/, ++ const rtl::OUString& rName ) const ++{ + switch(mnType) + { + case XML_composite: @@ -3924,7 +3744,8 @@ index 8e73676..b867951 100644 + break; + + case XML_cycle: -+ { + { +- bResult = pCond->test(); + if( rShape->getChildren().empty() ) + { + rShape->setSize(awt::Size(50,50)); @@ -3978,7 +3799,8 @@ index 8e73676..b867951 100644 + + rShape->setSize(aTotalSize); + break; -+ } + } +- return bResult; + + case XML_hierChild: + case XML_hierRoot: @@ -4068,7 +3890,8 @@ index 8e73676..b867951 100644 + + default: + break; -+ } + } +- catch(...) + + OSL_TRACE("Layouting shape %s: (%d,%d,%d,%d)", + OUSTRING_TO_CSTR( rName ), @@ -4089,7 +3912,7 @@ index 8e73676..b867951 100644 + DiagramData::PointsNameMap::const_iterator aDataNode=rDgm.getData()->getPointsPresNameMap().find(msName); + if( aDataNode->second.size() > nIdx && + aDataNode != rDgm.getData()->getPointsPresNameMap().end() ) -+ { + { + OSL_TRACE( "Filling content from %d th layout node named \"%s\", modelId \"%s\"", + nIdx, + OUSTRING_TO_CSTR( msName ), @@ -4164,8 +3987,7 @@ index 8e73676..b867951 100644 + // layout node's styleLbl for both style & color + // now, but docs are a bit unclear on this + if( msStyleLabel.getLength() ) - { -- bResult = pCond->test(); ++ { + OSL_TRACE("setting style with label %s", + OUSTRING_TO_CSTR( msStyleLabel ) ); + @@ -4197,21 +4019,19 @@ index 8e73676..b867951 100644 + if( rColor.maTextFillColor.isUsed() ) + rShape->getShapeStyleRefs()[XML_fontRef].maPhClr = rColor.maTextFillColor; + } - } -- return bResult; ++ } + + // even if no data node found, successful anyway. it's + // contained at the layoutnode + return true; } -- catch(...) + else - { ++ { + OSL_TRACE("ShapeCreationVisitor::visit: no text found while processing shape type %s for layout node named \"%s\"", + OUSTRING_TO_CSTR( + rShape->getCustomShapeProperties()->getShapePresetType()), + OUSTRING_TO_CSTR( msName ) ); - } ++ } + return false; } @@ -4285,16 +4105,16 @@ index 8e73676..b867951 100644 +} + +void ShapeCreationVisitor::visit(AlgAtom& rAtom) ++{ ++ defaultVisit(rAtom); ++} ++ ++void ShapeCreationVisitor::visit(ForEachAtom& rAtom) { - std::vector< LayoutAtomPtr >::iterator - iter = std::find_if( mpChildNodes.begin(), mpChildNodes.end(), - boost::bind( &_test_atom, _1 ) ); - if( iter != mpChildNodes.end() ) -+ defaultVisit(rAtom); -+} -+ -+void ShapeCreationVisitor::visit(ForEachAtom& rAtom) -+{ + const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); + + sal_Int32 nChildren=1; @@ -4343,8 +4163,8 @@ index 8e73676..b867951 100644 +void ShapeCreationVisitor::visit(ChooseAtom& rAtom) +{ + defaultVisit(rAtom); - } - ++} ++ +void ShapeCreationVisitor::visit(LayoutNode& rAtom) +{ + ShapePtr pCurrParent(mpParentShape); @@ -4402,8 +4222,8 @@ index 8e73676..b867951 100644 +void ShapeLayoutingVisitor::visit(ConstraintAtom& /*rAtom*/) +{ + // stop processing -+} -+ + } + +void ShapeLayoutingVisitor::visit(AlgAtom& rAtom) +{ + rAtom.layoutShape(mpParentShape,mrDgm,maName); @@ -4475,11 +4295,8 @@ index 8e73676..b867951 100644 +} } } -diff --git oox/source/drawingml/diagram/diagramlayoutatoms.hxx oox/source/drawingml/diagram/diagramlayoutatoms.hxx -new file mode 100644 -index 0000000..73a6b54 ---- /dev/null -+++ oox/source/drawingml/diagram/diagramlayoutatoms.hxx +--- oox/source/drawingml/diagram/diagramlayoutatoms.hxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/diagram/diagramlayoutatoms.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,318 @@ +/************************************************************************* + * @@ -4799,10 +4616,8 @@ index 0000000..73a6b54 +} } + +#endif -diff --git oox/source/drawingml/diagram/layoutnodecontext.cxx oox/source/drawingml/diagram/layoutnodecontext.cxx -index f1be084..d6a77ce 100644 ---- oox/source/drawingml/diagram/layoutnodecontext.cxx -+++ oox/source/drawingml/diagram/layoutnodecontext.cxx +--- oox/source/drawingml/diagram/layoutnodecontext.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/diagram/layoutnodecontext.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -34,7 +34,9 @@ #include "oox/core/namespaces.hxx" #include "oox/drawingml/diagram/diagram.hxx" @@ -4975,7 +4790,7 @@ index f1be084..d6a77ce 100644 } -@@ -230,33 +242,33 @@ void SAL_CALL LayoutNodeContext::endFastElement( ::sal_Int32 ) +@@ -230,33 +242,33 @@ void SAL_CALL LayoutNodeContext::endFast sal_Int32 LayoutNodeContext::tagToVarIdx( sal_Int32 aTag ) { sal_Int32 nIdx = -1; @@ -5019,7 +4834,7 @@ index f1be084..d6a77ce 100644 nIdx = LayoutNode::VAR_resizeHandles; break; default: -@@ -279,13 +291,39 @@ LayoutNodeContext::createFastChildContext( ::sal_Int32 aElement, +@@ -279,13 +291,39 @@ LayoutNodeContext::createFastChildContex { LayoutNodePtr pNode( new LayoutNode() ); mpNode->addChild( pNode ); @@ -5061,7 +4876,7 @@ index f1be084..d6a77ce 100644 break; } case NMSP_DIAGRAM|XML_extLst: -@@ -293,7 +331,7 @@ LayoutNodeContext::createFastChildContext( ::sal_Int32 aElement, +@@ -293,7 +331,7 @@ LayoutNodeContext::createFastChildContex case NMSP_DIAGRAM|XML_alg: { // CT_Algorithm @@ -5070,7 +4885,7 @@ index f1be084..d6a77ce 100644 mpNode->addChild( pAtom ); xRet.set( new AlgorithmContext( *this, xAttribs, pAtom ) ); break; -@@ -309,14 +347,14 @@ LayoutNodeContext::createFastChildContext( ::sal_Int32 aElement, +@@ -309,14 +347,14 @@ LayoutNodeContext::createFastChildContex case NMSP_DIAGRAM|XML_forEach: { // CT_ForEach @@ -5087,10 +4902,8 @@ index f1be084..d6a77ce 100644 break; case NMSP_DIAGRAM|XML_presOf: { -diff --git oox/source/drawingml/diagram/layoutnodecontext.hxx oox/source/drawingml/diagram/layoutnodecontext.hxx -index 8555825..1be9b79 100644 ---- oox/source/drawingml/diagram/layoutnodecontext.hxx -+++ oox/source/drawingml/diagram/layoutnodecontext.hxx +--- oox/source/drawingml/diagram/layoutnodecontext.hxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/diagram/layoutnodecontext.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -32,7 +32,8 @@ #define OOX_DRAWINGML_LAYOUTNODECONTEXT_HXX @@ -5101,10 +4914,8 @@ index 8555825..1be9b79 100644 namespace oox { namespace drawingml { -diff --git oox/source/drawingml/diagram/makefile.mk oox/source/drawingml/diagram/makefile.mk -index bf8c6f9..3c48afc 100644 ---- oox/source/drawingml/diagram/makefile.mk -+++ oox/source/drawingml/diagram/makefile.mk +--- oox/source/drawingml/diagram/makefile.mk.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/drawingml/diagram/makefile.mk 2010-03-03 17:00:08.000000000 +0100 @@ -45,6 +45,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- @@ -5113,10 +4924,8 @@ index bf8c6f9..3c48afc 100644 $(SLO)$/diagram.obj \ $(SLO)$/diagramfragmenthandler.obj \ $(SLO)$/diagramdefinitioncontext.obj \ -diff --git oox/source/drawingml/drawingmltypes.cxx oox/source/drawingml/drawingmltypes.cxx -index 89eaf02..3208b0f 100644 ---- oox/source/drawingml/drawingmltypes.cxx -+++ oox/source/drawingml/drawingmltypes.cxx +--- oox/source/drawingml/drawingmltypes.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/drawingmltypes.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -162,6 +162,7 @@ float GetFontHeight( sal_Int32 nHeight ) sal_Int16 GetFontUnderline( sal_Int32 nToken ) @@ -5125,7 +4934,7 @@ index 89eaf02..3208b0f 100644 switch( nToken ) { case XML_none: return FontUnderline::NONE; -@@ -188,6 +189,7 @@ sal_Int16 GetFontUnderline( sal_Int32 nToken ) +@@ -188,6 +189,7 @@ sal_Int16 GetFontUnderline( sal_Int32 nT sal_Int16 GetFontStrikeout( sal_Int32 nToken ) { @@ -5141,7 +4950,7 @@ index 89eaf02..3208b0f 100644 sal_Int16 nEnum; switch( nAlign ) { -@@ -238,6 +241,7 @@ sal_Int16 GetParaAdjust( sal_Int32 nAlign ) +@@ -238,6 +241,7 @@ sal_Int16 GetParaAdjust( sal_Int32 nAlig TabAlign GetTabAlign( sal_Int32 aToken ) { @@ -5149,11 +4958,9 @@ index 89eaf02..3208b0f 100644 TabAlign nEnum; switch( aToken ) { -diff --git oox/source/drawingml/fillproperties.cxx oox/source/drawingml/fillproperties.cxx -index f6a72c3..c728b7f 100644 ---- oox/source/drawingml/fillproperties.cxx -+++ oox/source/drawingml/fillproperties.cxx -@@ -83,6 +83,7 @@ static const sal_Int32 spnDefaultFillIds[ FillId_END ] = +--- oox/source/drawingml/fillproperties.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/fillproperties.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -83,6 +83,7 @@ static const sal_Int32 spnDefaultFillIds BitmapMode lclGetBitmapMode( sal_Int32 nToken ) { @@ -5161,7 +4968,7 @@ index f6a72c3..c728b7f 100644 switch( nToken ) { case XML_tile: return BitmapMode_REPEAT; -@@ -93,6 +94,7 @@ BitmapMode lclGetBitmapMode( sal_Int32 nToken ) +@@ -93,6 +94,7 @@ BitmapMode lclGetBitmapMode( sal_Int32 n RectanglePoint lclGetRectanglePoint( sal_Int32 nToken ) { @@ -5169,7 +4976,7 @@ index f6a72c3..c728b7f 100644 switch( nToken ) { case XML_tl: return RectanglePoint_LEFT_TOP; -@@ -231,6 +233,7 @@ void FillProperties::pushToPropMap( PropertyMap& rPropMap, const FilterBase& rFi +@@ -231,6 +233,7 @@ void FillProperties::pushToPropMap( Prop if( moFillType.has() ) { FillStyle eFillStyle = FillStyle_NONE; @@ -5177,10 +4984,8 @@ index f6a72c3..c728b7f 100644 switch( moFillType.get() ) { case XML_noFill: -diff --git oox/source/drawingml/graphicshapecontext.cxx oox/source/drawingml/graphicshapecontext.cxx -index cd36e95..239895b 100644 ---- oox/source/drawingml/graphicshapecontext.cxx -+++ oox/source/drawingml/graphicshapecontext.cxx +--- oox/source/drawingml/graphicshapecontext.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/graphicshapecontext.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -34,7 +34,7 @@ #include "oox/drawingml/fillpropertiesgroupcontext.hxx" @@ -5190,7 +4995,7 @@ index cd36e95..239895b 100644 #include "oox/drawingml/table/tablecontext.hxx" #include "oox/core/namespaces.hxx" #include "oox/core/xmlfilterbase.hxx" -@@ -95,7 +95,7 @@ Reference< XFastContextHandler > GraphicShapeContext::createFastChildContext( sa +@@ -95,7 +95,7 @@ Reference< XFastContextHandler > Graphic (mpShapePtr->getCustomShapeProperties()); sal_uInt32 nType = aElementToken & (~ NMSP_MASK); @@ -5199,7 +5004,7 @@ index cd36e95..239895b 100644 if (sType.getLength() > 0) pCstmShpProps->setShapePresetType(sType); -@@ -119,6 +119,7 @@ Reference< XFastContextHandler > GraphicalObjectFrameContext::createFastChildCon +@@ -119,6 +119,7 @@ Reference< XFastContextHandler > Graphic { Reference< XFastContextHandler > xRet; @@ -5207,7 +5012,7 @@ index cd36e95..239895b 100644 switch( aElementToken &(~NMSP_MASK) ) { // CT_ShapeProperties -@@ -277,48 +278,6 @@ DiagramGraphicDataContext::~DiagramGraphicDataContext() +@@ -277,48 +278,6 @@ DiagramGraphicDataContext::~DiagramGraph { } @@ -5256,7 +5061,7 @@ index cd36e95..239895b 100644 Reference< XFastContextHandler > DiagramGraphicDataContext::createFastChildContext( ::sal_Int32 aElementToken, const Reference< XFastAttributeList >& xAttribs ) throw (SAXException, RuntimeException) { -@@ -332,8 +291,12 @@ Reference< XFastContextHandler > DiagramGraphicDataContext::createFastChildConte +@@ -332,8 +291,12 @@ Reference< XFastContextHandler > Diagram msLo = xAttribs->getOptionalValue( NMSP_RELATIONSHIPS|XML_lo ); msQs = xAttribs->getOptionalValue( NMSP_RELATIONSHIPS|XML_qs ); msCs = xAttribs->getOptionalValue( NMSP_RELATIONSHIPS|XML_cs ); @@ -5271,7 +5076,7 @@ index cd36e95..239895b 100644 OSL_TRACE("diagram added shape %s of type %s", OUSTRING_TO_CSTR( mpShapePtr->getName() ), OUSTRING_TO_CSTR( mpShapePtr->getServiceName() ) ); break; -@@ -387,7 +350,8 @@ void CreateChartCallback::onXShapeCreated( const Reference< drawing::XShape >& r +@@ -387,7 +350,8 @@ void CreateChartCallback::onXShapeCreate // convert imported chart model to chart document Reference< chart2::XChartDocument > xChartDoc( xDocModel, UNO_QUERY_THROW ); @@ -5281,11 +5086,9 @@ index cd36e95..239895b 100644 } catch( Exception& ) { -diff --git oox/source/drawingml/lineproperties.cxx oox/source/drawingml/lineproperties.cxx -index 6cee420..ffa5b77 100644 ---- oox/source/drawingml/lineproperties.cxx -+++ oox/source/drawingml/lineproperties.cxx -@@ -163,6 +163,7 @@ void lclConvertCustomDash( LineDash& orLineDash, const LineProperties::DashStopV +--- oox/source/drawingml/lineproperties.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/lineproperties.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -163,6 +163,7 @@ void lclConvertCustomDash( LineDash& orL DashStyle lclGetDashStyle( sal_Int32 nToken ) { @@ -5293,7 +5096,7 @@ index 6cee420..ffa5b77 100644 switch( nToken ) { case XML_rnd: return DashStyle_ROUNDRELATIVE; -@@ -174,6 +175,7 @@ DashStyle lclGetDashStyle( sal_Int32 nToken ) +@@ -174,6 +175,7 @@ DashStyle lclGetDashStyle( sal_Int32 nTo LineJoint lclGetLineJoint( sal_Int32 nToken ) { @@ -5301,7 +5104,7 @@ index 6cee420..ffa5b77 100644 switch( nToken ) { case XML_round: return LineJoint_ROUND; -@@ -189,6 +191,7 @@ const sal_Int32 OOX_ARROWSIZE_LARGE = 2; +@@ -189,6 +191,7 @@ const sal_Int32 OOX_ARROWSIZE_LARGE sal_Int32 lclGetArrowSize( sal_Int32 nToken ) { @@ -5309,7 +5112,7 @@ index 6cee420..ffa5b77 100644 switch( nToken ) { case XML_sm: return OOX_ARROWSIZE_SMALL; -@@ -210,6 +213,7 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties& +@@ -210,6 +213,7 @@ void lclPushMarkerProperties( PropertyMa OUStringBuffer aBuffer; sal_Int32 nArrowType = rArrowProps.moArrowType.get( XML_none ); @@ -5317,7 +5120,7 @@ index 6cee420..ffa5b77 100644 switch( nArrowType ) { case XML_triangle: -@@ -266,6 +270,7 @@ void lclPushMarkerProperties( PropertyMap& rPropMap, const LineArrowProperties& +@@ -266,6 +270,7 @@ void lclPushMarkerProperties( PropertyMa #define OOX_ARROW_POINT( x, y ) Point( static_cast< sal_Int32 >( fArrowWidth * x ), static_cast< sal_Int32 >( fArrowLength * y ) ) ::std::vector< Point > aPoints; @@ -5325,10 +5128,8 @@ index 6cee420..ffa5b77 100644 switch( rArrowProps.moArrowType.get() ) { case XML_triangle: -diff --git oox/source/drawingml/makefile.mk oox/source/drawingml/makefile.mk -index 329d748..e241021 100644 ---- oox/source/drawingml/makefile.mk -+++ oox/source/drawingml/makefile.mk +--- oox/source/drawingml/makefile.mk.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/makefile.mk 2010-03-03 17:00:08.000000000 +0100 @@ -63,6 +63,7 @@ SLOFILES = \ $(SLO)$/linepropertiescontext.obj\ $(SLO)$/objectdefaultcontext.obj\ @@ -5337,11 +5138,8 @@ index 329d748..e241021 100644 $(SLO)$/shapecontext.obj\ $(SLO)$/shapegroupcontext.obj\ $(SLO)$/shapepropertiescontext.obj\ -diff --git oox/source/drawingml/scene3dcontext.cxx oox/source/drawingml/scene3dcontext.cxx -new file mode 100644 -index 0000000..e7008eb ---- /dev/null -+++ oox/source/drawingml/scene3dcontext.cxx +--- oox/source/drawingml/scene3dcontext.cxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/scene3dcontext.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,189 @@ +/************************************************************************* + * @@ -5532,10 +5330,8 @@ index 0000000..e7008eb +} + +} } -diff --git oox/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx -index e3b1347..20b71eb 100644 ---- oox/source/drawingml/shape.cxx -+++ oox/source/drawingml/shape.cxx +--- oox/source/drawingml/shape.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/shape.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -44,8 +44,10 @@ #include <tools/solar.h> // for the F_PI180 define #include <com/sun/star/graphic/XGraphic.hpp> @@ -5545,9 +5341,9 @@ index e3b1347..20b71eb 100644 #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/xml/AttributeData.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> + #include <com/sun/star/drawing/ConnectorType.hpp> #include <com/sun/star/text/XText.hpp> - #include <basegfx/point/b2dpoint.hxx> -@@ -102,6 +104,30 @@ Shape::Shape( const sal_Char* pServiceName ) +@@ -103,6 +105,30 @@ Shape::Shape( const sal_Char* pServiceNa msServiceName = OUString::createFromAscii( pServiceName ); setDefaults(); } @@ -5578,7 +5374,7 @@ index e3b1347..20b71eb 100644 Shape::~Shape() { } -@@ -184,6 +210,19 @@ void Shape::applyShapeReference( const Shape& rReferencedShape ) +@@ -185,6 +211,19 @@ void Shape::applyShapeReference( const S mbFlipV = rReferencedShape.mbFlipV; } @@ -5598,11 +5394,8 @@ index e3b1347..20b71eb 100644 // for group shapes, the following method is also adding each child void Shape::addChildren( const ::oox::core::XmlFilterBase& rFilterBase, -diff --git oox/source/drawingml/shape3dproperties.cxx oox/source/drawingml/shape3dproperties.cxx -new file mode 100644 -index 0000000..f7d2e36 ---- /dev/null -+++ oox/source/drawingml/shape3dproperties.cxx +--- oox/source/drawingml/shape3dproperties.cxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/drawingml/shape3dproperties.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,67 @@ +/************************************************************************* + * @@ -5671,10 +5464,8 @@ index 0000000..f7d2e36 +} // namespace drawingml +} // namespace oox + -diff --git oox/source/drawingml/shapepropertiescontext.cxx oox/source/drawingml/shapepropertiescontext.cxx -index 83b5cd0..b607af1 100644 ---- oox/source/drawingml/shapepropertiescontext.cxx -+++ oox/source/drawingml/shapepropertiescontext.cxx +--- oox/source/drawingml/shapepropertiescontext.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/drawingml/shapepropertiescontext.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -37,6 +37,7 @@ #include <com/sun/star/container/XNamed.hpp> @@ -5683,7 +5474,7 @@ index 83b5cd0..b607af1 100644 #include "oox/drawingml/linepropertiescontext.hxx" #include "oox/drawingml/fillpropertiesgroupcontext.hxx" #include "oox/drawingml/transform2dcontext.hxx" -@@ -108,8 +109,11 @@ Reference< XFastContextHandler > ShapePropertiesContext::createFastChildContext( +@@ -108,8 +109,11 @@ Reference< XFastContextHandler > ShapePr case NMSP_DRAWINGML|XML_effectDag: // CT_EffectContainer break; @@ -5696,10 +5487,8 @@ index 83b5cd0..b607af1 100644 case NMSP_DRAWINGML|XML_sp3d: // CT_Shape3D break; } -diff --git oox/source/drawingml/textparagraph.cxx oox/source/drawingml/textparagraph.cxx -index df63fad..7b3e466 100644 ---- oox/source/drawingml/textparagraph.cxx -+++ oox/source/drawingml/textparagraph.cxx +--- oox/source/drawingml/textparagraph.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/textparagraph.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -64,6 +64,9 @@ void TextParagraph::insertAt( Reference< XTextRange > xStart( xAt, UNO_QUERY ); @@ -5723,10 +5512,8 @@ index df63fad..7b3e466 100644 // FIXME this is causing a lot of dispruption (ie does not work). I wonder what to do -- Hub // Reference< XTextRange > xEnd( xAt, UNO_QUERY ); -diff --git oox/source/drawingml/textparagraphproperties.cxx oox/source/drawingml/textparagraphproperties.cxx -index b7cb899..c4d0b55 100644 ---- oox/source/drawingml/textparagraphproperties.cxx -+++ oox/source/drawingml/textparagraphproperties.cxx +--- oox/source/drawingml/textparagraphproperties.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/textparagraphproperties.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -116,6 +116,7 @@ void BulletList::setSuffixMinusRight() void BulletList::setType( sal_Int32 nType ) @@ -5735,10 +5522,8 @@ index b7cb899..c4d0b55 100644 // OSL_TRACE( "OOX: set list numbering type %d", nType); switch( nType ) { -diff --git oox/source/helper/storagebase.cxx oox/source/helper/storagebase.cxx -index 028daeb..1e5c266 100644 ---- oox/source/helper/storagebase.cxx -+++ oox/source/helper/storagebase.cxx +--- oox/source/helper/storagebase.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/helper/storagebase.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -49,17 +49,25 @@ namespace oox { namespace { @@ -5771,11 +5556,8 @@ index 028daeb..1e5c266 100644 } } -diff --git oox/source/ppt/dgmimport.cxx oox/source/ppt/dgmimport.cxx -new file mode 100644 -index 0000000..c8f84fe ---- /dev/null -+++ oox/source/ppt/dgmimport.cxx +--- oox/source/ppt/dgmimport.cxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/ppt/dgmimport.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,134 @@ +/************************************************************************* + * @@ -5911,11 +5693,8 @@ index 0000000..c8f84fe +} + +}} -diff --git oox/source/ppt/dgmlayout.cxx oox/source/ppt/dgmlayout.cxx -new file mode 100644 -index 0000000..4bcbf88 ---- /dev/null -+++ oox/source/ppt/dgmlayout.cxx +--- oox/source/ppt/dgmlayout.cxx.old 2010-03-03 17:00:08.000000000 +0100 ++++ oox/source/ppt/dgmlayout.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -0,0 +1,193 @@ +/************************************************************************* + * @@ -6110,10 +5889,8 @@ index 0000000..4bcbf88 +} + +}} -diff --git oox/source/ppt/makefile.mk oox/source/ppt/makefile.mk -index 0087fdf..de3722f 100644 ---- oox/source/ppt/makefile.mk -+++ oox/source/ppt/makefile.mk +--- oox/source/ppt/makefile.mk.old 2010-03-03 17:00:05.000000000 +0100 ++++ oox/source/ppt/makefile.mk 2010-03-03 17:00:08.000000000 +0100 @@ -54,6 +54,8 @@ SLOFILES = \ $(SLO)$/commontimenodecontext.obj \ $(SLO)$/conditioncontext.obj \ @@ -6123,11 +5900,9 @@ index 0087fdf..de3722f 100644 $(SLO)$/headerfootercontext.obj \ $(SLO)$/layoutfragmenthandler.obj\ $(SLO)$/pptfilterhelpers.obj\ -diff --git oox/source/ppt/pptimport.cxx oox/source/ppt/pptimport.cxx -index 0559d53..ba14107 100644 ---- oox/source/ppt/pptimport.cxx -+++ oox/source/ppt/pptimport.cxx -@@ -148,9 +148,9 @@ const oox::drawingml::table::TableStyleListPtr PowerPointImport::getTableStyles( +--- oox/source/ppt/pptimport.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ oox/source/ppt/pptimport.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -174,9 +174,9 @@ const oox::drawingml::table::TableStyleL return mpTableStyleList;; } @@ -6139,10 +5914,8 @@ index 0559d53..ba14107 100644 } OUString PowerPointImport::implGetImplementationName() const -diff --git oox/source/ppt/presentationfragmenthandler.cxx oox/source/ppt/presentationfragmenthandler.cxx -index fd7b466..7a678d3 100644 ---- oox/source/ppt/presentationfragmenthandler.cxx -+++ oox/source/ppt/presentationfragmenthandler.cxx +--- oox/source/ppt/presentationfragmenthandler.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/ppt/presentationfragmenthandler.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -35,6 +35,8 @@ #include <com/sun/star/drawing/XDrawPages.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> @@ -6152,7 +5925,7 @@ index fd7b466..7a678d3 100644 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> -@@ -233,8 +235,17 @@ void PresentationFragmentHandler::endDocument() throw (SAXException, RuntimeExce +@@ -233,8 +235,17 @@ void PresentationFragmentHandler::endDoc { oox::drawingml::ThemePtr pThemePtr( new oox::drawingml::Theme() ); pMasterPersistPtr->setTheme( pThemePtr ); @@ -6171,11 +5944,9 @@ index fd7b466..7a678d3 100644 } else { -diff --git oox/source/ppt/slidepersist.cxx oox/source/ppt/slidepersist.cxx -index ef04050..1e7bfbd 100644 ---- oox/source/ppt/slidepersist.cxx -+++ oox/source/ppt/slidepersist.cxx -@@ -167,6 +167,17 @@ void SlidePersist::createXShapes( const XmlFilterBase& rFilterBase ) +--- oox/source/ppt/slidepersist.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/ppt/slidepersist.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -167,6 +167,17 @@ void SlidePersist::createXShapes( const pNode->setNode( rFilterBase, xNode, pSlidePtr ); } } @@ -6193,11 +5964,9 @@ index ef04050..1e7bfbd 100644 } void SlidePersist::createBackground( const XmlFilterBase& rFilterBase ) -diff --git oox/source/shape/ShapeFilterBase.cxx oox/source/shape/ShapeFilterBase.cxx -index 9105b6c..2175069 100644 ---- oox/source/shape/ShapeFilterBase.cxx -+++ oox/source/shape/ShapeFilterBase.cxx -@@ -63,9 +63,9 @@ const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles +--- oox/source/shape/ShapeFilterBase.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/shape/ShapeFilterBase.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -63,9 +63,9 @@ const ::oox::drawingml::table::TableStyl return ::oox::drawingml::table::TableStyleListPtr(); } @@ -6209,10 +5978,8 @@ index 9105b6c..2175069 100644 } ::rtl::OUString ShapeFilterBase::implGetImplementationName() const -diff --git oox/source/shape/ShapeFilterBase.hxx oox/source/shape/ShapeFilterBase.hxx -index 1a2edcb..e9a9215 100644 ---- oox/source/shape/ShapeFilterBase.hxx -+++ oox/source/shape/ShapeFilterBase.hxx +--- oox/source/shape/ShapeFilterBase.hxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/shape/ShapeFilterBase.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -61,7 +61,7 @@ public: /** Has to be implemented by each filter to return TableStyles. */ virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles(); @@ -6222,29 +5989,27 @@ index 1a2edcb..e9a9215 100644 virtual rtl::OUString implGetImplementationName() const; -diff --git oox/source/token/makefile.mk oox/source/token/makefile.mk -index 1aa0fed..57508c3 100644 ---- oox/source/token/makefile.mk -+++ oox/source/token/makefile.mk -@@ -55,25 +55,27 @@ $(MISC)$/tokens.gperf $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx $(INCCOM)$ +--- oox/source/token/makefile.mk.old 2009-11-20 11:38:33.000000000 +0100 ++++ oox/source/token/makefile.mk 2010-03-03 17:00:08.000000000 +0100 +@@ -55,25 +55,27 @@ $(MISC)$/tokens.gperf $(INCCOM)$/tokenwo @@noop $(assign do_phony:=.PHONY) $(MISC)$/do_tokens $(do_phony) : tokens.txt gentoken.pl $(MISC)$/tokens.gperf $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx -- $(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf && $(TOUCH) $@ +- $(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf && $(TOUCH) $@ + @echo "Making: " tokens.hxx + $(COMMAND_ECHO)$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf && $(TOUCH) $@ $(INCCOM)$/oox: -- $(MKDIR) $(INCCOM)$/oox +- $(MKDIR) $(INCCOM)$/oox + $(COMMAND_ECHO)$(MKDIR) $(INCCOM)$/oox $(INCCOM)$/oox$/core: $(INCCOM)$/oox -- $(MKDIR) $(INCCOM)$/oox$/core +- $(MKDIR) $(INCCOM)$/oox$/core + $(COMMAND_ECHO)$(MKDIR) $(INCCOM)$/oox$/core $(MISC)$/do_namespaces $(do_phony) : namespaces.txt gennamespaces.pl -- $(MKDIRHIER) $(INCCOM)$/oox$/core -- $(PERL) gennamespaces.pl namespaces.txt $(INCCOM)$/oox$/core$/namespaces.hxx && $(TOUCH) $@ +- $(MKDIRHIER) $(INCCOM)$/oox$/core +- $(PERL) gennamespaces.pl namespaces.txt $(INCCOM)$/oox$/core$/namespaces.hxx && $(TOUCH) $@ + @echo "Making: " namespaces.hxx + $(COMMAND_ECHO)$(MKDIRHIER) $(INCCOM)$/oox$/core + $(COMMAND_ECHO)$(PERL) gennamespaces.pl namespaces.txt $(INCCOM)$/oox$/core$/namespaces.hxx && $(TOUCH) $@ @@ -6261,11 +6026,9 @@ index 1aa0fed..57508c3 100644 $(SLO)$/propertylist.obj : $(INCCOM)$/propertywords.inc $(INCCOM)$/properties.hxx $(MISC)$/do_properties -diff --git oox/source/xls/excelfilter.cxx oox/source/xls/excelfilter.cxx -index a5bfe5e..419a33e 100644 ---- oox/source/xls/excelfilter.cxx -+++ oox/source/xls/excelfilter.cxx -@@ -167,7 +167,7 @@ const TableStyleListPtr ExcelFilter::getTableStyles() +--- oox/source/xls/excelfilter.cxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ oox/source/xls/excelfilter.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -169,7 +169,7 @@ const TableStyleListPtr ExcelFilter::get return TableStyleListPtr(); } @@ -6274,10 +6037,8 @@ index a5bfe5e..419a33e 100644 { return getWorkbookHelper().getChartConverter(); } -diff --git oox/source/xls/workbookhelper.cxx oox/source/xls/workbookhelper.cxx -index 39b292a..1d4641d 100644 ---- oox/source/xls/workbookhelper.cxx -+++ oox/source/xls/workbookhelper.cxx +--- oox/source/xls/workbookhelper.cxx.old 2009-10-19 13:27:41.000000000 +0200 ++++ oox/source/xls/workbookhelper.cxx 2010-03-03 17:00:08.000000000 +0100 @@ -350,7 +350,7 @@ public: /** Returns the converter for string to cell address/range conversion. */ inline AddressConverter& getAddressConverter() const { return *mxAddrConverter; } @@ -6287,7 +6048,7 @@ index 39b292a..1d4641d 100644 /** Returns the page/print settings converter. */ inline PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; } -@@ -1031,7 +1031,7 @@ AddressConverter& WorkbookHelper::getAddressConverter() const +@@ -1031,7 +1031,7 @@ AddressConverter& WorkbookHelper::getAdd return mrBookData.getAddressConverter(); } @@ -6296,11 +6057,9 @@ index 39b292a..1d4641d 100644 { return mrBookData.getChartConverter(); } -diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx -index b83df4c..8ce2e15 100644 ---- sc/source/filter/excel/xestream.cxx -+++ sc/source/filter/excel/xestream.cxx -@@ -1011,10 +1011,9 @@ const oox::drawingml::table::TableStyleListPtr XclExpXmlStream::getTableStyles() +--- sc/source/filter/excel/xestream.cxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/filter/excel/xestream.cxx 2010-03-03 17:00:08.000000000 +0100 +@@ -1011,10 +1011,9 @@ const oox::drawingml::table::TableStyleL return oox::drawingml::table::TableStyleListPtr(); } @@ -6313,11 +6072,9 @@ index b83df4c..8ce2e15 100644 } bool XclExpXmlStream::exportDocument() throw() -diff --git sc/source/filter/inc/xestream.hxx sc/source/filter/inc/xestream.hxx -index 20008f1..49bdf1d 100644 ---- sc/source/filter/inc/xestream.hxx -+++ sc/source/filter/inc/xestream.hxx -@@ -339,7 +339,7 @@ public: +--- sc/source/filter/inc/xestream.hxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ sc/source/filter/inc/xestream.hxx 2010-03-03 17:00:08.000000000 +0100 +@@ -343,7 +343,7 @@ public: virtual oox::vml::Drawing* getVmlDrawing(); virtual const oox::drawingml::Theme* getCurrentTheme() const; virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); @@ -6326,8 +6083,8 @@ index 20008f1..49bdf1d 100644 void Trace( const char* format, ...); private: ---- sw/source/filter/ww8/docxexportfilter.hxx.old 2009-11-10 11:33:58.000000000 +0100 -+++ sw/source/filter/ww8/docxexportfilter.hxx 2009-11-10 13:54:07.000000000 +0100 +--- sw/source/filter/ww8/docxexportfilter.hxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sw/source/filter/ww8/docxexportfilter.hxx 2010-03-03 17:00:08.000000000 +0100 @@ -49,7 +49,7 @@ public: virtual const ::oox::drawingml::Theme* getCurrentTheme() const { return NULL; } virtual sal_Int32 getSchemeClr( sal_Int32 ) const { return 0; } diff --git a/patches/dev300/oox-tokenmap.string.h.diff b/patches/dev300/oox-tokenmap.string.h.diff index ef3f23dc4..4bef29fa4 100644 --- a/patches/dev300/oox-tokenmap.string.h.diff +++ b/patches/dev300/oox-tokenmap.string.h.diff @@ -1,10 +1,10 @@ ---- oox/source/token/tokenmap.cxx.orig 2009-09-19 23:23:28.406250000 +0900 -+++ oox/source/token/tokenmap.cxx 2009-09-20 21:33:08.484375000 +0900 +--- oox/source/token/tokenmap.cxx.old 2009-10-19 13:27:41.000000000 +0200 ++++ oox/source/token/tokenmap.cxx 2010-03-03 16:59:23.000000000 +0100 @@ -28,6 +28,7 @@ * ************************************************************************/ +#include <string.h> #include "oox/token/tokenmap.hxx" + #include <string.h> #include <rtl/strbuf.hxx> - #include <rtl/string.hxx> diff --git a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff index 8691d1f05..2daaf5b44 100644 --- a/patches/dev300/oox-xlsx-import-fix-connector-shape.diff +++ b/patches/dev300/oox-xlsx-import-fix-connector-shape.diff @@ -1,16 +1,14 @@ -diff --git oox/source/drawingml/shape.cxx oox/source/drawingml/shape.cxx -index 807b4ad..76a72a1 100644 ---- oox/source/drawingml/shape.cxx -+++ oox/source/drawingml/shape.cxx -@@ -49,6 +49,7 @@ +--- oox/source/drawingml/shape.cxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/source/drawingml/shape.cxx 2010-03-03 16:59:43.000000000 +0100 +@@ -46,6 +46,7 @@ + #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> - #include <com/sun/star/xml/AttributeData.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> +#include <com/sun/star/drawing/ConnectorType.hpp> #include <com/sun/star/text/XText.hpp> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -@@ -402,6 +403,17 @@ Reference< XShape > Shape::createAndInsert( +@@ -333,6 +334,17 @@ Reference< XShape > Shape::createAndInse maShapeProperties[ PROP_StartPosition ] <<= aAWTStartPosition; maShapeProperties[ PROP_EndPosition ] <<= aAWTEndPosition; @@ -28,23 +26,19 @@ index 807b4ad..76a72a1 100644 } else { -diff --git oox/source/token/properties.txt oox/source/token/properties.txt -index cd57740..63f53a7 100644 ---- oox/source/token/properties.txt -+++ oox/source/token/properties.txt -@@ -110,6 +110,7 @@ DrillDownOnDoubleClick +--- oox/source/token/properties.txt.old 2010-03-03 16:44:04.000000000 +0100 ++++ oox/source/token/properties.txt 2010-03-03 16:59:43.000000000 +0100 +@@ -107,6 +107,7 @@ DisplayLabels + DrillDownOnDoubleClick Dropdown - Duration EchoChar +EdgeKind Enabled EndPosition ErrorAlertStyle -diff --git oox/source/xls/drawingfragment.cxx oox/source/xls/drawingfragment.cxx -index 3b72126..f410574 100644 ---- oox/source/xls/drawingfragment.cxx -+++ oox/source/xls/drawingfragment.cxx -@@ -525,10 +525,26 @@ void OoxDrawingFragment::onEndElement( const OUString& rChars ) +--- oox/source/xls/drawingfragment.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/xls/drawingfragment.cxx 2010-03-03 16:59:43.000000000 +0100 +@@ -525,10 +525,26 @@ void OoxDrawingFragment::onEndElement( c case XDR_TOKEN( absoluteAnchor ): case XDR_TOKEN( oneCellAnchor ): case XDR_TOKEN( twoCellAnchor ): diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff index dc0d3a2d8..2d449ae0f 100644 --- a/patches/dev300/optional-outplace-ole.diff +++ b/patches/dev300/optional-outplace-ole.diff @@ -1,5 +1,5 @@ ---- embeddedobj/source/general/docholder.cxx.old 2009-04-02 10:44:16.000000000 +0000 -+++ embeddedobj/source/general/docholder.cxx 2009-04-06 16:42:20.000000000 +0000 +--- embeddedobj/source/general/docholder.cxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ embeddedobj/source/general/docholder.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -1029,16 +1029,13 @@ sal_Bool DocumentHolder::LoadDocToFrame( if( !xComponentLoader.is() ) throw uno::RuntimeException(); @@ -17,11 +17,11 @@ - } + aArgs[2].Name = ::rtl::OUString::createFromAscii( "PluginMode" ); + aArgs[2].Value <<= sal_Int16(bInPlace ? 1 : 2); - ::rtl::OUString sUrl; - uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY); - if ( xServiceInfo.is() ---- sc/inc/sc.hrc.old 2009-04-06 16:42:07.000000000 +0000 -+++ sc/inc/sc.hrc 2009-04-06 16:42:20.000000000 +0000 + ::rtl::OUString sUrl; + uno::Reference< lang::XServiceInfo> xServiceInfo(xDoc,uno::UNO_QUERY); + if ( xServiceInfo.is() +--- sc/inc/sc.hrc.old 2010-03-03 16:59:34.000000000 +0100 ++++ sc/inc/sc.hrc 2010-03-03 17:00:03.000000000 +0100 @@ -670,6 +670,9 @@ #define FID_DOC_MANAGER (SC_FUNCTION_START + 1) #define FID_CURSOR_ENTER (SC_FUNCTION_START + 2) @@ -32,9 +32,9 @@ #define FILE_MENU_END (SC_FUNCTION_START + 20) #define EDIT_MENU_START (FILE_MENU_END) ---- sc/sdi/scalc.sdi.old 2009-04-06 16:42:06.000000000 +0000 -+++ sc/sdi/scalc.sdi 2009-04-06 16:42:20.000000000 +0000 -@@ -4904,6 +4904,56 @@ SfxObjectItem Offset SID_RANGE_OFFSET +--- sc/sdi/scalc.sdi.old 2010-03-03 16:59:34.000000000 +0100 ++++ sc/sdi/scalc.sdi 2010-03-03 17:00:03.000000000 +0100 +@@ -4828,6 +4828,56 @@ SfxObjectItem Offset SID_RANGE_OFFSET ] //-------------------------------------------------------------------------- @@ -91,19 +91,19 @@ SfxObjectItem OleObject SID_OLE_OBJECT [ ---- sc/sdi/tabvwsh.sdi.old 2009-04-06 16:42:06.000000000 +0000 -+++ sc/sdi/tabvwsh.sdi 2009-04-06 16:42:20.000000000 +0000 -@@ -195,6 +195,8 @@ interface TableEditView : View +--- sc/sdi/tabvwsh.sdi.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/sdi/tabvwsh.sdi 2010-03-03 17:00:03.000000000 +0100 +@@ -196,6 +196,8 @@ interface TableEditView : View - SID_PRINTPREVIEW [ ExecMethod = Execute; StateMethod = GetState; ] + SID_PRINTPREVIEW [ ExecMethod = Execute; StateMethod = GetState; ] + SID_INPLACE_OBJECT [ ExecMethod = Execute; StateMethod = NoState; Export = FALSE; ] + SID_OUTPLACE_OBJECT [ ExecMethod = Execute; StateMethod = NoState; Export = FALSE; ] - // Suchen/Eersetzen: - FID_SEARCH_NOW [ ExecMethod = ExecSearch; StateMethod = NoState; ] ---- sc/source/ui/drawfunc/fudraw.cxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/source/ui/drawfunc/fudraw.cxx 2009-04-06 16:42:20.000000000 +0000 + // Suchen/Eersetzen: + FID_SEARCH_NOW [ ExecMethod = ExecSearch; StateMethod = NoState; ] +--- sc/source/ui/drawfunc/fudraw.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/drawfunc/fudraw.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -44,6 +44,7 @@ #include <svx/svdundo.hxx> #include <sfx2/dispatch.hxx> @@ -122,10 +122,10 @@ |* |* Basisklasse fuer alle Drawmodul-spezifischen Funktionen @@ -318,7 +321,12 @@ BOOL __EXPORT FuDraw::KeyInput(const Key - if( pObj && pObj->ISA( SdrOle2Obj ) && !bOle ) - { - //HMHpView->HideMarkHdl(); -- pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 ); + if( pObj && pObj->ISA( SdrOle2Obj ) && !bOle ) + { + //HMHpView->HideMarkHdl(); +- pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 ); + if(rKEvt.GetKeyCode().IsShift()) + pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), + embed::EmbedVerbs::MS_OLEVERB_OPEN ); @@ -133,14 +133,14 @@ + pViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), + embed::EmbedVerbs::MS_OLEVERB_PRIMARY ); - // consumed - bReturn = TRUE; ---- sc/source/ui/drawfunc/objdraw.src.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/source/ui/drawfunc/objdraw.src 2009-04-06 16:42:20.000000000 +0000 + // consumed + bReturn = TRUE; +--- sc/source/ui/drawfunc/objdraw.src.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/drawfunc/objdraw.src 2010-03-03 17:00:03.000000000 +0100 @@ -1453,6 +1453,21 @@ Menu RID_POPUP_OLE - //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; + //-#i68101#---------------------- + MenuItem { Separator = TRUE ; }; + MenuItem + { + Identifier = SID_INPLACE_OBJECT ; @@ -158,10 +158,10 @@ + MenuItem { Separator = TRUE ; }; MN_TITLE_DESCRIPTION_OBJECT MN_RENAME_OBJECT - //-#i68101#---------------------- + //-#i68101#---------------------- @@ -1481,6 +1496,20 @@ Menu RID_POPUP_CHART - MenuItem { ITEM_FORMAT_ATTR_TRANSFORM }; - MN_ORIGINALSIZE + MenuItem { ITEM_FORMAT_ATTR_TRANSFORM }; + MN_ORIGINALSIZE + MenuItem { Separator = TRUE ; }; + MenuItem @@ -177,11 +177,11 @@ + Text [ en-US ] = "~Activate OLE object outplace" ; + }; + - //-#i68101#---------------------- - MenuItem { Separator = TRUE ; }; + //-#i68101#---------------------- + MenuItem { Separator = TRUE ; }; MN_TITLE_DESCRIPTION_OBJECT ---- sc/source/ui/view/tabvwsh3.cxx.old 2009-04-06 16:41:50.000000000 +0000 -+++ sc/source/ui/view/tabvwsh3.cxx 2009-04-06 16:42:20.000000000 +0000 +--- sc/source/ui/view/tabvwsh3.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/ui/view/tabvwsh3.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -37,6 +37,9 @@ #include "scitems.hxx" @@ -210,8 +210,8 @@ //------------------------------------------------------------------ /** Try to parse the given range using Calc-style syntax first, then -@@ -1222,6 +1229,31 @@ void ScTabViewShell::Execute( SfxRequest - } +@@ -1236,6 +1243,31 @@ void ScTabViewShell::Execute( SfxRequest + } break; + case SID_OUTPLACE_OBJECT: @@ -239,29 +239,29 @@ + break; + } + - default: - DBG_ERROR("Unbekannter Slot bei ScTabViewShell::Execute"); - break; ---- sc/source/ui/view/tabvwsh4.cxx.old 2009-04-06 16:41:50.000000000 +0000 -+++ sc/source/ui/view/tabvwsh4.cxx 2009-04-06 16:42:20.000000000 +0000 + default: + DBG_ERROR("Unbekannter Slot bei ScTabViewShell::Execute"); + break; +--- sc/source/ui/view/tabvwsh4.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/ui/view/tabvwsh4.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -612,6 +612,7 @@ void ScTabViewShell::DoReadUserDataSeque - TestHintWindow(); + TestHintWindow(); - //! if ViewData has more tables than document, remove tables in ViewData + //! if ViewData has more tables than document, remove tables in ViewData + UIFeatureChanged(); } // DoReadUserData is also called from ctor when switching from print preview @@ -647,6 +648,7 @@ void ScTabViewShell::DoReadUserData( con - TestHintWindow(); + TestHintWindow(); - //! if ViewData has more tables than document, remove tables in ViewData + //! if ViewData has more tables than document, remove tables in ViewData + UIFeatureChanged(); } //------------------------------------------------------------------ ---- sd/inc/app.hrc -+++ sd/inc/app.hrc +--- sd/inc/app.hrc.old 2010-03-03 16:59:59.000000000 +0100 ++++ sd/inc/app.hrc 2010-03-03 17:00:03.000000000 +0100 @@ -460,11 +460,13 @@ #define SID_INSERTPAGE_LAYOUT_MENU (SID_SD_START+438) #define SID_TP_EDIT_MASTER (SID_SD_START+439) @@ -279,8 +279,8 @@ +#define SID_TABLE_TOOLBOX (SID_SD_START+445) #endif ---- sd/sdi/_drvwsh.sdi.old 2009-04-06 16:42:18.000000000 +0000 -+++ sd/sdi/_drvwsh.sdi 2009-04-06 16:42:20.000000000 +0000 +--- sd/sdi/_drvwsh.sdi.old 2010-03-03 16:59:59.000000000 +0100 ++++ sd/sdi/_drvwsh.sdi 2010-03-03 17:00:03.000000000 +0100 @@ -73,6 +73,16 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; @@ -295,12 +295,12 @@ + ExecMethod = FuTemporary ; + StateMethod = GetMenuState ; + ] - SID_SAVEGRAPHIC + SID_SAVEGRAPHIC [ ExecMethod = FuTemporary ; ---- sd/sdi/sdraw.sdi.old 2009-04-06 16:42:18.000000000 +0000 -+++ sd/sdi/sdraw.sdi 2009-04-06 16:42:20.000000000 +0000 -@@ -4865,6 +4865,56 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SI +--- sd/sdi/sdraw.sdi.old 2010-03-03 16:59:59.000000000 +0100 ++++ sd/sdi/sdraw.sdi 2010-03-03 17:00:03.000000000 +0100 +@@ -4864,6 +4864,56 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SI ] //-------------------------------------------------------------------------- @@ -357,8 +357,8 @@ SfxVoidItem SaveGraphic SID_SAVEGRAPHIC () [ ---- sd/source/ui/app/menuids_tmpl.src.old 2009-04-06 16:42:18.000000000 +0000 -+++ sd/source/ui/app/menuids_tmpl.src 2009-04-06 16:42:20.000000000 +0000 +--- sd/source/ui/app/menuids_tmpl.src.old 2010-03-03 16:59:59.000000000 +0100 ++++ sd/source/ui/app/menuids_tmpl.src 2010-03-03 17:00:03.000000000 +0100 @@ -870,11 +870,19 @@ #define MN_OLE_OBJECT\ MenuItem\ @@ -368,7 +368,7 @@ + Identifier = SID_INPLACE_OBJECT ; \ + HelpID = SID_INPLACE_OBJECT ; \ Text [ en-US ] = "~OLE Object" ; \ - }; + }; +#define MN_OUTPLACE_OLE_OBJECT\ + MenuItem\ @@ -381,18 +381,18 @@ #define MN_ORIGINAL_SIZE\ MenuItem\ {\ ---- sd/source/ui/app/popup2_tmpl.src.old 2009-04-06 16:42:18.000000000 +0000 -+++ sd/source/ui/app/popup2_tmpl.src 2009-04-06 16:42:20.000000000 +0000 +--- sd/source/ui/app/popup2_tmpl.src.old 2010-03-03 16:59:59.000000000 +0100 ++++ sd/source/ui/app/popup2_tmpl.src 2010-03-03 17:00:03.000000000 +0100 @@ -683,6 +683,7 @@ - MN_TRANSFORM - MN_ORIGINAL_SIZE - MN_OLE_OBJECT + MN_TRANSFORM + MN_ORIGINAL_SIZE + MN_OLE_OBJECT + MN_OUTPLACE_OLE_OBJECT - SEPARATOR - MN_POSITION - MN_OBJECT_ALIGN ---- sd/source/ui/func/fudraw.cxx.old 2009-04-02 10:45:52.000000000 +0000 -+++ sd/source/ui/func/fudraw.cxx 2009-04-06 16:42:20.000000000 +0000 + SEPARATOR + MN_POSITION + MN_OBJECT_ALIGN +--- sd/source/ui/func/fudraw.cxx.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/func/fudraw.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -52,6 +52,7 @@ #include <svx/svdpagv.hxx> @@ -402,17 +402,17 @@ #include "anminfo.hxx" #include "anmdef.hxx" @@ -858,7 +859,8 @@ void FuDraw::DoubleClick(const MouseEven - * aktivate OLE-object - **********************************************************/ - //HMHmpView->HideMarkHdl(); -- mpViewShell->ActivateObject( (SdrOle2Obj*) pObj, 0); + * aktivate OLE-object + **********************************************************/ + //HMHmpView->HideMarkHdl(); +- mpViewShell->ActivateObject( (SdrOle2Obj*) pObj, 0); + mpViewShell->ActivateObject( (SdrOle2Obj*) pObj, + embed::EmbedVerbs::MS_OLEVERB_PRIMARY ); - } - } - else if (nInv == SdrInventor && nSdrObjKind == OBJ_GRAF && pObj->IsEmptyPresObj() ) ---- sd/source/ui/func/fuinsert.cxx.old 2009-04-06 16:42:16.000000000 +0000 -+++ sd/source/ui/func/fuinsert.cxx 2009-04-06 16:42:20.000000000 +0000 + } + } + else if (nInv == SdrInventor && nSdrObjKind == OBJ_GRAF && pObj->IsEmptyPresObj() ) +--- sd/source/ui/func/fuinsert.cxx.old 2010-03-03 16:59:57.000000000 +0100 ++++ sd/source/ui/func/fuinsert.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -42,6 +42,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -439,8 +439,8 @@ } Size aVisSizePixel = mpWindow->GetOutputSizePixel(); ---- sd/source/ui/func/fupoor.cxx.old 2009-04-02 10:45:52.000000000 +0000 -+++ sd/source/ui/func/fupoor.cxx 2009-04-06 16:42:20.000000000 +0000 +--- sd/source/ui/func/fupoor.cxx.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/func/fupoor.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -49,6 +49,7 @@ #include <com/sun/star/drawing/XLayer.hpp> #include <com/sun/star/drawing/XLayerManager.hpp> @@ -451,8 +451,8 @@ #include "FrameView.hxx" @@ -339,8 +340,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rK - if( pObj && pObj->ISA( SdrOle2Obj ) && !mpDocSh->IsUIActive() ) - { + if( pObj && pObj->ISA( SdrOle2Obj ) && !mpDocSh->IsUIActive() ) + { - //HMHmpView->HideMarkHdl(); - mpViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), 0 ); + if(rKEvt.GetKeyCode().IsShift()) @@ -461,11 +461,11 @@ + else + mpViewShell->ActivateObject( static_cast< SdrOle2Obj* >( pObj ), + embed::EmbedVerbs::MS_OLEVERB_PRIMARY ); - } - else if( pObj && pObj->IsEmptyPresObj() && pObj->ISA( SdrGrafObj ) ) - { ---- sd/source/ui/view/drviews2.cxx.old 2009-04-06 16:42:18.000000000 +0000 -+++ sd/source/ui/view/drviews2.cxx 2009-04-06 16:42:20.000000000 +0000 + } + else if( pObj && pObj->IsEmptyPresObj() && pObj->ISA( SdrGrafObj ) ) + { +--- sd/source/ui/view/drviews2.cxx.old 2010-03-03 16:59:59.000000000 +0100 ++++ sd/source/ui/view/drviews2.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -58,6 +58,7 @@ #include <svx/flditem.hxx> #include <svx/xlineit0.hxx> @@ -482,10 +482,10 @@ #include <strings.hrc> -@@ -998,6 +1000,26 @@ void DrawViewShell::FuTemporary(SfxReque - } - Cancel(); - rReq.Ignore(); +@@ -1004,6 +1006,26 @@ void DrawViewShell::FuTemporary(SfxReque + } + Cancel(); + rReq.Ignore(); + } + break; + @@ -506,67 +506,67 @@ + } + Cancel(); + rReq.Ignore(); - } - break; + } + break; ---- sd/source/ui/view/drviews5.cxx.old 2009-04-02 10:46:02.000000000 +0000 -+++ sd/source/ui/view/drviews5.cxx 2009-04-06 16:42:20.000000000 +0000 +--- sd/source/ui/view/drviews5.cxx.old 2009-10-07 15:06:28.000000000 +0200 ++++ sd/source/ui/view/drviews5.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -623,7 +623,7 @@ void DrawViewShell::ReadUserDataSequence - { - const Rectangle aVisArea( mpFrameView->GetVisArea() ); + { + const Rectangle aVisArea( mpFrameView->GetVisArea() ); -- if ( GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) +- if ( GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) + if ( GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !aVisArea.IsEmpty() ) - { - GetDocSh()->SetVisArea(aVisArea); - } ---- sd/source/ui/view/frmview.cxx.old 2009-04-02 10:46:02.000000000 +0000 -+++ sd/source/ui/view/frmview.cxx 2009-04-06 16:42:20.000000000 +0000 + { + GetDocSh()->SetVisArea(aVisArea); + } +--- sd/source/ui/view/frmview.cxx.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/source/ui/view/frmview.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -886,7 +886,7 @@ void FrameView::ReadUserDataSequence ( c - else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaWidth ) ) ) - { - sal_Int32 nWidth = 0; -- if( pValue->Value >>= nWidth ) + else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaWidth ) ) ) + { + sal_Int32 nWidth = 0; +- if( pValue->Value >>= nWidth ) + if( (pValue->Value >>= nWidth) && nWidth > 0 ) - { - Rectangle aVisArea( GetVisArea() ); - aVisArea.nRight = aVisArea.nLeft + nWidth - 1; + { + Rectangle aVisArea( GetVisArea() ); + aVisArea.nRight = aVisArea.nLeft + nWidth - 1; @@ -896,7 +896,7 @@ void FrameView::ReadUserDataSequence ( c - else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaHeight ) ) ) - { - sal_Int32 nHeight = 0; -- if( pValue->Value >>= nHeight ) + else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaHeight ) ) ) + { + sal_Int32 nHeight = 0; +- if( pValue->Value >>= nHeight ) + if( (pValue->Value >>= nHeight) && nHeight > 0 ) - { - Rectangle aVisArea( GetVisArea() ); - aVisArea.nBottom = nHeight + aVisArea.nTop - 1; ---- sfx2/source/view/topfrm.cxx -+++ sfx2/source/view/topfrm.cxx -@@ -963,7 +963,7 @@ sal_Bool SfxTopFrame::InsertDocument( Sf + { + Rectangle aVisArea( GetVisArea() ); + aVisArea.nBottom = nHeight + aVisArea.nTop - 1; +--- sfx2/source/view/topfrm.cxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sfx2/source/view/topfrm.cxx 2010-03-03 17:00:03.000000000 +0100 +@@ -946,7 +946,7 @@ sal_Bool SfxTopFrame::InsertDocument( Sf if ( !pImp->bHidden ) - { + { - if ( pDoc->IsHelpDocument() || (pPluginItem && pPluginItem->GetValue() == 2) ) + if ( pDoc->IsHelpDocument() ) pFrame->GetDispatcher()->HideUI( TRUE ); else pFrame->GetDispatcher()->HideUI( FALSE ); ---- sw/inc/cmdid.h.old 2009-04-06 16:42:02.000000000 +0000 -+++ sw/inc/cmdid.h 2009-04-06 16:42:20.000000000 +0000 -@@ -1261,6 +1261,8 @@ Achtung: Ab sofort sind in diesem File k - - #define FN_SET_FRM_ALT_NAME (FN_FRAME + 18) +--- sw/inc/cmdid.h.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/inc/cmdid.h 2010-03-03 17:00:03.000000000 +0100 +@@ -1263,6 +1263,8 @@ Achtung: Ab sofort sind in diesem File k + #define FN_UNO_DESCRIPTION (FN_FRAME + 20) + // <-- +#define FN_INPLACE_OLE (FN_FRAME + 19) +#define FN_OUTPLACE_OLE (FN_FRAME + 20) //Member-Ids fuer Fill/SetVariable an Items #define MID_STYLE 0xe0 ---- sw/sdi/_frmsh.sdi.old 2009-04-02 10:50:08.000000000 +0000 -+++ sw/sdi/_frmsh.sdi 2009-04-06 16:42:20.000000000 +0000 +--- sw/sdi/_frmsh.sdi.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/sdi/_frmsh.sdi 2010-03-03 17:00:03.000000000 +0100 @@ -176,6 +176,20 @@ interface BaseTextFrame - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + FN_INPLACE_OLE // status(final|play) + [ @@ -582,12 +582,12 @@ + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + - SID_FRAME_LINESTYLE // status() - [ - ExecMethod = ExecFrameStyle ; ---- sw/sdi/swriter.sdi.old 2009-04-06 16:42:02.000000000 +0000 -+++ sw/sdi/swriter.sdi 2009-04-06 16:42:20.000000000 +0000 -@@ -2141,6 +2141,56 @@ SfxVoidItem FrameDialog FN_FORMAT_FRAME_ + SID_FRAME_LINESTYLE // status() + [ + ExecMethod = ExecFrameStyle ; +--- sw/sdi/swriter.sdi.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/sdi/swriter.sdi 2010-03-03 17:00:03.000000000 +0100 +@@ -2087,6 +2087,56 @@ SfxVoidItem FrameDialog FN_FORMAT_FRAME_ ] //-------------------------------------------------------------------------- @@ -644,11 +644,11 @@ SfxBoolItem GoDown FN_LINE_DOWN (SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select FN_PARAM_MOVE_SELECTION) [ ---- sw/sdi/swslots.src.old 2009-04-06 16:42:02.000000000 +0000 -+++ sw/sdi/swslots.src 2009-04-06 16:42:20.000000000 +0000 +--- sw/sdi/swslots.src.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/sdi/swslots.src 2010-03-03 17:00:03.000000000 +0100 @@ -290,6 +290,14 @@ SfxSlotInfo FN_FORMAT_FRAME_DLG { - Slotname [ en-US ] = "Frame Properties"; + Slotname [ en-US ] = "Frame Properties"; }; +SfxSlotInfo FN_INPLACE_OLE +{ @@ -660,10 +660,10 @@ +}; SfxSlotInfo FN_FORMAT_GRAFIC_DLG { - Slotname [ en-US ] = "Edit Graphics"; ---- sw/source/ui/app/mn.src.old 2009-04-02 10:50:28.000000000 +0000 -+++ sw/source/ui/app/mn.src 2009-04-06 16:42:20.000000000 +0000 -@@ -996,6 +996,18 @@ Menu MN_OLE_POPUPMENU + Slotname [ en-US ] = "Edit Graphics"; +--- sw/source/ui/app/mn.src.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/ui/app/mn.src 2010-03-03 17:00:03.000000000 +0100 +@@ -1004,6 +1004,18 @@ Menu MN_OLE_POPUPMENU HelpID = FN_FORMAT_FRAME_DLG ; Text [ en-US ] = "Object..." ; }; @@ -680,10 +680,10 @@ + Text [ en-US ] = "Activate OLE object outplace" ; + }; MN_FRM_CAPTION_ITEM - }; + }; }; ---- sw/source/ui/docvw/edtwin.cxx.old 2009-04-06 16:41:53.000000000 +0000 -+++ sw/source/ui/docvw/edtwin.cxx 2009-04-06 16:42:20.000000000 +0000 +--- sw/source/ui/docvw/edtwin.cxx.old 2010-03-03 16:59:58.000000000 +0100 ++++ sw/source/ui/docvw/edtwin.cxx 2010-03-03 17:00:03.000000000 +0100 @@ -40,6 +40,7 @@ #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/ScriptType.hpp> @@ -692,9 +692,9 @@ #include <com/sun/star/i18n/UnicodeScript.hpp> -@@ -1779,6 +1780,14 @@ KEYINPUT_CHECKTABLE_INSDEL: - } - break; +@@ -1781,6 +1782,14 @@ KEYINPUT_CHECKTABLE_INSDEL: + } + break; + case KEY_RETURN | KEY_SHIFT: // SHIFT-Return + if( !rSh.HasReadonlySel() ) @@ -704,12 +704,12 @@ + } + break; + - case KEY_RETURN | KEY_MOD2: // ALT-Return - if( !rSh.HasReadonlySel() && !rSh.IsSttPara() && rSh.GetCurNumRule() ) - eKeyState = KS_NoNum; -@@ -2180,7 +2189,10 @@ KEYINPUT_CHECKTABLE_INSDEL: - } - break; + case KEY_RETURN | KEY_MOD2: // ALT-Return + if( !rSh.HasReadonlySel() && !rSh.IsSttPara() && rSh.GetCurNumRule() ) + eKeyState = KS_NoNum; +@@ -2184,7 +2193,10 @@ KEYINPUT_CHECKTABLE_INSDEL: + } + break; case KS_LaunchOLEObject: - rSh.LaunchOLEObj(); + if( rKEvt.GetKeyCode().IsShift() ) @@ -719,9 +719,9 @@ eKeyState = KS_Ende; break; case KS_GoIntoFly : ---- sw/source/ui/shells/frmsh.cxx -+++ sw/source/ui/shells/frmsh.cxx -@@ -50,7 +50,7 @@ +--- sw/source/ui/shells/frmsh.cxx.old 2009-10-08 16:17:19.000000000 +0200 ++++ sw/source/ui/shells/frmsh.cxx 2010-03-03 17:00:03.000000000 +0100 +@@ -54,7 +54,7 @@ #include <svx/svdview.hxx> #include <vcl/msgbox.hxx> // <-- @@ -730,10 +730,10 @@ #include <fmturl.hxx> #include <fmtclds.hxx> -@@ -577,6 +577,16 @@ void SwFrameShell::Execute(SfxRequest &r - } - } - break; +@@ -590,6 +590,16 @@ void SwFrameShell::Execute(SfxRequest &r + } + } + break; + case FN_INPLACE_OLE: + { + rSh.LaunchOLEObj(); @@ -744,6 +744,6 @@ + rSh.LaunchOLEObj(embed::EmbedVerbs::MS_OLEVERB_OPEN); + } + break; - case FN_FRAME_MIRROR_ON_EVEN_PAGES: - { - SwFmtHoriOrient aHori(aMgr.GetHoriOrient()); + case FN_FRAME_MIRROR_ON_EVEN_PAGES: + { + SwFmtHoriOrient aHori(aMgr.GetHoriOrient()); diff --git a/patches/dev300/pptx-filter-as-a-separate-lib.diff b/patches/dev300/pptx-filter-as-a-separate-lib.diff index f7a31cc22..359211cda 100644 --- a/patches/dev300/pptx-filter-as-a-separate-lib.diff +++ b/patches/dev300/pptx-filter-as-a-separate-lib.diff @@ -1,17 +1,17 @@ ---- scp2/source/ooo/file_ooo.scp -+++ scp2/source/ooo/file_ooo.scp -@@ -361,6 +361,8 @@ +--- scp2/source/ooo/file_ooo.scp.old 2010-03-03 16:59:55.000000000 +0100 ++++ scp2/source/ooo/file_ooo.scp 2010-03-03 17:00:04.000000000 +0100 +@@ -350,6 +350,8 @@ STD_FILTER_FILE( gid_File_Filter_Eme, em - STD_FILTER_FILE_PATCH( gid_File_Filter_Emp, emp ) + STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt) +STD_UNO_LIB_FILE( gid_File_Lib_Pptx, pptx ) + STD_FILTER_FILE( gid_File_Filter_Icg, icg) STD_FILTER_FILE( gid_File_Filter_Egi, egi) ---- scp2/source/ooo/module_hidden_ooo.scp -+++ scp2/source/ooo/module_hidden_ooo.scp -@@ -141,6 +141,7 @@ Module gid_Module_Root_Files_4 +--- scp2/source/ooo/module_hidden_ooo.scp.old 2010-03-03 16:59:46.000000000 +0100 ++++ scp2/source/ooo/module_hidden_ooo.scp 2010-03-03 17:00:04.000000000 +0100 +@@ -140,6 +140,7 @@ Module gid_Module_Root_Files_4 Files = (gid_File_Dat_Root4, gid_File_Filter_Eme, gid_File_Filter_Sdfilt, @@ -19,11 +19,9 @@ gid_File_Filter_Icg, gid_File_Filter_Egi, gid_File_Filter_Epb, -diff --git a/sd/prj/d.lst b/sd/prj/d.lst -index fd21f7c..ebc244f 100644 ---- sd/prj/d.lst -+++ sd/prj/d.lst -@@ -32,6 +32,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\simpress\statusbar +--- sd/prj/d.lst.old 2009-10-07 15:06:28.000000000 +0200 ++++ sd/prj/d.lst 2010-03-03 17:00:04.000000000 +0100 +@@ -32,6 +32,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\module ..\%__SRC%\bin\sd??????.dll %_DEST%\bin%_EXT%\sd??????.dll ..\%__SRC%\bin\sd*.res %_DEST%\bin%_EXT%\sd*.res ..\%__SRC%\bin\sd???????.dll %_DEST%\bin%_EXT%\sd???????.dll @@ -31,11 +29,8 @@ index fd21f7c..ebc244f 100644 ..\%__SRC%\bin\emp?????.* %_DEST%\bin%_EXT%\emp?????.* mkdir: %_DEST%\pck%_EXT% -diff --git a/sd/source/filter/pptx/eppt.hxx b/sd/source/filter/pptx/eppt.hxx -new file mode 100644 -index 0000000..9d0ab80 ---- /dev/null -+++ sd/source/filter/pptx/eppt.hxx +--- sd/source/filter/pptx/eppt.hxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/eppt.hxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,853 @@ +/************************************************************************* + * @@ -890,11 +885,8 @@ index 0000000..9d0ab80 + + +#endif -diff --git a/sd/source/filter/pptx/epptdef.hxx b/sd/source/filter/pptx/epptdef.hxx -new file mode 100644 -index 0000000..cd35da8 ---- /dev/null -+++ sd/source/filter/pptx/epptdef.hxx +--- sd/source/filter/pptx/epptdef.hxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/epptdef.hxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,263 @@ +/************************************************************************* + * @@ -1159,11 +1151,8 @@ index 0000000..cd35da8 +#define EPP_SLIDESIZE_TYPECUSTOM 6 + +#endif -diff --git a/sd/source/filter/pptx/escherex.hxx b/sd/source/filter/pptx/escherex.hxx -new file mode 100644 -index 0000000..ced7adf ---- /dev/null -+++ sd/source/filter/pptx/escherex.hxx +--- sd/source/filter/pptx/escherex.hxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/escherex.hxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,85 @@ +/************************************************************************* + * @@ -1250,14 +1239,8 @@ index 0000000..ced7adf + + +#endif -diff --git a/sd/source/filter/pptx/exports.map b/sd/source/filter/pptx/exports.map -new file mode 100644 -index 0000000..e69de29 -diff --git a/sd/source/filter/pptx/makefile.mk b/sd/source/filter/pptx/makefile.mk -new file mode 100644 -index 0000000..239135b ---- /dev/null -+++ sd/source/filter/pptx/makefile.mk +--- sd/source/filter/pptx/makefile.mk.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/makefile.mk 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,61 @@ +#************************************************************************* +# @@ -1320,11 +1303,8 @@ index 0000000..239135b +# --- Targets -------------------------------------------------------------- + +.INCLUDE : target.mk -diff --git a/sd/source/filter/pptx/pptexanimations.hxx b/sd/source/filter/pptx/pptexanimations.hxx -new file mode 100644 -index 0000000..5099900 ---- /dev/null -+++ sd/source/filter/pptx/pptexanimations.hxx +--- sd/source/filter/pptx/pptexanimations.hxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/pptexanimations.hxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,140 @@ +/************************************************************************* + * @@ -1466,11 +1446,8 @@ index 0000000..5099900 +} // namespace ppt + +#endif -diff --git a/sd/source/filter/pptx/pptexsoundcollection.hxx b/sd/source/filter/pptx/pptexsoundcollection.hxx -new file mode 100644 -index 0000000..9dc8e54 ---- /dev/null -+++ sd/source/filter/pptx/pptexsoundcollection.hxx +--- sd/source/filter/pptx/pptexsoundcollection.hxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/pptexsoundcollection.hxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,86 @@ +/************************************************************************* + * @@ -1558,11 +1535,8 @@ index 0000000..9dc8e54 +} // namespace ppt + +#endif -diff --git a/sd/source/filter/pptx/pptx-eppt.cxx b/sd/source/filter/pptx/pptx-eppt.cxx -new file mode 100644 -index 0000000..29f6829 ---- /dev/null -+++ sd/source/filter/pptx/pptx-eppt.cxx +--- sd/source/filter/pptx/pptx-eppt.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/pptx-eppt.cxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,2458 @@ +/************************************************************************* + * @@ -4022,11 +3996,8 @@ index 0000000..29f6829 + return bStatus; +} + -diff --git a/sd/source/filter/pptx/pptx-epptso.cxx b/sd/source/filter/pptx/pptx-epptso.cxx -new file mode 100644 -index 0000000..08c427f ---- /dev/null -+++ sd/source/filter/pptx/pptx-epptso.cxx +--- sd/source/filter/pptx/pptx-epptso.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/pptx-epptso.cxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,5855 @@ +/************************************************************************* + * @@ -9883,11 +9854,8 @@ index 0000000..08c427f + } + mpPptEscherEx->CloseContainer(); +} -diff --git a/sd/source/filter/pptx/pptx-escherex.cxx b/sd/source/filter/pptx/pptx-escherex.cxx -new file mode 100644 -index 0000000..d1ef92f ---- /dev/null -+++ sd/source/filter/pptx/pptx-escherex.cxx +--- sd/source/filter/pptx/pptx-escherex.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/pptx-escherex.cxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,359 @@ +/************************************************************************* + * @@ -10248,11 +10216,8 @@ index 0000000..d1ef92f +} + +// --------------------------------------------------------------------------------------------- -diff --git a/sd/source/filter/pptx/pptx-pptexanimations.cxx b/sd/source/filter/pptx/pptx-pptexanimations.cxx -new file mode 100644 -index 0000000..2b2588a ---- /dev/null -+++ sd/source/filter/pptx/pptx-pptexanimations.cxx +--- sd/source/filter/pptx/pptx-pptexanimations.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/pptx-pptexanimations.cxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,2194 @@ +/************************************************************************* + * @@ -12448,11 +12413,8 @@ index 0000000..2b2588a + +} // namespace ppt; + -diff --git a/sd/source/filter/pptx/pptx-pptexsoundcollection.cxx b/sd/source/filter/pptx/pptx-pptexsoundcollection.cxx -new file mode 100644 -index 0000000..fe8616c ---- /dev/null -+++ sd/source/filter/pptx/pptx-pptexsoundcollection.cxx +--- sd/source/filter/pptx/pptx-pptexsoundcollection.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/source/filter/pptx/pptx-pptexsoundcollection.cxx 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,232 @@ +/************************************************************************* + * @@ -12686,11 +12648,11 @@ index 0000000..fe8616c + +} // namespace ppt; + ---- sd/util/makefile.mk -+++ sd/util/makefile.mk -@@ -270,6 +270,36 @@ SHL5STDLIBS = $(ISDLIB) \ - SHL4DEPN=$(SHL1IMPLIBN) - .ENDIF +--- sd/util/makefile.mk.old 2009-10-08 16:17:24.000000000 +0200 ++++ sd/util/makefile.mk 2010-03-03 17:00:04.000000000 +0100 +@@ -266,6 +266,36 @@ SHL5STDLIBS = $(ISDLIB) \ + $(COMPHELPERLIB) \ + $(I18NISOLANGLIB) +# pptx export library +SHL6TARGET = pptx$(DLLPOSTFIX) @@ -12725,11 +12687,8 @@ index 0000000..fe8616c # --- Targets ------------------------------------------------------------- .INCLUDE : target.mk -diff --git a/sd/util/pptx.map b/sd/util/pptx.map -new file mode 100644 -index 0000000..e72a8e3 ---- /dev/null -+++ sd/util/pptx.map +--- sd/util/pptx.map.old 2010-03-03 17:00:04.000000000 +0100 ++++ sd/util/pptx.map 2010-03-03 17:00:04.000000000 +0100 @@ -0,0 +1,9 @@ +PPTX_1_0 { + global: diff --git a/patches/dev300/pptx-fix-connector-crash.diff b/patches/dev300/pptx-fix-connector-crash.diff index 8d85cc001..c312fe9d2 100644 --- a/patches/dev300/pptx-fix-connector-crash.diff +++ b/patches/dev300/pptx-fix-connector-crash.diff @@ -1,20 +1,6 @@ -Fix for crashing on un-connected connectors - -From: Thorsten Behrens <thb@openoffice.org> - - ---- - - oox/source/export/drawingml.cxx | 18 ++++++++++-------- - oox/source/export/shapes.cxx | 6 ++++++ - 2 files changed, 16 insertions(+), 8 deletions(-) - - -diff --git oox/source/export/drawingml.cxx oox/source/export/drawingml.cxx -index 1d29513..338a40f 100644 ---- oox/source/export/drawingml.cxx -+++ oox/source/export/drawingml.cxx -@@ -1329,14 +1329,16 @@ void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon ) +--- oox/source/export/drawingml.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ oox/source/export/drawingml.cxx 2010-03-03 17:00:05.000000000 +0100 +@@ -1331,14 +1331,16 @@ void DrawingML::WritePolyPolygon( const void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID ) { @@ -39,13 +25,11 @@ index 1d29513..338a40f 100644 } // from sw/source/filter/ww8/wrtw8num.cxx for default bullets to export to MS intact -diff --git oox/source/export/shapes.cxx oox/source/export/shapes.cxx -index 08d0e0d..aae6d67 100644 ---- oox/source/export/shapes.cxx -+++ oox/source/export/shapes.cxx -@@ -979,6 +979,9 @@ size_t ShapeExport::ShapeHash::operator()( const ::com::sun::star::uno::Referenc +--- oox/source/export/shapes.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ oox/source/export/shapes.cxx 2010-03-03 17:00:05.000000000 +0100 +@@ -984,6 +984,9 @@ sal_Int32 ShapeExport::GetNewShapeID( co - sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape ) + sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape, XmlFilterBase* pFB ) { + if( !rXShape.is() ) + return -1; @@ -53,7 +37,7 @@ index 08d0e0d..aae6d67 100644 sal_Int32 nID = pFB->GetUniqueId(); saShapeMap[ rXShape ] = nID; -@@ -988,6 +991,9 @@ sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape ) +@@ -993,6 +996,9 @@ sal_Int32 ShapeExport::GetNewShapeID( co sal_Int32 ShapeExport::GetShapeID( const Reference< XShape > rXShape ) { diff --git a/patches/dev300/pptx-gfx-layout-fix.diff b/patches/dev300/pptx-gfx-layout-fix.diff index 727f50881..bb7ef0661 100644 --- a/patches/dev300/pptx-gfx-layout-fix.diff +++ b/patches/dev300/pptx-gfx-layout-fix.diff @@ -1,25 +1,5 @@ -Ugliest fix ever - copy'n'pastes all the code - -From: Thorsten Behrens <thb@openoffice.org> - - ---- - - oox/inc/oox/ppt/pptgraphicshapecontext.hxx | 49 ++++++ - oox/source/ppt/makefile.mk | 1 - oox/source/ppt/pptgraphicshapecontext.cxx | 238 ++++++++++++++++++++++++++++ - oox/source/ppt/pptshapecontext.cxx | 6 - - oox/source/ppt/pptshapegroupcontext.cxx | 3 - 5 files changed, 293 insertions(+), 4 deletions(-) - create mode 100644 oox/inc/oox/ppt/pptgraphicshapecontext.hxx - create mode 100644 oox/source/ppt/pptgraphicshapecontext.cxx - - -diff --git oox/inc/oox/ppt/pptgraphicshapecontext.hxx oox/inc/oox/ppt/pptgraphicshapecontext.hxx -new file mode 100644 -index 0000000..12dad26 ---- /dev/null -+++ oox/inc/oox/ppt/pptgraphicshapecontext.hxx +--- oox/inc/oox/ppt/pptgraphicshapecontext.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ oox/inc/oox/ppt/pptgraphicshapecontext.hxx 2010-03-03 17:00:05.000000000 +0100 @@ -0,0 +1,49 @@ +/************************************************************************* + * @@ -70,23 +50,18 @@ index 0000000..12dad26 +} } + +#endif // OOX_PPT_PPTGRAPHICSHAPEGROUPCONTEXT_HXX -diff --git oox/source/ppt/makefile.mk oox/source/ppt/makefile.mk -index 1dfc87c..4deca6a 100644 ---- oox/source/ppt/makefile.mk -+++ oox/source/ppt/makefile.mk -@@ -56,6 +56,7 @@ SLOFILES = \ - $(SLO)$/customshowlistcontext.obj \ - $(SLO)$/layoutfragmenthandler.obj\ - $(SLO)$/pptfilterhelpers.obj\ +--- oox/source/ppt/makefile.mk.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/ppt/makefile.mk 2010-03-03 17:00:05.000000000 +0100 +@@ -57,6 +57,7 @@ SLOFILES = \ + $(SLO)$/headerfootercontext.obj \ + $(SLO)$/layoutfragmenthandler.obj\ + $(SLO)$/pptfilterhelpers.obj\ + $(SLO)$/pptgraphicshapecontext.obj \ - $(SLO)$/pptimport.obj\ - $(SLO)$/pptshape.obj \ - $(SLO)$/pptshapecontext.obj \ -diff --git oox/source/ppt/pptgraphicshapecontext.cxx oox/source/ppt/pptgraphicshapecontext.cxx -new file mode 100644 -index 0000000..97e104c ---- /dev/null -+++ oox/source/ppt/pptgraphicshapecontext.cxx + $(SLO)$/pptimport.obj\ + $(SLO)$/pptshape.obj \ + $(SLO)$/pptshapecontext.obj \ +--- oox/source/ppt/pptgraphicshapecontext.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ oox/source/ppt/pptgraphicshapecontext.cxx 2010-03-03 17:00:05.000000000 +0100 @@ -0,0 +1,238 @@ +/************************************************************************* + * @@ -326,21 +301,19 @@ index 0000000..97e104c + + +} } -diff --git oox/source/ppt/pptshapecontext.cxx oox/source/ppt/pptshapecontext.cxx -index 762f758..80546ff 100644 ---- oox/source/ppt/pptshapecontext.cxx -+++ oox/source/ppt/pptshapecontext.cxx -@@ -65,7 +65,7 @@ PPTShapeContext::PPTShapeContext( ContextHandler& rParent, const SlidePersistPtr +--- oox/source/ppt/pptshapecontext.cxx.old 2010-03-03 16:59:43.000000000 +0100 ++++ oox/source/ppt/pptshapecontext.cxx 2010-03-03 17:00:05.000000000 +0100 +@@ -66,7 +66,7 @@ PPTShapeContext::PPTShapeContext( Contex { } -oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ) +static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ) { - oox::drawingml::ShapePtr aShapePtr; - std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() ); -@@ -85,7 +85,7 @@ oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, st - return aShapePtr; + oox::drawingml::ShapePtr aShapePtr; + std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() ); +@@ -86,7 +86,7 @@ oox::drawingml::ShapePtr findPlaceholder + return aShapePtr; } -oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes ) @@ -348,19 +321,17 @@ index 762f758..80546ff 100644 { oox::drawingml::ShapePtr aShapePtr; std::vector< oox::drawingml::ShapePtr >::reverse_iterator aRevIter( rShapes.rbegin() ); -@@ -106,7 +106,7 @@ oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vect +@@ -107,7 +107,7 @@ oox::drawingml::ShapePtr findPlaceholder } // if nFirstPlaceholder can't be found, it will be searched for nSecondPlaceholder -oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ) +static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ) { - oox::drawingml::ShapePtr pPlaceholder = findPlaceholder( nFirstPlaceholder, rShapes ); - return !nSecondPlaceholder || pPlaceholder.get() ? pPlaceholder : findPlaceholder( nSecondPlaceholder, rShapes ); -diff --git oox/source/ppt/pptshapegroupcontext.cxx oox/source/ppt/pptshapegroupcontext.cxx -index fd0f312..a77f90b 100644 ---- oox/source/ppt/pptshapegroupcontext.cxx -+++ oox/source/ppt/pptshapegroupcontext.cxx + oox::drawingml::ShapePtr pPlaceholder = findPlaceholder( nFirstPlaceholder, rShapes ); + return !nSecondPlaceholder || pPlaceholder.get() ? pPlaceholder : findPlaceholder( nSecondPlaceholder, rShapes ); +--- oox/source/ppt/pptshapegroupcontext.cxx.old 2009-10-07 15:06:37.000000000 +0200 ++++ oox/source/ppt/pptshapegroupcontext.cxx 2010-03-03 17:00:05.000000000 +0100 @@ -33,6 +33,7 @@ #include <com/sun/star/container/XNamed.hpp> @@ -369,12 +340,12 @@ index fd0f312..a77f90b 100644 #include "oox/ppt/pptshapecontext.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" #include "oox/drawingml/graphicshapecontext.hxx" -@@ -104,7 +105,7 @@ Reference< XFastContextHandler > PPTShapeGroupContext::createFastChildContext( s +@@ -104,7 +105,7 @@ Reference< XFastContextHandler > PPTShap xRet.set( new PPTShapeContext( *this, mpSlidePersistPtr, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.CustomShape" ) ) ) ); - break; - case NMSP_PPT|XML_pic: // CT_Picture + break; + case NMSP_PPT|XML_pic: // CT_Picture - xRet.set( new oox::drawingml::GraphicShapeContext( *this, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GraphicObjectShape" ) ) ) ); + xRet.set( new PPTGraphicShapeContext( *this, mpSlidePersistPtr, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GraphicObjectShape" ) ) ) ); - break; - case NMSP_PPT|XML_graphicFrame: // CT_GraphicalObjectFrame + break; + case NMSP_PPT|XML_graphicFrame: // CT_GraphicalObjectFrame xRet.set( new oox::drawingml::GraphicalObjectFrameContext( *this, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.OLE2Shape" ) ) ) ); diff --git a/patches/dev300/redirect-extensions.diff b/patches/dev300/redirect-extensions.diff index 5d483df11..3532d43a3 100644 --- a/patches/dev300/redirect-extensions.diff +++ b/patches/dev300/redirect-extensions.diff @@ -45,34 +45,34 @@ --- svx/source/options/optlingu.cxx.old 2009-04-02 11:03:06.000000000 +0000 +++ svx/source/options/optlingu.cxx 2009-04-06 16:41:41.000000000 +0000 @@ -1177,7 +1177,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window - aLinguOptionsCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); - - aMoreDictsLink.SetURL( String( -- RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); -+ RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/dictionary?cid=926386" ) ) ); - aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) ); - - + != SvtExtendedSecurityOptions::OPEN_NEVER ) + { + aMoreDictsLink.SetURL( String( +- RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); ++ RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/dictionary?cid=926386" ) ) ); + aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage, OpenURLHdl_Impl ) ); + } + else @@ -2065,7 +2065,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Win - aPrioDownPB.Enable( FALSE ); - - aMoreDictsLink.SetURL( String( -- RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); -+ RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/dictionary?cid=926386" ) ) ); - aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) ); - - // + != SvtExtendedSecurityOptions::OPEN_NEVER ) + { + aMoreDictsLink.SetURL( String( +- RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/dictionary?cid=926386" ) ) ); ++ RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/dictionary?cid=926386" ) ) ); + aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg, OpenURLHdl_Impl ) ); + } + else --- svtools/source/contnr/templwin.cxx.old 2009-04-02 11:06:15.000000000 +0000 +++ svtools/source/contnr/templwin.cxx 2009-04-06 16:41:41.000000000 +0000 @@ -1743,7 +1743,7 @@ void SvtDocumentTemplateDialog::InitImpl - pImpl->aTitle = GetText(); - + if ( !bHideLink ) + { aMoreTemplatesLink.SetURL( String( - RTL_CONSTASCII_STRINGPARAM( "http://templates.services.openoffice.org/?cid=923508" ) ) ); + RTL_CONSTASCII_STRINGPARAM( "http://templates.go-oo.org/?cid=923508" ) ) ); aMoreTemplatesLink.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OpenLinkHdl_Impl ) ); - - aManageBtn.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OrganizerHdl_Impl ) ); + } + else --- instsetoo_native/util/openoffice.lst.old 2009-04-02 10:36:19.000000000 +0000 +++ instsetoo_native/util/openoffice.lst 2009-04-06 16:41:41.000000000 +0000 @@ -88,9 +88,9 @@ OpenOffice diff --git a/patches/dev300/sc-cellformat-icon-toggle.diff b/patches/dev300/sc-cellformat-icon-toggle.diff index b9806bce6..3a3cd3949 100644 --- a/patches/dev300/sc-cellformat-icon-toggle.diff +++ b/patches/dev300/sc-cellformat-icon-toggle.diff @@ -1,65 +1,55 @@ -diff --git sc/inc/column.hxx sc/inc/column.hxx -index 26e4a45..48b44af 100644 ---- sc/inc/column.hxx -+++ sc/inc/column.hxx -@@ -298,6 +298,7 @@ public: +--- sc/inc/column.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/column.hxx 2010-03-03 16:59:12.000000000 +0100 +@@ -306,6 +306,7 @@ public: const ScPatternAttr* GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetNumberFormat( SCROW nRow ) const; + ULONG GetNumberFormat( SCROW nRow ) const; + sal_uInt32 GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const; - void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; - void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const; -diff --git sc/inc/document.hxx sc/inc/document.hxx -index b4844a1..dea8da9 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx -@@ -736,6 +736,7 @@ public: - SC_DLLPUBLIC double RoundValueAsShown( double fVal, ULONG nFormat ); - SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, - sal_uInt32& rFormat ); + void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; + void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const; +--- sc/inc/document.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:12.000000000 +0100 +@@ -748,6 +748,7 @@ public: + SC_DLLPUBLIC double RoundValueAsShown( double fVal, ULONG nFormat ); + SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, + sal_uInt32& rFormat ); + sal_uInt32 GetNumberFormat( const ScRange& rRange ) const; - SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const; + SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const; /** If no number format attribute is set and the cell pointer passed is of type formula cell, the calculated -diff --git sc/inc/table.hxx sc/inc/table.hxx -index 2378728..216a876 100644 ---- sc/inc/table.hxx -+++ sc/inc/table.hxx -@@ -433,6 +433,7 @@ public: - ULONG GetNumberFormat( const ScAddress& rPos ) const - { return aCol[rPos.Col()].GetNumberFormat( rPos.Row() ); } - ULONG GetNumberFormat( SCCOL nCol, SCROW nRow ) const; +--- sc/inc/table.hxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:12.000000000 +0100 +@@ -484,6 +484,7 @@ public: + 0; + } + ULONG GetNumberFormat( SCCOL nCol, SCROW nRow ) const; + sal_uInt32 GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const; - void MergeSelectionPattern( ScMergePatternState& rState, - const ScMarkData& rMark, BOOL bDeep ) const; - void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, -diff --git sc/sdi/formatsh.sdi sc/sdi/formatsh.sdi -index a7bd57a..ed57de4 100644 ---- sc/sdi/formatsh.sdi -+++ sc/sdi/formatsh.sdi + void MergeSelectionPattern( ScMergePatternState& rState, + const ScMarkData& rMark, BOOL bDeep ) const; + void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, +--- sc/sdi/formatsh.sdi.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/sdi/formatsh.sdi 2010-03-03 16:59:12.000000000 +0100 @@ -120,11 +120,11 @@ interface FormatForSelection SID_ATTR_NUMBERFORMAT_VALUE [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;] SID_NUMBER_FORMAT [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState;] - SID_NUMBER_TWODEC [ ExecMethod = ExecuteNumFormat;] -- SID_NUMBER_SCIENTIFIC [ ExecMethod = ExecuteNumFormat;] -- SID_NUMBER_DATE [ ExecMethod = ExecuteNumFormat;] -- SID_NUMBER_CURRENCY [ ExecMethod = ExecuteNumFormat;] -- SID_NUMBER_PERCENT [ ExecMethod = ExecuteNumFormat;] -- SID_NUMBER_TIME [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_TWODEC [ ExecMethod = ExecuteNumFormat;] +- SID_NUMBER_SCIENTIFIC [ ExecMethod = ExecuteNumFormat;] +- SID_NUMBER_DATE [ ExecMethod = ExecuteNumFormat;] +- SID_NUMBER_CURRENCY [ ExecMethod = ExecuteNumFormat;] +- SID_NUMBER_PERCENT [ ExecMethod = ExecuteNumFormat;] +- SID_NUMBER_TIME [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_SCIENTIFIC [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState; ] + SID_NUMBER_DATE [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState; ] + SID_NUMBER_CURRENCY [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState; ] + SID_NUMBER_PERCENT [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState; ] + SID_NUMBER_TIME [ ExecMethod = ExecuteNumFormat; StateMethod = GetNumFormatState; ] - SID_NUMBER_STANDARD [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_INCDEC [ ExecMethod = ExecuteNumFormat;] - SID_NUMBER_DECDEC [ ExecMethod = ExecuteNumFormat;] -diff --git sc/source/core/data/column.cxx sc/source/core/data/column.cxx -index b714fec..bc0fc1d 100644 ---- sc/source/core/data/column.cxx -+++ sc/source/core/data/column.cxx -@@ -362,6 +362,22 @@ const ScPatternAttr* ScColumn::GetMostUsedPattern( SCROW nStartRow, SCROW nEndRo + SID_NUMBER_STANDARD [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_INCDEC [ ExecMethod = ExecuteNumFormat;] + SID_NUMBER_DECDEC [ ExecMethod = ExecuteNumFormat;] +--- sc/source/core/data/column.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/column.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -357,6 +357,22 @@ const ScPatternAttr* ScColumn::GetMostUs return pMaxPattern; } @@ -82,12 +72,10 @@ index b714fec..bc0fc1d 100644 ULONG ScColumn::GetNumberFormat( SCROW nRow ) const { -diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx -index 5844fa0..bf0afb3 100644 ---- sc/source/core/data/document.cxx -+++ sc/source/core/data/document.cxx -@@ -2276,6 +2276,32 @@ void ScDocument::GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, - rFormat = 0; +--- sc/source/core/data/document.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -2680,6 +2680,32 @@ void ScDocument::GetNumberFormat( SCCOL + rFormat = 0; } +sal_uInt32 ScDocument::GetNumberFormat( const ScRange& rRange ) const @@ -119,12 +107,10 @@ index 5844fa0..bf0afb3 100644 sal_uInt32 ScDocument::GetNumberFormat( const ScAddress& rPos ) const { -diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx -index 678b7a0..d448214 100644 ---- sc/source/core/data/table2.cxx -+++ sc/source/core/data/table2.cxx -@@ -1104,6 +1104,14 @@ ULONG ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const - return 0; +--- sc/source/core/data/table2.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/table2.cxx 2010-03-03 16:59:12.000000000 +0100 +@@ -1171,6 +1171,14 @@ ULONG ScTable::GetNumberFormat( SCCOL nC + return 0; } +sal_uInt32 ScTable::GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const @@ -138,10 +124,8 @@ index 678b7a0..d448214 100644 const ScPatternAttr* ScTable::GetPattern( SCCOL nCol, SCROW nRow ) const { -diff --git sc/source/ui/inc/formatsh.hxx sc/source/ui/inc/formatsh.hxx -index c67f110..5bbece4 100644 ---- sc/source/ui/inc/formatsh.hxx -+++ sc/source/ui/inc/formatsh.hxx +--- sc/source/ui/inc/formatsh.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/inc/formatsh.hxx 2010-03-03 16:59:12.000000000 +0100 @@ -77,6 +77,9 @@ public: void ExecFormatPaintbrush( SfxRequest& rReq ); @@ -152,10 +136,8 @@ index c67f110..5bbece4 100644 }; #endif -diff --git sc/source/ui/view/formatsh.cxx sc/source/ui/view/formatsh.cxx -index d36a262..72db244 100644 ---- sc/source/ui/view/formatsh.cxx -+++ sc/source/ui/view/formatsh.cxx +--- sc/source/ui/view/formatsh.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/formatsh.cxx 2010-03-03 16:59:12.000000000 +0100 @@ -58,6 +58,7 @@ #include <sfx2/app.hxx> @@ -164,93 +146,93 @@ index d36a262..72db244 100644 #include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <svtools/whiter.hxx> -@@ -919,6 +920,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); +@@ -924,6 +925,7 @@ void ScFormatShell::ExecuteNumFormat( Sf + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); + SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox -@@ -951,6 +953,8 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) - } - } +@@ -956,6 +958,8 @@ void ScFormatShell::ExecuteNumFormat( Sf + } + } + short nType = GetCurrentNumberFormatType(); + SfxItemSet aSet( GetPool(), nSlot, nSlot ); - switch ( nSlot ) - { - case SID_NUMBER_TWODEC: -@@ -958,23 +962,48 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) - rReq.Done(); - break; - case SID_NUMBER_SCIENTIFIC: -- pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC ); + switch ( nSlot ) + { + case SID_NUMBER_TWODEC: +@@ -963,23 +967,48 @@ void ScFormatShell::ExecuteNumFormat( Sf + rReq.Done(); + break; + case SID_NUMBER_SCIENTIFIC: +- pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC ); + if ((nType & NUMBERFORMAT_SCIENTIFIC)) + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER ); + else + pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC ); + aSet.Put( SfxBoolItem(nSlot, !(nType & NUMBERFORMAT_SCIENTIFIC)) ); + rBindings.Invalidate( nSlot ); - rReq.Done(); - break; - case SID_NUMBER_DATE: -- pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE ); + rReq.Done(); + break; + case SID_NUMBER_DATE: +- pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE ); + if ((nType & NUMBERFORMAT_DATE)) + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER ); + else + pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE ); + aSet.Put( SfxBoolItem(nSlot, !(nType & NUMBERFORMAT_DATE)) ); + rBindings.Invalidate( nSlot ); - rReq.Done(); - break; - case SID_NUMBER_TIME: -- pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME ); + rReq.Done(); + break; + case SID_NUMBER_TIME: +- pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME ); + if ((nType & NUMBERFORMAT_TIME)) + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER ); + else + pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME ); + aSet.Put( SfxBoolItem(nSlot, !(nType & NUMBERFORMAT_TIME)) ); + rBindings.Invalidate( nSlot ); - rReq.Done(); - break; - case SID_NUMBER_CURRENCY: -- pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY ); + rReq.Done(); + break; + case SID_NUMBER_CURRENCY: +- pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY ); + if ((nType & NUMBERFORMAT_CURRENCY)) + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER ); + else + pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY ); + aSet.Put( SfxBoolItem(nSlot, !(nType & NUMBERFORMAT_CURRENCY)) ); + rBindings.Invalidate( nSlot ); - rReq.Done(); - break; - case SID_NUMBER_PERCENT: -- pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT ); + rReq.Done(); + break; + case SID_NUMBER_PERCENT: +- pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT ); + if ((nType & NUMBERFORMAT_PERCENT)) + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER ); + else + pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT ); + aSet.Put( SfxBoolItem(nSlot, !(nType & NUMBERFORMAT_PERCENT)) ); + rBindings.Invalidate( nSlot ); - rReq.Done(); - break; - case SID_NUMBER_STANDARD: -@@ -1975,9 +2004,8 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet ) + rReq.Done(); + break; + case SID_NUMBER_STANDARD: +@@ -1985,9 +2014,8 @@ void ScFormatShell::GetAlignState( SfxIt void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - - // ScViewData* pViewData = GetViewData(); -- ScDocument* pDoc = pViewData->GetDocument(); +- ScDocument* pDoc = pViewData->GetDocument(); + ScDocument* pDoc = pViewData->GetDocument(); + short nType = GetCurrentNumberFormatType(); - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); -@@ -2004,7 +2032,21 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) - rSet.Put( SfxStringItem( nWhich, aFormatCode ) ); - } - break; + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); +@@ -2014,7 +2042,21 @@ void ScFormatShell::GetNumFormatState( S + rSet.Put( SfxStringItem( nWhich, aFormatCode ) ); + } + break; - + case SID_NUMBER_SCIENTIFIC: + rSet.Put( SfxBoolItem(nWhich, (nType & NUMBERFORMAT_SCIENTIFIC)) ); @@ -267,10 +249,10 @@ index d36a262..72db244 100644 + case SID_NUMBER_TIME: + rSet.Put( SfxBoolItem(nWhich, (nType & NUMBERFORMAT_TIME)) ); + break; - } - nWhich = aIter.NextWhich(); - } -@@ -2155,3 +2197,68 @@ void ScFormatShell::StateFormatPaintbrush( SfxItemSet& rSet ) + } + nWhich = aIter.NextWhich(); + } +@@ -2165,3 +2207,68 @@ void ScFormatShell::StateFormatPaintbrus rSet.Put( SfxBoolItem( SID_FORMATPAINTBRUSH, pViewData->GetView()->HasPaintBrush() ) ); } @@ -339,10 +321,8 @@ index d36a262..72db244 100644 + return nType; +} + -diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx -index f2c10c8..edf4c95 100644 ---- sc/source/ui/view/tabview3.cxx -+++ sc/source/ui/view/tabview3.cxx +--- sc/source/ui/view/tabview3.cxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/view/tabview3.cxx 2010-03-03 16:59:12.000000000 +0100 @@ -267,6 +267,13 @@ void ScTabView::InvalidateAttribs() rBindings.Invalidate( SID_ALIGN_ANY_VCENTER ); rBindings.Invalidate( SID_ALIGN_ANY_BOTTOM ); @@ -357,10 +337,8 @@ index f2c10c8..edf4c95 100644 // rBindings.Invalidate( SID_RANGE_VALUE ); // rBindings.Invalidate( SID_RANGE_FORMULA ); } -diff --git sc/uiconfig/scalc/toolbar/formatobjectbar.xml sc/uiconfig/scalc/toolbar/formatobjectbar.xml -index 13b6abc..49c31d7 100644 ---- sc/uiconfig/scalc/toolbar/formatobjectbar.xml -+++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml +--- sc/uiconfig/scalc/toolbar/formatobjectbar.xml.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/uiconfig/scalc/toolbar/formatobjectbar.xml 2010-03-03 16:59:12.000000000 +0100 @@ -33,7 +33,7 @@ <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent" toolbar:helpid="helpid:26046" /> <toolbar:toolbaritem xlink:href=".uno:NumberFormatDate" toolbar:helpid="helpid:26053" toolbar:visible="false" /> diff --git a/patches/dev300/sc-overwrite-char-font-attrs.diff b/patches/dev300/sc-overwrite-char-font-attrs.diff index c2d0a01c8..3c56ca346 100644 --- a/patches/dev300/sc-overwrite-char-font-attrs.diff +++ b/patches/dev300/sc-overwrite-char-font-attrs.diff @@ -1,5 +1,5 @@ ---- sc/inc/attarray.hxx.old 2009-04-02 10:45:43.000000000 +0000 -+++ sc/inc/attarray.hxx 2009-04-06 16:41:49.000000000 +0000 +--- sc/inc/attarray.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/inc/attarray.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -35,6 +35,7 @@ #include "attrib.hxx" @@ -9,31 +9,31 @@ class ScPatternAttr; class ScStyleSheet; @@ -104,6 +105,9 @@ friend void lcl_IterGetNumberFormat( ULO - SCROW nStartRow, SCROW nEndRow, - BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ); + SCROW nStartRow, SCROW nEndRow, + BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ); + void RemoveCellCharAttribs( SCROW nStartRow, SCROW nEndRow, + const ScPatternAttr* pPattern, ScEditDataArray* pDataArray ); + public: - ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ); - ~ScAttrArray(); -@@ -125,9 +129,11 @@ public: - SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); + ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ); + ~ScAttrArray(); +@@ -126,9 +130,11 @@ public: + SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); - void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE ); -- void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE); + void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE ); +- void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE); + void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, + BOOL bPutToPool = FALSE, ScEditDataArray* pDataArray = NULL ); - void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); -- void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache ); + void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); +- void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache ); + void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, + ScEditDataArray* pDataArray = NULL ); - void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, - const SvxBorderLine* pLine, BOOL bColorOnly ); + void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, + const SvxBorderLine* pLine, BOOL bColorOnly ); ---- sc/inc/cell.hxx.old 2009-04-02 10:45:43.000000000 +0000 -+++ sc/inc/cell.hxx 2009-04-06 16:41:49.000000000 +0000 +--- sc/inc/cell.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/inc/cell.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -34,6 +34,9 @@ #include <stddef.h> @@ -44,18 +44,18 @@ #include <tools/mempool.hxx> #include <svtools/listener.hxx> #include "global.hxx" -@@ -58,6 +61,7 @@ class SvtBroadcaster; +@@ -59,6 +62,7 @@ class SvtBroadcaster; class ScCodeArray; class ScProgress; class ScPostIt; +class ScPatternAttr; - class ScMultipleReadHeader; - class ScMultipleWriteHeader; -@@ -285,6 +289,53 @@ public: - void GetString( String& rString ) const; + // ============================================================================ + +@@ -279,6 +283,53 @@ public: + void GetString( String& rString ) const; - const EditTextObject* GetData() const { return pData; } + const EditTextObject* GetData() const { return pData; } + + /** Removes character attribute based on new pattern attributes. */ + void RemoveCharAttribs( const ScPatternAttr& rAttr ); @@ -106,77 +106,77 @@ }; // ============================================================================ ---- sc/inc/column.hxx.old 2009-04-02 10:45:43.000000000 +0000 -+++ sc/inc/column.hxx 2009-04-06 16:41:49.000000000 +0000 -@@ -56,6 +56,7 @@ class ScAttrIterator; +--- sc/inc/column.hxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/inc/column.hxx 2010-03-03 16:59:11.000000000 +0100 +@@ -57,6 +57,7 @@ class ScAttrIterator; class ScAttrArray; class ScBaseCell; class ScDocument; +class ScEditDataArray; class ScFormulaCell; class ScMarkData; - class ScMultipleReadHeader; -@@ -317,7 +318,8 @@ public: + class ScPatternAttr; +@@ -316,7 +317,8 @@ public: - void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ); - void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ); -- void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr ); + void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ); + void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ); +- void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr ); + void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, + ScEditDataArray* pDataArray = NULL ); - void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); - void SetPatternArea( SCROW nStartRow, SCROW nEndRow, - const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); -@@ -349,7 +351,7 @@ public: + void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); + void SetPatternArea( SCROW nStartRow, SCROW nEndRow, + const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); +@@ -348,7 +350,7 @@ public: - void RemoveProtected( SCROW nStartRow, SCROW nEndRow ); + void RemoveProtected( SCROW nStartRow, SCROW nEndRow ); -- SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); +- 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 ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); ---- sc/inc/document.hxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/inc/document.hxx 2009-04-06 16:41:49.000000000 +0000 + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); +--- sc/inc/document.hxx.old 2010-03-03 16:59:09.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -369,6 +369,7 @@ private: - // kein Broadcast, keine Listener aufbauen waehrend aus einem anderen - // Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad - BOOL bInsertingFromOtherDoc; + // kein Broadcast, keine Listener aufbauen waehrend aus einem anderen + // Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad + BOOL bInsertingFromOtherDoc; + bool bLoadingMedium; - BOOL bImportingXML; // special handling of formula text + BOOL bImportingXML; // special handling of formula text BOOL bXMLFromWrapper; // distinguish ScXMLImportWrapper from external component - BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE -@@ -1118,7 +1119,8 @@ public: - const ScPatternAttr& rAttr ); - SC_DLLPUBLIC void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, -- const ScMarkData& rMark, const ScPatternAttr& rAttr ); + BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE +@@ -1146,7 +1147,8 @@ public: + const ScPatternAttr& rAttr ); + SC_DLLPUBLIC void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, +- const ScMarkData& rMark, const ScPatternAttr& rAttr ); + const ScMarkData& rMark, const ScPatternAttr& rAttr, + ScEditDataArray* pDataArray = NULL ); - SC_DLLPUBLIC void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, - const ScPatternAttr& rAttr ); -@@ -1180,7 +1182,8 @@ public: - SCCOL nVCol, SCROW nVRow, SCTAB nVTab, - const String& sValStr, double& nX); - -- void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark ); + SC_DLLPUBLIC void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, + SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, + const ScPatternAttr& rAttr ); +@@ -1208,7 +1210,8 @@ public: + SCCOL nVCol, SCROW nVRow, SCTAB nVTab, + const String& sValStr, double& nX); + +- 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 DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark ); + void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark ); -@@ -1429,6 +1432,8 @@ public: - BOOL GetNoSetDirty() const { return bNoSetDirty; } - void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; } - BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } +@@ -1458,6 +1461,8 @@ public: + BOOL GetNoSetDirty() const { return bNoSetDirty; } + void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; } + BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } + void SetLoadingMedium( bool bVal ); + bool IsLoadingMedium() const; - void SetImportingXML( BOOL bVal ); - BOOL IsImportingXML() const { return bImportingXML; } - void SetXMLFromWrapper( BOOL bVal ); ---- sc/inc/table.hxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/inc/table.hxx 2009-04-06 16:41:49.000000000 +0000 -@@ -57,6 +57,7 @@ class ScAutoFormatData; + void SetImportingXML( BOOL bVal ); + BOOL IsImportingXML() const { return bImportingXML; } + void SetXMLFromWrapper( BOOL bVal ); +--- sc/inc/table.hxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:11.000000000 +0100 +@@ -59,6 +59,7 @@ class ScAutoFormatData; class ScBaseCell; class ScDocument; class ScDrawLayer; @@ -184,27 +184,27 @@ class ScFormulaCell; class ScOutlineTable; class ScPostIt; -@@ -456,7 +457,8 @@ public: +@@ -498,7 +499,8 @@ public: - void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ); - void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); -- void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr ); + void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ); + void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); +- void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr ); + void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + const ScPatternAttr& rAttr, ScEditDataArray* pDataArray = NULL ); - void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ) - { aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool ); } - void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); -@@ -484,7 +486,7 @@ public: - BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); - -- void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark ); + void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ) + { + if (ValidColRow(rPos.Col(),rPos.Row())) +@@ -529,7 +531,7 @@ public: + BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); + BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); + +- 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 ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); ---- sc/source/core/data/attarray.cxx.old 2009-04-02 10:45:01.000000000 +0000 -+++ sc/source/core/data/attarray.cxx 2009-04-06 16:41:49.000000000 +0000 + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); +--- sc/source/core/data/attarray.cxx.old 2010-01-26 16:48:38.000000000 +0100 ++++ sc/source/core/data/attarray.cxx 2010-03-03 16:59:11.000000000 +0100 @@ -41,6 +41,7 @@ #include <svx/bolnitem.hxx> #include <svx/frmdiritem.hxx> @@ -222,8 +222,8 @@ #undef DBG_INVALIDATE #define DBGOUTPUT(s) \ -@@ -299,8 +300,31 @@ void ScAttrArray::SetPattern( SCROW nRow - SetPatternArea( nRow, nRow, pPattern, bPutToPool ); +@@ -302,8 +303,31 @@ void ScAttrArray::SetPattern( SCROW nRow + SetPatternArea( nRow, nRow, pPattern, bPutToPool ); } +void ScAttrArray::RemoveCellCharAttribs( SCROW nStartRow, SCROW nEndRow, @@ -253,9 +253,9 @@ +void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPatternAttr *pPattern, + BOOL bPutToPool, ScEditDataArray* pDataArray ) { - if (ValidRow(nStartRow) && ValidRow(nEndRow)) - { -@@ -470,6 +494,13 @@ void ScAttrArray::SetPatternArea(SCROW n + if (ValidRow(nStartRow) && ValidRow(nEndRow)) + { +@@ -473,6 +497,13 @@ void ScAttrArray::SetPatternArea(SCROW n pData[nInsert-1].nRow = nStartRow - 1; pData[nInsert].nRow = nEndRow; pData[nInsert].pPattern = pPattern; @@ -268,8 +268,8 @@ + nCount++; } - } -@@ -705,7 +736,7 @@ void ScAttrArray::ApplyLineStyleArea( SC + +@@ -714,7 +745,7 @@ void ScAttrArray::ApplyLineStyleArea( SC #undef SET_LINE @@ -277,28 +277,28 @@ +void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, ScEditDataArray* pDataArray ) { #ifdef DBG_UTIL - TestData(); -@@ -740,7 +771,7 @@ void ScAttrArray::ApplyCacheArea( SCROW - { - if (nY1 < nStartRow) nY1=nStartRow; - if (nY2 > nEndRow) nY2=nEndRow; -- SetPatternArea( nY1, nY2, pNewPattern ); + TestData(); +@@ -749,7 +780,7 @@ void ScAttrArray::ApplyCacheArea( SCROW + { + if (nY1 < nStartRow) nY1=nStartRow; + if (nY2 > nEndRow) nY2=nEndRow; +- SetPatternArea( nY1, nY2, pNewPattern ); + SetPatternArea( nY1, nY2, pNewPattern, false, pDataArray ); - Search( nStart, nPos ); - } - else ---- sc/source/core/data/cell2.cxx.old 2009-04-02 10:45:01.000000000 +0000 -+++ sc/source/core/data/cell2.cxx 2009-04-06 16:41:49.000000000 +0000 -@@ -50,6 +50,8 @@ + Search( nStart, nPos ); + } + else +--- sc/source/core/data/cell2.cxx.old 2010-01-21 00:59:54.000000000 +0100 ++++ sc/source/core/data/cell2.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -54,6 +54,8 @@ + #include "editutil.hxx" #include "chgtrack.hxx" - #include "indexmap.hxx" #include "externalrefmgr.hxx" +#include "scitems.hxx" +#include "patattr.hxx" using namespace formula; -@@ -138,6 +140,28 @@ void ScEditCell::GetString( String& rStr +@@ -142,6 +144,28 @@ void ScEditCell::GetString( String& rStr rString.Erase(); } @@ -327,7 +327,7 @@ void ScEditCell::SetTextObject( const EditTextObject* pObject, const SfxItemPool* pFromPool ) { -@@ -173,6 +197,76 @@ void ScEditCell::SetTextObject( const Ed +@@ -177,6 +201,76 @@ void ScEditCell::SetTextObject( const Ed pData = NULL; } @@ -403,9 +403,9 @@ + // ============================================================================ - BOOL ScFormulaCell::IsEmpty() ---- sc/source/core/data/column.cxx.old 2009-04-02 10:45:01.000000000 +0000 -+++ sc/source/core/data/column.cxx 2009-04-06 16:41:49.000000000 +0000 + namespace +--- sc/source/core/data/column.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/data/column.cxx 2010-03-03 16:59:11.000000000 +0100 @@ -364,7 +364,7 @@ ULONG ScColumn::GetNumberFormat( SCROW n } @@ -416,14 +416,14 @@ SCROW nTop = 0; SCROW nBottom = 0; @@ -375,7 +375,7 @@ SCsROW ScColumn::ApplySelectionCache( Sf - ScMarkArrayIter aMarkIter( rMark.GetArray() + nCol ); - while (aMarkIter.Next( nTop, nBottom )) - { -- pAttrArray->ApplyCacheArea( nTop, nBottom, pCache ); + ScMarkArrayIter aMarkIter( rMark.GetArray() + nCol ); + while (aMarkIter.Next( nTop, nBottom )) + { +- pAttrArray->ApplyCacheArea( nTop, nBottom, pCache ); + pAttrArray->ApplyCacheArea( nTop, nBottom, pCache, pDataArray ); - bFound = TRUE; - } - } + bFound = TRUE; + } + } @@ -449,11 +449,12 @@ void ScColumn::ApplyPattern( SCROW nRow, } @@ -432,27 +432,27 @@ +void ScColumn::ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, + ScEditDataArray* pDataArray ) { - const SfxItemSet* pSet = &rPatAttr.GetItemSet(); - SfxItemPoolCache aCache( pDocument->GetPool(), pSet ); -- pAttrArray->ApplyCacheArea( nStartRow, nEndRow, &aCache ); + const SfxItemSet* pSet = &rPatAttr.GetItemSet(); + SfxItemPoolCache aCache( pDocument->GetPool(), pSet ); +- pAttrArray->ApplyCacheArea( nStartRow, nEndRow, &aCache ); + pAttrArray->ApplyCacheArea( nStartRow, nEndRow, &aCache, pDataArray ); } ---- sc/source/core/data/documen2.cxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/source/core/data/documen2.cxx 2009-04-06 16:41:49.000000000 +0000 -@@ -188,6 +188,7 @@ ScDocument::ScDocument( ScDocumentMode e +--- sc/source/core/data/documen2.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/data/documen2.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -190,6 +190,7 @@ ScDocument::ScDocument( ScDocumentMode e // bNoSetDirty( TRUE ), - bNoSetDirty( FALSE ), - bInsertingFromOtherDoc( FALSE ), + bNoSetDirty( FALSE ), + bInsertingFromOtherDoc( FALSE ), + bLoadingMedium(false), - bImportingXML( FALSE ), + bImportingXML( FALSE ), bXMLFromWrapper( FALSE ), - bCalcingAfterLoad( FALSE ), ---- sc/source/core/data/documen9.cxx.old 2009-04-02 10:45:01.000000000 +0000 -+++ sc/source/core/data/documen9.cxx 2009-04-06 16:41:49.000000000 +0000 + bCalcingAfterLoad( FALSE ), +--- sc/source/core/data/documen9.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/data/documen9.cxx 2010-03-03 16:59:11.000000000 +0100 @@ -799,6 +799,16 @@ void ScDocument::UpdateFontCharSet() - } + } } +void ScDocument::SetLoadingMedium( bool bVal ) @@ -467,72 +467,72 @@ + void ScDocument::SetImportingXML( BOOL bVal ) { - bImportingXML = bVal; ---- sc/source/core/data/document.cxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/source/core/data/document.cxx 2009-04-06 16:41:49.000000000 +0000 -@@ -3098,12 +3098,13 @@ void ScDocument::ApplyPattern( SCCOL nCo + bImportingXML = bVal; +--- sc/source/core/data/document.cxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -3556,12 +3556,13 @@ void ScDocument::ApplyPattern( SCCOL nCo void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, - const ScMarkData& rMark, -- const ScPatternAttr& rAttr ) + SCCOL nEndCol, SCROW nEndRow, + const ScMarkData& rMark, +- const ScPatternAttr& rAttr ) + const ScPatternAttr& rAttr, + ScEditDataArray* pDataArray ) { - for (SCTAB i=0; i <= MAXTAB; i++) - if (pTab[i]) - if (rMark.GetTableSelect(i)) -- pTab[i]->ApplyPatternArea( nStartCol, nStartRow, nEndCol, nEndRow, rAttr ); + for (SCTAB i=0; i <= MAXTAB; i++) + if (pTab[i]) + if (rMark.GetTableSelect(i)) +- pTab[i]->ApplyPatternArea( nStartCol, nStartRow, nEndCol, nEndRow, rAttr ); + pTab[i]->ApplyPatternArea( nStartCol, nStartRow, nEndCol, nEndRow, rAttr, pDataArray ); } -@@ -4033,7 +4034,7 @@ void ScDocument::ApplyFrameAreaTab( cons +@@ -4496,7 +4497,7 @@ void ScDocument::ApplyFrameAreaTab( cons } -void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark ) +void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, ScEditDataArray* pDataArray ) { - const SfxItemSet* pSet = &rAttr.GetItemSet(); - BOOL bSet = FALSE; -@@ -4050,7 +4051,7 @@ void ScDocument::ApplySelectionPattern( - ScRange aRange; - rMark.GetMarkArea( aRange ); - ApplyPatternArea( aRange.aStart.Col(), aRange.aStart.Row(), -- aRange.aEnd.Col(), aRange.aEnd.Row(), rMark, rAttr ); + const SfxItemSet* pSet = &rAttr.GetItemSet(); + BOOL bSet = FALSE; +@@ -4513,7 +4514,7 @@ void ScDocument::ApplySelectionPattern( + ScRange aRange; + rMark.GetMarkArea( aRange ); + ApplyPatternArea( aRange.aStart.Col(), aRange.aStart.Row(), +- aRange.aEnd.Col(), aRange.aEnd.Row(), rMark, rAttr ); + aRange.aEnd.Col(), aRange.aEnd.Row(), rMark, rAttr, pDataArray ); - } - else - { -@@ -4058,7 +4059,7 @@ void ScDocument::ApplySelectionPattern( + } + else + { +@@ -4521,7 +4522,7 @@ void ScDocument::ApplySelectionPattern( for (SCTAB nTab=0; nTab<=MAXTAB; nTab++) if (pTab[nTab]) if (rMark.GetTableSelect(nTab)) - pTab[nTab]->ApplySelectionCache( &aCache, rMark ); + pTab[nTab]->ApplySelectionCache( &aCache, rMark, pDataArray ); - } - } + } + } } ---- sc/source/core/data/table2.cxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/source/core/data/table2.cxx 2009-04-06 16:41:49.000000000 +0000 -@@ -1661,14 +1661,14 @@ void ScTable::ApplyPattern( SCCOL nCol, +--- sc/source/core/data/table2.cxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/core/data/table2.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -1713,14 +1713,14 @@ void ScTable::ApplyPattern( SCCOL nCol, void ScTable::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, -- const ScPatternAttr& rAttr ) +- const ScPatternAttr& rAttr ) + const ScPatternAttr& rAttr, ScEditDataArray* pDataArray ) { - if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) - { - PutInOrder(nStartCol, nEndCol); - PutInOrder(nStartRow, nEndRow); - for (SCCOL i = nStartCol; i <= nEndCol; i++) -- aCol[i].ApplyPatternArea(nStartRow, nEndRow, rAttr); + if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) + { + PutInOrder(nStartCol, nEndCol); + PutInOrder(nStartRow, nEndRow); + for (SCCOL i = nStartCol; i <= nEndCol; i++) +- aCol[i].ApplyPatternArea(nStartRow, nEndRow, rAttr); + aCol[i].ApplyPatternArea(nStartRow, nEndRow, rAttr, pDataArray); - } + } } -@@ -1876,10 +1876,11 @@ void ScTable::ApplyAttr( SCCOL nCol, SCR +@@ -1928,10 +1928,11 @@ void ScTable::ApplyAttr( SCCOL nCol, SCR } @@ -540,15 +540,15 @@ +void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, + ScEditDataArray* pDataArray ) { - for (SCCOL i=0; i<=MAXCOL; i++) -- aCol[i].ApplySelectionCache( pCache, rMark ); + for (SCCOL i=0; i<=MAXCOL; i++) +- aCol[i].ApplySelectionCache( pCache, rMark ); + aCol[i].ApplySelectionCache( pCache, rMark, pDataArray ); } ---- sc/source/ui/docshell/docsh.cxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/source/ui/docshell/docsh.cxx 2009-04-06 16:41:49.000000000 +0000 -@@ -427,10 +427,31 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSa +--- sc/source/ui/docshell/docsh.cxx.old 2010-03-03 16:59:07.000000000 +0100 ++++ sc/source/ui/docshell/docsh.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -432,10 +432,31 @@ BOOL ScDocShell::SaveXML( SfxMedium* pSa return bRet; } @@ -575,31 +575,31 @@ + BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" ); + RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::Load" ); - + DocLoadChecker aChecker(&aDocument); - ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() ); + ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() ); - // only the latin script language is loaded -@@ -769,7 +790,7 @@ void __EXPORT ScDocShell::Notify( SfxBro + // only the latin script language is loaded +@@ -779,7 +800,7 @@ void __EXPORT ScDocShell::Notify( SfxBro BOOL __EXPORT ScDocShell::LoadFrom( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::LoadFrom" ); + RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::LoadFrom" ); - + DocLoadChecker aChecker(&aDocument); - ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() ); + ScRefreshTimerProtector( aDocument.GetRefreshTimerControlAddress() ); - WaitObject aWait( GetActiveDialogParent() ); -@@ -796,6 +817,7 @@ BOOL __EXPORT ScDocShell::LoadFrom( SfxM + WaitObject aWait( GetActiveDialogParent() ); +@@ -834,6 +855,7 @@ static void lcl_parseHtmlFilterOption(co BOOL __EXPORT ScDocShell::ConvertFrom( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" ); + RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ConvertFrom" ); + DocLoadChecker aChecker(&aDocument); - BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !! - // bei Fehler: Fehler am Stream setzen!! ---- sc/source/ui/inc/undoblk.hxx.old 2009-04-02 10:45:37.000000000 +0000 -+++ sc/source/ui/inc/undoblk.hxx 2009-04-06 16:41:49.000000000 +0000 + BOOL bRet = FALSE; // FALSE heisst Benutzerabbruch !! + // bei Fehler: Fehler am Stream setzen!! +--- sc/source/ui/inc/undoblk.hxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/inc/undoblk.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -35,6 +35,10 @@ #include "viewutil.hxx" #include "spellparam.hxx" @@ -609,30 +609,30 @@ +#include <boost/shared_ptr.hpp> + class ScDocShell; + class ScBaseCell; class ScDocument; - class ScOutlineTable; -@@ -353,9 +357,11 @@ public: +@@ -354,9 +358,11 @@ public: - virtual String GetComment() const; + virtual String GetComment() const; + ScEditDataArray* GetDataArray(); private: - ScMarkData aMarkData; - ScRange aRange; + ScMarkData aMarkData; + ScRange aRange; + ScEditDataArray aDataArray; - ScDocument* pUndoDoc; - BOOL bMulti; - ScPatternAttr* pApplyPattern; -@@ -363,6 +369,7 @@ private: - SvxBoxInfoItem* pLineInner; + ScDocument* pUndoDoc; + BOOL bMulti; + ScPatternAttr* pApplyPattern; +@@ -364,6 +370,7 @@ private: + SvxBoxInfoItem* pLineInner; - void DoChange( const BOOL bUndo ); + void DoChange( const BOOL bUndo ); + void ChangeEditData( const bool bUndo ); }; ---- sc/source/ui/inc/undocell.hxx.old 2009-04-02 10:45:37.000000000 +0000 -+++ sc/source/ui/inc/undocell.hxx 2009-04-06 16:41:49.000000000 +0000 +--- sc/source/ui/inc/undocell.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/inc/undocell.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -34,6 +34,8 @@ #include "undobase.hxx" #include "postit.hxx" @@ -644,7 +644,7 @@ class ScPatternAttr; @@ -62,6 +64,11 @@ public: - virtual String GetComment() const; + virtual String GetComment() const; + /** once the objects are passed to this class, their life-cycle is + managed by this class; the calling function must pass new'ed @@ -652,35 +652,35 @@ + void SetEditData( EditTextObject* pOld, EditTextObject* pNew ); + private: - SCCOL nCol; - SCROW nRow; + SCCOL nCol; + SCROW nRow; @@ -69,9 +76,11 @@ private: - ScPatternAttr* pOldPattern; - ScPatternAttr* pNewPattern; - ScPatternAttr* pApplyPattern; + ScPatternAttr* pOldPattern; + ScPatternAttr* pNewPattern; + ScPatternAttr* pApplyPattern; + ::boost::shared_ptr<EditTextObject> pOldEditData; + ::boost::shared_ptr<EditTextObject> pNewEditData; - BOOL bIsAutomatic; + BOOL bIsAutomatic; -- void DoChange( const ScPatternAttr* pWhichPattern ) const; +- void DoChange( const ScPatternAttr* pWhichPattern ) const; + void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const; }; ---- sc/source/ui/undo/makefile.mk.old 2009-04-02 10:45:28.000000000 +0000 -+++ sc/source/ui/undo/makefile.mk 2009-04-06 16:41:49.000000000 +0000 +--- sc/source/ui/undo/makefile.mk.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/undo/makefile.mk 2010-03-03 16:59:11.000000000 +0100 @@ -78,6 +78,7 @@ SLOFILES = \ - $(SLO)$/undotab.obj + $(SLO)$/undotab.obj EXCEPTIONSFILES= \ + $(SLO)$/undocell.obj \ $(SLO)$/undostyl.obj # --- Tagets ------------------------------------------------------- ---- sc/source/ui/undo/undoblk3.cxx.old 2009-04-02 10:45:28.000000000 +0000 -+++ sc/source/ui/undo/undoblk3.cxx 2009-04-06 16:41:49.000000000 +0000 -@@ -481,6 +481,12 @@ String __EXPORT ScUndoSelectionAttr::Get - return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR ); +--- sc/source/ui/undo/undoblk3.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/undo/undoblk3.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -482,6 +482,12 @@ String __EXPORT ScUndoSelectionAttr::Get + return ScGlobal::GetRscString( pLineOuter ? STR_UNDO_SELATTRLINES : STR_UNDO_SELATTR ); } +//---------------------------------------------------------------------------- @@ -692,17 +692,17 @@ //---------------------------------------------------------------------------- -@@ -499,6 +505,8 @@ void ScUndoSelectionAttr::DoChange( cons - USHORT nExtFlags = 0; - pDocShell->UpdatePaintExt( nExtFlags, aEffRange ); +@@ -500,6 +506,8 @@ void ScUndoSelectionAttr::DoChange( cons + USHORT nExtFlags = 0; + pDocShell->UpdatePaintExt( nExtFlags, aEffRange ); + ChangeEditData(bUndo); + - if (bUndo) // nur bei Undo - { - ScRange aCopyRange = aRange; -@@ -523,6 +531,24 @@ void ScUndoSelectionAttr::DoChange( cons - ShowTable( aRange ); + if (bUndo) // nur bei Undo + { + ScRange aCopyRange = aRange; +@@ -524,6 +532,24 @@ void ScUndoSelectionAttr::DoChange( cons + ShowTable( aRange ); } +void ScUndoSelectionAttr::ChangeEditData( const bool bUndo ) @@ -726,8 +726,8 @@ //---------------------------------------------------------------------------- ---- sc/source/ui/undo/undocell.cxx.old 2009-04-02 10:45:28.000000000 +0000 -+++ sc/source/ui/undo/undocell.cxx 2009-04-06 16:41:49.000000000 +0000 +--- sc/source/ui/undo/undocell.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/undo/undocell.cxx 2010-03-03 16:59:11.000000000 +0100 @@ -57,6 +57,8 @@ #include "sc.hrc" #include "docuno.hxx" @@ -738,22 +738,22 @@ TYPEINIT1(ScUndoCursorAttr, ScSimpleUndo); @@ -85,6 +87,8 @@ ScUndoCursorAttr::ScUndoCursorAttr( ScDo - nCol( nNewCol ), - nRow( nNewRow ), - nTab( nNewTab ), + nCol( nNewCol ), + nRow( nNewRow ), + nTab( nNewTab ), + pOldEditData( static_cast<EditTextObject*>(NULL) ), + pNewEditData( static_cast<EditTextObject*>(NULL) ), - bIsAutomatic( bAutomatic ) + bIsAutomatic( bAutomatic ) { - ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); + ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool(); @@ -109,9 +113,21 @@ String __EXPORT ScUndoCursorAttr::GetCom - return ScGlobal::GetRscString( nId ); + return ScGlobal::GetRscString( nId ); } -void ScUndoCursorAttr::DoChange( const ScPatternAttr* pWhichPattern ) const +void ScUndoCursorAttr::SetEditData( EditTextObject* pOld, EditTextObject* pNew ) { -- pDocShell->GetDocument()->SetPattern( nCol, nRow, nTab, *pWhichPattern, TRUE ); +- pDocShell->GetDocument()->SetPattern( nCol, nRow, nTab, *pWhichPattern, TRUE ); + pOldEditData.reset(pOld); + pNewEditData.reset(pNew); +} @@ -768,63 +768,63 @@ + if (pCell && pCell->GetCellType() == CELLTYPE_EDIT && pEditData.get()) + static_cast<ScEditCell*>(pCell)->SetData(pEditData.get(), NULL); - ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - if (pViewShell) + ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); + if (pViewShell) @@ -137,7 +153,7 @@ void ScUndoCursorAttr::DoChange( const S void __EXPORT ScUndoCursorAttr::Undo() { - BeginUndo(); -- DoChange(pOldPattern); + BeginUndo(); +- DoChange(pOldPattern); + DoChange(pOldPattern, pOldEditData); - if ( bIsAutomatic ) - { + if ( bIsAutomatic ) + { @@ -155,7 +171,7 @@ void __EXPORT ScUndoCursorAttr::Undo() void __EXPORT ScUndoCursorAttr::Redo() { - BeginRedo(); -- DoChange(pNewPattern); + BeginRedo(); +- DoChange(pNewPattern); + DoChange(pNewPattern, pNewEditData); - EndRedo(); + EndRedo(); } ---- sc/source/ui/view/viewfunc.cxx.old 2009-04-06 16:41:49.000000000 +0000 -+++ sc/source/ui/view/viewfunc.cxx 2009-04-06 16:41:49.000000000 +0000 -@@ -1348,6 +1348,8 @@ void ScViewFunc::ApplySelectionPattern( - SCROW nEndRow = aMarkRange.aEnd.Row(); - SCTAB nEndTab = aMarkRange.aEnd.Tab(); +--- sc/source/ui/view/viewfunc.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/ui/view/viewfunc.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -1316,6 +1316,8 @@ void ScViewFunc::ApplySelectionPattern( + SCROW nEndRow = aMarkRange.aEnd.Row(); + SCTAB nEndTab = aMarkRange.aEnd.Tab(); + ScUndoSelectionAttr* pUndoAttr = NULL; + ScEditDataArray* pEditDataArray = NULL; - if (bRecord) - { - ScRange aCopyRange = aMarkRange; -@@ -1363,15 +1365,14 @@ void ScViewFunc::ApplySelectionPattern( - - aFuncMark.MarkToMulti(); - -- pDocSh->GetUndoManager()->AddUndoAction( -- new ScUndoSelectionAttr( -- pDocSh, aFuncMark, -- nStartCol, nStartRow, nStartTab, -- nEndCol, nEndRow, nEndTab, -- pUndoDoc, bMulti, &rAttr ) ); + if (bRecord) + { + ScRange aCopyRange = aMarkRange; +@@ -1331,15 +1333,14 @@ void ScViewFunc::ApplySelectionPattern( + + aFuncMark.MarkToMulti(); + +- pDocSh->GetUndoManager()->AddUndoAction( +- new ScUndoSelectionAttr( +- pDocSh, aFuncMark, +- nStartCol, nStartRow, nStartTab, +- nEndCol, nEndRow, nEndTab, +- pUndoDoc, bMulti, &rAttr ) ); + pUndoAttr = new ScUndoSelectionAttr( + pDocSh, aFuncMark, nStartCol, nStartRow, nStartTab, + nEndCol, nEndRow, nEndTab, pUndoDoc, bMulti, &rAttr ); + pDocSh->GetUndoManager()->AddUndoAction(pUndoAttr); + pEditDataArray = pUndoAttr->GetDataArray(); - } + } -- pDoc->ApplySelectionPattern( rAttr, aFuncMark ); +- pDoc->ApplySelectionPattern( rAttr, aFuncMark ); + pDoc->ApplySelectionPattern( rAttr, aFuncMark, pEditDataArray ); - pDocSh->PostPaint( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab, -@@ -1385,6 +1386,19 @@ void ScViewFunc::ApplySelectionPattern( - SCCOL nCol = pViewData->GetCurX(); - SCROW nRow = pViewData->GetCurY(); - SCTAB nTab = pViewData->GetTabNo(); + pDocSh->PostPaint( nStartCol, nStartRow, nStartTab, + nEndCol, nEndRow, nEndTab, +@@ -1353,6 +1354,19 @@ void ScViewFunc::ApplySelectionPattern( + SCCOL nCol = pViewData->GetCurX(); + SCROW nRow = pViewData->GetCurY(); + SCTAB nTab = pViewData->GetTabNo(); + + ScBaseCell* pCell; + pDoc->GetCell(nCol, nRow, nTab, pCell); @@ -839,21 +839,21 @@ + } + aChangeRanges.Append( ScRange( nCol, nRow, nTab ) ); - ScPatternAttr* pOldPat = new ScPatternAttr(*pDoc->GetPattern( nCol, nRow, nTab )); + ScPatternAttr* pOldPat = new ScPatternAttr(*pDoc->GetPattern( nCol, nRow, nTab )); -@@ -1394,11 +1408,10 @@ void ScViewFunc::ApplySelectionPattern( +@@ -1362,11 +1376,10 @@ void ScViewFunc::ApplySelectionPattern( - if (bRecord) - { -- pDocSh->GetUndoManager()->AddUndoAction( -- new ScUndoCursorAttr( pDocSh, -- nCol, nRow, nTab, -- pOldPat, pNewPat, &rAttr, -- FALSE ) ); // FALSE = nicht automatisch + if (bRecord) + { +- pDocSh->GetUndoManager()->AddUndoAction( +- new ScUndoCursorAttr( pDocSh, +- nCol, nRow, nTab, +- pOldPat, pNewPat, &rAttr, +- FALSE ) ); // FALSE = nicht automatisch + ScUndoCursorAttr* pUndo = new ScUndoCursorAttr( + pDocSh, nCol, nRow, nTab, pOldPat, pNewPat, &rAttr, false ); + pUndo->SetEditData(pOldEditData, pNewEditData); + pDocSh->GetUndoManager()->AddUndoAction(pUndo); - } - delete pOldPat; // wird im Undo kopiert (Pool) + } + delete pOldPat; // wird im Undo kopiert (Pool) diff --git a/patches/dev300/sc-print-selected-sheets.diff b/patches/dev300/sc-print-selected-sheets.diff index a795eb3f2..133d55370 100644 --- a/patches/dev300/sc-print-selected-sheets.diff +++ b/patches/dev300/sc-print-selected-sheets.diff @@ -1,70 +1,55 @@ -Index: sc/source/ui/inc/preview.hxx -=================================================================== -RCS file: /cvs/sc/sc/source/ui/inc/preview.hxx,v -retrieving revision 1.11 -diff -u -p -r1.11 preview.hxx ---- sc/source/ui/inc/preview.hxx 10 Apr 2008 23:16:01 -0000 1.11 -+++ sc/source/ui/inc/preview.hxx 19 May 2008 14:06:41 -0000 +--- sc/source/ui/inc/preview.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/inc/preview.hxx 2010-03-03 16:59:11.000000000 +0100 @@ -66,6 +66,8 @@ private: - ScPreviewLocationData* pLocationData; // stores table layout for accessibility API - FmFormView* pDrawView; + ScPreviewLocationData* pLocationData; // stores table layout for accessibility API + FmFormView* pDrawView; + SCTAB nCurTab; + - // intern: - BOOL bInPaint; - BOOL bInGetState; -Index: sc/source/ui/view/preview.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/ui/view/preview.cxx,v -retrieving revision 1.34 -diff -u -p -r1.34 preview.cxx ---- sc/source/ui/view/preview.cxx 11 Apr 2008 01:35:53 -0000 1.34 -+++ sc/source/ui/view/preview.cxx 19 May 2008 14:06:41 -0000 -@@ -109,6 +109,7 @@ ScPreview::ScPreview( Window* pParent, S - bLocationValid( FALSE ), - pLocationData( NULL ), - pDrawView( NULL ), + // intern: + BOOL bInPaint; + BOOL bInGetState; +--- sc/source/ui/view/preview.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/preview.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -112,6 +112,7 @@ ScPreview::ScPreview( Window* pParent, S + bLocationValid( FALSE ), + pLocationData( NULL ), + pDrawView( NULL ), + nCurTab ( ScDocShell::GetCurTab() ), - bInPaint( FALSE ), - bInGetState( FALSE ), - pDocShell( pDocSh ), -@@ -244,8 +245,17 @@ void ScPreview::CalcPages( SCTAB nToWhic - // but always all sheets are used (there is no selected sheet) - ScPrintOptions aOptions = SC_MOD()->GetPrintOptions(); + bInPaint( FALSE ), + bInGetState( FALSE ), + pDocShell( pDocSh ), +@@ -252,8 +253,17 @@ void ScPreview::CalcPages( SCTAB /*nToWh + // but always all sheets are used (there is no selected sheet) + ScPrintOptions aOptions = SC_MOD()->GetPrintOptions(); + ScMarkData aMarkData; + aMarkData.SelectTable( nCurTab, TRUE ); + - for (SCTAB i=nStart; i<nAnz; i++) - { + for (SCTAB i=nStart; i<nAnz; i++) + { + if (!aOptions.GetAllSheets() && !aMarkData.GetTableSelect( i )) { + nPages[i] = 0; + nFirstAttr[i] = 0; + continue; + } + - long nAttrPage = i > 0 ? nFirstAttr[i-1] : 1; + long nAttrPage = i > 0 ? nFirstAttr[i-1] : 1; - long nThisStart = nTotalPages; -Index: sc/source/ui/view/tabvwsh4.cxx -=================================================================== -RCS file: /cvs/sc/sc/source/ui/view/tabvwsh4.cxx,v -retrieving revision 1.70 -diff -u -p -r1.70 tabvwsh4.cxx ---- sc/source/ui/view/tabvwsh4.cxx 26 Nov 2007 18:43:29 -0000 1.70 -+++ sc/source/ui/view/tabvwsh4.cxx 15 Dec 2007 03:19:14 -0000 -@@ -1207,8 +1215,13 @@ PrintDialog* __EXPORT ScTabViewShell::Cr - bool bAllTabs = SC_MOD()->GetPrintOptions().GetAllSheets(); - pDlg->CheckSheetRange( bAllTabs ? PRINTSHEETS_ALL : PRINTSHEETS_SELECTED_SHEETS ); + long nThisStart = nTotalPages; +--- sc/source/ui/view/tabvwsh4.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/tabvwsh4.cxx 2010-03-03 16:59:11.000000000 +0100 +@@ -1194,8 +1194,13 @@ PrintDialog* __EXPORT ScTabViewShell::Cr + // instead of a separate progress for each sheet from ScPrintFunc + pDocShell->UpdatePendingRowHeights( MAXTAB, true ); + ScMarkData aMarkData; + aMarkData.SelectTable( GetViewData()->GetTabNo(), TRUE ); + - for ( SCTAB i=0; i<nTabCount; i++ ) - { + for ( SCTAB i=0; i<nTabCount; i++ ) + { + if ( !bAllTabs && !aMarkData.GetTableSelect( i ) ) + continue; - ScPrintFunc aPrintFunc( pDocShell, pPrinter, i ); - nDocPageMax += aPrintFunc.GetTotalPages(); - } + ScPrintFunc aPrintFunc( pDocShell, pPrinter, i ); + nDocPageMax += aPrintFunc.GetTotalPages(); + } diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff index 531bb8214..ab8acbae7 100644 --- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff +++ b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff @@ -1,6 +1,6 @@ ---- sfx2/source/doc/objstor.cxx -+++ sfx2/source/doc/objstor.cxx -@@ -110,6 +110,9 @@ +--- sfx2/source/doc/objstor.cxx.old 2010-03-03 16:59:21.000000000 +0100 ++++ sfx2/source/doc/objstor.cxx 2010-03-03 16:59:42.000000000 +0100 +@@ -109,6 +109,9 @@ #include <rtl/logfile.hxx> #include <basic/modsizeexceeded.hxx> #include <osl/file.hxx> @@ -10,7 +10,7 @@ #include <sfx2/signaturestate.hxx> #include <sfx2/app.hxx> -@@ -161,6 +164,126 @@ using namespace ::cppu; +@@ -160,6 +163,126 @@ using namespace ::cppu; namespace css = ::com::sun::star; @@ -137,7 +137,7 @@ //========================================================================= void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel) { -@@ -600,8 +600,14 @@ +@@ -662,8 +785,14 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi // treat the package as broken if the mediatype was retrieved as a fallback uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); @@ -154,7 +154,7 @@ if ( pRepairPackageItem && pRepairPackageItem->GetValue() ) { -@@ -640,8 +640,17 @@ +@@ -675,8 +804,17 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi bWarnMediaTypeFallback = sal_False; } @@ -174,7 +174,7 @@ } catch( uno::Exception& ) { -@@ -693,7 +816,51 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) +@@ -689,7 +827,51 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi { pImp->nLoadedFlags = 0; pImp->bModelInitialized = sal_False; @@ -227,7 +227,7 @@ if ( bOk ) { // the document loaded from template has no name -@@ -1126,6 +1293,7 @@ void Lock_Impl( SfxObjectShell* pDoc, BOOL bLock ) +@@ -1122,6 +1304,7 @@ void Lock_Impl( SfxObjectShell* pDoc, BO } @@ -235,7 +235,7 @@ //------------------------------------------------------------------------- sal_Bool SfxObjectShell::SaveTo_Impl -@@ -1606,6 +1774,59 @@ sal_Bool SfxObjectShell::SaveTo_Impl +@@ -1602,6 +1785,59 @@ sal_Bool SfxObjectShell::SaveTo_Impl bOk = SaveChildren( TRUE ); } @@ -295,7 +295,7 @@ if ( bOk ) { // if ODF version of oasis format changes on saving the signature should not be preserved -@@ -1713,11 +1934,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl +@@ -1709,11 +1945,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl // transfer data to its destinated location // the medium commits the storage or the stream it is based on RegisterTransfer( rMedium ); @@ -308,7 +308,7 @@ // if the target medium is an alien format and the "old" medium was an own format and the "old" medium // has a name, the object storage must be exchanged, because now we need a new temporary storage -@@ -3800,7 +3800,14 @@ +@@ -3574,7 +3810,14 @@ sal_Bool SfxObjectShell::CopyStoragesOfU try { @@ -324,9 +324,9 @@ for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ ) { if ( aSubElements[nInd].equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Configurations" ) ) ) ) ---- package/source/xstor/xstorage.cxx -+++ package/source/xstor/xstorage.cxx -@@ -4460,12 +4460,6 @@ +--- package/source/xstor/xstorage.cxx.old 2009-10-21 11:50:33.000000000 +0200 ++++ package/source/xstor/xstorage.cxx 2010-03-03 16:59:42.000000000 +0100 +@@ -4460,13 +4460,7 @@ sal_Bool SAL_CALL OStorage::hasByName( c catch ( uno::Exception& aException ) { m_pImpl->AddLog( aException.Message ); @@ -339,4 +339,5 @@ - aCaught ); + m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Ignored...ok!?" ) ) ); } + return ( pElement != NULL ); diff --git a/patches/dev300/slideshow-sound.diff b/patches/dev300/slideshow-sound.diff index 8fd8feb2e..ceaec0a9c 100644 --- a/patches/dev300/slideshow-sound.diff +++ b/patches/dev300/slideshow-sound.diff @@ -1,6 +1,5 @@ -diff -rup slideshow-orig/source/engine/shapes/mediashape.cxx slideshow/source/engine/shapes/mediashape.cxx ---- slideshow-orig/source/engine/shapes/mediashape.cxx 2009-09-30 16:38:08.000000000 +0200 -+++ slideshow/source/engine/shapes/mediashape.cxx 2009-10-05 12:24:37.000000000 +0200 +--- slideshow/source/engine/shapes/mediashape.cxx.old 2009-10-07 15:06:28.000000000 +0200 ++++ slideshow/source/engine/shapes/mediashape.cxx 2010-03-03 17:00:17.000000000 +0100 @@ -101,6 +101,8 @@ namespace slideshow virtual bool implIsIntrinsicAnimationPlaying() const; virtual void implSetIntrinsicAnimationTime(double); @@ -56,10 +55,8 @@ diff -rup slideshow-orig/source/engine/shapes/mediashape.cxx slideshow/source/en return true; } -Only in slideshow/source/engine/shapes: mediashape.cxx~ -diff -rup slideshow-orig/source/engine/slide/layermanager.cxx slideshow/source/engine/slide/layermanager.cxx ---- slideshow-orig/source/engine/slide/layermanager.cxx 2009-09-30 16:38:08.000000000 +0200 -+++ slideshow/source/engine/slide/layermanager.cxx 2009-10-09 14:38:59.000000000 +0200 +--- slideshow/source/engine/slide/layermanager.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ slideshow/source/engine/slide/layermanager.cxx 2010-03-03 17:00:17.000000000 +0100 @@ -295,6 +295,28 @@ namespace slideshow implAddShape( rShape ); } @@ -89,10 +86,8 @@ diff -rup slideshow-orig/source/engine/slide/layermanager.cxx slideshow/source/e void LayerManager::putShape2BackgroundLayer( LayerShapeMap::value_type& rShapeEntry ) { LayerSharedPtr& rBgLayer( maLayers.front() ); -Only in slideshow/source/engine/slide: layermanager.cxx~ -diff -rup slideshow-orig/source/engine/slide/layermanager.hxx slideshow/source/engine/slide/layermanager.hxx ---- slideshow-orig/source/engine/slide/layermanager.hxx 2009-09-30 16:38:08.000000000 +0200 -+++ slideshow/source/engine/slide/layermanager.hxx 2009-10-08 16:05:27.000000000 +0200 +--- slideshow/source/engine/slide/layermanager.hxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ slideshow/source/engine/slide/layermanager.hxx 2010-03-03 17:00:17.000000000 +0100 @@ -147,6 +147,10 @@ namespace slideshow ShapeSharedPtr lookupShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) const; @@ -104,10 +99,8 @@ diff -rup slideshow-orig/source/engine/slide/layermanager.hxx slideshow/source/e /** Query a subset of the given original shape This method queries a new (but not necessarily unique) -Only in slideshow/source/engine/slide: layermanager.hxx~ -diff -rup slideshow-orig/source/engine/slide/slideimpl.cxx slideshow/source/engine/slide/slideimpl.cxx ---- slideshow-orig/source/engine/slide/slideimpl.cxx 2009-09-30 16:38:08.000000000 +0200 -+++ slideshow/source/engine/slide/slideimpl.cxx 2009-10-08 18:28:23.000000000 +0200 +--- slideshow/source/engine/slide/slideimpl.cxx.old 2010-03-03 17:00:03.000000000 +0100 ++++ slideshow/source/engine/slide/slideimpl.cxx 2010-03-03 17:00:17.000000000 +0100 @@ -142,6 +142,7 @@ public: // but on canvas-independent basegfx bitmaps virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const; @@ -144,11 +137,9 @@ diff -rup slideshow-orig/source/engine/slide/slideimpl.cxx slideshow/source/engi + } // namespace internal } // namespace slideshow -Only in slideshow/source/engine/slide: slideimpl.cxx~ -diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine/slideshowimpl.cxx ---- slideshow-orig/source/engine/slideshowimpl.cxx 2009-09-30 16:38:08.000000000 +0200 -+++ slideshow/source/engine/slideshowimpl.cxx 2009-10-09 14:39:41.000000000 +0200 -@@ -340,6 +340,8 @@ private: +--- slideshow/source/engine/slideshowimpl.cxx.old 2010-03-03 17:00:04.000000000 +0100 ++++ slideshow/source/engine/slideshowimpl.cxx 2010-03-03 17:00:17.000000000 +0100 +@@ -341,6 +341,8 @@ private: private: SlideShowImpl& mrSlideShowImpl; }; @@ -157,7 +148,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine /// Filter requested cursor shape against hard slideshow cursors (wait, etc.) sal_Int16 calcActiveCursor( sal_Int16 nCursorShape ) const; -@@ -365,6 +367,7 @@ private: +@@ -366,6 +368,7 @@ private: boost::optional<double> maUserPaintStrokeWidth; boost::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer; @@ -165,7 +156,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine ScreenUpdater maScreenUpdater; EventQueue maEventQueue; EventMultiplexer maEventMultiplexer; -@@ -408,6 +411,9 @@ private: +@@ -409,6 +412,9 @@ private: bool mbDisableAnimationZOrder; EffectRewinder maEffectRewinder; @@ -175,7 +166,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine }; -@@ -480,6 +486,7 @@ SlideShowImpl::SlideShowImpl( +@@ -481,6 +487,7 @@ SlideShowImpl::SlideShowImpl( maUserPaintColor(), maUserPaintStrokeWidth(4.0), mpPresTimer( new canvas::tools::ElapsedTime ), @@ -183,7 +174,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine maScreenUpdater(maViewContainer), maEventQueue( mpPresTimer ), maEventMultiplexer( maEventQueue, -@@ -550,6 +557,9 @@ void SlideShowImpl::disposing() +@@ -551,6 +558,9 @@ void SlideShowImpl::disposing() osl::MutexGuard const guard( m_aMutex ); maEffectRewinder.dispose(); @@ -193,7 +184,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine // stop slide transition sound, if any: stopSlideTransitionSound(); -@@ -949,6 +959,33 @@ private: +@@ -950,6 +960,33 @@ private: bool& mrbSkipSlideTransition; }; @@ -227,7 +218,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine void SlideShowImpl::displaySlide( uno::Reference<drawing::XDrawPage> const& xSlide, uno::Reference<animations::XAnimationNode> const& xRootNode, -@@ -991,6 +1028,8 @@ void SlideShowImpl::displaySlide( +@@ -992,6 +1029,8 @@ void SlideShowImpl::displaySlide( mpPreviousSlide = mpCurrentSlide; mpCurrentSlide.reset(); @@ -236,7 +227,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine if (matches( mpPrefetchSlide, xSlide, xRootNode )) { // prefetched slide matches: -@@ -1004,6 +1043,8 @@ void SlideShowImpl::displaySlide( +@@ -1005,6 +1044,8 @@ void SlideShowImpl::displaySlide( OSL_ASSERT( mpCurrentSlide ); if (mpCurrentSlide) { @@ -245,7 +236,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine basegfx::B2DSize oldSlideSize; if( mpPreviousSlide ) oldSlideSize = mpPreviousSlide->getSlideSize(); -@@ -1834,6 +1875,8 @@ void SlideShowImpl::notifySlideTransitio +@@ -1835,6 +1876,8 @@ void SlideShowImpl::notifySlideTransitio "notifySlideTransitionEnded(): Invalid current slide" ); if (mpCurrentSlide) { @@ -254,7 +245,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine // first init show, to give the animations // the chance to register SlideStartEvents const bool bBackgroundLayerRendered( !bPaintSlide ); -@@ -1844,7 +1887,8 @@ void SlideShowImpl::notifySlideTransitio +@@ -1845,7 +1888,8 @@ void SlideShowImpl::notifySlideTransitio void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xDrawPage, double& nAutomaticNextSlideTimeout, @@ -264,7 +255,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine { // retrieve slide change parameters from XDrawPage // =============================================== -@@ -1864,7 +1908,8 @@ void queryAutomaticSlideTransition( uno: +@@ -1865,7 +1909,8 @@ void queryAutomaticSlideTransition( uno: "Could not extract slide change mode from XDrawPage - assuming <none>\n" ); } @@ -274,7 +265,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine if( !xPropSet.is() || !getPropertyValue( nAutomaticNextSlideTimeout, -@@ -1906,10 +1951,12 @@ void SlideShowImpl::notifySlideAnimation +@@ -1907,10 +1952,12 @@ void SlideShowImpl::notifySlideAnimation "notifySlideAnimationsEnded(): Invalid current slide!" ); bool bHasAutomaticNextSlide=false; @@ -288,7 +279,7 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine // check whether slide transition should happen // 'automatically'. If yes, simply schedule the -@@ -1921,6 +1968,14 @@ void SlideShowImpl::notifySlideAnimation +@@ -1922,6 +1969,14 @@ void SlideShowImpl::notifySlideAnimation !mpRehearseTimingsActivity && bHasAutomaticNextSlide ) { @@ -301,11 +292,10 @@ diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine + } + aNotificationEvents = makeInterruptableDelay( - boost::bind( &SlideShowImpl::notifySlideEnded, this, false ), + boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ), nAutomaticNextSlideTimeout); -diff -rup slideshow-orig/source/inc/shape.hxx slideshow/source/inc/shape.hxx ---- slideshow-orig/source/inc/shape.hxx 2009-09-30 16:38:08.000000000 +0200 -+++ slideshow/source/inc/shape.hxx 2009-10-09 10:00:39.000000000 +0200 +--- slideshow/source/inc/shape.hxx.old 2009-10-07 15:06:28.000000000 +0200 ++++ slideshow/source/inc/shape.hxx 2010-03-03 17:00:17.000000000 +0100 @@ -41,6 +41,7 @@ #include <boost/shared_ptr.hpp> @@ -330,10 +320,8 @@ diff -rup slideshow-orig/source/inc/shape.hxx slideshow/source/inc/shape.hxx /** Represents a slide's shape object. This interface represents the view-independent aspects of a -Only in slideshow/source/inc: shape.hxx~ -diff -rup slideshow-orig/source/inc/slide.hxx slideshow/source/inc/slide.hxx ---- slideshow-orig/source/inc/slide.hxx 2009-09-30 16:38:08.000000000 +0200 -+++ slideshow/source/inc/slide.hxx 2009-10-08 16:16:17.000000000 +0200 +--- slideshow/source/inc/slide.hxx.old 2010-03-03 17:00:03.000000000 +0100 ++++ slideshow/source/inc/slide.hxx 2010-03-03 17:00:17.000000000 +0100 @@ -35,6 +35,7 @@ #include "subsettableshapemanager.hxx" #include "unoviewcontainer.hxx" diff --git a/patches/dev300/solenv-installer-cleaner-paths.diff b/patches/dev300/solenv-installer-cleaner-paths.diff index f22658b28..7a586ffcf 100644 --- a/patches/dev300/solenv-installer-cleaner-paths.diff +++ b/patches/dev300/solenv-installer-cleaner-paths.diff @@ -1,12 +1,12 @@ ---- solenv/bin/modules/installer/worker.pm.old 2008-06-23 19:13:40.000000000 +0200 -+++ solenv/bin/modules/installer/worker.pm 2008-06-24 14:12:04.000000000 +0200 -@@ -765,9 +765,16 @@ sub install_simple ($$$$$$) - - if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ )) - { -- # printf "mkdir $destdir$onedir->{'HostName'}\n"; -- mkdir $destdir . $onedir->{'HostName'}; -- push @lines, "%dir " . $onedir->{'HostName'} . "\n"; +--- solenv/bin/modules/installer/worker.pm.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/bin/modules/installer/worker.pm 2010-03-03 16:59:22.000000000 +0100 +@@ -776,9 +776,16 @@ sub install_simple ($$$$$$) + + if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ )) + { +- # printf "mkdir $destdir$onedir->{'HostName'}\n"; +- mkdir $destdir . $onedir->{'HostName'}; +- push @lines, "%dir " . $onedir->{'HostName'} . "\n"; + my $hostname = $onedir->{'HostName'}; + + # ignore '.' subdirectories @@ -17,17 +17,17 @@ + # printf "mkdir $destdir$hostname\n"; + mkdir $destdir . $hostname; + push @lines, "%dir " . $hostname . "\n"; - } - } + } + } + +@@ -795,6 +802,10 @@ sub install_simple ($$$$$$) + $destination =~ s/\$\$/\$/; + $sourcepath =~ s/\$\$/\$/; -@@ -784,6 +791,10 @@ sub install_simple ($$$$$$) - $destination =~ s/\$\$/\$/; - $sourcepath =~ s/\$\$/\$/; - + # remove './' from the path + $sourcepath =~ s/\.\///g; + $destination =~ s/\.\///g; + - push @lines, "$destination\n"; - # printf "cp $sourcepath $destdir$destination\n"; - copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!"; + push @lines, "$destination\n"; + # printf "cp $sourcepath $destdir$destination\n"; + copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $sourcepath -> $destdir$destination $!"; diff --git a/patches/dev300/statusbar-fancy-modified-status-svx.diff b/patches/dev300/statusbar-fancy-modified-status-svx.diff index 306febbd1..b6f906d37 100644 --- a/patches/dev300/statusbar-fancy-modified-status-svx.diff +++ b/patches/dev300/statusbar-fancy-modified-status-svx.diff @@ -1,7 +1,5 @@ -diff --git svx/inc/modctrl.hxx svx/inc/modctrl.hxx -index e1f41a8..94de89b 100644 ---- svx/inc/modctrl.hxx -+++ svx/inc/modctrl.hxx +--- svx/inc/modctrl.hxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ svx/inc/modctrl.hxx 2010-03-03 16:59:51.000000000 +0100 @@ -35,6 +35,8 @@ #include <sfx2/stbitem.hxx> #include "svx/svxdllapi.h" @@ -11,7 +9,7 @@ index e1f41a8..94de89b 100644 // class SvxModifyControl ------------------------------------------------ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl -@@ -42,7 +44,8 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl +@@ -42,7 +44,8 @@ class SVX_DLLPUBLIC SvxModifyControl : p public: virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); @@ -35,11 +33,9 @@ index e1f41a8..94de89b 100644 }; -diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc -index 57e4e9f..53d5aae 100644 ---- svx/inc/svx/dialogs.hrc -+++ svx/inc/svx/dialogs.hrc -@@ -1568,3 +1568,7 @@ +--- svx/inc/svx/dialogs.hrc.old 2010-03-03 16:59:13.000000000 +0100 ++++ svx/inc/svx/dialogs.hrc 2010-03-03 16:59:51.000000000 +0100 +@@ -1582,3 +1582,7 @@ #endif #define SID_SC_TP_FORMULA (SVX_OOO_BUILD_START + 1) @@ -47,10 +43,8 @@ index 57e4e9f..53d5aae 100644 +#define RID_SVXBMP_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 3) +#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4) +#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5) -diff --git svx/source/stbctrls/makefile.mk svx/source/stbctrls/makefile.mk -index 7a6fad6..e5bff5a 100644 ---- svx/source/stbctrls/makefile.mk -+++ svx/source/stbctrls/makefile.mk +--- svx/source/stbctrls/makefile.mk.old 2009-10-07 15:07:04.000000000 +0200 ++++ svx/source/stbctrls/makefile.mk 2010-03-03 16:59:51.000000000 +0100 @@ -59,6 +59,7 @@ SLOFILES= \ $(SLO)$/zoomsliderctrl.obj @@ -59,10 +53,8 @@ index 7a6fad6..e5bff5a 100644 $(SLO)$/zoomsliderctrl.obj HXX1TARGET=stbctrls -diff --git svx/source/stbctrls/modctrl.cxx svx/source/stbctrls/modctrl.cxx -index 843c845..42f1d7c 100644 ---- svx/source/stbctrls/modctrl.cxx -+++ svx/source/stbctrls/modctrl.cxx +--- svx/source/stbctrls/modctrl.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ svx/source/stbctrls/modctrl.cxx 2010-03-03 16:59:51.000000000 +0100 @@ -33,29 +33,48 @@ // include --------------------------------------------------------------- @@ -118,7 +110,7 @@ index 843c845..42f1d7c 100644 { } -@@ -65,32 +84,71 @@ void SvxModifyControl::StateChanged( USHORT, SfxItemState eState, +@@ -65,32 +84,71 @@ void SvxModifyControl::StateChanged( USH const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState ) @@ -206,12 +198,10 @@ index 843c845..42f1d7c 100644 } ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb) -diff --git svx/source/stbctrls/stbctrls.src svx/source/stbctrls/stbctrls.src -index b4dac87..72b7d1a 100644 ---- svx/source/stbctrls/stbctrls.src -+++ svx/source/stbctrls/stbctrls.src -@@ -87,6 +87,16 @@ String RID_SVXSTR_XMLSEC_NO_SIG - Text [ en-US ] = "Digital Signature: The document is not signed."; +--- svx/source/stbctrls/stbctrls.src.old 2009-10-08 16:17:56.000000000 +0200 ++++ svx/source/stbctrls/stbctrls.src 2010-03-03 16:59:51.000000000 +0100 +@@ -92,6 +92,16 @@ String RID_SVXSTR_XMLSEC_SIG_CERT_OK_PAR + Text [ en-US ] = "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed."; }; +String RID_SVXSTR_DOC_MODIFIED_YES @@ -227,7 +217,7 @@ index b4dac87..72b7d1a 100644 // PopupMenu ------------------------------------------------------------- Menu RID_SVXMNU_ZOOM { -@@ -323,3 +333,19 @@ Image RID_SVXBMP_SLIDERINCREASE_HC +@@ -328,3 +338,19 @@ Image RID_SVXBMP_SLIDERINCREASE_HC MaskColor = STD_MASKCOLOR; }; diff --git a/patches/dev300/svtools-emf-fix.diff b/patches/dev300/svtools-emf-fix.diff index 685caed40..f03afd6c1 100644 --- a/patches/dev300/svtools-emf-fix.diff +++ b/patches/dev300/svtools-emf-fix.diff @@ -1,7 +1,5 @@ -Index: source/filter.vcl/wmf/emfwr.cxx -=================================================================== ---- svtools/source/filter.vcl/wmf/emfwr.cxx (revision 275398) -+++ svtools/source/filter.vcl/wmf/emfwr.cxx (working copy) +--- svtools/source/filter.vcl/wmf/emfwr.cxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/source/filter.vcl/wmf/emfwr.cxx 2010-03-03 17:00:14.000000000 +0100 @@ -162,6 +162,8 @@ #define TA_RTLREADING 256 #define TA_MASK (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING) @@ -11,82 +9,80 @@ Index: source/filter.vcl/wmf/emfwr.cxx // ------------- // - EMFWriter - // ------------- -@@ -181,21 +183,39 @@ - maVDev.SetMapMode( rMtf.GetPrefMapMode() ); - mpFilterConfigItem = pFilterConfigItem; +@@ -181,19 +183,37 @@ BOOL EMFWriter::WriteEMF( const GDIMetaF + maVDev.SetMapMode( rMtf.GetPrefMapMode() ); + mpFilterConfigItem = pFilterConfigItem; + // don't work with pixel as destination map mode -> higher resolution preferrable + maDestMapMode.SetMapUnit( MAP_100TH_MM ); + - const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) ); - const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) ); - - // seek over header -- rOStm.SeekRel( 100 ); + const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) ); + const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) ); + + // seek over header +- rOStm.SeekRel( 100 ); + // use [MS-EMF 2.2.11] HeaderExtension2 Object, otherwise resulting EMF cannot be converted with GetWinMetaFileBits() + rOStm.SeekRel( 108 ); - // write initial values -- ImplBeginRecord( WIN_EMR_SETWINDOWORGEX ); -- (*mpStm) << (INT32) 0 << (INT32) 0; + // write initial values +- ImplBeginRecord( WIN_EMR_SETWINDOWORGEX ); +- (*mpStm) << (INT32) 0 << (INT32) 0; + + // set 100th mm map mode in EMF + ImplBeginRecord( WIN_EMR_SETMAPMODE ); + (*mpStm) << (INT32) MM_ANISOTROPIC; - ImplEndRecord(); + ImplEndRecord(); + ImplBeginRecord( WIN_EMR_SETVIEWPORTEXTEX ); + (*mpStm) << (INT32) maVDev.ImplGetDPIX() << (INT32) maVDev.ImplGetDPIY(); + ImplEndRecord(); + - ImplBeginRecord( WIN_EMR_SETWINDOWEXTEX ); -- (*mpStm) << (INT32) aMtfSizePix.Width() << (INT32) aMtfSizePix.Height(); + ImplBeginRecord( WIN_EMR_SETWINDOWEXTEX ); +- (*mpStm) << (INT32) aMtfSizePix.Width() << (INT32) aMtfSizePix.Height(); + (*mpStm) << (INT32) 2540 << (INT32) 2540; - ImplEndRecord(); - ++ ImplEndRecord(); ++ + ImplBeginRecord( WIN_EMR_SETVIEWPORTORGEX ); + (*mpStm) << (INT32) 0 << (INT32) 0; + ImplEndRecord(); + + ImplBeginRecord( WIN_EMR_SETWINDOWORGEX ); + (*mpStm) << (INT32) 0 << (INT32) 0; -+ ImplEndRecord(); -+ - ImplWriteRasterOp( ROP_OVERPAINT ); + ImplEndRecord(); - ImplBeginRecord( WIN_EMR_SETBKMODE ); -@@ -207,7 +227,7 @@ + ImplWriteRasterOp( ROP_OVERPAINT ); +@@ -207,7 +227,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaF - ImplBeginRecord( WIN_EMR_EOF ); - (*mpStm)<< (sal_uInt32)0 // nPalEntries -- << (sal_uInt32)0x16 // offPalEntries + ImplBeginRecord( WIN_EMR_EOF ); + (*mpStm)<< (sal_uInt32)0 // nPalEntries +- << (sal_uInt32)0x16 // offPalEntries + << (sal_uInt32)0x10 // offPalEntries - << (sal_uInt32)0x14; // nSizeLast - ImplEndRecord(); - -@@ -215,7 +235,7 @@ - // write header - const ULONG nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos ); - -- (*mpStm) << (UINT32) 0x00000001 << (UINT32) 100; + << (sal_uInt32)0x14; // nSizeLast + ImplEndRecord(); + +@@ -215,7 +235,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaF + // write header + const ULONG nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos ); + +- (*mpStm) << (UINT32) 0x00000001 << (UINT32) 100; + (*mpStm) << (UINT32) 0x00000001 << (UINT32) 108; //use [MS-EMF 2.2.11] HeaderExtension2 Object - (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizePix.Width() - 1 ) << (INT32) ( aMtfSizePix.Height() - 1 ); - (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizeLog.Width() - 1 ) << (INT32) ( aMtfSizeLog.Height() - 1 ); - (*mpStm) << (UINT32) 0x464d4520 << (UINT32) 0x10000 << (UINT32) ( nEndPos - nHeaderPos ); -@@ -223,6 +243,7 @@ - (*mpStm) << (INT32) aMtfSizePix.Width() << (INT32) aMtfSizePix.Height(); - (*mpStm) << (INT32) ( aMtfSizeLog.Width() / 100 ) << (INT32) ( aMtfSizeLog.Height() / 100 ); - (*mpStm) << (UINT32) 0 << (UINT32) 0 << (UINT32) 0; + (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizePix.Width() - 1 ) << (INT32) ( aMtfSizePix.Height() - 1 ); + (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizeLog.Width() - 1 ) << (INT32) ( aMtfSizeLog.Height() - 1 ); + (*mpStm) << (UINT32) 0x464d4520 << (UINT32) 0x10000 << (UINT32) ( nEndPos - nHeaderPos ); +@@ -223,6 +243,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaF + (*mpStm) << (INT32) aMtfSizePix.Width() << (INT32) aMtfSizePix.Height(); + (*mpStm) << (INT32) ( aMtfSizeLog.Width() / 100 ) << (INT32) ( aMtfSizeLog.Height() / 100 ); + (*mpStm) << (UINT32) 0 << (UINT32) 0 << (UINT32) 0; + (*mpStm) << (INT32) ( aMtfSizeLog.Width() * 10 ) << (INT32) ( aMtfSizeLog.Height() * 10 ); //use [MS-EMF 2.2.11] HeaderExtension2 Object - mpStm->Seek( nEndPos ); - delete[] mpHandlesUsed; -@@ -520,25 +541,24 @@ + mpStm->Seek( nEndPos ); + delete[] mpHandlesUsed; +@@ -520,25 +541,24 @@ void EMFWriter::ImplWriteRasterOp( Raste void EMFWriter::ImplWriteExtent( long nExtent ) { -- const Size aSize( maVDev.LogicToPixel( Size( nExtent, nExtent ) ) ); -- (*mpStm) << (INT32) aSize.Width(); +- const Size aSize( maVDev.LogicToPixel( Size( nExtent, nExtent ) ) ); +- (*mpStm) << (INT32) aSize.Width(); + nExtent = maVDev.LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width(); + (*mpStm) << (INT32) nExtent; } @@ -95,10 +91,10 @@ Index: source/filter.vcl/wmf/emfwr.cxx void EMFWriter::ImplWritePoint( const Point& rPoint ) { -- const Point aPoint( maVDev.LogicToPixel( rPoint ) ); -- +- const Point aPoint( maVDev.LogicToPixel( rPoint ) ); +- + const Point aPoint( maVDev.LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode )); - (*mpStm) << (INT32) aPoint.X() << (INT32) aPoint.Y(); + (*mpStm) << (INT32) aPoint.X() << (INT32) aPoint.Y(); } + @@ -106,112 +102,106 @@ Index: source/filter.vcl/wmf/emfwr.cxx void EMFWriter::ImplWriteSize( const Size& rSize) { -- const Size aSize( maVDev.LogicToPixel( rSize ) ); -- +- const Size aSize( maVDev.LogicToPixel( rSize ) ); +- + const Size aSize( maVDev.LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode )); - (*mpStm) << (INT32) aSize.Width() << (INT32) aSize.Height(); + (*mpStm) << (INT32) aSize.Width() << (INT32) aSize.Height(); } -@@ -546,8 +566,7 @@ +@@ -546,8 +566,7 @@ void EMFWriter::ImplWriteSize( const Siz void EMFWriter::ImplWriteRect( const Rectangle& rRect ) { -- const Rectangle aRect( maVDev.LogicToPixel( rRect ) ); +- const Rectangle aRect( maVDev.LogicToPixel( rRect ) ); - + const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode )); - (*mpStm) << aRect.Left() << aRect.Top() << aRect.Right() << aRect.Bottom(); + (*mpStm) << aRect.Left() << aRect.Top() << aRect.Right() << aRect.Bottom(); } -@@ -647,12 +666,20 @@ - const Polygon& rPoly = rPolyPoly[ i ]; - while ( n < rPoly.GetSize() ) - { -- sal_uInt16 nBezPoints = 0; -- if ( n ) -- { -- while ( ( ( nBezPoints + n + 2 ) < rPoly.GetSize() ) && ( rPoly.GetFlags( nBezPoints + n ) == POLY_CONTROL ) ) -- nBezPoints += 3; -- } +@@ -647,12 +666,20 @@ void EMFWriter::ImplWritePath( const Pol + const Polygon& rPoly = rPolyPoly[ i ]; + while ( n < rPoly.GetSize() ) + { +- sal_uInt16 nBezPoints = 0; +- if ( n ) + if( n == 0) -+ { + { +- while ( ( ( nBezPoints + n + 2 ) < rPoly.GetSize() ) && ( rPoly.GetFlags( nBezPoints + n ) == POLY_CONTROL ) ) +- nBezPoints += 3; + ImplBeginRecord( WIN_EMR_MOVETOEX ); + ImplWritePoint( rPoly[ 0 ] ); + ImplEndRecord(); + n++; + continue; -+ } + } + + sal_uInt16 nBezPoints = 0; + + while ( ( ( nBezPoints + n + 2 ) < rPoly.GetSize() ) && ( rPoly.GetFlags( nBezPoints + n ) == POLY_CONTROL ) ) + nBezPoints += 3; + - if ( nBezPoints ) - { - ImplBeginRecord( WIN_EMR_POLYBEZIERTO ); -@@ -672,23 +699,27 @@ - sal_uInt16 nPoints = 1; - while( ( nPoints + n ) < rPoly.GetSize() && ( rPoly.GetFlags( nPoints + n ) != POLY_CONTROL ) ) - nPoints++; -- ImplBeginRecord( WIN_EMR_MOVETOEX ); -- ImplWritePoint( rPoly[ n ] ); -- ImplEndRecord(); + if ( nBezPoints ) + { + ImplBeginRecord( WIN_EMR_POLYBEZIERTO ); +@@ -672,22 +699,26 @@ void EMFWriter::ImplWritePath( const Pol + sal_uInt16 nPoints = 1; + while( ( nPoints + n ) < rPoly.GetSize() && ( rPoly.GetFlags( nPoints + n ) != POLY_CONTROL ) ) + nPoints++; +- ImplBeginRecord( WIN_EMR_MOVETOEX ); +- ImplWritePoint( rPoly[ n ] ); +- ImplEndRecord(); + - if ( nPoints > 1 ) - { - ImplBeginRecord( WIN_EMR_POLYLINETO ); -- Polygon aNewPoly( nPoints ); -- aNewPoly[ 0 ] = rPoly[ n ]; -- for ( o = 1; o < nPoints; o++ ) -- aNewPoly[ o ] = rPoly[ n + o ]; + if ( nPoints > 1 ) + { + ImplBeginRecord( WIN_EMR_POLYLINETO ); +- Polygon aNewPoly( nPoints ); +- aNewPoly[ 0 ] = rPoly[ n ]; +- for ( o = 1; o < nPoints; o++ ) +- aNewPoly[ o ] = rPoly[ n + o ]; + Polygon aNewPoly( nPoints + 1 ); + aNewPoly[ 0 ] = rPoly[ n - 1]; + for ( o = 1; o <= nPoints; o++ ) + aNewPoly[ o ] = rPoly[ n - 1 + o ]; - ImplWriteRect( aNewPoly.GetBoundRect() ); -- (*mpStm) << (sal_uInt32)( nPoints - 1 ); + ImplWriteRect( aNewPoly.GetBoundRect() ); +- (*mpStm) << (sal_uInt32)( nPoints - 1 ); + (*mpStm) << (sal_uInt32)( nPoints ); - for( o = 1; o < aNewPoly.GetSize(); o++ ) - ImplWritePoint( aNewPoly[ o ] ); - ImplEndRecord(); - } -- n = n + nPoints; + for( o = 1; o < aNewPoly.GetSize(); o++ ) + ImplWritePoint( aNewPoly[ o ] ); + ImplEndRecord(); + } + else + { + ImplBeginRecord( WIN_EMR_LINETO ); + ImplWritePoint( rPoly[ n ] ); + ImplEndRecord(); + } -+ n = n + nPoints; - } - if ( bClosed && ( n == rPoly.GetSize() ) ) - { -@@ -700,6 +731,7 @@ - ImplBeginRecord( WIN_EMR_ENDPATH ); - ImplEndRecord(); - ImplBeginRecord( bClosed ? WIN_EMR_FILLPATH : WIN_EMR_STROKEPATH ); + n = n + nPoints; + } + if ( bClosed && ( n == rPoly.GetSize() ) ) +@@ -700,6 +731,7 @@ void EMFWriter::ImplWritePath( const Pol + ImplBeginRecord( WIN_EMR_ENDPATH ); + ImplEndRecord(); + ImplBeginRecord( bClosed ? WIN_EMR_FILLPATH : WIN_EMR_STROKEPATH ); + ImplWriteRect( rPolyPoly.GetBoundRect() ); - ImplEndRecord(); + ImplEndRecord(); } -Index: source/filter.vcl/wmf/emfwr.hxx -=================================================================== ---- svtools/source/filter.vcl/wmf/emfwr.hxx (revision 275398) -+++ svtools/source/filter.vcl/wmf/emfwr.hxx (working copy) -@@ -47,6 +47,7 @@ +--- svtools/source/filter.vcl/wmf/emfwr.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/source/filter.vcl/wmf/emfwr.hxx 2010-03-03 17:00:14.000000000 +0100 +@@ -47,6 +47,7 @@ class EMFWriter private: - VirtualDevice maVDev; + VirtualDevice maVDev; + MapMode maDestMapMode; - FilterConfigItem* mpFilterConfigItem; - SvStream* mpStm; - BOOL* mpHandlesUsed; -@@ -73,7 +74,7 @@ - void ImplCheckLineAttr(); - void ImplCheckFillAttr(); - void ImplCheckTextAttr(); -- + FilterConfigItem* mpFilterConfigItem; + SvStream* mpStm; + BOOL* mpHandlesUsed; +@@ -73,7 +74,7 @@ private: + void ImplCheckLineAttr(); + void ImplCheckFillAttr(); + void ImplCheckTextAttr(); +- + - void ImplWriteColor( const Color& rColor ); - void ImplWriteRasterOp( RasterOp eRop ); - void ImplWriteExtent( long nExtent );
\ No newline at end of file + void ImplWriteColor( const Color& rColor ); + void ImplWriteRasterOp( RasterOp eRop ); + void ImplWriteExtent( long nExtent ); diff --git a/patches/dev300/svx-customshapes-NOOPTFILES.diff b/patches/dev300/svx-customshapes-NOOPTFILES.diff index a68eefa54..726532c26 100644 --- a/patches/dev300/svx-customshapes-NOOPTFILES.diff +++ b/patches/dev300/svx-customshapes-NOOPTFILES.diff @@ -1,11 +1,6 @@ -Index: svx/source/customshapes/makefile.mk -=================================================================== -RCS file: /cvs/graphics/svx/source/customshapes/makefile.mk,v -retrieving revision 1.9 -diff -u -u -r1.9 makefile.mk ---- svx/source/customshapes/makefile.mk 1 Mar 2005 19:06:56 -0000 1.9 -+++ svx/source/customshapes/makefile.mk 22 Aug 2005 02:01:36 -0000 -@@ -81,6 +81,10 @@ +--- svx/source/customshapes/makefile.mk.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/customshapes/makefile.mk 2010-03-03 16:59:28.000000000 +0100 +@@ -48,6 +48,10 @@ ENABLE_EXCEPTIONS=TRUE .IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj .ENDIF @@ -14,5 +9,5 @@ diff -u -u -r1.9 makefile.mk +NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj +.ENDIF - # --- Files ------------------------------------- + ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE diff --git a/patches/dev300/svx-text-rotation-fix.diff b/patches/dev300/svx-text-rotation-fix.diff index 76275f090..159466693 100644 --- a/patches/dev300/svx-text-rotation-fix.diff +++ b/patches/dev300/svx-text-rotation-fix.diff @@ -7,8 +7,8 @@ diff -u -r1.73 escherex.cxx +++ svx/source/msfilter/escherex.cxx 11 Aug 2008 12:26:47 -0000 @@ -853,6 +853,29 @@ - if ( nTextId ) - AddOpt( ESCHER_Prop_lTxid, nTextId ); + if ( nTextId ) + AddOpt( ESCHER_Prop_lTxid, nTextId ); + + // n#404221: In case of rotation we need to write the txtflTextFlow + // attribute too. @@ -34,4 +34,4 @@ diff -u -r1.73 escherex.cxx + } } - static sal_Bool GetLineArrow( const sal_Bool bLineStart, + sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, diff --git a/patches/dev300/sw-collapse-empty-table-par-like-html.diff b/patches/dev300/sw-collapse-empty-table-par-like-html.diff index 8ec5eef47..d232109d2 100644 --- a/patches/dev300/sw-collapse-empty-table-par-like-html.diff +++ b/patches/dev300/sw-collapse-empty-table-par-like-html.diff @@ -1,8 +1,6 @@ -diff --git sw/inc/IDocumentSettingAccess.hxx sw/inc/IDocumentSettingAccess.hxx -index b8db22d..3b90c41 100644 ---- sw/inc/IDocumentSettingAccess.hxx -+++ sw/inc/IDocumentSettingAccess.hxx -@@ -85,6 +85,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd +--- sw/inc/IDocumentSettingAccess.hxx.old 2010-03-03 17:00:01.000000000 +0100 ++++ sw/inc/IDocumentSettingAccess.hxx 2010-03-03 17:00:02.000000000 +0100 +@@ -85,6 +85,7 @@ namespace com { namespace sun { namespac TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, // <-- INVERT_BORDER_SPACING, @@ -10,11 +8,9 @@ index b8db22d..3b90c41 100644 // COMPATIBILITY FLAGS END BROWSE_MODE, -diff --git sw/inc/doc.hxx sw/inc/doc.hxx -index 8507a8c..0d54d84 100644 ---- sw/inc/doc.hxx -+++ sw/inc/doc.hxx -@@ -611,6 +611,7 @@ private: +--- sw/inc/doc.hxx.old 2010-03-03 17:00:01.000000000 +0100 ++++ sw/inc/doc.hxx 2010-03-03 17:00:02.000000000 +0100 +@@ -598,6 +598,7 @@ private: bool mbTabRelativeToIndent : 1; // #i24363# tab stops relative to indent bool mbProtectForm : 1; bool mbInvertBorderSpacing : 1; @@ -22,23 +18,19 @@ index 8507a8c..0d54d84 100644 bool mbTabAtLeftIndentForParagraphsInList; // OD 2008-06-05 #i89181# - see above // #i78591# -diff --git sw/inc/ndtxt.hxx sw/inc/ndtxt.hxx -index cf282c3..da1b8fa 100644 ---- sw/inc/ndtxt.hxx -+++ sw/inc/ndtxt.hxx -@@ -808,6 +808,8 @@ public: - - USHORT GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const; +--- sw/inc/ndtxt.hxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/inc/ndtxt.hxx 2010-03-03 17:00:02.000000000 +0100 +@@ -821,6 +821,8 @@ public: + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::rdf::XMetadatable > MakeUnoObject(); + bool IsCollapse() const; + DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode) }; -diff --git sw/source/core/crsr/callnk.cxx sw/source/core/crsr/callnk.cxx -index 8aaa93c..410b70e 100644 ---- sw/source/core/crsr/callnk.cxx -+++ sw/source/core/crsr/callnk.cxx +--- sw/source/core/crsr/callnk.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/core/crsr/callnk.cxx 2010-03-03 17:00:02.000000000 +0100 @@ -46,10 +46,15 @@ #include <doc.hxx> #include <frmfmt.hxx> @@ -107,11 +99,9 @@ index 8aaa93c..410b70e 100644 xub_StrLen nCmp, nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex(); USHORT nNdWhich = pCNd->GetNodeType(); ULONG nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex(); -diff --git sw/source/core/doc/doc.cxx sw/source/core/doc/doc.cxx -index f5ec3e5..bc44a5a 100644 ---- sw/source/core/doc/doc.cxx -+++ sw/source/core/doc/doc.cxx -@@ -185,6 +185,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const +--- sw/source/core/doc/doc.cxx.old 2010-03-03 17:00:01.000000000 +0100 ++++ sw/source/core/doc/doc.cxx 2010-03-03 17:00:02.000000000 +0100 +@@ -185,6 +185,7 @@ bool SwDoc::get(/*[in]*/ DocumentSetting case TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: return mbTabAtLeftIndentForParagraphsInList; // <-- case INVERT_BORDER_SPACING: return mbInvertBorderSpacing; @@ -119,7 +109,7 @@ index f5ec3e5..bc44a5a 100644 // COMPATIBILITY FLAGS END case BROWSE_MODE: return mbBrowseMode; -@@ -311,6 +312,9 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) +@@ -311,6 +312,9 @@ void SwDoc::set(/*[in]*/ DocumentSetting case INVERT_BORDER_SPACING: mbInvertBorderSpacing = value; break; @@ -129,11 +119,9 @@ index f5ec3e5..bc44a5a 100644 // COMPATIBILITY FLAGS END case BROWSE_MODE: -diff --git sw/source/core/doc/docnew.cxx sw/source/core/doc/docnew.cxx -index 966255b..2e8e1f8 100644 ---- sw/source/core/doc/docnew.cxx -+++ sw/source/core/doc/docnew.cxx -@@ -380,6 +380,7 @@ SwDoc::SwDoc() : +--- sw/source/core/doc/docnew.cxx.old 2010-03-03 17:00:01.000000000 +0100 ++++ sw/source/core/doc/docnew.cxx 2010-03-03 17:00:02.000000000 +0100 +@@ -369,6 +369,7 @@ SwDoc::SwDoc() : mbTabAtLeftIndentForParagraphsInList = false; // hidden // <-- mbInvertBorderSpacing = false; // hidden @@ -141,10 +129,8 @@ index 966255b..2e8e1f8 100644 // // COMPATIBILITY FLAGS END -diff --git sw/source/core/inc/frame.hxx sw/source/core/inc/frame.hxx -index 9a35030..420d970 100644 ---- sw/source/core/inc/frame.hxx -+++ sw/source/core/inc/frame.hxx +--- sw/source/core/inc/frame.hxx.old 2009-10-07 15:06:25.000000000 +0200 ++++ sw/source/core/inc/frame.hxx 2010-03-03 17:00:02.000000000 +0100 @@ -630,6 +630,7 @@ public: SwRootFrm *FindRootFrm(); SwPageFrm *FindPageFrm(); @@ -163,10 +149,8 @@ index 9a35030..420d970 100644 }; inline BOOL SwFrm::IsInDocBody() const -diff --git sw/source/core/layout/calcmove.cxx sw/source/core/layout/calcmove.cxx -index bb73a85..4c5df37 100644 ---- sw/source/core/layout/calcmove.cxx -+++ sw/source/core/layout/calcmove.cxx +--- sw/source/core/layout/calcmove.cxx.old 2009-10-07 15:06:25.000000000 +0200 ++++ sw/source/core/layout/calcmove.cxx 2010-03-03 17:00:02.000000000 +0100 @@ -68,6 +68,8 @@ #include <flyfrms.hxx> // <-- @@ -219,7 +203,7 @@ index bb73a85..4c5df37 100644 BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) { -@@ -1057,6 +1095,11 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) +@@ -1057,6 +1095,11 @@ BOOL SwCntntFrm::MakePrtArea( const SwBo // OD 2004-03-02 #106629# - use new method <CalcLowerSpace(..)> SwTwips nLower = CalcLowerSpace( &rAttrs ); @@ -231,10 +215,8 @@ index bb73a85..4c5df37 100644 // // in balanced columned section frames we do not want the // // common border // sal_Bool bCommonBorder = sal_True; -diff --git sw/source/core/layout/findfrm.cxx sw/source/core/layout/findfrm.cxx -index e192364..d641056 100644 ---- sw/source/core/layout/findfrm.cxx -+++ sw/source/core/layout/findfrm.cxx +--- sw/source/core/layout/findfrm.cxx.old 2009-10-07 15:06:25.000000000 +0200 ++++ sw/source/core/layout/findfrm.cxx 2010-03-03 17:00:02.000000000 +0100 @@ -599,6 +599,15 @@ SwFrm *SwFrm::FindColFrm() return pFrm; } @@ -251,11 +233,9 @@ index e192364..d641056 100644 SwFrm* SwFrm::FindFooterOrHeader() { SwFrm* pRet = this; -diff --git sw/source/core/text/frmpaint.cxx sw/source/core/text/frmpaint.cxx -index d1f2416..f93ba6f 100644 ---- sw/source/core/text/frmpaint.cxx -+++ sw/source/core/text/frmpaint.cxx -@@ -570,21 +570,25 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const +--- sw/source/core/text/frmpaint.cxx.old 2009-10-07 15:06:25.000000000 +0200 ++++ sw/source/core/text/frmpaint.cxx 2010-03-03 17:00:02.000000000 +0100 +@@ -570,21 +570,25 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwR } } @@ -296,10 +276,8 @@ index d1f2416..f93ba6f 100644 delete pClip; } delete pFnt; -diff --git sw/source/core/text/porrst.cxx sw/source/core/text/porrst.cxx -index 99aeaa4..2c74caf 100644 ---- sw/source/core/text/porrst.cxx -+++ sw/source/core/text/porrst.cxx +--- sw/source/core/text/porrst.cxx.old 2009-10-07 15:06:25.000000000 +0200 ++++ sw/source/core/text/porrst.cxx 2010-03-03 17:00:02.000000000 +0100 @@ -61,6 +61,8 @@ #include <IDocumentSettingAccess.hxx> #include <IDocumentDeviceAccess.hxx> @@ -309,7 +287,7 @@ index 99aeaa4..2c74caf 100644 /************************************************************************* * class SwTmpEndPortion *************************************************************************/ -@@ -230,6 +232,20 @@ SwLinePortion *SwArrowPortion::Compress() { return this; } +@@ -230,6 +232,20 @@ SwLinePortion *SwArrowPortion::Compress( SwTwips SwTxtFrm::EmptyHeight() const { @@ -330,11 +308,9 @@ index 99aeaa4..2c74caf 100644 ASSERT( ! IsVertical() || ! IsSwapped(),"SwTxtFrm::EmptyHeight with swapped frame" ); SwFont *pFnt; -diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx -index 2426ced..f9cd78e 100644 ---- sw/source/filter/ww8/ww8par.cxx -+++ sw/source/filter/ww8/ww8par.cxx -@@ -1538,6 +1538,7 @@ void SwWW8ImplReader::ImportDop() +--- sw/source/filter/ww8/ww8par.cxx.old 2010-03-03 17:00:01.000000000 +0100 ++++ sw/source/filter/ww8/ww8par.cxx 2010-03-03 17:00:02.000000000 +0100 +@@ -1455,6 +1455,7 @@ void SwWW8ImplReader::ImportDop() // <-- rDoc.set(IDocumentSettingAccess::INVERT_BORDER_SPACING, true); @@ -342,11 +318,9 @@ index 2426ced..f9cd78e 100644 // // COMPATIBILITY FLAGS END -diff --git sw/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx -index 2426ced..f9cd78e 100644 ---- sw/source/filter/ww8/ww8par2.cxx -+++ sw/source/filter/ww8/ww8par2.cxx -@@ -3623,18 +3623,6 @@ +--- sw/source/filter/ww8/ww8par2.cxx.old 2010-01-21 01:00:04.000000000 +0100 ++++ sw/source/filter/ww8/ww8par2.cxx 2010-03-03 17:00:02.000000000 +0100 +@@ -3643,18 +3643,6 @@ void SwWW8ImplReader::TabCellEnd() if (nInTable && pTableDesc) { pTableDesc->TableCellEnd(); @@ -365,10 +339,8 @@ index 2426ced..f9cd78e 100644 } bFirstPara = true; // We have come to the end of a cell so FirstPara flag -diff --git sw/source/ui/uno/SwXDocumentSettings.cxx sw/source/ui/uno/SwXDocumentSettings.cxx -index a65d367..039cfb4 100644 ---- sw/source/ui/uno/SwXDocumentSettings.cxx -+++ sw/source/ui/uno/SwXDocumentSettings.cxx +--- sw/source/ui/uno/SwXDocumentSettings.cxx.old 2010-03-03 17:00:01.000000000 +0100 ++++ sw/source/ui/uno/SwXDocumentSettings.cxx 2010-03-03 17:00:02.000000000 +0100 @@ -132,6 +132,7 @@ enum SwDocumentSettingsPropertyHandles HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST // <-- @@ -377,7 +349,7 @@ index a65d367..039cfb4 100644 }; MasterPropertySetInfo * lcl_createSettingsInfo() -@@ -186,6 +187,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo() +@@ -186,6 +187,7 @@ MasterPropertySetInfo * lcl_createSettin // --> OD 2008-06-05 #i89181# { RTL_CONSTASCII_STRINGPARAM("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("InvertBorderSpacing"), HANDLE_INVERT_BORDER_SPACING, CPPUTYPE_BOOLEAN, 0, 0}, @@ -385,7 +357,7 @@ index a65d367..039cfb4 100644 /* * As OS said, we don't have a view when we need to set this, so I have to * find another solution before adding them to this property set - MTG -@@ -685,6 +687,12 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf +@@ -685,6 +687,12 @@ void SwXDocumentSettings::_setSingleValu mpDoc->set(IDocumentSettingAccess::INVERT_BORDER_SPACING, bTmp); } break; @@ -398,7 +370,7 @@ index a65d367..039cfb4 100644 default: throw UnknownPropertyException(); } -@@ -1018,6 +1026,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf +@@ -1018,6 +1026,12 @@ void SwXDocumentSettings::_getSingleValu rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; diff --git a/patches/dev300/sw-no-macro-recorder-in-ui.diff b/patches/dev300/sw-no-macro-recorder-in-ui.diff index 86a01fcc8..873affbd5 100644 --- a/patches/dev300/sw-no-macro-recorder-in-ui.diff +++ b/patches/dev300/sw-no-macro-recorder-in-ui.diff @@ -1,57 +1,57 @@ ---- sw/uiconfig/sglobal/menubar/menubar.xml 2009-10-09 14:58:36.000000000 +0200 -+++ sw/uiconfig/sglobal/menubar/menubar.xml 2009-10-09 14:59:48.000000000 +0200 +--- sw/uiconfig/sglobal/menubar/menubar.xml.old 2010-03-03 16:59:24.000000000 +0100 ++++ sw/uiconfig/sglobal/menubar/menubar.xml 2010-03-03 17:00:12.000000000 +0100 @@ -421,7 +421,6 @@ - <menu:menuseparator/> + <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:MacroRecorder"/> <menu:menuitem menu:id=".uno:RunMacro"/> <menu:menu menu:id=".uno:ScriptOrganizer"/> <menu:menuitem menu:id=".uno:MacroSignature"/> ---- sw/uiconfig/sweb/menubar/menubar.xml 2009-10-09 14:58:36.000000000 +0200 -+++ sw/uiconfig/sweb/menubar/menubar.xml 2009-10-09 14:59:40.000000000 +0200 +--- sw/uiconfig/sweb/menubar/menubar.xml.old 2010-03-03 16:59:24.000000000 +0100 ++++ sw/uiconfig/sweb/menubar/menubar.xml 2010-03-03 17:00:12.000000000 +0100 @@ -351,7 +351,6 @@ - <menu:menuseparator/> + <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:MacroRecorder"/> <menu:menuitem menu:id=".uno:RunMacro"/> <menu:menu menu:id=".uno:ScriptOrganizer"/> <menu:menuseparator/> ---- sw/uiconfig/swform/menubar/menubar.xml 2009-10-09 14:58:36.000000000 +0200 -+++ sw/uiconfig/swform/menubar/menubar.xml 2009-10-09 14:59:32.000000000 +0200 -@@ -418,7 +418,6 @@ - <menu:menuseparator/> +--- sw/uiconfig/swform/menubar/menubar.xml.old 2009-10-08 16:17:19.000000000 +0200 ++++ sw/uiconfig/swform/menubar/menubar.xml 2010-03-03 17:00:12.000000000 +0100 +@@ -417,7 +417,6 @@ + <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:MacroRecorder"/> <menu:menuitem menu:id=".uno:RunMacro"/> <menu:menu menu:id=".uno:ScriptOrganizer"/> - <menu:menuitem menu:id=".uno:MacroSignature"/> ---- sw/uiconfig/swreport/menubar/menubar.xml 2009-10-09 14:58:36.000000000 +0200 -+++ sw/uiconfig/swreport/menubar/menubar.xml 2009-10-09 14:59:21.000000000 +0200 -@@ -418,7 +418,6 @@ - <menu:menuseparator/> + <menu:menuseparator/> +--- sw/uiconfig/swreport/menubar/menubar.xml.old 2009-10-08 16:17:19.000000000 +0200 ++++ sw/uiconfig/swreport/menubar/menubar.xml 2010-03-03 17:00:12.000000000 +0100 +@@ -417,7 +417,6 @@ + <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:MacroRecorder"/> <menu:menuitem menu:id=".uno:RunMacro"/> <menu:menu menu:id=".uno:ScriptOrganizer"/> - <menu:menuitem menu:id=".uno:MacroSignature"/> ---- sw/uiconfig/swriter/menubar/menubar.xml 2009-10-09 14:58:36.000000000 +0200 -+++ sw/uiconfig/swriter/menubar/menubar.xml 2009-10-09 14:59:13.000000000 +0200 + <menu:menuseparator/> +--- sw/uiconfig/swriter/menubar/menubar.xml.old 2010-03-03 16:59:24.000000000 +0100 ++++ sw/uiconfig/swriter/menubar/menubar.xml 2010-03-03 17:00:12.000000000 +0100 @@ -424,7 +424,6 @@ - <menu:menuseparator/> + <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:MacroRecorder"/> <menu:menuitem menu:id=".uno:RunMacro"/> <menu:menu menu:id=".uno:ScriptOrganizer"/> <menu:menuitem menu:id=".uno:MacroSignature"/> ---- sw/uiconfig/swxform/menubar/menubar.xml 2009-10-09 14:58:36.000000000 +0200 -+++ sw/uiconfig/swxform/menubar/menubar.xml 2009-10-09 14:59:05.000000000 +0200 +--- sw/uiconfig/swxform/menubar/menubar.xml.old 2009-10-07 15:06:26.000000000 +0200 ++++ sw/uiconfig/swxform/menubar/menubar.xml 2010-03-03 17:00:12.000000000 +0100 @@ -418,7 +418,6 @@ - <menu:menuseparator/> + <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> - <menu:menuitem menu:id=".uno:MacroRecorder"/> diff --git a/patches/dev300/sw-table-join-fix-i99267.diff b/patches/dev300/sw-table-join-fix-i99267.diff index 8c63228e8..f07c7821a 100644 --- a/patches/dev300/sw-table-join-fix-i99267.diff +++ b/patches/dev300/sw-table-join-fix-i99267.diff @@ -1,16 +1,14 @@ -diff --git sw/source/core/layout/tabfrm.cxx sw/source/core/layout/tabfrm.cxx -index 96a11b5..f2602e4 100644 ---- sw/source/core/layout/tabfrm.cxx -+++ sw/source/core/layout/tabfrm.cxx -@@ -2102,6 +2102,11 @@ void SwTabFrm::MakeAll() - { - bMovedFwd = TRUE; - bCalcLowers = TRUE; +--- sw/source/core/layout/tabfrm.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/core/layout/tabfrm.cxx 2010-03-03 17:00:02.000000000 +0100 +@@ -2135,6 +2135,11 @@ void SwTabFrm::MakeAll() + pPre->GetAttrSet()->GetKeep().GetValue()) ) + { + bCalcLowers = TRUE; + // --> OD 2009-03-06 #i99267# + // reset <bSplit> after forward move to assure that follows + // can be joined, if further space is available. + bSplit = FALSE; + // <-- - } + } + } - Point aOldPos( (Frm().*fnRect->fnGetPos)() ); diff --git a/patches/dev300/testtool-more-defaults.diff b/patches/dev300/testtool-more-defaults.diff index f368e65d9..c3a21f508 100644 --- a/patches/dev300/testtool-more-defaults.diff +++ b/patches/dev300/testtool-more-defaults.diff @@ -101,10 +101,10 @@ index 659d473..a4615d5 100755 --- solenv/bin/linkoo +++ solenv/bin/linkoo @@ -372,6 +372,7 @@ if (!-f "$OOO_INSTALL/" . $brand_program_dir . "/ooenv") { - print "Creating '$OOO_INSTALL/", $brand_program_dir, "/ooenv'\n"; - open ($ooenv, ">$OOO_INSTALL/" . $brand_program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $brand_program_dir . "/ooenv: $!"; + print "Creating '$OOO_INSTALL/", $program_dir, "/ooenv'\n"; + open ($ooenv, ">$OOO_INSTALL/" . $program_dir . "/ooenv") || die "Can't open $OOO_INSTALL/" . $program_dir . "/ooenv: $!"; print $ooenv $env_script; -+ print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n"; ++ print $ooenv "# testtool\nexport SRC_ROOT=$OOO_BUILD\n"; close ($ooenv); } diff --git a/patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff b/patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff index 4ac8c5a41..4aef23088 100644 --- a/patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff +++ b/patches/dev300/toolkit-layout-gcc-4.3.2-hack.diff @@ -1,13 +1,13 @@ ---- toolkit/source/layout/core/makefile.mk.old 2009-04-06 16:42:13.000000000 +0000 -+++ toolkit/source/layout/core/makefile.mk 2009-04-06 16:42:14.000000000 +0000 -@@ -45,6 +45,10 @@ ENABLE_EXCEPTIONS=true - CFLAGS+= -O1 - .ENDIF +--- toolkit/source/layout/core/makefile.mk.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/layout/core/makefile.mk 2010-03-03 16:59:48.000000000 +0100 +@@ -44,6 +44,10 @@ ENABLE_EXCEPTIONS=true + # FIXME: This is bad, hmkay + CFLAGS+= -I$(PRJ)/source +.IF "$(CCNUMVER)" >= "000400030000" && "$(CCNUMVER)" < "000400040000" +CFLAGS+= -O1 +.ENDIF + SLOFILES= \ - $(SLO)$/bin.obj \ - $(SLO)$/box-base.obj \ + $(SLO)$/bin.obj \ + $(SLO)$/box-base.obj \ diff --git a/patches/dev300/ui-desktop-integration.diff b/patches/dev300/ui-desktop-integration.diff index 5be08a4eb..ab84070a8 100644 --- a/patches/dev300/ui-desktop-integration.diff +++ b/patches/dev300/ui-desktop-integration.diff @@ -1,6 +1,6 @@ ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2009-04-06 16:42:16.000000000 +0000 -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2009-04-06 16:42:19.000000000 +0000 -@@ -5653,6 +5653,13 @@ Dymamic border coloring means that when +--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2010-03-03 16:59:57.000000000 +0100 ++++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2010-03-03 17:00:00.000000000 +0100 +@@ -5747,6 +5747,13 @@ Dymamic border coloring means that when </info> <value>false</value> </prop> @@ -14,8 +14,8 @@ <prop oor:name="SymbolSet" oor:type="xs:short"> <!-- UIHints: Tools Options General View --> <info> ---- svtools/inc/svtools/miscopt.hxx.old 2009-04-06 16:42:16.000000000 +0000 -+++ svtools/inc/svtools/miscopt.hxx 2009-04-06 16:42:19.000000000 +0000 +--- svtools/inc/svtools/miscopt.hxx.old 2010-03-03 16:59:57.000000000 +0100 ++++ svtools/inc/svtools/miscopt.hxx 2010-03-03 17:00:00.000000000 +0100 @@ -117,6 +117,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: publ void SetTryODMADialog( sal_Bool bSet ); sal_Bool IsTryUseODMADialogReadOnly() const; @@ -25,8 +25,8 @@ sal_Bool IsPluginsEnabled() const; void SetPluginsEnabled( sal_Bool bEnable ); sal_Bool IsPluginsEnabledReadOnly() const; ---- svtools/source/config/miscopt.cxx.old 2009-04-06 16:42:16.000000000 +0000 -+++ svtools/source/config/miscopt.cxx 2009-04-06 16:42:19.000000000 +0000 +--- svtools/source/config/miscopt.cxx.old 2010-03-03 16:59:57.000000000 +0100 ++++ svtools/source/config/miscopt.cxx 2010-03-03 17:00:00.000000000 +0100 @@ -89,8 +89,10 @@ using namespace ::com::sun::star; #define PROPERTYHANDLE_TRYODMADIALOG 6 #define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog") @@ -46,7 +46,7 @@ + sal_Bool m_bDisableUICustomization; //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods @@ -200,6 +203,9 @@ class SvtMiscOptions_Impl : public Confi inline sal_Bool IsTryUseODMADialogReadOnly() const { return m_bIsTryODMADialogRO; } @@ -57,7 +57,7 @@ inline sal_Bool IsPluginsEnabled() const { return m_bPluginsEnabled; } -@@ -448,6 +454,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl +@@ -450,6 +456,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl m_bIsSymbolsStyleRO = seqRO[nProperty]; break; } @@ -69,9 +69,9 @@ + break; + } } - } + } -@@ -563,6 +576,11 @@ void SvtMiscOptions_Impl::Load( const Se +@@ -565,6 +578,11 @@ void SvtMiscOptions_Impl::Load( const Se } } break; @@ -83,7 +83,7 @@ } } } -@@ -726,6 +744,12 @@ void SvtMiscOptions_Impl::Commit() +@@ -728,6 +746,12 @@ void SvtMiscOptions_Impl::Commit() seqValues[nProperty] <<= m_bShowLinkWarningDialog; break; } @@ -94,19 +94,19 @@ + break; + } } - } - // Set properties in configuration. -@@ -747,7 +771,8 @@ Sequence< OUString > SvtMiscOptions_Impl + } + // Set properties in configuration. +@@ -749,7 +773,8 @@ Sequence< OUString > SvtMiscOptions_Impl PROPERTYNAME_SYMBOLSTYLE, PROPERTYNAME_USESYSTEMPRINTDIALOG, PROPERTYNAME_TRYODMADIALOG, - PROPERTYNAME_SHOWLINKWARNINGDIALOG + PROPERTYNAME_SHOWLINKWARNINGDIALOG, + PROPERTYNAME_DISABLEUICUSTOMIZATION - }; + }; - // Initialize return sequence with these list ... -@@ -908,6 +933,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsSty + // Initialize return sequence with these list ... +@@ -910,6 +935,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsSty return m_pDataContainer->IsGetSymbolsStyleReadOnly(); } @@ -118,18 +118,18 @@ sal_Int16 SvtMiscOptions::GetToolboxStyle() const { return m_pDataContainer->GetToolboxStyle(); ---- sfx2/sdi/appslots.sdi.old 2009-04-02 10:43:51.000000000 +0000 -+++ sfx2/sdi/appslots.sdi 2009-04-06 16:42:19.000000000 +0000 -@@ -188,6 +188,7 @@ interface Application - SID_AVAILABLE_TOOLBARS - [ - ExecMethod = MiscExec_Impl ; +--- sfx2/sdi/appslots.sdi.old 2010-03-03 16:59:21.000000000 +0100 ++++ sfx2/sdi/appslots.sdi 2010-03-03 17:00:00.000000000 +0100 +@@ -184,6 +184,7 @@ interface Application + SID_AVAILABLE_TOOLBARS + [ + ExecMethod = MiscExec_Impl ; + StateMethod = MiscState_Impl ; - ] - SID_HELP_TUTORIALS - [ ---- sfx2/source/appl/appserv.cxx.old 2009-04-06 16:41:54.000000000 +0000 -+++ sfx2/source/appl/appserv.cxx 2009-04-06 16:42:19.000000000 +0000 + ] + SID_HELP_TUTORIALS + [ +--- sfx2/source/appl/appserv.cxx.old 2010-03-03 16:59:22.000000000 +0100 ++++ sfx2/source/appl/appserv.cxx 2010-03-03 17:00:00.000000000 +0100 @@ -90,6 +90,7 @@ #include <svtools/moduleoptions.hxx> #include <svtools/regoptions.hxx> @@ -138,9 +138,9 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/shl.hxx> #include <unotools/bootstrap.hxx> -@@ -680,6 +681,18 @@ void SfxApplication::MiscState_Impl(SfxI - break; - } +@@ -697,6 +698,18 @@ void SfxApplication::MiscState_Impl(SfxI + break; + } + case SID_CONFIG: + case SID_TOOLBOXOPTIONS: @@ -154,12 +154,12 @@ + break; + } + - case SID_BASICSTOP: - if ( !StarBASIC::IsRunning() ) - rSet.DisableItem(nWhich); ---- framework/source/uielement/toolbarmanager.cxx.old 2009-04-02 10:56:25.000000000 +0000 -+++ framework/source/uielement/toolbarmanager.cxx 2009-04-06 16:42:19.000000000 +0000 -@@ -252,7 +252,7 @@ ToolBarManager::ToolBarManager( const Re + case SID_BASICSTOP: + if ( !StarBASIC::IsRunning() ) + rSet.DisableItem(nWhich); +--- framework/source/uielement/toolbarmanager.cxx.old 2010-03-03 16:59:34.000000000 +0100 ++++ framework/source/uielement/toolbarmanager.cxx 2010-03-03 17:00:00.000000000 +0100 +@@ -253,7 +253,7 @@ ToolBarManager::ToolBarManager( const Re m_bUpdateControllers( sal_False ), m_bImageOrientationRegistered( sal_False ), m_bImageMirrored( sal_False ), @@ -168,7 +168,7 @@ m_lImageRotation( 0 ), m_pToolBar( pToolBar ), m_aResourceName( rResourceName ), -@@ -473,6 +473,24 @@ void ToolBarManager::UpdateControllers() +@@ -492,6 +492,24 @@ void ToolBarManager::UpdateControllers() { RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" ); @@ -193,7 +193,7 @@ if ( !m_bUpdateControllers ) { m_bUpdateControllers = sal_True; -@@ -1701,6 +1719,7 @@ PopupMenu * ToolBarManager::GetToolBarCu +@@ -1673,6 +1691,7 @@ PopupMenu * ToolBarManager::GetToolBarCu // Non-configurable toolbars should disable configuration menu items aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False ); aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False ); @@ -201,10 +201,9 @@ } // Disable menu item CLOSE if the toolbar has no closer ---- framework/source/uielement/toolbarsmenucontroller.cxx.old 2009-04-02 10:56:25.000000000 +0000 -+++ framework/source/uielement/toolbarsmenucontroller.cxx 2009-04-06 16:42:19.000000000 +0000 -@@ -85,7 +85,8 @@ - #include <svtools/menuoptions.hxx> +--- framework/source/uielement/toolbarsmenucontroller.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/source/uielement/toolbarsmenucontroller.cxx 2010-03-03 17:00:00.000000000 +0100 +@@ -83,6 +83,7 @@ #include <svtools/cmdoptions.hxx> #include <dispatch/uieventloghelper.hxx> #include <rtl/logfile.hxx> @@ -212,7 +211,7 @@ //_________________________________________________________________________________________________________________ // Defines -@@ -384,6 +385,9 @@ sal_Bool ToolbarsMenuController::isConte +@@ -380,6 +381,9 @@ sal_Bool ToolbarsMenuController::isConte void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { diff --git a/patches/dev300/unxsplash-rework.diff b/patches/dev300/unxsplash-rework.diff index d3339aa19..1875946aa 100644 --- a/patches/dev300/unxsplash-rework.diff +++ b/patches/dev300/unxsplash-rework.diff @@ -1,18 +1,16 @@ -diff --git desktop/inc/app.hxx desktop/inc/app.hxx -index aae085b..d686e56 100644 ---- desktop/inc/app.hxx -+++ desktop/inc/app.hxx +--- desktop/inc/app.hxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ desktop/inc/app.hxx 2010-03-03 16:59:08.000000000 +0100 @@ -90,6 +90,7 @@ class Desktop : public Application - ~Desktop(); - virtual void Main( ); - virtual void Init(); + ~Desktop(); + virtual void Main( ); + virtual void Init(); + virtual void InitFinished(); - virtual void DeInit(); - virtual BOOL QueryExit(); - virtual USHORT Exception(USHORT nError); ---- desktop/prj/build.lst -+++ desktop/prj/build.lst -@@ -18,6 +18,8 @@ dt desktop\win32\source\applauncher nmake - w dt_applauncher dt_inc NULL + virtual void DeInit(); + virtual BOOL QueryExit(); + virtual USHORT Exception(USHORT nError); +--- desktop/prj/build.lst.old 2009-10-08 16:17:54.000000000 +0200 ++++ desktop/prj/build.lst 2010-03-03 16:59:08.000000000 +0100 +@@ -19,6 +19,8 @@ dt desktop\win32\source\applauncher\ooo dt desktop\win32\source\rebase nmake - w dt_rebase dt_inc NULL dt desktop\os2\source\applauncher nmake - p dt_applauncher dt_inc NULL dt desktop\unx\source\officeloader nmake - u dt_officeloader_unx dt_inc NULL @@ -21,18 +19,18 @@ index aae085b..d686e56 100644 dt desktop\source\pagein nmake - u dt_pagein dt_inc NULL dt desktop\source\pkgchk\unopkg nmake - all dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL dt desktop\source\deployment nmake - all dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_migration dt_dp_unopkg dt_inc NULL -@@ -35,5 +37,5 @@ dt desktop\source\deployment\registry\configuration nmake - all dt_dp_registry_c +@@ -36,7 +38,7 @@ dt desktop\source\deployment\registry\co dt desktop\source\deployment\registry\help nmake - all dt_dp_registry_help dt_inc NULL dt desktop\source\deployment\registry\executable nmake - all dt_dp_registry_executable dt_inc NULL dt desktop\scripts nmake - u dt_scripts dt_inc NULL -dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL +dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL dt desktop\zipintro nmake - all dt_zipintro NULL -diff --git desktop/prj/d.lst desktop/prj/d.lst -index 1f401d8..78e9977 100644 ---- desktop/prj/d.lst -+++ desktop/prj/d.lst -@@ -13,6 +13,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms + dt desktop\registry\data\org\openoffice\Office nmake - all sn_regconfig NULL + dt desktop\source\registration\com\sun\star\servicetag\resources get - all sn_svctagres NULL +--- desktop/prj/d.lst.old 2009-10-08 16:17:54.000000000 +0200 ++++ desktop/prj/d.lst 2010-03-03 16:59:08.000000000 +0100 +@@ -10,6 +10,7 @@ mkdir: %_DEST%\bin%_EXT%\odf4ms ..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin ..\%__SRC%\bin\soffice_mac %_DEST%\bin%_EXT%\soffice @@ -40,11 +38,9 @@ index 1f401d8..78e9977 100644 ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe ..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin -diff --git desktop/scripts/soffice.sh desktop/scripts/soffice.sh -index b469f35..9ebd74c 100644 ---- desktop/scripts/soffice.sh -+++ desktop/scripts/soffice.sh -@@ -128,6 +128,16 @@ sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common" +--- desktop/scripts/soffice.sh.old 2010-03-03 16:44:05.000000000 +0100 ++++ desktop/scripts/soffice.sh 2010-03-03 16:59:08.000000000 +0100 +@@ -126,6 +126,16 @@ fi PATH=$sd_prog${PATH+:$PATH} export PATH @@ -61,11 +57,9 @@ index b469f35..9ebd74c 100644 # execute soffice binary "$sd_prog/$sd_binary" "$@" & trap 'kill -9 $!' TERM -diff --git desktop/source/app/app.cxx desktop/source/app/app.cxx -index deac5f2..b1645eb 100644 ---- desktop/source/app/app.cxx -+++ desktop/source/app/app.cxx -@@ -506,6 +506,13 @@ void Desktop::Init() +--- desktop/source/app/app.cxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ desktop/source/app/app.cxx 2010-03-03 16:59:08.000000000 +0100 +@@ -507,6 +507,13 @@ void Desktop::Init() } } @@ -79,7 +73,7 @@ index deac5f2..b1645eb 100644 void Desktop::DeInit() { RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::DeInit" ); -@@ -1232,6 +1239,7 @@ void Desktop::Main() +@@ -1256,6 +1263,7 @@ void Desktop::Main() OpenSplashScreen(); RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main } OpenSplashScreen" ); @@ -87,7 +81,7 @@ index deac5f2..b1645eb 100644 { UserInstall::UserInstallError instErr_fin = UserInstall::finalize(); if ( instErr_fin != UserInstall::E_None) -@@ -1247,7 +1255,7 @@ void Desktop::Main() +@@ -1271,7 +1279,7 @@ void Desktop::Main() } // refresh path information utl::Bootstrap::reloadData(); @@ -96,7 +90,7 @@ index deac5f2..b1645eb 100644 } Reference< XMultiServiceFactory > xSMgr = -@@ -1260,7 +1268,7 @@ void Desktop::Main() +@@ -1285,7 +1293,7 @@ void Desktop::Main() { RegisterServices( xSMgr ); @@ -105,7 +99,7 @@ index deac5f2..b1645eb 100644 #ifndef UNX if ( pCmdLineArgs->IsHelp() ) { -@@ -1298,7 +1306,7 @@ void Desktop::Main() +@@ -1323,7 +1331,7 @@ void Desktop::Main() // Read the common configuration items for optimization purpose if ( !InitializeConfiguration() ) return; @@ -114,7 +108,7 @@ index deac5f2..b1645eb 100644 // set static variable to enabled/disable crash reporter retrieveCrashReporterState(); -@@ -1357,10 +1365,10 @@ void Desktop::Main() +@@ -1382,10 +1390,10 @@ void Desktop::Main() #endif SetDisplayName( aTitle ); @@ -127,7 +121,7 @@ index deac5f2..b1645eb 100644 // pLanguageOptions = new SvtLanguageOptions(sal_True); // SetSplashScreenProgress(45); RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" ); -@@ -1452,7 +1460,7 @@ void Desktop::Main() +@@ -1482,7 +1490,7 @@ void Desktop::Main() OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY ); if (xDesktopFrame.is()) { @@ -136,7 +130,7 @@ index deac5f2..b1645eb 100644 Reference< XFrame > xBackingFrame; Reference< ::com::sun::star::awt::XWindow > xContainerWindow; -@@ -1468,7 +1476,7 @@ void Desktop::Main() +@@ -1505,7 +1513,7 @@ void Desktop::Main() Reference< XController > xBackingComp( xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs), UNO_QUERY); @@ -145,7 +139,7 @@ index deac5f2..b1645eb 100644 if (xBackingComp.is()) { Reference< ::com::sun::star::awt::XWindow > xBackingWin(xBackingComp, UNO_QUERY); -@@ -1507,7 +1515,7 @@ void Desktop::Main() +@@ -1544,7 +1552,7 @@ void Desktop::Main() return; } */ @@ -154,16 +148,16 @@ index deac5f2..b1645eb 100644 SvtFontSubstConfig().Apply(); -@@ -1516,7 +1524,7 @@ void Desktop::Main() - aAppearanceCfg.SetApplicationDefaults( this ); - SvtAccessibilityOptions aOptions; - aOptions.SetVCLSettings(); +@@ -1553,7 +1561,7 @@ void Desktop::Main() + aAppearanceCfg.SetApplicationDefaults( this ); + SvtAccessibilityOptions aOptions; + aOptions.SetVCLSettings(); -// SetSplashScreenProgress(60); + SetSplashScreenProgress(60); - Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) ); + Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) ); -@@ -1539,7 +1547,7 @@ void Desktop::Main() +@@ -1576,7 +1584,7 @@ void Desktop::Main() // use system window dialogs Application::SetSystemWindowMode( SYSTEMWINDOW_MODE_DIALOG ); @@ -172,7 +166,7 @@ index deac5f2..b1645eb 100644 if ( !bTerminateRequested && !pCmdLineArgs->IsInvisible() ) InitializeQuickstartMode( xSMgr ); -@@ -2832,14 +2840,18 @@ void Desktop::OpenSplashScreen() +@@ -2912,14 +2920,18 @@ void Desktop::OpenSplashScreen() else if ( pCmdLine->IsWeb() ) aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "web" )); @@ -193,14 +187,12 @@ index deac5f2..b1645eb 100644 if(m_rSplashScreen.is()) m_rSplashScreen->start(OUString::createFromAscii("SplashScreen"), 100); -diff --git desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.cxx -index b14baab..6b8ca2a 100644 ---- desktop/source/app/cmdlineargs.cxx -+++ desktop/source/app/cmdlineargs.cxx -@@ -457,6 +457,11 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& - SetBoolParam_Impl( CMD_BOOLPARAM_HELPMATH, sal_True ); - return sal_True; - } +--- desktop/source/app/cmdlineargs.cxx.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/source/app/cmdlineargs.cxx 2010-03-03 16:59:08.000000000 +0100 +@@ -457,6 +457,11 @@ sal_Bool CommandLineArgs::InterpretComma + SetBoolParam_Impl( CMD_BOOLPARAM_HELPMATH, sal_True ); + return sal_True; + } + else if ( aArgStr.Copy(0, 13).EqualsIgnoreCaseAscii( "-splash-pipe=" )) + { + AddStringListParam_Impl( CMD_STRINGPARAM_SPLASHPIPE, aArgStr.Copy( 13 ) ); @@ -209,7 +201,7 @@ index b14baab..6b8ca2a 100644 #ifdef MACOSX /* #i84053# ignore -psn on Mac Platform dependent #ifdef here is ugly, however this is currently -@@ -858,7 +863,8 @@ sal_Bool CommandLineArgs::IsEmptyOrAcceptOnly() const +@@ -866,7 +871,8 @@ sal_Bool CommandLineArgs::IsEmptyOrAccep { osl::MutexGuard aMutexGuard( m_aMutex ); @@ -219,23 +211,18 @@ index b14baab..6b8ca2a 100644 ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() )) || ( ( m_eArgumentCount == ONE ) && m_aBoolParams[ CMD_BOOLPARAM_PSN ] ); } -diff --git desktop/source/app/cmdlineargs.hxx desktop/source/app/cmdlineargs.hxx -index 6411398..c42bb99 100644 ---- desktop/source/app/cmdlineargs.hxx -+++ desktop/source/app/cmdlineargs.hxx +--- desktop/source/app/cmdlineargs.hxx.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/source/app/cmdlineargs.hxx 2010-03-03 16:59:08.000000000 +0100 @@ -79,6 +79,7 @@ class CommandLineArgs - enum StringParam // must be zero based! - { - CMD_STRINGPARAM_PORTAL, + enum StringParam // must be zero based! + { + CMD_STRINGPARAM_PORTAL, + CMD_STRINGPARAM_SPLASHPIPE, - CMD_STRINGPARAM_ACCEPT, - CMD_STRINGPARAM_UNACCEPT, - CMD_STRINGPARAM_USERDIR, -diff --git desktop/unx/source/makefile.mk desktop/unx/source/makefile.mk -new file mode 100644 -index 0000000..110d081 ---- /dev/null -+++ desktop/unx/source/makefile.mk + CMD_STRINGPARAM_ACCEPT, + CMD_STRINGPARAM_UNACCEPT, + CMD_STRINGPARAM_USERDIR, +--- desktop/unx/source/makefile.mk.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/source/makefile.mk 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,38 @@ +PRJ=..$/.. +PRJNAME=desktop @@ -275,11 +262,8 @@ index 0000000..110d081 +$(INCCOM)$/introbmpnames.hxx $(DO_PHONY): + echo const char INTRO_BITMAP_STRINGLIST[]=$(EMQ)"$(INTRO_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@ + echo LASTTIME_INTRO_BITMAPS=$(INTRO_BITMAPS:f) > $(MISC)$/intro_bmp_names.mk -diff --git desktop/unx/source/splashx.c desktop/unx/source/splashx.c -new file mode 100644 -index 0000000..b3b6da0 ---- /dev/null -+++ desktop/unx/source/splashx.c +--- desktop/unx/source/splashx.c.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/source/splashx.c 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,570 @@ +/************************************************************************* + * @@ -851,11 +835,8 @@ index 0000000..b3b6da0 + free( bitmap ); + bitmap = NULL; +} -diff --git desktop/unx/source/splashx.h desktop/unx/source/splashx.h -new file mode 100644 -index 0000000..6d84d4b ---- /dev/null -+++ desktop/unx/source/splashx.h +--- desktop/unx/source/splashx.h.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/source/splashx.h 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,71 @@ +/************************************************************************* + * @@ -928,11 +909,8 @@ index 0000000..6d84d4b +#endif + +#endif // _SPLASHX_H -diff --git desktop/unx/source/start.c desktop/unx/source/start.c -new file mode 100644 -index 0000000..a42a286 ---- /dev/null -+++ desktop/unx/source/start.c +--- desktop/unx/source/start.c.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/source/start.c 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,719 @@ +/************************************************************************* + * @@ -1653,11 +1631,8 @@ index 0000000..a42a286 + + return 0; +} -diff --git desktop/unx/splash/exports.map desktop/unx/splash/exports.map -new file mode 100644 -index 0000000..ba501f9 ---- /dev/null -+++ desktop/unx/splash/exports.map +--- desktop/unx/splash/exports.map.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/splash/exports.map 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,10 @@ +UDK_3_0_0 { + global: @@ -1669,11 +1644,8 @@ index 0000000..ba501f9 + local: + *; +}; -diff --git desktop/unx/splash/makefile.mk desktop/unx/splash/makefile.mk -new file mode 100644 -index 0000000..874b81b ---- /dev/null -+++ desktop/unx/splash/makefile.mk +--- desktop/unx/splash/makefile.mk.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/splash/makefile.mk 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,73 @@ +#************************************************************************* +# @@ -1748,11 +1720,8 @@ index 0000000..874b81b + +.INCLUDE : target.mk + -diff --git desktop/unx/splash/services_unxsplash.cxx desktop/unx/splash/services_unxsplash.cxx -new file mode 100644 -index 0000000..b762fa5 ---- /dev/null -+++ desktop/unx/splash/services_unxsplash.cxx +--- desktop/unx/splash/services_unxsplash.cxx.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/splash/services_unxsplash.cxx 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,177 @@ +/************************************************************************* + * @@ -1931,11 +1900,8 @@ index 0000000..b762fa5 + return NULL; +} +} // extern "C" -diff --git desktop/unx/splash/unxsplash.cxx desktop/unx/splash/unxsplash.cxx -new file mode 100644 -index 0000000..ca20334 ---- /dev/null -+++ desktop/unx/splash/unxsplash.cxx +--- desktop/unx/splash/unxsplash.cxx.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/splash/unxsplash.cxx 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,192 @@ +/************************************************************************* + * @@ -2129,11 +2095,8 @@ index 0000000..ca20334 +} + +} -diff --git desktop/unx/splash/unxsplash.hxx desktop/unx/splash/unxsplash.hxx -new file mode 100644 -index 0000000..5419324 ---- /dev/null -+++ desktop/unx/splash/unxsplash.hxx +--- desktop/unx/splash/unxsplash.hxx.old 2010-03-03 16:59:08.000000000 +0100 ++++ desktop/unx/splash/unxsplash.hxx 2010-03-03 16:59:08.000000000 +0100 @@ -0,0 +1,117 @@ +/************************************************************************* + * @@ -2252,11 +2215,9 @@ index 0000000..5419324 +}; + +} -diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp -index 6bccbd8..161de3d 100644 ---- scp2/source/ooo/common_brand.scp -+++ scp2/source/ooo/common_brand.scp -@@ -415,6 +415,15 @@ File gid_Brand_File_Bin_Soffice_Bin +--- scp2/source/ooo/common_brand.scp.old 2009-10-08 16:17:46.000000000 +0200 ++++ scp2/source/ooo/common_brand.scp 2010-03-03 16:59:08.000000000 +0100 +@@ -417,6 +417,15 @@ File gid_Brand_File_Bin_Soffice_Bin Name = "soffice.bin"; End @@ -2272,11 +2233,9 @@ index 6bccbd8..161de3d 100644 // use this for high detail file open dialog >= 5.1 windows #ifdef WNT File gid_Brand_File_Bin_Soffice_Bin_Manifest -diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp -index 1a6661a..dbbe327 100644 ---- scp2/source/ooo/file_library_ooo.scp -+++ scp2/source/ooo/file_library_ooo.scp -@@ -1346,6 +1346,9 @@ File gid_File_Lib_Spell +--- scp2/source/ooo/file_library_ooo.scp.old 2010-03-03 16:44:08.000000000 +0100 ++++ scp2/source/ooo/file_library_ooo.scp 2010-03-03 16:59:08.000000000 +0100 +@@ -1455,6 +1455,9 @@ File gid_File_Lib_Spell End STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl) @@ -2286,23 +2245,21 @@ index 1a6661a..dbbe327 100644 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) ---- smoketestoo_native/smoketest.pl -+++ smoketestoo_native/smoketest.pl -@@ -502,7 +502,7 @@ sub doTest { +--- smoketestoo_native/smoketest.pl.old 2009-10-08 16:17:37.000000000 +0200 ++++ smoketestoo_native/smoketest.pl 2010-03-03 16:59:08.000000000 +0100 +@@ -517,7 +517,7 @@ sub doTest { - print "starting office ($INSTSETNAME)\n"; + print "starting office ($INSTSETNAME)\n"; -- $Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions"; +- $Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions"; + $Command = "\"$programpath" . "$SOFFICEBIN\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions"; - if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) { - $Command = "cd \"$programpath\"; " . $Command; - } -diff --git solenv/bin/cwscheckapi solenv/bin/cwscheckapi -index fe5ecc1..e43ba12 100755 ---- solenv/bin/cwscheckapi -+++ solenv/bin/cwscheckapi -@@ -225,7 +225,7 @@ if [ -n "$WORK_STAMP" ]; then - fi + if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) { + $Command = "cd \"$programpath\"; " . $Command; + } +--- solenv/bin/cwscheckapi.old 2009-10-08 16:17:46.000000000 +0200 ++++ solenv/bin/cwscheckapi 2010-03-03 16:59:08.000000000 +0100 +@@ -300,7 +300,7 @@ if [ -n "$WORK_STAMP" ]; then + fi fi -PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'" @@ -2310,10 +2267,8 @@ index fe5ecc1..e43ba12 100755 PARAM="$PARAM -cs pipe,name=$USER" PARAM="$PARAM -NoOffice true" PARAM="$PARAM -SRC_ROOT $SRC_ROOT" -diff --git vcl/inc/vcl/svapp.hxx vcl/inc/vcl/svapp.hxx -index d900862..a324664 100644 ---- vcl/inc/vcl/svapp.hxx -+++ vcl/inc/vcl/svapp.hxx +--- vcl/inc/vcl/svapp.hxx.old 2009-10-19 13:28:02.000000000 +0200 ++++ vcl/inc/vcl/svapp.hxx 2010-03-03 16:59:08.000000000 +0100 @@ -267,6 +267,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -2322,10 +2277,8 @@ index d900862..a324664 100644 virtual void DeInit(); static void InitAppRes( const ResId& rResId ); -diff --git vcl/source/app/svapp.cxx vcl/source/app/svapp.cxx -index 0c8b1d8..08c9ebd 100644 ---- vcl/source/app/svapp.cxx -+++ vcl/source/app/svapp.cxx +--- vcl/source/app/svapp.cxx.old 2009-10-19 13:28:02.000000000 +0200 ++++ vcl/source/app/svapp.cxx 2010-03-03 16:59:08.000000000 +0100 @@ -326,6 +326,11 @@ void Application::Init() } @@ -2338,11 +2291,9 @@ index 0c8b1d8..08c9ebd 100644 void Application::DeInit() { -diff --git vcl/source/window/window.cxx vcl/source/window/window.cxx -index d7cc722..8882c23 100644 ---- vcl/source/window/window.cxx -+++ vcl/source/window/window.cxx -@@ -6539,10 +6539,19 @@ void Window::Show( BOOL bVisible, USHORT nFlags ) +--- vcl/source/window/window.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ vcl/source/window/window.cxx 2010-03-03 16:59:08.000000000 +0100 +@@ -6560,10 +6560,19 @@ void Window::Show( BOOL bVisible, USHORT mpWindowImpl->mpBorderWindow->Show( TRUE, nFlags ); else if ( mpWindowImpl->mbFrame ) { diff --git a/patches/dev300/vbahelper-optionality-fix.diff b/patches/dev300/vbahelper-optionality-fix.diff index 2e3e82632..867ac7030 100644 --- a/patches/dev300/vbahelper-optionality-fix.diff +++ b/patches/dev300/vbahelper-optionality-fix.diff @@ -1,22 +1,5 @@ -Make vbahelper truly optional - -From: Eric Bachard <ericb@openoffice.org> - - ---- - - solenv/inc/libs.mk | 2 ++ - sw/util/makefile.mk | 10 ++++++++-- - vbahelper/source/msforms/makefile.mk | 5 +++++ - vbahelper/source/vbahelper/makefile.mk | 5 +++++ - vbahelper/util/makefile.mk | 4 ++++ - 5 files changed, 24 insertions(+), 2 deletions(-) - - -diff --git solenv/inc/libs.mk solenv/inc/libs.mk -index 346bcdb..dfdd04c 100644 ---- solenv/inc/libs.mk -+++ solenv/inc/libs.mk +--- solenv/inc/libs.mk.old 2010-03-03 16:59:55.000000000 +0100 ++++ solenv/inc/libs.mk 2010-03-03 17:00:18.000000000 +0100 @@ -190,7 +190,9 @@ SAXLIB=-lsax$(DLLPOSTFIX) MAILLIB=-lmail DOCMGRLIB=-ldmg$(DLLPOSTFIX) @@ -27,11 +10,9 @@ index 346bcdb..dfdd04c 100644 DBTOOLSLIB=-ldbtools$(DLLPOSTFIX) HM2LIBSH=-lhmwrpdll HM2LIBST=-lhmwrap -diff --git sw/util/makefile.mk sw/util/makefile.mk -index b4e1127..ddd3ced 100644 ---- sw/util/makefile.mk -+++ sw/util/makefile.mk -@@ -345,6 +349,7 @@ SHL4STDLIBS= \ +--- sw/util/makefile.mk.old 2010-03-03 17:00:04.000000000 +0100 ++++ sw/util/makefile.mk 2010-03-03 17:00:18.000000000 +0100 +@@ -344,6 +344,7 @@ SHL4STDLIBS= \ $(BASICLIB) \ $(I18NUTILLIB) @@ -39,18 +20,16 @@ index b4e1127..ddd3ced 100644 #target vba TARGET_VBA=vbaswobj SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno -@@ -377,5 +382,6 @@ SHL5STDLIBS= \ +@@ -380,5 +381,6 @@ SHL5STDLIBS+=$(SHELLLIB) SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib +.ENDIF # .IF "$(ENABLE_VBA)" == "YES" .INCLUDE : target.mk -diff --git vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/makefile.mk -index 9bde7db..e123aeb 100644 ---- vbahelper/source/msforms/makefile.mk -+++ vbahelper/source/msforms/makefile.mk -@@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS := TRUE +--- vbahelper/source/msforms/makefile.mk.old 2010-03-03 16:59:35.000000000 +0100 ++++ vbahelper/source/msforms/makefile.mk 2010-03-03 17:00:18.000000000 +0100 +@@ -38,6 +38,11 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -62,12 +41,10 @@ index 9bde7db..e123aeb 100644 .INCLUDE : settings.mk CDEFS+=-DVBA_OOBUILD_HACK -diff --git vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/makefile.mk -index bd57415..ce2f862 100644 ---- vbahelper/source/vbahelper/makefile.mk -+++ vbahelper/source/vbahelper/makefile.mk +--- vbahelper/source/vbahelper/makefile.mk.old 2010-03-03 16:59:35.000000000 +0100 ++++ vbahelper/source/vbahelper/makefile.mk 2010-03-03 17:00:18.000000000 +0100 @@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS := TRUE - + VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- +.IF "$(ENABLE_VBA)" == "NO" @@ -78,10 +55,8 @@ index bd57415..ce2f862 100644 .INCLUDE : settings.mk SLOFILES=\ -diff --git vbahelper/util/makefile.mk vbahelper/util/makefile.mk -index 9180676..14cec55 100644 ---- vbahelper/util/makefile.mk -+++ vbahelper/util/makefile.mk +--- vbahelper/util/makefile.mk.old 2010-03-03 16:59:35.000000000 +0100 ++++ vbahelper/util/makefile.mk 2010-03-03 17:00:18.000000000 +0100 @@ -38,6 +38,10 @@ TARGET=vbahelper .INCLUDE : settings.mk diff --git a/patches/dev300/vcl-better-fallback.diff b/patches/dev300/vcl-better-fallback.diff index 35a0fad1e..aa368a208 100644 --- a/patches/dev300/vcl-better-fallback.diff +++ b/patches/dev300/vcl-better-fallback.diff @@ -1,9 +1,9 @@ ---- vcl/unx/source/plugadapt/salplug.cxx 2005-06-21 09:49:05.563280678 +0200 -+++ vcl/unx/source/plugadapt/salplug.cxx 2005-06-21 10:19:57.119254553 +0200 -@@ -464,9 +464,11 @@ SalInstance *CreateSalInstance() - if( ! pInst && pUsePlugin && *pUsePlugin ) - pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) ); - +--- vcl/unx/source/plugadapt/salplug.cxx.old 2010-03-03 16:44:10.000000000 +0100 ++++ vcl/unx/source/plugadapt/salplug.cxx 2010-03-03 16:59:29.000000000 +0100 +@@ -213,9 +213,11 @@ SalInstance *CreateSalInstance() + if( ! pInst ) + pInst = autodetect_plugin(); + - // fallback to gen - if( ! pInst ) - pInst = tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "gen" ) ) ); diff --git a/patches/dev300/webdav-locking.diff b/patches/dev300/webdav-locking.diff index 6e81ff0ad..4a7c5961d 100644 --- a/patches/dev300/webdav-locking.diff +++ b/patches/dev300/webdav-locking.diff @@ -1,5 +1,5 @@ ---- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu -+++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu +--- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu.old 2009-10-07 15:07:00.000000000 +0200 ++++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 2010-03-03 16:59:07.000000000 +0100 @@ -178,6 +178,28 @@ <value/> </prop> @@ -29,24 +29,24 @@ <!-- We want the Provider to be the final fallback provider --> <node oor:name="Provider999" oor:op="replace" install:module="gio"> <prop oor:name="ServiceName"> ---- sc/source/ui/docshell/docsh.cxx -+++ sc/source/ui/docshell/docsh.cxx +--- sc/source/ui/docshell/docsh.cxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/ui/docshell/docsh.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -856,7 +856,7 @@ BOOL __EXPORT ScDocShell::ConvertFrom( S - // Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron), - // darum vorher per CreateFileStream dafuer sorgen, dass die komplette - // Datei uebertragen wird. -- rMedium.GetPhysicalName(); //! CreateFileStream direkt rufen, wenn verfuegbar + // Alle Filter brauchen die komplette Datei am Stueck (nicht asynchron), + // darum vorher per CreateFileStream dafuer sorgen, dass die komplette + // Datei uebertragen wird. +- rMedium.GetPhysicalName(); //! CreateFileStream direkt rufen, wenn verfuegbar + rMedium.GetPhysicalName( sal_False ); //! CreateFileStream direkt rufen, wenn verfuegbar SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE; ---- sfx2/inc/sfx2/docfile.hxx -+++ sfx2/inc/sfx2/docfile.hxx +--- sfx2/inc/sfx2/docfile.hxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ sfx2/inc/sfx2/docfile.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -187,7 +187,7 @@ public: ::com::sun::star::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue ); ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > GetContent() const; -- const String& GetPhysicalName() const; +- const String& GetPhysicalName() const; + const String& GetPhysicalName( sal_Bool bForceCreateTempIfRemote = sal_True ) const; void SetTemporary( sal_Bool bTemp ); sal_Bool IsTemporary() const; @@ -60,9 +60,9 @@ #if _SOLAR__PRIVATE SAL_DLLPRIVATE BOOL HasStorage_Impl() const; ---- sfx2/source/doc/docfile.cxx -+++ sfx2/source/doc/docfile.cxx -@@ -582,7 +582,7 @@ +--- sfx2/source/doc/docfile.cxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ sfx2/source/doc/docfile.cxx 2010-03-03 16:59:07.000000000 +0100 +@@ -586,7 +586,7 @@ void SfxMedium::CheckFileDate( const uti //------------------------------------------------------------------ sal_Bool SfxMedium::DocNeedsFileDateCheck() { @@ -71,7 +71,7 @@ } //------------------------------------------------------------------ -@@ -804,10 +804,13 @@ +@@ -811,10 +811,13 @@ sal_Bool SfxMedium::CloseOutStream_Impl( } //------------------------------------------------------------------ @@ -87,11 +87,10 @@ // return the name then return aName; -@@ -916,15 +916,35 @@ - return bPreview; +@@ -924,6 +927,26 @@ sal_Bool SfxMedium::IsPreview_Impl() } -+//------------------------------------------------------------------ + //------------------------------------------------------------------ +sal_Bool SfxMedium::SupportsActiveStreaming( const rtl::OUString &rName ) const +{ + if ( ::utl::LocalFileHelper::IsLocalFile( rName ) ) @@ -111,11 +110,11 @@ + return sal_False; +} + - //------------------------------------------------------------------ ++//------------------------------------------------------------------ void SfxMedium::StorageBackup_Impl() { ::ucbhelper::Content aOriginalContent; - Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; +@@ -931,7 +954,7 @@ void SfxMedium::StorageBackup_Impl() sal_Bool bBasedOnOriginalFile = ( !pImp->pTempFile && !( aLogicName.Len() && pImp->m_bSalvageMode ) && GetURLObject().GetMainURL( INetURLObject::NO_DECODE ).getLength() @@ -124,7 +123,7 @@ && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ); if ( bBasedOnOriginalFile && !pImp->m_aBackupURL.getLength() -@@ -1995,7 +1995,7 @@ void SfxMedium::Transfer_Impl() +@@ -2015,7 +2038,7 @@ void SfxMedium::Transfer_Impl() xComEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< ::com::sun::star::ucb::XProgressHandler >() ); @@ -133,12 +132,15 @@ { TransactedTransferForFS_Impl( aSource, aDest, xComEnv ); } -@@ -2108,11 +2108,20 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont - if ( pImp->m_aBackupURL.getLength() ) - return; // the backup was done already +@@ -2128,11 +2151,20 @@ void SfxMedium::DoInternalBackup_Impl( c + if ( pImp->m_aBackupURL.getLength() ) + return; // the backup was done already -- ::utl::TempFile aTransactTemp( aPrefix, &aExtension, &aDestDir ); -- aTransactTemp.EnableKillingFile( sal_False ); +- ::utl::TempFile aTransactTemp( aPrefix, &aExtension, &aDestDir ); +- aTransactTemp.EnableKillingFile( sal_False ); +- +- INetURLObject aBackObj( aTransactTemp.GetURL() ); +- ::rtl::OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + ::rtl::OUString aBackupName; + ::rtl::OUString aBackupURL; + { @@ -147,55 +149,53 @@ + // file name... + ::utl::TempFile aTransactTemp( aPrefix, &aExtension, &aDestDir ); + aTransactTemp.EnableKillingFile( sal_True ); - -- INetURLObject aBackObj( aTransactTemp.GetURL() ); -- ::rtl::OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); ++ + INetURLObject aBackObj( aTransactTemp.GetURL() ); + + aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + aBackupURL = aBackObj.GetMainURL( INetURLObject::NO_DECODE ); + } - Reference < ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; - ::ucbhelper::Content aBackupCont; -@@ -2125,16 +2125,13 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont - aBackupName, - NameClash::OVERWRITE ) ) - { -- pImp->m_aBackupURL = aBackObj.GetMainURL( INetURLObject::NO_DECODE ); + Reference < ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; + ::ucbhelper::Content aBackupCont; +@@ -2145,16 +2177,13 @@ void SfxMedium::DoInternalBackup_Impl( c + aBackupName, + NameClash::OVERWRITE ) ) + { +- pImp->m_aBackupURL = aBackObj.GetMainURL( INetURLObject::NO_DECODE ); + pImp->m_aBackupURL = aBackupURL; - pImp->m_bRemoveBackup = sal_True; - } - } - catch( Exception& ) - {} - } + pImp->m_bRemoveBackup = sal_True; + } + } + catch( Exception& ) + {} + } - -- if ( !pImp->m_aBackupURL.getLength() ) -- aTransactTemp.EnableKillingFile( sal_True ); +- if ( !pImp->m_aBackupURL.getLength() ) +- aTransactTemp.EnableKillingFile( sal_True ); } //------------------------------------------------------------------ -@@ -2327,7 +2327,7 @@ void SfxMedium::GetMedium_Impl() - aMedium.erase( comphelper::MediaDescriptor::PROP_READONLY() ); - aMedium.addInputStream(); - } -- else if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ) +@@ -2393,7 +2422,7 @@ void SfxMedium::GetMedium_Impl() + aMedium.erase( comphelper::MediaDescriptor::PROP_READONLY() ); + aMedium.addInputStream(); + } +- else if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ) + else if ( SupportsActiveStreaming( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ) - { - // use the special locking approach only for file URLs - aMedium.addInputStreamOwnLock(); -@@ -3423,7 +3423,7 @@ - if ( !( nStorOpenMode & STREAM_TRUNC ) ) - { + { + // use the special locking approach only for file URLs + aMedium.addInputStreamOwnLock(); +@@ -3519,7 +3548,7 @@ void SfxMedium::CreateTempFile( sal_Bool + sal_Bool bTransferSuccess = sal_False; + if ( GetContent().is() - && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) + && SupportsActiveStreaming( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ) { // if there is already such a document, we should copy it ---- sfx2/source/view/viewfrm.cxx -+++ sfx2/source/view/viewfrm.cxx +--- sfx2/source/view/viewfrm.cxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ sfx2/source/view/viewfrm.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -632,6 +632,11 @@ void SfxViewFrame::ExecReload_Impl( SfxR sal_Bool bHandsOff = ( pMedium->GetURLObject().GetProtocol() == INET_PROT_FILE && !xOldObj->IsDocShared() ); @@ -208,15 +208,15 @@ // bestehende SfxMDIFrames f"ur dieses Doc leeren // eigenes Format oder R/O jetzt editierbar "offnen? SfxViewNotificatedFrameList_Impl aFrames; ---- tools/inc/tools/urlobj.hxx -+++ tools/inc/tools/urlobj.hxx +--- tools/inc/tools/urlobj.hxx.old 2010-03-03 16:44:12.000000000 +0100 ++++ tools/inc/tools/urlobj.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -141,9 +141,14 @@ enum INetProtocol INET_PROT_TELNET = 28, INET_PROT_VND_SUN_STAR_EXPAND = 29, INET_PROT_VND_SUN_STAR_TDOC = 30, - INET_PROT_GENERIC = 31, - INET_PROT_SMB = 32, -- INET_PROT_END = 33 +- INET_PROT_END = 33 + INET_PROT_SMB = 31, + INET_PROT_DAV = 32, + INET_PROT_DAVS = 33, @@ -228,36 +228,36 @@ }; //============================================================================ ---- tools/source/fsys/urlobj.cxx -+++ tools/source/fsys/urlobj.cxx +--- tools/source/fsys/urlobj.cxx.old 2010-03-03 16:44:12.000000000 +0100 ++++ tools/source/fsys/urlobj.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -374,21 +374,21 @@ static INetURLObject::SchemeInfo const a - false }, - { "ftp", "ftp://", 21, true, true, false, true, true, true, true, - false }, -- { "http", "http://", 80, true, false, false, false, true, true, + false }, + { "ftp", "ftp://", 21, true, true, false, true, true, true, true, + false }, +- { "http", "http://", 80, true, false, false, false, true, true, + { "http", "http://", 80, true, true, false, true, true, true, - true, true }, - { "file", "file://", 0, true, false, false, false, true, false, - true, false }, - { "mailto", "mailto:", 0, false, false, false, false, false, - false, false, true }, -- { "vnd.sun.star.webdav", "vnd.sun.star.webdav://", 80, true, false, -- false, false, true, true, true, true }, + true, true }, + { "file", "file://", 0, true, false, false, false, true, false, + true, false }, + { "mailto", "mailto:", 0, false, false, false, false, false, + false, false, true }, +- { "vnd.sun.star.webdav", "vnd.sun.star.webdav://", 80, true, false, +- false, false, true, true, true, true }, + { "vnd.sun.star.webdav", "vnd.sun.star.webdav://", 80, true, true, + false, true, true, true, true, true }, - { "news", "news:", 0, false, false, false, false, false, false, false, + { "news", "news:", 0, false, false, false, false, false, false, false, false }, - { "private", "private:", 0, false, false, false, false, false, - false, false, true }, - { "vnd.sun.star.help", "vnd.sun.star.help://", 0, true, false, false, - false, false, false, true, true }, -- { "https", "https://", 443, true, false, false, false, true, true, + { "private", "private:", 0, false, false, false, false, false, + false, false, true }, + { "vnd.sun.star.help", "vnd.sun.star.help://", 0, true, false, false, + false, false, false, true, true }, +- { "https", "https://", 443, true, false, false, false, true, true, + { "https", "https://", 443, true, true, false, true, true, true, - true, true }, - { "slot", "slot:", 0, false, false, false, false, false, false, - false, true }, + true, true }, + { "slot", "slot:", 0, false, false, false, false, false, false, + false, true }, @@ -432,9 +432,19 @@ static INetURLObject::SchemeInfo const a - false, false, false, false, false }, + false, false, false, false, false }, { "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", 0, false, false, false, false, false, false, true, false }, - { "", "", 0, false, false, false, false, false, false, false, false }, @@ -291,8 +291,8 @@ } } @@ -866,8 +879,9 @@ bool INetURLObject::setAbsURIRef(rtl::OU - return false; - } + return false; + } - if (m_eScheme != INET_PROT_GENERIC) { - aSynScheme = rtl::OUString::createFromAscii(getSchemeInfo().m_pScheme); @@ -302,61 +302,61 @@ } m_aScheme.set(aSynAbsURIRef, aSynScheme, aSynAbsURIRef.getLength()); aSynAbsURIRef.append(sal_Unicode(':')); -@@ -2127,6 +2127,8 @@ INetURLObject::getPrefix(sal_Unicode con - PrefixInfo::INTERNAL }, - { "cid:", 0, INET_PROT_CID, PrefixInfo::OFFICIAL }, - { "data:", 0, INET_PROT_DATA, PrefixInfo::OFFICIAL }, +@@ -2125,6 +2139,8 @@ INetURLObject::getPrefix(sal_Unicode con + PrefixInfo::INTERNAL }, + { "cid:", 0, INET_PROT_CID, PrefixInfo::OFFICIAL }, + { "data:", 0, INET_PROT_DATA, PrefixInfo::OFFICIAL }, + { "dav:", 0, INET_PROT_DAV, PrefixInfo::OFFICIAL }, + { "davs:", 0, INET_PROT_DAVS, PrefixInfo::OFFICIAL }, - { "db:", "staroffice.db:", INET_PROT_DB, PrefixInfo::INTERNAL }, - { "file:", 0, INET_PROT_FILE, PrefixInfo::OFFICIAL }, - { "ftp:", 0, INET_PROT_FTP, PrefixInfo::OFFICIAL }, -@@ -2208,6 +2208,8 @@ INetURLObject::getPrefix(sal_Unicode con - PrefixInfo::OFFICIAL }, - { "vnd.sun.star.wfs:", 0, INET_PROT_VND_SUN_STAR_WFS, - PrefixInfo::OFFICIAL }, + { "db:", "staroffice.db:", INET_PROT_DB, PrefixInfo::INTERNAL }, + { "file:", 0, INET_PROT_FILE, PrefixInfo::OFFICIAL }, + { "ftp:", 0, INET_PROT_FTP, PrefixInfo::OFFICIAL }, +@@ -2206,6 +2222,8 @@ INetURLObject::getPrefix(sal_Unicode con + PrefixInfo::OFFICIAL }, + { "vnd.sun.star.wfs:", 0, INET_PROT_VND_SUN_STAR_WFS, + PrefixInfo::OFFICIAL }, + { "webdav:", 0, INET_PROT_WEBDAV, PrefixInfo::OFFICIAL }, + { "webdavs:", 0, INET_PROT_WEBDAVS, PrefixInfo::OFFICIAL }, - { "wfs:", "vnd.sun.star.wfs:", INET_PROT_VND_SUN_STAR_WFS, - PrefixInfo::ALIAS } }; - PrefixInfo const * pFirst = aMap + 1; -@@ -3011,6 +3011,10 @@ bool INetURLObject::parsePath(INetProtoc - case INET_PROT_VND_SUN_STAR_WEBDAV: - case INET_PROT_HTTPS: + { "wfs:", "vnd.sun.star.wfs:", INET_PROT_VND_SUN_STAR_WFS, + PrefixInfo::ALIAS } }; + PrefixInfo const * pFirst = aMap + 1; +@@ -3009,6 +3027,10 @@ bool INetURLObject::parsePath(INetProtoc + case INET_PROT_VND_SUN_STAR_WEBDAV: + case INET_PROT_HTTPS: case INET_PROT_SMB: + case INET_PROT_DAV: + case INET_PROT_DAVS: + case INET_PROT_WEBDAV: + case INET_PROT_WEBDAVS: - if (pPos < pEnd && *pPos != '/') - return false; - while (pPos < pEnd && *pPos != nQueryDelimiter -@@ -3429,6 +3429,7 @@ bool INetURLObject::parsePath(INetProtoc - break; + if (pPos < pEnd && *pPos != '/') + return false; + while (pPos < pEnd && *pPos != nQueryDelimiter +@@ -3427,6 +3449,7 @@ bool INetURLObject::parsePath(INetProtoc + break; case INET_PROT_GENERIC: + case INET_PROT_GENERIC_HIERARCHICAL: - while (pPos < pEnd && *pPos != nFragmentDelimiter) - { - EscapeType eEscapeType; -@@ -4140,10 +4140,13 @@ bool INetURLObject::ConcatData(INetProto + while (pPos < pEnd && *pPos != nFragmentDelimiter) + { + EscapeType eEscapeType; +@@ -4138,10 +4161,13 @@ bool INetURLObject::ConcatData(INetProto { - setInvalid(); - m_eScheme = eTheScheme; -- if (HasError() || m_eScheme == INET_PROT_GENERIC) + setInvalid(); + m_eScheme = eTheScheme; +- if (HasError() || m_eScheme == INET_PROT_GENERIC) + const char *pSchemeName = getSchemeInfo().m_pScheme; + + if (HasError() || pSchemeName[0] == '\0') - return false; + return false; + - m_aAbsURIRef.setLength(0); -- m_aAbsURIRef.appendAscii(getSchemeInfo().m_pScheme); + m_aAbsURIRef.setLength(0); +- m_aAbsURIRef.appendAscii(getSchemeInfo().m_pScheme); + m_aAbsURIRef.appendAscii(pSchemeName); - m_aAbsURIRef.append(sal_Unicode(':')); - if (getSchemeInfo().m_bAuthority) - { ---- tools/workben/urltest.cxx -+++ tools/workben/urltest.cxx + m_aAbsURIRef.append(sal_Unicode(':')); + if (getSchemeInfo().m_bAuthority) + { +--- tools/workben/urltest.cxx.old 2010-01-21 01:00:41.000000000 +0100 ++++ tools/workben/urltest.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -1495,7 +1495,7 @@ main() url = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A-b.3:/%2f?x#y")); @@ -393,8 +393,8 @@ bSuccess &= assertEqual( url, url, rtl::OUString(urlobj.GetMainURL(INetURLObject::NO_DECODE))); ---- ucb/source/ucp/webdav/DAVRequestEnvironment.hxx -+++ ucb/source/ucp/webdav/DAVRequestEnvironment.hxx +--- ucb/source/ucp/webdav/DAVRequestEnvironment.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/DAVRequestEnvironment.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -34,6 +34,8 @@ #include <rtl/ref.hxx> #include "DAVAuthListener.hxx" @@ -404,7 +404,7 @@ namespace webdav_ucp { typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader; -@@ -46,12 +50,12 @@ struct DAVRequestEnvironment +@@ -46,12 +48,12 @@ struct DAVRequestEnvironment // rtl::Reference< DAVStatusListener > m_xStatusListener; // rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; @@ -420,8 +420,8 @@ : m_aRequestURI( rRequestURI ), m_xAuthListener( xListener ), m_aRequestHeaders( rRequestHeaders ), ---- ucb/source/ucp/webdav/DAVResourceAccess.cxx -+++ ucb/source/ucp/webdav/DAVResourceAccess.cxx +--- ucb/source/ucp/webdav/DAVResourceAccess.cxx.old 2009-12-03 13:52:17.000000000 +0100 ++++ ucb/source/ucp/webdav/DAVResourceAccess.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -42,6 +42,9 @@ #include "DAVAuthListenerImpl.hxx" #include "DAVResourceAccess.hxx" @@ -432,7 +432,7 @@ using namespace webdav_ucp; using namespace com::sun::star; -@@ -63,11 +63,18 @@ int DAVAuthListener_Impl::authenticate( +@@ -63,11 +66,18 @@ int DAVAuthListener_Impl::authenticate( sal_Bool bAllowPersistentStoring, sal_Bool bCanUseSystemCredentials ) { @@ -442,6 +442,7 @@ { - uno::Reference< task::XInteractionHandler > xIH - = m_xEnv->getInteractionHandler(); +- if ( xIH.is() ) + xIH = m_xEnv->getInteractionHandler(); + } + else @@ -450,11 +451,10 @@ + } + + { -- if ( xIH.is() ) { // #102871# - Supply username and password from previous try. // Password container service depends on this! -@@ -444,15 +446,16 @@ void DAVResourceAccess::GET( +@@ -465,15 +475,16 @@ void DAVResourceAccess::GET( } //========================================================================= @@ -474,7 +474,7 @@ int errorCount = 0; bool bRetry; do -@@ -472,7 +475,8 @@ uno::Reference< io::XInputStream > DAVRe +@@ -493,7 +504,8 @@ uno::Reference< io::XInputStream > DAVRe DAVRequestEnvironment( getRequestURI(), new DAVAuthListener_Impl( xEnv, m_aURL ), @@ -484,7 +484,7 @@ } catch ( DAVException & e ) { -@@ -606,6 +610,45 @@ void DAVResourceAccess::PUT( +@@ -635,6 +647,45 @@ void DAVResourceAccess::PUT( } //========================================================================= @@ -528,9 +528,9 @@ + +//========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, -@@ -888,22 +931,44 @@ void DAVResourceAccess::DESTROY( + const rtl::OUString & rContentType, + const rtl::OUString & rReferer, +@@ -917,22 +968,44 @@ void DAVResourceAccess::DESTROY( //========================================================================= void DAVResourceAccess::LOCK ( @@ -583,7 +583,7 @@ } //========================================================================= -@@ -1008,6 +1073,18 @@ void DAVResourceAccess::getUserRequestHe +@@ -1037,6 +1110,18 @@ void DAVResourceAccess::getUserRequestHe } } @@ -602,10 +602,10 @@ //========================================================================= sal_Bool DAVResourceAccess::detectRedirectCycle( const rtl::OUString& rRedirectURL ) ---- ucb/source/ucp/webdav/DAVResourceAccess.hxx -+++ ucb/source/ucp/webdav/DAVResourceAccess.hxx +--- ucb/source/ucp/webdav/DAVResourceAccess.hxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ ucb/source/ucp/webdav/DAVResourceAccess.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -134,11 +134,12 @@ public: - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > @@ -613,15 +613,15 @@ GET( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< -- com::sun::star::ucb::XCommandEnvironment > & xEnv ) +- com::sun::star::ucb::XCommandEnvironment > & xEnv ) + com::sun::star::ucb::XCommandEnvironment > & xEnv, + sal_Bool bAllowEmpty = sal_False ) throw( DAVException ); void @@ -157,6 +158,11 @@ public: - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ); + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw( DAVException ); + void + PUT( const char * buffer, size_t size, @@ -630,25 +630,25 @@ + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const rtl::OUString & rReferer, @@ -204,13 +210,13 @@ public: - throw( DAVException ); + throw( DAVException ); void - LOCK( const com::sun::star::ucb::Lock & rLock, + LOCK( com::sun::star::ucb::Lock & rLock, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ); + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw( DAVException ); void - UNLOCK( const com::sun::star::ucb::Lock & rLock, + UNLOCK( com::sun::star::ucb::Lock & rLock, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ); -@@ -223,6 +229,8 @@ public: - const rtl::OUString & rMethod, + const com::sun::star::uno::Reference< + com::sun::star::ucb::XCommandEnvironment > & xEnv ) + throw( DAVException ); +@@ -227,6 +233,8 @@ public: + const rtl::OUString & rMethod, DAVRequestHeaders & rRequestHeaders ); + static com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > createCommandEnvironment( void ); @@ -656,8 +656,8 @@ private: const rtl::OUString & getRequestURI() const; sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL ) ---- ucb/source/ucp/webdav/DAVSession.hxx -+++ ucb/source/ucp/webdav/DAVSession.hxx +--- ucb/source/ucp/webdav/DAVSession.hxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ ucb/source/ucp/webdav/DAVSession.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -33,8 +33,11 @@ #include <memory> @@ -681,7 +681,7 @@ @@ -114,11 +115,12 @@ public: const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + throw( DAVException ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > @@ -694,9 +694,9 @@ throw( DAVException ) = 0; virtual void GET( const ::rtl::OUString & inPath, -@@ -134,6 +136,12 @@ public: - virtual void ABORT() - throw( DAVException ) = 0; +@@ -137,6 +139,12 @@ public: + virtual void ABORT() + throw( DAVException ) = 0; + virtual void PUT( const ::rtl::OUString & inPath, + const char * buffer, @@ -707,28 +707,28 @@ virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > POST( const rtl::OUString & inPath, const rtl::OUString & rContentType, -@@ -173,16 +181,14 @@ public: +@@ -176,16 +184,14 @@ public: const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + throw( DAVException ) = 0; -- // Note: Uncomment the following if locking support is required -- /* -- virtual void LOCK ( const Lock & inLock, +- // Note: Uncomment the following if locking support is required +- /* +- virtual void LOCK ( const Lock & inLock, + virtual void LOCK ( com::sun::star::ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + throw( DAVException ) = 0; -- virtual void UNLOCK ( const Lock & inLock, +- virtual void UNLOCK ( const Lock & inLock, + virtual void UNLOCK ( com::sun::star::ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; -- */ + throw( DAVException ) = 0; +- */ + protected: rtl::Reference< DAVSessionFactory > m_xFactory; ---- ucb/source/ucp/webdav/NeonInputStream.cxx -+++ ucb/source/ucp/webdav/NeonInputStream.cxx +--- ucb/source/ucp/webdav/NeonInputStream.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/NeonInputStream.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -31,21 +31,28 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_ucb.hxx" @@ -770,7 +770,7 @@ { - mInputBuffer.realloc( sal::static_int_cast<sal_Int32>(mLen) + inLen ); - rtl_copyMemory( mInputBuffer.getArray() + mLen, inBuf, inLen ); -- mLen += inLen; +- mLen += inLen; + OSL_ENSURE( !m_bDirty, "Cannot AddToStream() when it was already written to it." ); + + m_aInputBuffer.realloc( sal::static_int_cast<sal_Int32>(m_nLen) + inLen ); @@ -792,20 +792,20 @@ // queryInterface // ------------------------------------------------------------------- -Any NeonInputStream::queryInterface( const Type &type ) -- throw( RuntimeException ) +- throw( RuntimeException ) +uno::Any NeonInputStream::queryInterface( const uno::Type &type ) + throw( uno::RuntimeException ) { -- Any aRet = ::cppu::queryInterface( type, -- static_cast< XInputStream * >( this ), -- static_cast< XSeekable * >( this ) ); +- Any aRet = ::cppu::queryInterface( type, +- static_cast< XInputStream * >( this ), +- static_cast< XSeekable * >( this ) ); + uno::Any aRet = ::cppu::queryInterface( type, + static_cast< XStream * >( this ), + static_cast< XInputStream * >( this ), + static_cast< XOutputStream * >( this ), + static_cast< XSeekable * >( this ), + static_cast< XTruncate * >( this ) ); - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type ); + return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type ); } // ------------------------------------------------------------------- @@ -834,22 +834,22 @@ // ------------------------------------------------------------------- @@ -92,7 +134,7 @@ sal_Int32 SAL_CALL NeonInputStream::read { - // Work out how much we're actually going to write - sal_Int32 theBytes2Read = nBytesToRead; -- sal_Int32 theBytesLeft = sal::static_int_cast<sal_Int32>(mLen - mPos); + // Work out how much we're actually going to write + sal_Int32 theBytes2Read = nBytesToRead; +- sal_Int32 theBytesLeft = sal::static_int_cast<sal_Int32>(mLen - mPos); + sal_Int32 theBytesLeft = sal::static_int_cast<sal_Int32>(m_nLen - m_nPos); - if ( theBytes2Read > theBytesLeft ) - theBytes2Read = theBytesLeft; + if ( theBytes2Read > theBytesLeft ) + theBytes2Read = theBytesLeft; @@ -101,10 +143,10 @@ sal_Int32 SAL_CALL NeonInputStream::read - // Write the data - rtl_copyMemory( -- aData.getArray(), mInputBuffer.getConstArray() + mPos, theBytes2Read ); + // Write the data + rtl_copyMemory( +- aData.getArray(), mInputBuffer.getConstArray() + mPos, theBytes2Read ); + aData.getArray(), m_aInputBuffer.getConstArray() + m_nPos, theBytes2Read ); - // Update our stream position for next time -- mPos += theBytes2Read; + // Update our stream position for next time +- mPos += theBytes2Read; + m_nPos += theBytes2Read; return theBytes2Read; @@ -858,9 +858,9 @@ ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) { -- mPos += nBytesToSkip; -- if ( mPos >= mLen ) -- mPos = mLen; +- mPos += nBytesToSkip; +- if ( mPos >= mLen ) +- mPos = mLen; + m_nPos += nBytesToSkip; + if ( m_nPos >= m_nLen ) + m_nPos = m_nLen; @@ -871,43 +871,36 @@ ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) { -- return sal::static_int_cast<sal_Int32>(mLen - mPos); +- return sal::static_int_cast<sal_Int32>(mLen - mPos); + return sal::static_int_cast<sal_Int32>(m_nLen - m_nPos); } // ------------------------------------------------------------------- -@@ -168,12 +210,12 @@ void SAL_CALL NeonInputStream::seek( sal - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) - { -- if ( location < 0 ) -- throw ::com::sun::star::lang::IllegalArgumentException(); -+ if ( location < 0 ) -+ throw ::com::sun::star::lang::IllegalArgumentException(); +@@ -171,8 +213,8 @@ void SAL_CALL NeonInputStream::seek( sal + if ( location < 0 ) + throw ::com::sun::star::lang::IllegalArgumentException(); - if ( location <= mLen ) -- mPos = location; -- else +- mPos = location; + if ( location <= m_nLen ) + m_nPos = location; -+ else + else throw ::com::sun::star::lang::IllegalArgumentException(); } - @@ -184,7 +226,7 @@ sal_Int64 SAL_CALL NeonInputStream::getP - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) { -- return mPos; +- return mPos; + return m_nPos; } // ------------------------------------------------------------------- @@ -194,5 +236,108 @@ sal_Int64 SAL_CALL NeonInputStream::getL - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ) { -- return mLen; +- return mLen; + return m_nLen; +} + @@ -1013,8 +1006,8 @@ + m_bDirty = sal_True; + } } ---- ucb/source/ucp/webdav/NeonInputStream.hxx -+++ ucb/source/ucp/webdav/NeonInputStream.hxx +--- ucb/source/ucp/webdav/NeonInputStream.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/NeonInputStream.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -31,11 +31,19 @@ #define _NEONINPUTSTREAM_HXX_ @@ -1043,18 +1036,18 @@ +class NeonInputStream : public ::com::sun::star::io::XStream, + public ::com::sun::star::io::XInputStream, + public ::com::sun::star::io::XOutputStream, - public ::com::sun::star::io::XSeekable, + public ::com::sun::star::io::XSeekable, + public ::com::sun::star::io::XTruncate, - public ::cppu::OWeakObject + public ::cppu::OWeakObject { -- private: -- com::sun::star::uno::Sequence< sal_Int8 > mInputBuffer; -- sal_Int64 mLen; -- sal_Int64 mPos; +- private: +- com::sun::star::uno::Sequence< sal_Int8 > mInputBuffer; +- sal_Int64 mLen; +- sal_Int64 mPos; - -- public: -- NeonInputStream( void ); -- virtual ~NeonInputStream(); +- public: +- NeonInputStream( void ); +- virtual ~NeonInputStream(); +private: + com::sun::star::uno::Sequence< sal_Int8 > m_aInputBuffer; + sal_Int64 m_nLen; // cannot be just m_aInputBuffer.getLength() - the buffer can be bigger @@ -1066,8 +1059,8 @@ + + osl::Mutex m_aLock; -- // Add some data to the end of the stream -- void AddToStream( const char * inBuf, sal_Int32 inLen ); +- // Add some data to the end of the stream +- void AddToStream( const char * inBuf, sal_Int32 inLen ); +public: + NeonInputStream( void ); + virtual ~NeonInputStream(); @@ -1078,11 +1071,11 @@ + // Associate a URL with this stream + void SetURL( const rtl::OUString &rURL ); - // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( + // XInterface + virtual com::sun::star::uno::Any SAL_CALL queryInterface( @@ -74,6 +94,12 @@ class NeonInputStream : public ::com::su - throw() - { OWeakObject::release(); } + throw() + { OWeakObject::release(); } + // XStream + virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream( void ) @@ -1091,12 +1084,12 @@ + virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( void ) + throw( com::sun::star::uno::RuntimeException ); - // XInputStream - virtual sal_Int32 SAL_CALL readBytes( + // XInputStream + virtual sal_Int32 SAL_CALL readBytes( @@ -121,6 +147,30 @@ class NeonInputStream : public ::com::su - virtual sal_Int64 SAL_CALL getLength() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + virtual sal_Int64 SAL_CALL getLength() + throw( ::com::sun::star::io::IOException, + ::com::sun::star::uno::RuntimeException ); + + // XOutputStream + virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) @@ -1124,9 +1117,9 @@ }; } // namespace webdav_ucp ---- ucb/source/ucp/webdav/NeonSession.cxx -+++ ucb/source/ucp/webdav/NeonSession.cxx -@@ -65,6 +65,7 @@ +--- ucb/source/ucp/webdav/NeonSession.cxx.old 2009-12-03 13:52:17.000000000 +0100 ++++ ucb/source/ucp/webdav/NeonSession.cxx 2010-03-03 16:59:07.000000000 +0100 +@@ -44,6 +44,7 @@ #include "rtl/ustrbuf.hxx" #include "comphelper/sequence.hxx" #include "ucbhelper/simplecertificatevalidationrequest.hxx" @@ -1134,7 +1127,7 @@ #include "DAVAuthListener.hxx" #include "NeonTypes.hxx" -@@ -153,6 +154,12 @@ static sal_uInt16 makeStatusCode( const +@@ -147,6 +148,12 @@ static sal_uInt16 makeStatusCode( const return sal_uInt16( rStatusText.copy( 0, nPos ).toInt32() ); } @@ -1147,7 +1140,7 @@ // ------------------------------------------------------------------- struct NeonRequestContext { -@@ -196,12 +203,13 @@ struct NeonRequestContext +@@ -190,12 +197,13 @@ struct NeonRequestContext // ------------------------------------------------------------------- #if NEON_VERSION >= 0x0250 @@ -1165,7 +1158,7 @@ { // neon calls this function with (inLen == 0)... if ( inLen > 0 ) -@@ -226,12 +234,13 @@ extern "C" void NeonSession_ResponseBloc +@@ -220,12 +228,13 @@ extern "C" void NeonSession_ResponseBloc // ------------------------------------------------------------------- #if NEON_VERSION >= 0x0250 @@ -1183,7 +1176,7 @@ { // neon calls this function with (inLen == 0)... if ( inLen > 0 ) -@@ -299,11 +308,10 @@ extern "C" int NeonSession_NeonAuth( voi +@@ -294,11 +303,10 @@ extern "C" int NeonSession_NeonAuth( voi try { @@ -1197,7 +1190,7 @@ if ( nPos == -1 ) { theUserName = aUserInfo; -@@ -564,6 +572,8 @@ extern "C" void NeonSession_PreSendReque +@@ -640,6 +648,8 @@ extern "C" void NeonSession_PreSendReque } // namespace @@ -1206,7 +1199,7 @@ // ------------------------------------------------------------------- // Constructor // ------------------------------------------------------------------- -@@ -581,6 +591,7 @@ NeonSession::NeonSession( +@@ -657,6 +667,7 @@ NeonSession::NeonSession( m_aScheme = theUri.GetScheme(); m_aHostName = theUri.GetHost(); m_nPort = theUri.GetPort(); @@ -1214,22 +1207,22 @@ // Init(); } -@@ -594,14 +605,6 @@ NeonSession::~NeonSession( ) +@@ -670,14 +681,6 @@ NeonSession::~NeonSession( ) { ne_session_destroy( m_pHttpSession ); m_pHttpSession = 0; -- // Note: Uncomment the following if locking support is required -- /* -- if ( mNeonLockSession != NULL ) -- { -- ne_lock_unregister( mNeonLockSession ); -- mNeonLockSession = NULL; -- } -- */ +- // Note: Uncomment the following if locking support is required +- /* +- if ( mNeonLockSession != NULL ) +- { +- ne_lock_unregister( mNeonLockSession ); +- mNeonLockSession = NULL; +- } +- */ } delete static_cast<RequestDataMap*>(m_pRequestData); -@@ -629,6 +632,9 @@ void NeonSession::Init() +@@ -705,6 +708,9 @@ void NeonSession::Init() throw DAVException( DAVException::DAV_SESSION_CREATE, NeonUri::makeConnectionEndPointString( m_aHostName, m_nPort ) ); @@ -1239,7 +1232,7 @@ // #122205# - libxml2 needs to be initialized once if used by // multithreaded programs like OOo. xmlInitParser(); -@@ -746,14 +752,15 @@ void NeonSession::Init() +@@ -821,14 +827,15 @@ void NeonSession::Init() m_nProxyPort ); } @@ -1261,22 +1254,22 @@ // Register for redirects. ne_redirect_register( m_pHttpSession ); -@@ -1088,11 +1095,12 @@ void NeonSession::GET( const rtl::OUStri +@@ -1156,11 +1163,12 @@ void NeonSession::GET( const rtl::OUStri // ------------------------------------------------------------------- // GET // ------------------------------------------------------------------- -uno::Reference< io::XInputStream > +uno::Reference< io::XStream > NeonSession::GET( const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, - DAVResource & ioResource, -- const DAVRequestEnvironment & rEnv ) + const std::vector< ::rtl::OUString > & inHeaderNames, + DAVResource & ioResource, +- const DAVRequestEnvironment & rEnv ) + const DAVRequestEnvironment & rEnv, + sal_Bool bAllowEmpty ) throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); -@@ -1104,16 +1112,23 @@ NeonSession::GET( const rtl::OUString & +@@ -1172,16 +1180,23 @@ NeonSession::GET( const rtl::OUString & ioResource.uri = inPath; ioResource.properties.clear(); @@ -1304,7 +1297,7 @@ } // ------------------------------------------------------------------- -@@ -1153,22 +1168,38 @@ void NeonSession::PUT( const rtl::OUStri +@@ -1221,22 +1236,38 @@ void NeonSession::PUT( const rtl::OUStri const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1350,7 +1343,7 @@ HandleError( theRetVal ); } -@@ -1344,9 +1375,7 @@ void NeonSession::DESTROY( const rtl::OU +@@ -1425,9 +1456,7 @@ void NeonSession::DESTROY( const rtl::OU // ------------------------------------------------------------------- // LOCK // ------------------------------------------------------------------- @@ -1359,13 +1352,13 @@ -void NeonSession::LOCK( const Lock & inLock, +void NeonSession::LOCK( ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) + throw ( DAVException ) { -@@ -1356,16 +1385,13 @@ void NeonSession::LOCK( const Lock & inL +@@ -1437,16 +1466,13 @@ void NeonSession::LOCK( const Lock & inL m_aEnv = rEnv; -- Lockit( inLock, true ); +- Lockit( inLock, true ); + Lockit( rLock, true ); } -*/ @@ -1378,24 +1371,24 @@ -void NeonSession::UNLOCK( const Lock & inLock, +void NeonSession::UNLOCK( ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) + throw ( DAVException ) { -@@ -1375,9 +1401,8 @@ void NeonSession::UNLOCK( const Lock & i +@@ -1456,9 +1482,8 @@ void NeonSession::UNLOCK( const Lock & i m_aEnv = rEnv; -- Lockit( inLock, false ); +- Lockit( inLock, false ); + Lockit( rLock, false ); } -*/ // ------------------------------------------------------------------- const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const -@@ -1416,7 +1441,10 @@ void NeonSession::HandleError( int nErro +@@ -1497,7 +1522,10 @@ void NeonSession::HandleError( int nErro case NE_ERROR: // Generic error { rtl::OUString aText = rtl::OUString::createFromAscii( -- ne_get_error( m_pHttpSession ) ); +- ne_get_error( m_pHttpSession ) ); + ne_get_error( m_pHttpSession ) ); +#if OSL_DEBUG_LEVEL > 0 + fprintf( stderr, "WebDAV: got error '%s'\n", rtl::OUStringToOString( aText, RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -1403,7 +1396,7 @@ throw DAVException( DAVException::DAV_HTTP_ERROR, aText, makeStatusCode( aText ) ); -@@ -1473,77 +1501,156 @@ void NeonSession::HandleError( int nErro +@@ -1554,77 +1582,156 @@ void NeonSession::HandleError( int nErro } } @@ -1411,35 +1404,21 @@ -/* -void NeonSession::Lockit( const Lock & inLock, bool inLockit ) +void NeonSession::Lockit( ucb::Lock & rLock, bool bLockit ) - throw ( DAVException ) + throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); -- // Create the neon lock -- NeonLock * theLock = new NeonLock; -- int theRetVal; -- -- // Set the lock uri -- NeonUri theUri( inLock.uri ); -- theLock->uri = const_cast< char * > -- ( rtl::OUStringToOString( -- theUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); +- // Create the neon lock +- NeonLock * theLock = new NeonLock; +- int theRetVal; + if ( !s_aNeonLockStore ) + throw DAVException( DAVException::DAV_INVALID_ARG ); -- if ( inLockit ) -- { -- // Set the lock depth -- switch( inLock.depth ) -- { -- case DAVZERO: -- case DAVINFINITY: -- theLock->depth = int ( inLock.depth ); -- break; -- default: -- throw DAVException( DAVException::DAV_INVALID_ARG ); -- break; -- } +- // Set the lock uri +- NeonUri theUri( inLock.uri ); +- theLock->uri = const_cast< char * > +- ( rtl::OUStringToOString( +- theUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); + ne_uri aUri; + ne_uri_parse( rtl::OUStringToOString( m_aEnv.m_aRequestURI, RTL_TEXTENCODING_UTF8 ).getStr(), + &aUri ); @@ -1452,78 +1431,67 @@ +#undef FILLIN +#endif -- // Set the lock scope -- switch ( inLock.scope ) -- { -- case EXCLUSIVE: -- theLock->scope = ne_lockscope_exclusive; -- break; -- case SHARED: -- theLock->scope = ne_lockscope_shared; -- break; -- default: -- throw DAVException( DAVException::DAV_INVALID_ARG ); -- break; -- } +- if ( inLockit ) + // Create the neon lock + NeonLock * theLock = ne_lockstore_findbyuri( s_aNeonLockStore, &aUri ); + bool bAlreadyExists = false; + if ( theLock ) + bAlreadyExists = true; + else -+ { + { + theLock = ne_lock_create(); - -- // Set the lock owner -- const char * theOwner = rtl::OUStringToOString( inLock.owner, -- RTL_TEXTENCODING_UTF8 ); -- theLock->owner = const_cast< char * > ( theOwner ); -- -- // Set the lock timeout -- // Note: Neon ignores the timeout -- //theLock->timeout = inLock.timeout; ++ + // Set the lock uri + theLock->uri = aUri; - -- theRetVal = ne_lock( m_pHttpSession, theLock ); -- } -- else -- { -+ // Set the lock depth ++ + // Set the lock depth +- switch( inLock.depth ) + switch( rLock.Depth ) -+ { + { +- case DAVZERO: +- case DAVINFINITY: +- theLock->depth = int ( inLock.depth ); +- break; + case ucb::LockDepth_ZERO: theLock->depth = NE_DEPTH_ZERO; break; + case ucb::LockDepth_ONE: theLock->depth = NE_DEPTH_ONE; break; + case ucb::LockDepth_INFINITY: theLock->depth = NE_DEPTH_INFINITE; break; -+ default: + default: +- throw DAVException( DAVException::DAV_INVALID_ARG ); +- break; + throw DAVException( DAVException::DAV_INVALID_ARG ); -+ } + } -- // Set the lock token -- rtl::OUString theToken = inLock.locktoken.getConstArray()[ 0 ]; -- theLock->token = const_cast< char * > -- ( rtl::OUStringToOString( -- theToken, RTL_TEXTENCODING_UTF8 ).getStr() ); -+ // Set the lock scope + // Set the lock scope +- switch ( inLock.scope ) + switch ( rLock.Scope ) -+ { + { +- case EXCLUSIVE: +- theLock->scope = ne_lockscope_exclusive; +- break; +- case SHARED: +- theLock->scope = ne_lockscope_shared; +- break; + case ucb::LockScope_EXCLUSIVE: theLock->scope = ne_lockscope_exclusive; break; + case ucb::LockScope_SHARED: theLock->scope = ne_lockscope_shared; break; -+ default: + default: +- throw DAVException( DAVException::DAV_INVALID_ARG ); +- break; + throw DAVException( DAVException::DAV_INVALID_ARG ); + break; -+ } + } -- theRetVal = ne_unlock( m_pHttpSession, theLock ); -- } -+ // Set the lock owner + // Set the lock owner +- const char * theOwner = rtl::OUStringToOString( inLock.owner, +- RTL_TEXTENCODING_UTF8 ); +- theLock->owner = const_cast< char * > ( theOwner ); + rtl::OUString aValue; + rLock.Owner >>= aValue; - -- HandleError( theRetVal ); -+ theLock->owner = strdup( rtl::OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); + -+ // Set the lock timeout ++ theLock->owner = strdup( rtl::OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); + + // Set the lock timeout +- // Note: Neon ignores the timeout +- //theLock->timeout = inLock.timeout; + // We re-new the lock while the stream is open + theLock->timeout = rLock.Timeout; + } @@ -1567,7 +1535,8 @@ + if ( !bAlreadyExists ) + { + nRet = ne_lock( m_pHttpSession, theLock ); -+ + +- theRetVal = ne_lock( m_pHttpSession, theLock ); + if ( nRet == NE_OK ) + { + ne_lockstore_add( s_aNeonLockStore, theLock ); @@ -1596,19 +1565,27 @@ + else + fprintf( stderr, "WebDAV: failed to lock the file: %s\n", ne_get_error( m_pHttpSession ) ); +#endif -+ } -+ else -+ { -+ // Set the lock token + } + else + { +- + // Set the lock token +- rtl::OUString theToken = inLock.locktoken.getConstArray()[ 0 ]; +- theLock->token = const_cast< char * > +- ( rtl::OUStringToOString( +- theToken, RTL_TEXTENCODING_UTF8 ).getStr() ); + if ( rLock.LockTokens.getLength() > 0 ) + { + rtl::OUString theToken = rLock.LockTokens.getConstArray()[ 0 ]; + theLock->token = strdup( rtl::OUStringToOString( theToken, RTL_TEXTENCODING_UTF8 ).getStr() ); -+ + +- theRetVal = ne_unlock( m_pHttpSession, theLock ); +- } +#if OSL_DEBUG_LEVEL > 0 + fprintf( stderr, "WebDAV: going to unlock the URL, the token is: %s\n", theLock->token ); +#endif -+ + +- HandleError( theRetVal ); + ne_unlock( m_pHttpSession, theLock ); + ne_lockstore_remove( s_aNeonLockStore, theLock ); + // FIXME even ne_lock_destroy( theLock )? @@ -1619,8 +1596,8 @@ // ------------------------------------------------------------------- namespace { ---- ucb/source/ucp/webdav/NeonSession.hxx -+++ ucb/source/ucp/webdav/NeonSession.hxx +--- ucb/source/ucp/webdav/NeonSession.hxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ ucb/source/ucp/webdav/NeonSession.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -57,6 +57,7 @@ class NeonSession : public DAVSession rtl::OUString m_aScheme; rtl::OUString m_aHostName; @@ -1633,7 +1610,7 @@ // moment. DAVRequestEnvironment m_aEnv; -- // Note: Uncomment the following if locking support is required +- // Note: Uncomment the following if locking support is required - // NeonLockSession * mNeonLockSession; + static NeonLockStore *s_aNeonLockStore; @@ -1649,7 +1626,7 @@ OPTIONS( const ::rtl::OUString & inPath, DAVCapabilities & outCapabilities, @@ -142,11 +144,12 @@ class NeonSession : public DAVSession - throw ( DAVException ); + throw ( DAVException ); virtual com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > @@ -1665,7 +1642,7 @@ virtual void @@ -165,6 +168,13 @@ class NeonSession : public DAVSession const DAVRequestEnvironment & rEnv ) - throw ( DAVException ); + throw ( DAVException ); + virtual void + PUT( const ::rtl::OUString & inPath, @@ -1677,41 +1654,41 @@ virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > POST( const rtl::OUString & inPath, -@@ -209,16 +219,13 @@ class NeonSession : public DAVSession - virtual void ABORT() - throw ( DAVException ); +@@ -212,16 +222,13 @@ class NeonSession : public DAVSession + virtual void ABORT() + throw ( DAVException ); -- // Note: Uncomment the following if locking support is required -- /* -- virtual void LOCK (const Lock & inLock, +- // Note: Uncomment the following if locking support is required +- /* +- virtual void LOCK (const Lock & inLock, - const DAVRequestEnvironment & rEnv ) + virtual void LOCK ( com::sun::star::ucb::Lock & rLock, + const DAVRequestEnvironment & rEnv ) - throw ( DAVException ); + throw ( DAVException ); -- virtual void UNLOCK (const Lock & inLock, +- virtual void UNLOCK (const Lock & inLock, - const DAVRequestEnvironment & rEnv ) + virtual void UNLOCK ( com::sun::star::ucb::Lock & rLock, + const DAVRequestEnvironment & rEnv ) - throw ( DAVException ); -- */ + throw ( DAVException ); +- */ // helpers const rtl::OUString & getHostName() const { return m_aHostName; } -@@ -239,9 +246,8 @@ class NeonSession : public DAVSession +@@ -242,9 +249,8 @@ class NeonSession : public DAVSession const ucbhelper::InternetProxyServer & getProxySettings() const; -- // Note: Uncomment the following if locking support is required -- // void Lockit( const Lock & inLock, bool inLockit ) -- // throw ( DAVException ); +- // Note: Uncomment the following if locking support is required +- // void Lockit( const Lock & inLock, bool inLockit ) +- // throw ( DAVException ); + void Lockit( com::sun::star::ucb::Lock & rLock, bool bLockit ) + throw ( DAVException ); // low level GET implementation, used by public GET implementations static int GET( ne_session * sess, ---- ucb/source/ucp/webdav/NeonTypes.hxx -+++ ucb/source/ucp/webdav/NeonTypes.hxx +--- ucb/source/ucp/webdav/NeonTypes.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/NeonTypes.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -35,6 +35,7 @@ #include <ne_utils.h> #include <ne_basic.h> @@ -1728,8 +1705,8 @@ +typedef struct ne_lock NeonLock; + #endif // _NEONTYPES_HXX_ ---- ucb/source/ucp/webdav/webdavcontent.cxx -+++ ucb/source/ucp/webdav/webdavcontent.cxx +--- ucb/source/ucp/webdav/webdavcontent.cxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ ucb/source/ucp/webdav/webdavcontent.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -37,6 +37,7 @@ *************************************************************************/ @@ -1921,7 +1898,7 @@ } catch ( DAVException const & ) { -@@ -390,12 +518,24 @@ Content::Content( +@@ -390,12 +519,24 @@ Content::Content( m_pProvider( pProvider ), m_bTransient( true ), m_bCollection( isCollection ), @@ -1947,7 +1924,7 @@ } catch ( DAVException const & ) { -@@ -409,6 +548,47 @@ Content::Content( +@@ -409,6 +550,47 @@ Content::Content( // virtual Content::~Content() { @@ -1995,7 +1972,7 @@ } //========================================================================= -@@ -630,6 +811,11 @@ uno::Any SAL_CALL Content::execute( +@@ -630,6 +812,11 @@ uno::Any SAL_CALL Content::execute( ucb::CommandAbortedException, uno::RuntimeException ) { @@ -2007,7 +1984,7 @@ uno::Any aRet; if ( aCommand.Name.equalsAsciiL( -@@ -1000,6 +1000,11 @@ +@@ -899,6 +1086,11 @@ void SAL_CALL Content::addProperty( cons if ( !Name.getLength() ) throw lang::IllegalArgumentException(); @@ -2019,7 +1996,7 @@ // Check property type. if ( !UCBDeadPropertyValue::supportsType( DefaultValue.getValueType() ) ) { -@@ -1100,6 +1100,11 @@ +@@ -1048,6 +1240,11 @@ void SAL_CALL Content::removeProperty( c // Try to remove property from server. ////////////////////////////////////////////////////////////////////// @@ -2031,7 +2008,7 @@ try { std::vector< ProppatchValue > aProppatchValues; -@@ -1349,6 +1535,31 @@ uno::Reference< sdbc::XRow > Content::ge +@@ -1361,6 +1558,31 @@ uno::Reference< sdbc::XRow > Content::ge uno::Reference< ucb::XContentIdentifier > xIdentifier; rtl::Reference< ::ucbhelper::ContentProviderImplHelper > xProvider; @@ -2063,12 +2040,12 @@ { osl::Guard< osl::Mutex > aGuard( m_aMutex ); -@@ -1475,8 +1686,13 @@ uno::Reference< sdbc::XRow > Content::ge - - if ( !bNetworkAccessAllowed ) - { -- cancelCommandExecution( e, xEnv ); -- // unreachable +@@ -1487,8 +1709,13 @@ uno::Reference< sdbc::XRow > Content::ge + + if ( !bNetworkAccessAllowed ) + { +- cancelCommandExecution( e, xEnv ); +- // unreachable + if ( e.getStatus() == SC_NOT_FOUND ) + xProps.reset(); + else @@ -2076,10 +2053,10 @@ + cancelCommandExecution( e, xEnv ); + // unreachable + } - } - } - } -@@ -2000,6 +2000,10 @@ + } + } + } +@@ -2063,6 +2290,10 @@ uno::Any Content::open( { uno::Any aRet; @@ -2090,7 +2067,7 @@ sal_Bool bOpenFolder = ( ( rArg.Mode == ucb::OpenMode::ALL ) || ( rArg.Mode == ucb::OpenMode::FOLDERS ) || ( rArg.Mode == ucb::OpenMode::DOCUMENTS ) ); -@@ -2092,13 +2308,16 @@ uno::Any Content::open( +@@ -2104,13 +2335,16 @@ uno::Any Content::open( } } @@ -2102,8 +2079,8 @@ + + // Open document. -- if ( ( rArg.Mode == ucb::OpenMode::DOCUMENT_SHARE_DENY_NONE ) || -- ( rArg.Mode == ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) ) +- if ( ( rArg.Mode == ucb::OpenMode::DOCUMENT_SHARE_DENY_NONE ) || +- ( rArg.Mode == ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) ) + if ( rArg.Mode == ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) { +#if OSL_DEBUG_LEVEL > 0 @@ -2112,7 +2089,7 @@ // Currently(?) unsupported. ucbhelper::cancelCommandExecution( uno::makeAny( -@@ -2115,6 +2332,9 @@ uno::Any Content::open( +@@ -2127,6 +2361,9 @@ uno::Any Content::open( = uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY ); if ( xOut.is() ) { @@ -2122,7 +2099,7 @@ // PUSH: write data try { -@@ -2159,6 +2379,60 @@ uno::Any Content::open( +@@ -2171,6 +2408,60 @@ uno::Any Content::open( uno::UNO_QUERY ); if ( xDataSink.is() ) { @@ -2183,7 +2160,7 @@ // PULL: wait for client read try { -@@ -2174,9 +2448,31 @@ uno::Any Content::open( +@@ -2186,9 +2477,31 @@ uno::Any Content::open( DAVResource aResource; std::vector< rtl::OUString > aHeaders; @@ -2210,14 +2187,14 @@ + + uno::Reference< io::XStream > xStream + = xResAccess->GET( aHeaders, aResource, xEnv, sal_True ); - m_bDidGetOrHead = true; + m_bDidGetOrHead = true; + + // pass the URL to the stream + static_cast< NeonInputStream* >( xStream.get() )->SetURL( m_xResAccess->getURL() ); - + { osl::MutexGuard aGuard( m_aMutex ); -@@ -2191,16 +2487,24 @@ uno::Any Content::open( +@@ -2203,16 +2516,24 @@ uno::Any Content::open( new DAVResourceAccess( *xResAccess.get() ) ); } @@ -2243,7 +2220,7 @@ // Note: aOpenCommand.Sink may contain an XStream // implementation. Support for this type of // sink is optional... -@@ -2228,9 +2532,16 @@ void Content::post( +@@ -2237,9 +2558,16 @@ void Content::post( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( uno::Exception ) { @@ -2260,7 +2237,7 @@ try { std::auto_ptr< DAVResourceAccess > xResAccess; -@@ -2262,6 +2569,9 @@ void Content::post( +@@ -2274,6 +2602,9 @@ void Content::post( uno::Reference< io::XOutputStream > xResult( rArg.Sink, uno::UNO_QUERY ); if ( xResult.is() ) { @@ -2270,7 +2247,7 @@ try { std::auto_ptr< DAVResourceAccess > xResAccess; -@@ -2291,6 +2601,9 @@ void Content::post( +@@ -2303,6 +2634,9 @@ void Content::post( } else { @@ -2280,7 +2257,7 @@ ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( -@@ -2600,6 +2600,10 @@ +@@ -2377,6 +2711,10 @@ void Content::insert( rtl::OUString aEscapedTitle; std::auto_ptr< DAVResourceAccess > xResAccess; @@ -2291,7 +2268,7 @@ { osl::Guard< osl::Mutex > aGuard( m_aMutex ); -@@ -2643,11 +2956,23 @@ void Content::transfer( +@@ -2655,11 +2993,23 @@ void Content::transfer( rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); } else if ( aScheme.equalsAsciiL( @@ -2315,7 +2292,7 @@ else { if ( !aScheme.equalsAsciiL( -@@ -2674,6 +2999,18 @@ void Content::transfer( +@@ -2686,6 +3036,18 @@ void Content::transfer( RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) targetURI.SetScheme( rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); @@ -2331,11 +2308,11 @@ + RTL_CONSTASCII_STRINGPARAM( PLAIN_WEBDAVS_URL_SCHEME ) ) ) + targetURI.SetScheme( + rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) ); - + // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. ---- ucb/source/ucp/webdav/webdavcontent.hxx -+++ ucb/source/ucp/webdav/webdavcontent.hxx +--- ucb/source/ucp/webdav/webdavcontent.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/webdavcontent.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -33,10 +33,13 @@ #include <memory> @@ -2351,13 +2328,13 @@ #include "PropertyMap.hxx" @@ -91,6 +94,9 @@ class Content : public ::ucbhelper::Cont - bool m_bTransient; - bool m_bCollection; - bool m_bDidGetOrHead; + bool m_bTransient; + bool m_bCollection; + bool m_bDidGetOrHead; + bool m_bForceReadOnly; + com::sun::star::ucb::Lock *m_pLock; + uno::Reference< ucb::XCommandEnvironment > m_xLockEnv; - std::vector< rtl::OUString > m_aFailedPropNames; + std::vector< rtl::OUString > m_aFailedPropNames; private: @@ -184,6 +190,17 @@ private: @@ -2376,12 +2353,12 @@ + static oslSignalAction HandleLockingSignal( void* pData, oslSignalInfo* pInfo ); + public: - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, ---- ucb/source/ucp/webdav/webdavcontentcaps.cxx -+++ ucb/source/ucp/webdav/webdavcontentcaps.cxx + Content( const ::com::sun::star::uno::Reference< + ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr, +--- ucb/source/ucp/webdav/webdavcontentcaps.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/webdavcontentcaps.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -263,6 +263,24 @@ bool ContentProvider::getProperty( - -1, + -1, getCppuType( static_cast< const rtl::OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); + @@ -2402,11 +2379,11 @@ + getCppuBooleanType(), + beans::PropertyAttribute::BOUND + | beans::PropertyAttribute::READONLY ) ); - } - } + } + } ---- ucb/source/ucp/webdav/webdavprovider.cxx -+++ ucb/source/ucp/webdav/webdavprovider.cxx +--- ucb/source/ucp/webdav/webdavprovider.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/webdavprovider.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -36,6 +36,9 @@ ************************************************************************** @@ -2436,6 +2413,15 @@ bool bNewId = false; - if ( aScheme.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ) +- { +- aURL = aURL.replaceAt( 0, +- WEBDAV_URL_SCHEME_LENGTH, +- rtl::OUString::createFromAscii( +- HTTP_URL_SCHEME ) ); +- bNewId = true; +- } +- else if ( aScheme.equalsAsciiL( +- RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) + struct { + const char *from; + const char *to; @@ -2450,15 +2436,6 @@ + for ( pScheme = pReplace; pScheme->from ; ++pScheme ) { - aURL = aURL.replaceAt( 0, -- WEBDAV_URL_SCHEME_LENGTH, -- rtl::OUString::createFromAscii( -- HTTP_URL_SCHEME ) ); -- bNewId = true; -- } -- else if ( aScheme.equalsAsciiL( -- RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ) -- { -- aURL = aURL.replaceAt( 0, - DAV_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( - HTTP_URL_SCHEME ) ); @@ -2483,7 +2460,7 @@ } sal_Int32 nPos = aURL.lastIndexOf( '/' ); -@@ -208,6 +208,12 @@ +@@ -206,6 +208,12 @@ ContentProvider::queryContent( else xCanonicId = Identifier; @@ -2493,20 +2470,20 @@ + rtl::OUStringToOString( xCanonicId->getContentIdentifier(), RTL_TEXTENCODING_UTF8 ).getStr() ); +#endif + - osl::MutexGuard aGuard( m_aMutex ); + osl::MutexGuard aGuard( m_aMutex ); - // Check, if a content with given id already exists... -@@ -232,4 +234,3 @@ ContentProvider::queryContent( + // Check, if a content with given id already exists... +@@ -232,4 +240,3 @@ ContentProvider::queryContent( - return xContent; + return xContent; } - ---- ucb/source/ucp/webdav/webdavprovider.hxx -+++ ucb/source/ucp/webdav/webdavprovider.hxx +--- ucb/source/ucp/webdav/webdavprovider.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ ucb/source/ucp/webdav/webdavprovider.hxx 2010-03-03 16:59:07.000000000 +0100 @@ -52,13 +52,10 @@ namespace webdav_ucp { // contents ) according to this scheme. #define WEBDAV_URL_SCHEME \ - "vnd.sun.star.webdav" + "vnd.sun.star.webdav" -#define WEBDAV_URL_SCHEME_LENGTH 19 #define HTTP_URL_SCHEME "http" @@ -2528,21 +2505,21 @@ +#define PLAIN_WEBDAVS_URL_SCHEME "webdavs" + #define HTTP_CONTENT_TYPE \ - "application/" HTTP_URL_SCHEME "-content" + "application/" HTTP_URL_SCHEME "-content" ---- unotools/source/ucbhelper/ucblockbytes.cxx -+++ unotools/source/ucbhelper/ucblockbytes.cxx +--- unotools/source/ucbhelper/ucblockbytes.cxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ unotools/source/ucbhelper/ucblockbytes.cxx 2010-03-03 16:59:07.000000000 +0100 @@ -964,6 +964,10 @@ static sal_Bool UCBOpenContentSync( if( ! aScheme.equalsIgnoreAsciiCaseAscii("http") && - ! aScheme.equalsIgnoreAsciiCaseAscii("https") && + ! aScheme.equalsIgnoreAsciiCaseAscii("https") && ! aScheme.equalsIgnoreAsciiCaseAscii("vnd.sun.star.webdav") && + ! aScheme.equalsIgnoreAsciiCaseAscii("dav") && + ! aScheme.equalsIgnoreAsciiCaseAscii("davs") && + ! aScheme.equalsIgnoreAsciiCaseAscii("webdav") && + ! aScheme.equalsIgnoreAsciiCaseAscii("webdavs") && ! aScheme.equalsIgnoreAsciiCaseAscii("ftp")) - return _UCBOpenContentSync( - xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); + return _UCBOpenContentSync( + xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); @@ -1541,7 +1545,13 @@ ErrCode UcbLockBytes::Flush() const Reference <XOutputStream > xOutputStream = getOutputStream_Impl(); if ( !xOutputStream.is() ) diff --git a/patches/dev300/wiki-publisher-no-license.diff b/patches/dev300/wiki-publisher-no-license.diff index 2983925dd..5772e00bb 100644 --- a/patches/dev300/wiki-publisher-no-license.diff +++ b/patches/dev300/wiki-publisher-no-license.diff @@ -41,19 +41,19 @@ - </simple-license> - </registration> <dependencies> - <OpenOffice.org-minimal-version value="2.4" d:name="OpenOffice.org 2.4 or StarOffice 8 Update 10"/> + <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/> </dependencies> --- swext/mediawiki/build.xml.old 2009-04-02 10:56:46.000000000 +0000 +++ swext/mediawiki/build.xml 2009-04-06 16:42:24.000000000 +0000 -@@ -146,7 +146,6 @@ - <file file="${commons-logging-jar}"/> +@@ -152,7 +152,6 @@ + <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/> <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> - <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/> <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/> </zip> </target> -@@ -164,7 +163,6 @@ +@@ -173,7 +172,6 @@ <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/> diff --git a/patches/dev300/wmf-mm-text.diff b/patches/dev300/wmf-mm-text.diff index 69532fcb1..697b66e94 100644 --- a/patches/dev300/wmf-mm-text.diff +++ b/patches/dev300/wmf-mm-text.diff @@ -1,11 +1,9 @@ -diff --git svtools/source/filter.vcl/wmf/winmtf.cxx svtools/source/filter.vcl/wmf/winmtf.cxx -index d3e2c92..d634a4e 100644 ---- svtools/source/filter.vcl/wmf/winmtf.cxx -+++ svtools/source/filter.vcl/wmf/winmtf.cxx -@@ -415,6 +415,14 @@ Point WinMtfOutput::ImplMap( const Point& rPt ) - { - switch( mnMapMode ) - { +--- svtools/source/filter.vcl/wmf/winmtf.cxx.old 2010-03-03 16:59:57.000000000 +0100 ++++ svtools/source/filter.vcl/wmf/winmtf.cxx 2010-03-03 17:00:09.000000000 +0100 +@@ -419,6 +419,14 @@ Point WinMtfOutput::ImplMap( const Point + { + switch( mnMapMode ) + { + case MM_TEXT: + fX2 -= mnWinOrgX; + fY2 -= mnWinOrgY; @@ -14,41 +12,42 @@ index d3e2c92..d634a4e 100644 + fX2 += mnDevOrgX; + fY2 += mnDevOrgY; + break; - case MM_LOENGLISH : - { - fX2 -= mnWinOrgX; -@@ -490,6 +498,10 @@ Size WinMtfOutput::ImplMap( const Size& rSz ) - { - switch( mnMapMode ) - { + case MM_LOENGLISH : + { + fX2 -= mnWinOrgX; +@@ -494,6 +502,10 @@ Size WinMtfOutput::ImplMap( const Size& + { + switch( mnMapMode ) + { + case MM_TEXT: + fWidth *= 2540.0/mnUnitsPerInch; + fHeight*= 2540.0/mnUnitsPerInch; + break; - case MM_LOENGLISH : - { - fWidth *= 25.40; -@@ -926,6 +938,7 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : - mbFillStyleSelected ( sal_False ), - mnGfxMode ( GM_COMPATIBLE ), + case MM_LOENGLISH : + { + fWidth *= 25.40; +@@ -930,6 +942,7 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& + mbFillStyleSelected ( sal_False ), + mnGfxMode ( GM_COMPATIBLE ), mnMapMode ( MM_TEXT ), + mnUnitsPerInch ( 96 ), - mnDevOrgX ( 0 ), - mnDevOrgY ( 0 ), - mnDevWidth ( 1 ), -@@ -1660,7 +1673,7 @@ void WinMtfOutput::ImplDrawBitmap( const Point& rPos, const Size& rSize, const B - if ( aBmpEx.IsTransparent() ) - mpGDIMetaFile->AddAction( new MetaBmpExScaleAction( rPos, rSize, aBmpEx ) ); - else -- mpGDIMetaFile->AddAction( new MetaBmpScaleAction( rPos, rSize, aBmpEx.GetBitmap() ) ); + mnDevOrgX ( 0 ), + mnDevOrgY ( 0 ), + mnDevWidth ( 1 ), +@@ -1693,7 +1706,7 @@ void WinMtfOutput::ImplDrawBitmap( const + if ( aBmpEx.IsTransparent() ) + mpGDIMetaFile->AddAction( new MetaBmpExScaleAction( rPos, rSize, aBmpEx ) ); + else +- mpGDIMetaFile->AddAction( new MetaBmpScaleAction( rPos, rSize, aBmpEx.GetBitmap() ) ); + mpGDIMetaFile->AddAction( new MetaBmpScaleAction( rPos, rSize, aBmpEx.GetBitmap() ) ); } //----------------------------------------------------------------------------------- -@@ -2023,6 +2036,14 @@ void WinMtfOutput::SetMapMode( sal_uInt32 nMapMode ) +@@ -2055,6 +2068,14 @@ void WinMtfOutput::SetMapMode( sal_uInt3 + } //----------------------------------------------------------------------------------- - ++ +void WinMtfOutput::SetUnitsPerInch( UINT16 nUnitsPerInch ) +{ + if( nUnitsPerInch != 0 ) @@ -56,40 +55,35 @@ index d3e2c92..d634a4e 100644 +} + +//----------------------------------------------------------------------------------- -+ + void WinMtfOutput::SetWorldTransform( const XForm& rXForm ) { - maXForm.eM11 = rXForm.eM11; -diff --git svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/winmtf.hxx -index f9ade1b..58189c0 100644 ---- svtools/source/filter.vcl/wmf/winmtf.hxx -+++ svtools/source/filter.vcl/wmf/winmtf.hxx -@@ -574,6 +574,8 @@ class WinMtfOutput +--- svtools/source/filter.vcl/wmf/winmtf.hxx.old 2010-03-03 17:00:09.000000000 +0100 ++++ svtools/source/filter.vcl/wmf/winmtf.hxx 2010-03-03 17:00:09.000000000 +0100 +@@ -590,6 +590,8 @@ class WinMtfOutput - sal_uInt32 mnGfxMode; + sal_uInt32 mnGfxMode; sal_uInt32 mnMapMode; + UINT16 mnUnitsPerInch; + - XForm maXForm; - sal_Int32 mnDevOrgX, mnDevOrgY; - sal_Int32 mnDevWidth, mnDevHeight; -@@ -620,6 +622,7 @@ class WinMtfOutput + XForm maXForm; + sal_Int32 mnDevOrgX, mnDevOrgY; + sal_Int32 mnDevWidth, mnDevHeight; +@@ -636,6 +638,7 @@ class WinMtfOutput - sal_uInt32 GetMapMode() const { return mnMapMode; }; + sal_uInt32 GetMapMode() const { return mnMapMode; }; void SetMapMode( sal_uInt32 mnMapMode ); + void SetUnitsPerInch( UINT16 nUnitsPerInch ); - void SetWorldTransform( const XForm& rXForm ); - void ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ); + void SetWorldTransform( const XForm& rXForm ); + void ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ); -diff --git svtools/source/filter.vcl/wmf/winwmf.cxx svtools/source/filter.vcl/wmf/winwmf.cxx -index 6901de7..19d7c61 100644 ---- svtools/source/filter.vcl/wmf/winwmf.cxx -+++ svtools/source/filter.vcl/wmf/winwmf.cxx -@@ -977,6 +977,7 @@ BOOL WMFReader::ReadHeader() - pWMF->Seek( nStrmPos ); - } +--- svtools/source/filter.vcl/wmf/winwmf.cxx.old 2010-03-03 17:00:09.000000000 +0100 ++++ svtools/source/filter.vcl/wmf/winwmf.cxx 2010-03-03 17:00:09.000000000 +0100 +@@ -990,6 +990,7 @@ BOOL WMFReader::ReadHeader(WMF_APMFILEHE + } + } + pOut->SetUnitsPerInch( nUnitsPerInch ); pOut->SetWinOrg( aPlaceableBound.TopLeft() ); aWMFSize = Size( labs( aPlaceableBound.GetWidth() ), labs( aPlaceableBound.GetHeight() ) ); - pOut->SetWinExt( aWMFSize ); + pOut->SetWinExt( aWMFSize ); diff --git a/patches/dev300/wpsimport-writerperfect.diff b/patches/dev300/wpsimport-writerperfect.diff index cb9d6261f..3fa243a06 100644 --- a/patches/dev300/wpsimport-writerperfect.diff +++ b/patches/dev300/wpsimport-writerperfect.diff @@ -12,11 +12,13 @@ +wp writerperfect\util nmake - all wp_util wp_wpsimp wp_wpdimp wp_filter wp_stream NULL --- writerperfect/prj/d.lst.old 2009-04-02 10:49:34.000000000 +0000 +++ writerperfect/prj/d.lst 2009-04-06 16:41:41.000000000 +0000 -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ -..\%__SRC%\lib\libwpft*.so %_DEST%\lib%_EXT% -..\%__SRC%\bin\wpft*.dll %_DEST%\lib%_EXT% +-..\%__SRC%\bin\wpft*.dll %_DEST%\bin%_EXT% +..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\bin\*.dll %_DEST%\lib%_EXT% ++..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\%__SRC%\bin\wpftgo.dll %_DEST%\bin%_EXT%\wpftgo.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib --- writerperfect/source/filter/DocumentCollector.cxx.old 2009-04-02 10:49:34.000000000 +0000 diff --git a/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff b/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff index 085c1d2b9..dbf30dcf5 100644 --- a/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff +++ b/patches/dev300/xlsx-filter-as-a-separate-lib-guards.diff @@ -1,7 +1,5 @@ -diff --git sc/source/filter/inc/XclExpChangeTrack.hxx sc/source/filter/inc/XclExpChangeTrack.hxx -index a9ece3d..0d9407b 100644 ---- sc/source/filter/inc/XclExpChangeTrack.hxx -+++ sc/source/filter/inc/XclExpChangeTrack.hxx +--- sc/source/filter/inc/XclExpChangeTrack.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/inc/XclExpChangeTrack.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XCLEXPCHANGETRACK_HXX #define SC_XCLEXPCHANGETRACK_HXX @@ -13,10 +11,8 @@ index a9ece3d..0d9407b 100644 #include <tools/debug.hxx> #include <tools/datetime.hxx> #include <rtl/uuid.h> -diff --git sc/source/filter/inc/excdoc.hxx sc/source/filter/inc/excdoc.hxx -index 3330335..6d6858e 100644 ---- sc/source/filter/inc/excdoc.hxx -+++ sc/source/filter/inc/excdoc.hxx +--- sc/source/filter/inc/excdoc.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/excdoc.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_EXCDOC_HXX #define SC_EXCDOC_HXX @@ -28,10 +24,8 @@ index 3330335..6d6858e 100644 #include <tools/solar.h> #include "excrecds.hxx" #include "xeroot.hxx" -diff --git sc/source/filter/inc/excrecds.hxx sc/source/filter/inc/excrecds.hxx -index ba8a573..c05dd6b 100644 ---- sc/source/filter/inc/excrecds.hxx -+++ sc/source/filter/inc/excrecds.hxx +--- sc/source/filter/inc/excrecds.hxx.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/source/filter/inc/excrecds.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_EXCRECDS_HXX #define SC_EXCRECDS_HXX @@ -43,10 +37,8 @@ index ba8a573..c05dd6b 100644 #include <tools/solar.h> #include <svtools/zforlist.hxx> #include <tools/string.hxx> -diff --git sc/source/filter/inc/exp_op.hxx sc/source/filter/inc/exp_op.hxx -index 0e05e00..0a306d3 100644 ---- sc/source/filter/inc/exp_op.hxx -+++ sc/source/filter/inc/exp_op.hxx +--- sc/source/filter/inc/exp_op.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/exp_op.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_EXP_OP_HXX #define SC_EXP_OP_HXX @@ -58,10 +50,8 @@ index 0e05e00..0a306d3 100644 #include "filter.hxx" #include "root.hxx" #include "xeroot.hxx" -diff --git sc/source/filter/inc/xcl97esc.hxx sc/source/filter/inc/xcl97esc.hxx -index 67a6e3f..e9c6f5c 100644 ---- sc/source/filter/inc/xcl97esc.hxx -+++ sc/source/filter/inc/xcl97esc.hxx +--- sc/source/filter/inc/xcl97esc.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/inc/xcl97esc.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XCL97ESC_HXX #define SC_XCL97ESC_HXX @@ -73,10 +63,8 @@ index 67a6e3f..e9c6f5c 100644 #include <svx/escherex.hxx> #include <tools/table.hxx> #include <tools/stack.hxx> -diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx -index 30b6e8a..54032e0 100644 ---- sc/source/filter/inc/xcl97rec.hxx -+++ sc/source/filter/inc/xcl97rec.hxx +--- sc/source/filter/inc/xcl97rec.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/inc/xcl97rec.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XCL97REC_HXX #define SC_XCL97REC_HXX @@ -88,10 +76,8 @@ index 30b6e8a..54032e0 100644 #include "excrecds.hxx" #include "xcl97esc.hxx" #include "xlstyle.hxx" -diff --git sc/source/filter/inc/xechart.hxx sc/source/filter/inc/xechart.hxx -index b5964ea..fbda089 100644 ---- sc/source/filter/inc/xechart.hxx -+++ sc/source/filter/inc/xechart.hxx +--- sc/source/filter/inc/xechart.hxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/filter/inc/xechart.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XECHART_HXX #define SC_XECHART_HXX @@ -103,10 +89,8 @@ index b5964ea..fbda089 100644 #include "xerecord.hxx" #include "xlchart.hxx" #include "xlformula.hxx" -diff --git sc/source/filter/inc/xecontent.hxx sc/source/filter/inc/xecontent.hxx -index aeb6c13..85e6543 100644 ---- sc/source/filter/inc/xecontent.hxx -+++ sc/source/filter/inc/xecontent.hxx +--- sc/source/filter/inc/xecontent.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/inc/xecontent.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XECONTENT_HXX #define SC_XECONTENT_HXX @@ -118,10 +102,8 @@ index aeb6c13..85e6543 100644 #include "rangelst.hxx" #include "xlcontent.hxx" #include "xladdress.hxx" -diff --git sc/source/filter/inc/xeescher.hxx sc/source/filter/inc/xeescher.hxx -index 8b3f9a6..0a4e29f 100644 ---- sc/source/filter/inc/xeescher.hxx -+++ sc/source/filter/inc/xeescher.hxx +--- sc/source/filter/inc/xeescher.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/inc/xeescher.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XEESCHER_HXX #define SC_XEESCHER_HXX @@ -133,10 +115,8 @@ index 8b3f9a6..0a4e29f 100644 #include <vcl/graph.hxx> #include "xcl97rec.hxx" #include "xlescher.hxx" -diff --git sc/source/filter/inc/xelink.hxx sc/source/filter/inc/xelink.hxx -index 7da521f..737bc72 100644 ---- sc/source/filter/inc/xelink.hxx -+++ sc/source/filter/inc/xelink.hxx +--- sc/source/filter/inc/xelink.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/inc/xelink.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XELINK_HXX #define SC_XELINK_HXX @@ -148,10 +128,8 @@ index 7da521f..737bc72 100644 #include "markdata.hxx" #include "xllink.hxx" #include "xerecord.hxx" -diff --git sc/source/filter/inc/xename.hxx sc/source/filter/inc/xename.hxx -index 1c6f5e3..d847d1d 100644 ---- sc/source/filter/inc/xename.hxx -+++ sc/source/filter/inc/xename.hxx +--- sc/source/filter/inc/xename.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/inc/xename.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XENAME_HXX #define SC_XENAME_HXX @@ -163,10 +141,8 @@ index 1c6f5e3..d847d1d 100644 #include "xerecord.hxx" #include "xlname.hxx" #include "xlformula.hxx" -diff --git sc/source/filter/inc/xepage.hxx sc/source/filter/inc/xepage.hxx -index 3e119d3..5e9f88d 100644 ---- sc/source/filter/inc/xepage.hxx -+++ sc/source/filter/inc/xepage.hxx +--- sc/source/filter/inc/xepage.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/xepage.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XEPAGE_HXX #define SC_XEPAGE_HXX @@ -178,10 +154,8 @@ index 3e119d3..5e9f88d 100644 #include "xerecord.hxx" #include "xlpage.hxx" #include "xeroot.hxx" -diff --git sc/source/filter/inc/xepivot.hxx sc/source/filter/inc/xepivot.hxx -index de9d284..c5ff185 100644 ---- sc/source/filter/inc/xepivot.hxx -+++ sc/source/filter/inc/xepivot.hxx +--- sc/source/filter/inc/xepivot.hxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/filter/inc/xepivot.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XEPIVOT_HXX #define SC_XEPIVOT_HXX @@ -193,10 +167,8 @@ index de9d284..c5ff185 100644 #include <map> #include "xerecord.hxx" #include "xlpivot.hxx" -diff --git sc/source/filter/inc/xerecord.hxx sc/source/filter/inc/xerecord.hxx -index 8abd4d0..c592e8d 100644 ---- sc/source/filter/inc/xerecord.hxx -+++ sc/source/filter/inc/xerecord.hxx +--- sc/source/filter/inc/xerecord.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/inc/xerecord.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XERECORD_HXX #define SC_XERECORD_HXX @@ -208,10 +180,8 @@ index 8abd4d0..c592e8d 100644 #include "xlconst.hxx" #include "xestream.hxx" -diff --git sc/source/filter/inc/xestream.hxx sc/source/filter/inc/xestream.hxx -index 49bdf1d..d191b05 100644 ---- sc/source/filter/inc/xestream.hxx -+++ sc/source/filter/inc/xestream.hxx +--- sc/source/filter/inc/xestream.hxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/filter/inc/xestream.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -33,6 +33,10 @@ #ifndef SC_XESTREAM_HXX #define SC_XESTREAM_HXX @@ -223,10 +193,8 @@ index 49bdf1d..d191b05 100644 #include <map> #include <stack> #include <string> -diff --git sc/source/filter/inc/xestyle.hxx sc/source/filter/inc/xestyle.hxx -index 9508c8b..b5db56c 100644 ---- sc/source/filter/inc/xestyle.hxx -+++ sc/source/filter/inc/xestyle.hxx +--- sc/source/filter/inc/xestyle.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/filter/inc/xestyle.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XESTYLE_HXX #define SC_XESTYLE_HXX @@ -238,10 +206,8 @@ index 9508c8b..b5db56c 100644 #include <map> #include <tools/mempool.hxx> #include <tools/string.hxx> -diff --git sc/source/filter/inc/xetable.hxx sc/source/filter/inc/xetable.hxx -index 2beb423..09e900c 100644 ---- sc/source/filter/inc/xetable.hxx -+++ sc/source/filter/inc/xetable.hxx +--- sc/source/filter/inc/xetable.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/inc/xetable.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XETABLE_HXX #define SC_XETABLE_HXX @@ -253,10 +219,8 @@ index 2beb423..09e900c 100644 #include "xltable.hxx" #include <deque> -diff --git sc/source/filter/inc/xeview.hxx sc/source/filter/inc/xeview.hxx -index 5c54ecd..c2ce621 100644 ---- sc/source/filter/inc/xeview.hxx -+++ sc/source/filter/inc/xeview.hxx +--- sc/source/filter/inc/xeview.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/filter/inc/xeview.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XEVIEW_HXX #define SC_XEVIEW_HXX @@ -268,10 +232,8 @@ index 5c54ecd..c2ce621 100644 #include "xerecord.hxx" #include "xlview.hxx" #include "xeroot.hxx" -diff --git sc/source/filter/xlsx/makefile.mk sc/source/filter/xlsx/makefile.mk -index 656ecf3..fdaa385 100644 ---- sc/source/filter/xlsx/makefile.mk -+++ sc/source/filter/xlsx/makefile.mk +--- sc/source/filter/xlsx/makefile.mk.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/makefile.mk 2010-03-03 17:00:06.000000000 +0100 @@ -48,6 +48,8 @@ PROJECTPCHSOURCE=..\pch\filt_pch # --- Files -------------------------------------------------------- @@ -279,12 +241,10 @@ index 656ecf3..fdaa385 100644 +CDEFS+=-DXLSX_GUARD + SLOFILES = \ - $(SLO)$/xlsx-colrowst.obj \ $(SLO)$/xlsx-excdoc.obj \ -diff --git sc/source/filter/inc/imp_op.hxx sc/source/filter/inc/imp_op.hxx -index ea286bc..3572a82 100644 ---- sc/source/filter/inc/imp_op.hxx -+++ sc/source/filter/inc/imp_op.hxx + $(SLO)$/xlsx-excrecds.obj \ +--- sc/source/filter/inc/imp_op.hxx.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/source/filter/inc/imp_op.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_IMP_OP_HXX #define SC_IMP_OP_HXX @@ -296,10 +256,8 @@ index ea286bc..3572a82 100644 #include <tools/gen.hxx> #include "xiroot.hxx" #include "xistream.hxx" -diff --git sc/source/filter/inc/xehelper.hxx sc/source/filter/inc/xehelper.hxx -index b9ed319..c9b751d 100644 ---- sc/source/filter/inc/xehelper.hxx -+++ sc/source/filter/inc/xehelper.hxx +--- sc/source/filter/inc/xehelper.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/xehelper.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XEHELPER_HXX #define SC_XEHELPER_HXX @@ -311,10 +269,8 @@ index b9ed319..c9b751d 100644 #include "xladdress.hxx" #include "xeroot.hxx" #include "xestring.hxx" -diff --git sc/source/filter/inc/xeroot.hxx sc/source/filter/inc/xeroot.hxx -index f4e1d25..c318278 100644 ---- sc/source/filter/inc/xeroot.hxx -+++ sc/source/filter/inc/xeroot.hxx +--- sc/source/filter/inc/xeroot.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/inc/xeroot.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XEROOT_HXX #define SC_XEROOT_HXX @@ -326,10 +282,8 @@ index f4e1d25..c318278 100644 #include "xlroot.hxx" // Forward declarations of objects in public use ============================== -diff --git sc/source/filter/inc/xistyle.hxx sc/source/filter/inc/xistyle.hxx -index baebad3..e04a79b 100644 ---- sc/source/filter/inc/xistyle.hxx -+++ sc/source/filter/inc/xistyle.hxx +--- sc/source/filter/inc/xistyle.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/inc/xistyle.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XISTYLE_HXX #define SC_XISTYLE_HXX @@ -341,10 +295,8 @@ index baebad3..e04a79b 100644 #include <list> #include <tools/mempool.hxx> #include "rangelst.hxx" -diff --git sc/source/filter/inc/xladdress.hxx sc/source/filter/inc/xladdress.hxx -index c4aff69..e521a86 100644 ---- sc/source/filter/inc/xladdress.hxx -+++ sc/source/filter/inc/xladdress.hxx +--- sc/source/filter/inc/xladdress.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/xladdress.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XLADDRESS_HXX #define SC_XLADDRESS_HXX @@ -356,10 +308,8 @@ index c4aff69..e521a86 100644 #include <vector> #include "address.hxx" -diff --git sc/source/filter/inc/xlescher.hxx sc/source/filter/inc/xlescher.hxx -index d6c9b7c..28efd8a 100644 ---- sc/source/filter/inc/xlescher.hxx -+++ sc/source/filter/inc/xlescher.hxx +--- sc/source/filter/inc/xlescher.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/inc/xlescher.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XLESCHER_HXX #define SC_XLESCHER_HXX @@ -371,10 +321,8 @@ index d6c9b7c..28efd8a 100644 #include <vcl/mapunit.hxx> #include "fapihelper.hxx" #include "xladdress.hxx" -diff --git sc/source/filter/inc/xlpivot.hxx sc/source/filter/inc/xlpivot.hxx -index 8b5bd4e..4d1f1b9 100644 ---- sc/source/filter/inc/xlpivot.hxx -+++ sc/source/filter/inc/xlpivot.hxx +--- sc/source/filter/inc/xlpivot.hxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/filter/inc/xlpivot.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XLPIVOT_HXX #define SC_XLPIVOT_HXX @@ -386,10 +334,8 @@ index 8b5bd4e..4d1f1b9 100644 #include <com/sun/star/sheet/GeneralFunction.hpp> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp> -diff --git sc/source/filter/inc/xlview.hxx sc/source/filter/inc/xlview.hxx -index 3070c28..1386899 100644 ---- sc/source/filter/inc/xlview.hxx -+++ sc/source/filter/inc/xlview.hxx +--- sc/source/filter/inc/xlview.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/filter/inc/xlview.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,10 @@ #ifndef SC_XLVIEW_HXX #define SC_XLVIEW_HXX diff --git a/patches/dev300/xlsx-shared-import-and-export.diff b/patches/dev300/xlsx-shared-import-and-export.diff index fdd0ad1db..507956001 100644 --- a/patches/dev300/xlsx-shared-import-and-export.diff +++ b/patches/dev300/xlsx-shared-import-and-export.diff @@ -1,28 +1,16 @@ -# For the purpose of the 3.1 release, instead of sharing the binary and ooxml -# export, we introduce a separate sc/source/filter/xlsx that creates libxlsx - -# a filter for the XLSX files. After the release, the changes will be -# reverted so that the binary and ooxml are shared again. -# The changes include: -# sc/source/filter/excel/* -> sc/source/filter/xlsx/xlsx-* -# sc/source/filter/inc/*.hxx -> sc/source/filter/xlsx/*.hxx -# scp2 introduction of libxlsx -diff --git oox/inc/oox/xls/excelfilter.hxx oox/inc/oox/xls/excelfilter.hxx -index 4ed3418..f1e2d65 100644 ---- oox/inc/oox/xls/excelfilter.hxx -+++ oox/inc/oox/xls/excelfilter.hxx -@@ -76,6 +76,8 @@ public: - virtual ::oox::vml::Drawing* getVmlDrawing(); +--- oox/inc/oox/xls/excelfilter.hxx.old 2009-10-08 16:17:32.000000000 +0200 ++++ oox/inc/oox/xls/excelfilter.hxx 2010-03-03 17:00:06.000000000 +0100 +@@ -75,6 +75,8 @@ public: virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles(); virtual ::oox::drawingml::chart::ChartConverter& getChartConverter(); -+ -+ virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException ); ++ virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException ); ++ private: virtual ::rtl::OUString implGetImplementationName() const; -diff --git oox/source/xls/excelfilter.cxx oox/source/xls/excelfilter.cxx -index cb02ba3..fcf3d3f 100644 ---- oox/source/xls/excelfilter.cxx -+++ oox/source/xls/excelfilter.cxx + }; +--- oox/source/xls/excelfilter.cxx.old 2009-10-08 16:17:33.000000000 +0200 ++++ oox/source/xls/excelfilter.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -43,7 +43,9 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -33,7 +21,7 @@ index cb02ba3..fcf3d3f 100644 using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::xml::sax::XFastDocumentHandler; using ::oox::core::BinaryFilterBase; -@@ -143,6 +145,32 @@ const TableStyleListPtr ExcelFilter::getTableStyles() +@@ -172,6 +174,32 @@ const TableStyleListPtr ExcelFilter::get return getWorkbookHelper().getChartConverter(); } @@ -66,11 +54,9 @@ index cb02ba3..fcf3d3f 100644 OUString ExcelFilter::implGetImplementationName() const { return ExcelFilter_getImplementationName(); -diff --git sc/inc/filter.hxx sc/inc/filter.hxx -index bc72301..275f787 100644 ---- sc/inc/filter.hxx -+++ sc/inc/filter.hxx -@@ -72,7 +72,7 @@ enum EXCIMPFORMAT { EIF_AUTO, EIF_BIFF5, EIF_BIFF8, EIF_BIFF_LE4 }; +--- sc/inc/filter.hxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/inc/filter.hxx 2010-03-03 17:00:06.000000000 +0100 +@@ -72,7 +72,7 @@ enum EXCIMPFORMAT { EIF_AUTO, EIF_BIFF5, // fuer Export enum ExportFormatLotus { ExpWK1, ExpWK3, ExpWK4 }; @@ -79,12 +65,10 @@ index bc72301..275f787 100644 // Optionen fuer DIF-Im-/Export (Kombination ueber '|') -diff --git sc/source/filter/excel/excdoc.cxx sc/source/filter/excel/excdoc.cxx -index ff03be7..0e213f6 100644 ---- sc/source/filter/xlsx/xlsx-excdoc.cxx -+++ sc/source/filter/xlsx/xlsx-excdoc.cxx -@@ -769,19 +769,17 @@ void ExcDocument::Write( SvStream& rSvStrm ) - pExpChangeTrack->Write(); +--- sc/source/filter/xlsx/xlsx-excdoc.cxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-excdoc.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -795,19 +795,17 @@ void ExcDocument::Write( SvStream& rSvSt + pExpChangeTrack->Write(); } -void ExcDocument::WriteXml( SvStream& rStrm ) @@ -106,7 +90,7 @@ index ff03be7..0e213f6 100644 rWorkbook->startElement( XML_workbook, XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", FSNS(XML_xmlns, XML_r), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", -@@ -800,7 +798,7 @@ void ExcDocument::WriteXml( SvStream& rStrm ) +@@ -826,7 +824,7 @@ void ExcDocument::WriteXml( SvStream& rS GetOldRoot().pEscher->GetStrm().Seek(0); // ready for take off @@ -115,7 +99,7 @@ index ff03be7..0e213f6 100644 for( size_t nTab = 0, nTabCount = maTableList.GetSize(); nTab < nTabCount; ++nTab ) { -@@ -811,16 +809,16 @@ void ExcDocument::WriteXml( SvStream& rStrm ) +@@ -837,16 +835,16 @@ void ExcDocument::WriteXml( SvStream& rS xBoundsheet->SetStreamPos( aXclStrm.GetSvStreamPos() ); #endif // write the table @@ -135,13 +119,11 @@ index ff03be7..0e213f6 100644 + rStrm.commitStorage(); } -diff --git sc/source/filter/excel/expop2.cxx sc/source/filter/excel/expop2.cxx -index bed1d2c..b4763c4 100644 ---- sc/source/filter/xlsx/xlsx-expop2.cxx -+++ sc/source/filter/xlsx/xlsx-expop2.cxx +--- sc/source/filter/xlsx/xlsx-expop2.cxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-expop2.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -153,63 +153,3 @@ ExportBiff8::~ExportBiff8() - delete pExcRoot->pEscher; - pExcRoot->pEscher = NULL; + delete pExcRoot->pEscher; + pExcRoot->pEscher = NULL; } - - @@ -203,10 +185,8 @@ index bed1d2c..b4763c4 100644 -} - - -diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx -index 33cd93b..a147e13 100644 ---- sc/source/filter/xlsx/xlsx-xestream.cxx -+++ sc/source/filter/xlsx/xlsx-xestream.cxx +--- sc/source/filter/xlsx/xlsx-xestream.cxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xestream.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -49,6 +49,11 @@ #include "rangelst.hxx" #include "compiler.hxx" @@ -219,8 +199,8 @@ index 33cd93b..a147e13 100644 #include <oox/core/tokens.hxx> #include <formula/grammar.hxx> #include <oox/export/drawingml.hxx> -@@ -58,14 +63,20 @@ - using ::std::vector; +@@ -56,14 +61,20 @@ + #define DEBUG_XL_ENCRYPTION 0 using ::com::sun::star::beans::PropertyValue; +using ::com::sun::star::embed::XStorage; @@ -240,17 +220,14 @@ index 33cd93b..a147e13 100644 using ::oox::drawingml::DrawingML; using ::rtl::OString; using ::rtl::OUString; -@@ -968,29 +979,10 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper +@@ -982,29 +993,10 @@ sax_fastparser::FSHelperPtr XclXmlUtils: // ============================================================================ -XclExpXmlStream::XclExpXmlStream( const Reference< XMultiServiceFactory >& rSMgr, SvStream& rStrm, const XclExpRoot& rRoot ) - : XmlFilterBase( rSMgr ) - , mrRoot( rRoot ) -+XclExpXmlStream::XclExpXmlStream( const Reference< XMultiServiceFactory >& rSMgr ) -+ : XmlFilterBase( rSMgr ), -+ mpRoot( NULL ) - { +-{ - Sequence< PropertyValue > aArgs( 1 ); - const OUString sStream( RTL_CONSTASCII_USTRINGPARAM( "StreamForOutput" ) ); - aArgs[0].Name = sStream; @@ -270,11 +247,15 @@ index 33cd93b..a147e13 100644 - - DrawingML::ResetCounters(); - XclObjList::ResetCounters(); ++XclExpXmlStream::XclExpXmlStream( const Reference< XMultiServiceFactory >& rSMgr ) ++ : XmlFilterBase( rSMgr ), ++ mpRoot( NULL ) ++{ } XclExpXmlStream::~XclExpXmlStream() -@@ -1108,14 +1100,59 @@ oox::drawingml::chart::ChartConverter& XclExpXmlStream::getChartConverter() - return * (oox::drawingml::chart::ChartConverter*) NULL; +@@ -1116,14 +1108,59 @@ oox::drawingml::chart::ChartConverter* X + return NULL; } -bool XclExpXmlStream::exportDocument() throw() @@ -337,7 +318,7 @@ index 33cd93b..a147e13 100644 } void XclExpXmlStream::Trace( const char* format, ...) -@@ -1126,3 +1163,98 @@ void XclExpXmlStream::Trace( const char* format, ...) +@@ -1134,3 +1171,98 @@ void XclExpXmlStream::Trace( const char* va_end( ap ); } @@ -436,23 +417,19 @@ index 33cd93b..a147e13 100644 +#ifdef __cplusplus +} +#endif -diff --git sc/source/filter/inc/excdoc.hxx sc/source/filter/inc/excdoc.hxx -index dd73a3e..26edc01 100644 ---- sc/source/filter/xlsx/excdoc.hxx -+++ sc/source/filter/xlsx/excdoc.hxx +--- sc/source/filter/xlsx/excdoc.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/excdoc.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -113,7 +113,7 @@ public: - void ReadDoc( void ); - void Write( SvStream& rSvStrm ); -- void WriteXml( SvStream& rSvStrm ); + void ReadDoc( void ); + void Write( SvStream& rSvStrm ); +- void WriteXml( SvStream& rSvStrm ); + void WriteXml( XclExpXmlStream& ); }; -diff --git sc/source/filter/inc/exp_op.hxx sc/source/filter/inc/exp_op.hxx -index f696cc3..b0197c1 100644 ---- sc/source/filter/xlsx/exp_op.hxx -+++ sc/source/filter/xlsx/exp_op.hxx +--- sc/source/filter/xlsx/exp_op.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/exp_op.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -130,21 +130,6 @@ public: }; @@ -475,11 +452,9 @@ index f696cc3..b0197c1 100644 #endif -diff --git sc/source/filter/inc/xestream.hxx sc/source/filter/inc/xestream.hxx -index 172f054..fc986fb 100644 ---- sc/source/filter/xlsx/xestream.hxx -+++ sc/source/filter/xlsx/xestream.hxx -@@ -269,6 +269,7 @@ private: +--- sc/source/filter/xlsx/xestream.hxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ sc/source/filter/xlsx/xestream.hxx 2010-03-03 17:00:06.000000000 +0100 +@@ -268,6 +268,7 @@ private: (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : NULL) class ScAddress; @@ -487,7 +462,7 @@ index 172f054..fc986fb 100644 class ScDocument; class ScFormulaCell; class ScRange; -@@ -317,11 +318,11 @@ public: +@@ -316,11 +317,11 @@ public: class XclExpXmlStream : public oox::core::XmlFilterBase { public: @@ -501,14 +476,14 @@ index 172f054..fc986fb 100644 sax_fastparser::FSHelperPtr& GetCurrentStream(); void PushStream( sax_fastparser::FSHelperPtr aStream ); -@@ -354,12 +355,13 @@ public: +@@ -352,12 +353,13 @@ public: void Trace( const char* format, ...); private: virtual ::rtl::OUString implGetImplementationName() const; + ScDocShell *getDocShell(); - typedef std::map< ::rtl::OUString, - std::pair< ::rtl::OUString, + typedef std::map< ::rtl::OUString, + std::pair< ::rtl::OUString, sax_fastparser::FSHelperPtr > > XclExpXmlPathToStateMap; - const XclExpRoot& mrRoot; /// Filter root data. @@ -516,11 +491,9 @@ index 172f054..fc986fb 100644 std::stack< sax_fastparser::FSHelperPtr > maStreams; XclExpXmlPathToStateMap maOpenedStreamMap; }; -diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx -index 9ed459f..04825b9 100644 ---- sc/source/ui/docshell/docsh.cxx -+++ sc/source/ui/docshell/docsh.cxx -@@ -166,7 +166,6 @@ static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95"; +--- sc/source/ui/docshell/docsh.cxx.old 2010-03-03 17:00:06.000000000 +0100 ++++ sc/source/ui/docshell/docsh.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -169,7 +169,6 @@ static const sal_Char __FAR_DATA pFilter static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97"; static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; @@ -528,17 +501,17 @@ index 9ed459f..04825b9 100644 static const sal_Char __FAR_DATA pFilterDBase[] = "dBase"; static const sal_Char __FAR_DATA pFilterDif[] = "DIF"; static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK"; -@@ -1954,8 +1953,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) - } - else if (aFltName.EqualsAscii(pFilterExcel5) || aFltName.EqualsAscii(pFilterExcel95) || - aFltName.EqualsAscii(pFilterExcel97) || aFltName.EqualsAscii(pFilterEx5Temp) || -- aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp) || -- aFltName.EqualsAscii(pFilterEx07Xml)) +@@ -2014,8 +2013,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( Sfx + } + else if (aFltName.EqualsAscii(pFilterExcel5) || aFltName.EqualsAscii(pFilterExcel95) || + aFltName.EqualsAscii(pFilterExcel97) || aFltName.EqualsAscii(pFilterEx5Temp) || +- aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp) || +- aFltName.EqualsAscii(pFilterEx07Xml)) + aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp)) - { - WaitObject aWait( GetActiveDialogParent() ); + { + WaitObject aWait( GetActiveDialogParent() ); -@@ -2008,8 +2006,6 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed ) +@@ -2057,8 +2055,6 @@ BOOL __EXPORT ScDocShell::ConvertTo( Sfx ExportFormatExcel eFormat = ExpBiff5; if( aFltName.EqualsAscii( pFilterExcel97 ) || aFltName.EqualsAscii( pFilterEx97Temp ) ) eFormat = ExpBiff8; @@ -547,46 +520,19 @@ index 9ed459f..04825b9 100644 FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 ); if( eError && !GetError() ) -# disabled for the temporary libxlsx diff --git sc/util/scfilt.map sc/util/scfilt.map -# disabled for the temporary libxlsx index 589736f..dc24c02 100644 -# disabled for the temporary libxlsx --- sc/util/scfilt.map -# disabled for the temporary libxlsx +++ sc/util/scfilt.map -# disabled for the temporary libxlsx @@ -1,6 +1,9 @@ -# disabled for the temporary libxlsx SCFILT_1_0 { -# disabled for the temporary libxlsx global: -# disabled for the temporary libxlsx ScFilterCreate; -# disabled for the temporary libxlsx + component_getImplementationEnvironment; -# disabled for the temporary libxlsx + component_writeInfo; -# disabled for the temporary libxlsx + component_getFactory; -# disabled for the temporary libxlsx local: -# disabled for the temporary libxlsx *; -# disabled for the temporary libxlsx }; -# disabled for the temporary libxlsx diff --git scp2/source/calc/file_calc.scp scp2/source/calc/file_calc.scp -# disabled for the temporary libxlsx index e49770f..4674990 100644 -# disabled for the temporary libxlsx --- scp2/source/calc/file_calc.scp -# disabled for the temporary libxlsx +++ scp2/source/calc/file_calc.scp -# disabled for the temporary libxlsx @@ -49,7 +49,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc) -# disabled for the temporary libxlsx -# disabled for the temporary libxlsx STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui) -# disabled for the temporary libxlsx -# disabled for the temporary libxlsx -STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) -# disabled for the temporary libxlsx +STD_UNO_LIB_FILE( gid_File_Lib_Scfilt, scfilt) -# disabled for the temporary libxlsx -# disabled for the temporary libxlsx STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd) -# disabled for the temporary libxlsx ---- scp2/source/calc/file_calc.scp -+++ scp2/source/calc/file_calc.scp -@@ -49,6 +49,8 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc) - STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui) +--- scp2/source/calc/file_calc.scp.old 2009-10-08 16:17:46.000000000 +0200 ++++ scp2/source/calc/file_calc.scp 2010-03-03 17:00:06.000000000 +0100 +@@ -57,6 +57,8 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Scui, s STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) -+ -+STD_UNO_LIB_FILE( gid_File_Lib_Xlsx, xlsx) ++STD_UNO_LIB_FILE( gid_File_Lib_Xlsx, xlsx) ++ STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd) ---- scp2/source/calc/module_calc.scp 2009-01-06 14:16:56.000000000 +0100 -+++ scp2/source/calc/module_calc.scp 2009-04-30 09:36:28.000000000 +0200 + STD_LIB_FILE( gid_File_Lib_Tfu, tfu) +--- scp2/source/calc/module_calc.scp.old 2009-10-08 16:17:46.000000000 +0200 ++++ scp2/source/calc/module_calc.scp 2010-03-03 17:00:06.000000000 +0100 @@ -45,7 +45,7 @@ Module gid_Module_Prg_Calc_Bin Minimal = YES; Default = YES; @@ -596,13 +542,3 @@ index 9ed459f..04825b9 100644 gid_File_Lib_Solver,gid_File_Lib_Lpsolve, gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs, gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu, ---- sc/source/filter/xlsx/xlsx-xepivot.cxx -+++ sc/source/filter/xlsx/xlsx-xepivot.cxx -@ -30,6 +30,7 @ - - // MARKER(update_precomp.py): autogen include statement, do not remove - #include "precompiled_sc.hxx" -+#include "xestream.hxx" - #include "xepivot.hxx" - #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp> - #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp> diff --git a/patches/dev300/xlsx-snapshot.diff b/patches/dev300/xlsx-snapshot.diff index fee9be57e..4f6ada869 100644 --- a/patches/dev300/xlsx-snapshot.diff +++ b/patches/dev300/xlsx-snapshot.diff @@ -1,38 +1,25 @@ -# For the purpose of the 3.1 release, instead of sharing the binary and ooxml -# export, we introduce a separate sc/source/filter/xlsx that creates libxlsx - -# a filter for the XLSX files. After the release, the changes will be -# reverted so that the binary and ooxml are shared again. -# The changes include: -# sc/source/filter/excel/* -> sc/source/filter/xlsx/xlsx-* -# sc/source/filter/xlsx/ooxml-export-TODO.txt patching disabled -diff --git filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu -index 3af06f5..07373eb 100644 ---- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu -+++ filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu +--- filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu.old 2009-10-07 15:06:36.000000000 +0200 ++++ filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu 2010-03-03 17:00:06.000000000 +0100 @@ -1,5 +1,5 @@ <node oor:name="Calc MS Excel 2007 XML" oor:op="replace"> -- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> +- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop> - <prop oor:name="UserData"/> -diff --git filter/source/config/fragments/types/MS_Excel_2007_XML.xcu filter/source/config/fragments/types/MS_Excel_2007_XML.xcu -index 9eba615..195bfc1 100644 ---- filter/source/config/fragments/types/MS_Excel_2007_XML.xcu -+++ filter/source/config/fragments/types/MS_Excel_2007_XML.xcu + <prop oor:name="UIComponent"/> + <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop> + <prop oor:name="UserData"/> +--- filter/source/config/fragments/types/MS_Excel_2007_XML.xcu.old 2009-10-07 15:06:36.000000000 +0200 ++++ filter/source/config/fragments/types/MS_Excel_2007_XML.xcu 2010-03-03 17:00:06.000000000 +0100 @@ -1,7 +1,7 @@ <node oor:name="MS Excel 2007 XML" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop> - <prop oor:name="URLPattern"/> -- <prop oor:name="Extensions"><value>xlsm xlsx</value></prop> + <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop> + <prop oor:name="URLPattern"/> +- <prop oor:name="Extensions"><value>xlsm xlsx</value></prop> + <prop oor:name="Extensions"><value>xlsx xlsm</value></prop> - <prop oor:name="MediaType"/> - <prop oor:name="Preferred"><value>false</value></prop> - <prop oor:name="PreferredFilter"><value>Calc MS Excel 2007 XML</value></prop> -diff --git formula/inc/formula/tokenarray.hxx formula/inc/formula/tokenarray.hxx -index 46192f9..809ef80 100644 ---- formula/inc/formula/tokenarray.hxx -+++ formula/inc/formula/tokenarray.hxx + <prop oor:name="MediaType"/> + <prop oor:name="Preferred"><value>false</value></prop> + <prop oor:name="PreferredFilter"><value>Calc MS Excel 2007 XML</value></prop> +--- formula/inc/formula/tokenarray.hxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ formula/inc/formula/tokenarray.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -31,6 +31,7 @@ #ifndef FORMULA_TOKENARRAY_HXX #define FORMULA_TOKENARRAY_HXX @@ -41,10 +28,8 @@ index 46192f9..809ef80 100644 #include "formula/token.hxx" #include "formula/ExternalReferenceHelper.hxx" #include <tools/solar.h> -diff --git offapi/com/sun/star/sheet/FormulaLanguage.idl offapi/com/sun/star/sheet/FormulaLanguage.idl -index 07a9582..b7c4980 100644 ---- offapi/com/sun/star/sheet/FormulaLanguage.idl -+++ offapi/com/sun/star/sheet/FormulaLanguage.idl +--- offapi/com/sun/star/sheet/FormulaLanguage.idl.old 2010-03-03 16:59:13.000000000 +0100 ++++ offapi/com/sun/star/sheet/FormulaLanguage.idl 2010-03-03 17:00:06.000000000 +0100 @@ -64,7 +64,8 @@ constants FormulaLanguage const long NATIVE = 3; @@ -55,10 +40,8 @@ index 07a9582..b7c4980 100644 */ const long XL_ENGLISH = 4; }; -diff --git sc/source/filter/excel/excdoc.cxx sc/source/filter/excel/excdoc.cxx -index 8c81942..ff03be7 100644 ---- sc/source/filter/xlsx/xlsx-excdoc.cxx -+++ sc/source/filter/xlsx/xlsx-excdoc.cxx +--- sc/source/filter/xlsx/xlsx-excdoc.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-excdoc.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -87,6 +87,8 @@ #include <math.h> @@ -68,7 +51,7 @@ index 8c81942..ff03be7 100644 #include <oox/core/tokens.hxx> using ::rtl::OString; -@@ -122,27 +124,22 @@ static void lcl_AddCalcPr( XclExpRecordList<>& aRecList, ExcTable& self ) +@@ -122,27 +124,22 @@ static void lcl_AddCalcPr( XclExpRecordL aRecList.AppendNewRecord( new XclExpXmlEndSingleElementRecord() ); // XML_calcPr } @@ -97,9 +80,9 @@ index 8c81942..ff03be7 100644 } -#endif - static void lcl_AddScenariosAndFilters( XclExpRecordList<>& aRecList, ExcTable& self, SCTAB mnScTab ) + static void lcl_AddScenariosAndFilters( XclExpRecordList<>& aRecList, const XclExpRoot& rRoot, SCTAB nScTab ) { -@@ -250,30 +247,25 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) +@@ -277,30 +274,25 @@ void ExcTable::FillAsHeader( ExcBoundshe } // document protection options @@ -142,7 +125,7 @@ index 8c81942..ff03be7 100644 if ( GetBiff() == EXC_BIFF8 ) { -@@ -358,7 +350,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) +@@ -384,7 +376,7 @@ void ExcTable::FillAsHeader( ExcBoundshe if( GetOutput() != EXC_OUTPUT_BINARY ) { @@ -151,7 +134,7 @@ index 8c81942..ff03be7 100644 lcl_AddBookviews( aRecList, *this ); } -@@ -417,7 +409,7 @@ void ExcTable::FillAsTable( size_t nCodeNameIdx ) +@@ -443,7 +435,7 @@ void ExcTable::FillAsTable( size_t nCode if ( eBiff == EXC_BIFF8 ) // list holding OBJ records and creating MSODRAWING per-sheet data @@ -160,7 +143,7 @@ index 8c81942..ff03be7 100644 // cell table: DEFROWHEIGHT, DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records mxCellTable.reset( new XclExpCellTable( GetRoot() ) ); -@@ -571,8 +563,6 @@ void ExcTable::FillAsXmlTable( size_t nCodeNameIdx ) +@@ -597,8 +589,6 @@ void ExcTable::FillAsXmlTable( size_t nC //! close Escher group shape and ESCHER_DgContainer //! opened by XclObjList ctor MSODRAWING rR.pObjRecs->EndSheet(); @@ -169,7 +152,7 @@ index 8c81942..ff03be7 100644 // pivot tables aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) ); -@@ -623,6 +613,9 @@ void ExcTable::FillAsXmlTable( size_t nCodeNameIdx ) +@@ -649,6 +639,9 @@ void ExcTable::FillAsXmlTable( size_t nC } } @@ -179,7 +162,7 @@ index 8c81942..ff03be7 100644 // EOF Add( new ExcEof ); } -@@ -778,27 +771,35 @@ void ExcDocument::Write( SvStream& rSvStrm ) +@@ -804,27 +797,35 @@ void ExcDocument::Write( SvStream& rSvSt void ExcDocument::WriteXml( SvStream& rStrm ) { @@ -219,8 +202,8 @@ index 8c81942..ff03be7 100644 - XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", - FSNS(XML_xmlns, XML_r), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", - FSEND ); -- rWorkbook->singleElement( XML_fileVersion, -- XML_appName, "Calc", +- rWorkbook->singleElement( XML_fileVersion, +- XML_appName, "Calc", - // OOXTODO: XML_codeName - // OOXTODO: XML_lastEdited - // OOXTODO: XML_lowestEdited @@ -230,7 +213,7 @@ index 8c81942..ff03be7 100644 aHeader.WriteXml( aStrm ); for( size_t nTab = 0, nTabCount = maTableList.GetSize(); nTab < nTabCount; ++nTab ) -@@ -812,14 +813,14 @@ void ExcDocument::WriteXml( SvStream& rStrm ) +@@ -838,14 +839,14 @@ void ExcDocument::WriteXml( SvStream& rS // write the table maTableList.GetRecord( nTab )->WriteXml( aStrm ); } @@ -252,11 +235,9 @@ index 8c81942..ff03be7 100644 + aStrm.commitStorage(); } -diff --git sc/source/filter/excel/excrecds.cxx sc/source/filter/excel/excrecds.cxx -index 6d7dd44..6bf8e9e 100644 ---- sc/source/filter/xlsx/xlsx-excrecds.cxx -+++ sc/source/filter/xlsx/xlsx-excrecds.cxx -@@ -162,6 +162,10 @@ void ExcRecord::WriteBody( XclExpStream& rStrm ) +--- sc/source/filter/xlsx/xlsx-excrecds.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-excrecds.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -156,6 +156,10 @@ void ExcRecord::WriteBody( XclExpStream& SaveCont( rStrm ); } @@ -267,10 +248,8 @@ index 6d7dd44..6bf8e9e 100644 //--------------------------------------------------------- class ExcEmptyRec - -diff --git sc/source/filter/excel/expop2.cxx sc/source/filter/excel/expop2.cxx -index 80423f1..bed1d2c 100644 ---- sc/source/filter/xlsx/xlsx-expop2.cxx -+++ sc/source/filter/xlsx/xlsx-expop2.cxx +--- sc/source/filter/xlsx/xlsx-expop2.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-expop2.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -204,20 +204,6 @@ FltError ExportXml2007::Write() pExcDoc->ReadDoc(); // ScDoc -> ExcDoc pExcDoc->WriteXml( aOut ); // wechstreamen @@ -292,115 +271,8 @@ index 80423f1..bed1d2c 100644 //! TODO: separate warnings for columns and sheets const XclExpAddressConverter& rAddrConv = GetAddressConverter(); if( rAddrConv.IsColTruncated() || rAddrConv.IsRowTruncated() || rAddrConv.IsTabTruncated() ) -# disabled for the temporary libxlsx diff --git sc/source/filter/excel/ooxml-export-TODO.txt sc/source/filter/excel/ooxml-export-TODO.txt -# disabled for the temporary libxlsx index 5b04efb..a90feb4 100644 -# disabled for the temporary libxlsx --- sc/source/filter/xlsx/ooxml-export-TODO.txt -# disabled for the temporary libxlsx +++ sc/source/filter/xlsx/ooxml-export-TODO.txt -# disabled for the temporary libxlsx @@ -67,7 +67,6 @@ Elements: -# disabled for the temporary libxlsx - oleObjects (§3.3.1.58) [ ??? ] -# disabled for the temporary libxlsx - outlinePr (§3.3.1.59) [ ??? ] -# disabled for the temporary libxlsx - pageSetup (§3.3.1.62) [ ???; for charts; see chartsheet? ] -# disabled for the temporary libxlsx - - picture (§3.3.1.65) [ BkHim E9h; see XclExpBitmap ] -# disabled for the temporary libxlsx - pivotArea (§3.3.1.66) [ ??? ] -# disabled for the temporary libxlsx - pivotSelection (§3.3.1.67) [ ??? ] -# disabled for the temporary libxlsx - protectedRange (§3.3.1.69) [ ??? ] -# disabled for the temporary libxlsx @@ -127,12 +126,12 @@ Elements: -# disabled for the temporary libxlsx - Comments (§3.7): -# disabled for the temporary libxlsx - Note: Excel *requires* that there be a drawing object associated -# disabled for the temporary libxlsx with the comment before it will show it. If you _just_ generate the -# disabled for the temporary libxlsx - <comments/> XML part and create a <Relationship/> for it, Excell -# disabled for the temporary libxlsx + <comments/> XML part and create a <Relationship/> for it, Excel -# disabled for the temporary libxlsx will NOT display the comment. -# disabled for the temporary libxlsx - - As drawing is not currently implemented, comments support is -# disabled for the temporary libxlsx - incomplete. -# disabled for the temporary libxlsx - - TODO: text formatting. Currently we only write unformatted text -# disabled for the temporary libxlsx - into comments?.xml, as I'm not sure how formatted text is handled. -# disabled for the temporary libxlsx + - Furthermore, the drawing object MUST be VML, not DrawingML. -# disabled for the temporary libxlsx + - We currently generate a subset of VML to permit Excel to load -# disabled for the temporary libxlsx + comments, but drawing object formatting is lost (e.g. borders, -# disabled for the temporary libxlsx + border style, background color, etc). -# disabled for the temporary libxlsx - Styles (§3.8): -# disabled for the temporary libxlsx - dxf (§3.8.14): [ DXF 88Dh; unsupported ] -# disabled for the temporary libxlsx - dxfs (§3.8.15): [ DXF 88Dh ] -# disabled for the temporary libxlsx @@ -141,8 +140,71 @@ Elements: -# disabled for the temporary libxlsx - mruColors (§3.8.28): [ ??? ] -# disabled for the temporary libxlsx - scheme (§3.8.36): [ ??? ] -# disabled for the temporary libxlsx - stop (§3.8.38): [ ??? ] -# disabled for the temporary libxlsx - - tableStyle (§3.8.40): [ TableStyle 88Fh; unsupported ] -# disabled for the temporary libxlsx - - tableStyleElement (§3.8.41): [ TableStyleElement 890h; unsupported ] -# disabled for the temporary libxlsx - - tableStyles (§3.8.42): [ TableStyles 88Eh; unsupported ] -# disabled for the temporary libxlsx + - tableStyle (§3.8.40): [ ??? ] -# disabled for the temporary libxlsx + - tableStyleElement (§3.8.41): [ ??? ] -# disabled for the temporary libxlsx + - tableStyles (§3.8.42): [ ??? ] -# disabled for the temporary libxlsx - vertical (§3.8.44): [ DXF 88Dh fNewBorder, xfprops ] -# disabled for the temporary libxlsx + - Metadata (§3.9): [ not imported; unsupported ] -# disabled for the temporary libxlsx + - bk (§3.9.1): [ ??? ] -# disabled for the temporary libxlsx + - bk (§3.9.2): [ ??? ] -# disabled for the temporary libxlsx + - cellMetadata (§3.9.3): [ ??? ] -# disabled for the temporary libxlsx + - futureMetadata (§3.9.4): [ ??? ] -# disabled for the temporary libxlsx + - k (§3.9.5): [ ??? ] -# disabled for the temporary libxlsx + - mdx (§3.9.6): [ ??? ] -# disabled for the temporary libxlsx + - mdxMetadata (§3.9.7): [ ??? ] -# disabled for the temporary libxlsx + - metadata (§3.9.8): [ ??? ] -# disabled for the temporary libxlsx + - metadataStrings (§3.9.9): [ ??? ] -# disabled for the temporary libxlsx + - metadataType (§3.9.10): [ ??? ] -# disabled for the temporary libxlsx + - metadataTypes (§3.9.11): [ ??? ] -# disabled for the temporary libxlsx + - ms (§3.9.12): [ ??? ] -# disabled for the temporary libxlsx + - n (§3.9.13): [ ??? ] -# disabled for the temporary libxlsx + - p (§3.9.14): [ ??? ] -# disabled for the temporary libxlsx + - rc (§3.9.15): [ ??? ] -# disabled for the temporary libxlsx + - t (§3.9.16): [ ??? ] -# disabled for the temporary libxlsx + - valueMetadata (§3.9.17): [ ??? ] -# disabled for the temporary libxlsx + - Pivot Tables (§3.10): -# disabled for the temporary libxlsx + - * -# disabled for the temporary libxlsx + - Shared Workbook Data (§3.11): -# disabled for the temporary libxlsx + - ndxf (§3.11.1.4) [ ??? ] -# disabled for the temporary libxlsx + - odxf (§3.11.1.6) [ ??? ] -# disabled for the temporary libxlsx + - oldFormula (§3.11.1.7) [ ??? ] -# disabled for the temporary libxlsx + - raf (§3.11.1.8) [ RRAutoFmt 14Bh ] -# disabled for the temporary libxlsx + - rcft (§3.11.1.10) [ RRDConflict 152h ] -# disabled for the temporary libxlsx + - rcmt (§3.11.11) [ Note 1Ch ] -# disabled for the temporary libxlsx + - rcv (§3.11.12) [ RRDUserView 1ACh ] -# disabled for the temporary libxlsx + - rdn (§3.11.13) [ RRDDefName 153h ] -# disabled for the temporary libxlsx + - reviewed (§3.11.1.14) [ ??? ] -# disabled for the temporary libxlsx + - reviewedList (§3.11.1.15) [ ??? ] -# disabled for the temporary libxlsx + - rfmt (§3.11.17) [ RRFormat 14Ah: partial via XclExpChTr0x014A ] -# disabled for the temporary libxlsx + - rqt (§3.11.20) [ RRDTQSIF 808h ] -# disabled for the temporary libxlsx + - rsnm (§3.11.22) [ RRDRenSheet 13Eh ] -# disabled for the temporary libxlsx + - undo (§3.11.25) [ ??? ] -# disabled for the temporary libxlsx + - QueryTable Data (§3.12): -# disabled for the temporary libxlsx + - * -# disabled for the temporary libxlsx + - External Data Connections (§3.13): -# disabled for the temporary libxlsx + - * -# disabled for the temporary libxlsx + - Supplementary Workbook Data (§3.14): -# disabled for the temporary libxlsx + - * -# disabled for the temporary libxlsx + - Volatile Dependencies (§3.15): -# disabled for the temporary libxlsx + - * -# disabled for the temporary libxlsx + - Custom XML Mappings (§3.16): -# disabled for the temporary libxlsx + - * -# disabled for the temporary libxlsx + - DrawingML - SpreadsheetML Drawing (§5.6) -# disabled for the temporary libxlsx + - absoluteAnchor (§5.6.2.1) [ Not sure when it should be used; -# disabled for the temporary libxlsx + Most drawings seem to use twoCellAnchor ] -# disabled for the temporary libxlsx + - cNvCxnSpPr (§5.6.2.4) [ ??? ] -# disabled for the temporary libxlsx + - cNvGraphicFramePr (§5.6.2.5) [ ??? ] -# disabled for the temporary libxlsx + - cNvGrpSpPr (§5.6.2.6) [ ??? ] -# disabled for the temporary libxlsx + - cxnSp (§5.6.2.12) [ ??? ] -# disabled for the temporary libxlsx + - ext (§5.6.2.13) [ child of absoluteAnchor, oneCellAnchor ] -# disabled for the temporary libxlsx + - graphicFrame (§5.6.2.15) [ ??? ] -# disabled for the temporary libxlsx + - grpSp (§5.6.2.16) [ ??? ] -# disabled for the temporary libxlsx + - grpSpPr (§5.6.2.17) [ ??? ] -# disabled for the temporary libxlsx + - nvCxnSpPr (§5.6.2.18) [ ??? ] -# disabled for the temporary libxlsx + - nvCxnSpPr (§5.6.2.18) [ ??? ] -# disabled for the temporary libxlsx + - nvGraphicFramePr (§5.6.2.19) [ ??? ] -# disabled for the temporary libxlsx + - nvGrpSpPr (§5.6.2.20) [ ??? ] -# disabled for the temporary libxlsx + - oneCellAnchor (§5.6.2.23) [ Not sure when it should be used; -# disabled for the temporary libxlsx + Most drawings seem to use twoCellAnchor ] -# disabled for the temporary libxlsx + - style (§5.6.2.30) [ ??? ] -# disabled for the temporary libxlsx -diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx -index 46dadab..d3d10ff 100644 ---- sc/source/filter/xlsx/xlsx-xeescher.cxx -+++ sc/source/filter/xlsx/xlsx-xeescher.cxx +--- sc/source/filter/xlsx/xlsx-xeescher.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xeescher.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -71,6 +71,7 @@ #include "svx/unoapi.hxx" @@ -409,7 +281,7 @@ index 46dadab..d3d10ff 100644 using ::rtl::OString; using ::rtl::OUString; -@@ -91,6 +92,7 @@ using ::com::sun::star::form::binding::XListEntrySource; +@@ -91,6 +92,7 @@ using ::com::sun::star::form::binding::X using ::com::sun::star::script::ScriptEventDescriptor; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; @@ -417,7 +289,7 @@ index 46dadab..d3d10ff 100644 // ============================================================================ -@@ -142,6 +144,17 @@ void XclExpImgData::Save( XclExpStream& rStrm ) +@@ -142,6 +144,17 @@ void XclExpImgData::Save( XclExpStream& } } @@ -435,16 +307,16 @@ index 46dadab..d3d10ff 100644 // ============================================================================ XclExpControlHelper::XclExpControlHelper( const XclExpRoot& rRoot ) : -@@ -850,7 +863,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, +@@ -855,7 +868,7 @@ XclExpNote::XclExpNote( const XclExpRoot if( pScNote ) - if( SdrCaptionObj* pCaption = pScNote->GetCaption() ) + if( SdrCaptionObj* pCaption = pScNote->GetOrCreateCaption( maScPos ) ) if( const OutlinerParaObject* pOPO = pCaption->GetOutlinerParaObject() ) - mnObjId = rRoot.GetOldRoot().pObjRecs->Add( new XclObjComment( rRoot, pCaption->GetLogicRect(), pOPO->GetTextObject(), pCaption, mbVisible ) ); + mnObjId = rRoot.GetOldRoot().pObjRecs->Add( new XclObjComment( rRoot, pCaption->GetLogicRect(), pOPO->GetTextObject(), pCaption, mbVisible, maScPos ) ); SetRecSize( 9 + maAuthor.GetSize() ); } -@@ -935,9 +948,14 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ) +@@ -940,9 +953,14 @@ void XclExpNote::WriteXml( sal_Int32 nAu FSEND ); rComments->startElement( XML_text, FSEND ); // OOXTODO: phoneticPr, rPh, r @@ -459,7 +331,7 @@ index 46dadab..d3d10ff 100644 rComments->endElement( XML_text ); rComments->endElement( XML_comment ); } -@@ -985,7 +1003,7 @@ XclMacroHelper::SetMacroLink( const String& rMacroName ) +@@ -990,7 +1008,7 @@ XclMacroHelper::SetMacroLink( const Stri } XclExpShapeObj::XclExpShapeObj( const XclExpRoot& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ) : @@ -468,7 +340,7 @@ index 46dadab..d3d10ff 100644 XclMacroHelper( rRoot ) { if( SdrObject* pSdrObj = ::GetSdrObjectFromXShape( xShape ) ) -@@ -1017,7 +1035,7 @@ struct OUStringLess : public std::binary_function<OUString, OUString, bool> +@@ -1022,7 +1040,7 @@ struct OUStringLess : public std::binary { bool operator()(const OUString& x, const OUString& y) const { @@ -477,11 +349,9 @@ index 46dadab..d3d10ff 100644 } }; -diff --git sc/source/filter/excel/xename.cxx sc/source/filter/excel/xename.cxx -index b4de112..9bd6ac4 100644 ---- sc/source/filter/xlsx/xlsx-xename.cxx -+++ sc/source/filter/xlsx/xlsx-xename.cxx -@@ -565,7 +565,7 @@ sal_uInt16 XclExpNameManagerImpl::CreateName( const ScRangeData& rRangeData ) +--- sc/source/filter/xlsx/xlsx-xename.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xename.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -565,7 +565,7 @@ sal_uInt16 XclExpNameManagerImpl::Create xName->SetTokenArray( xTokArr ); String sSymbol; @@ -490,11 +360,9 @@ index b4de112..9bd6ac4 100644 xName->SetSymbol( sSymbol ); /* Try to replace by existing built-in name - complete token array is -diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx -index 0d43d06..0058266 100644 ---- sc/source/filter/xlsx/xlsx-xepivot.cxx -+++ sc/source/filter/xlsx/xlsx-xepivot.cxx -@@ -1322,6 +1322,147 @@ void XclExpPivotTable::Save( XclExpStream& rStrm ) +--- sc/source/filter/xlsx/xlsx-xepivot.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xepivot.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -1353,6 +1353,147 @@ void XclExpPivotTable::Save( XclExpStrea } } @@ -642,10 +510,8 @@ index 0d43d06..0058266 100644 // private -------------------------------------------------------------------- XclExpPTField* XclExpPivotTable::GetFieldAcc( const String& rName ) -diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx -index a279b9d..33cd93b 100644 ---- sc/source/filter/xlsx/xlsx-xestream.cxx -+++ sc/source/filter/xlsx/xlsx-xestream.cxx +--- sc/source/filter/xlsx/xlsx-xestream.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xestream.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -45,11 +45,13 @@ #include "xlstring.hxx" #include "xeroot.hxx" @@ -660,7 +526,7 @@ index a279b9d..33cd93b 100644 #define DEBUG_XL_ENCRYPTION 0 -@@ -64,6 +66,7 @@ using ::com::sun::star::lang::XServiceInfo; +@@ -62,6 +64,7 @@ using ::com::sun::star::lang::XServiceIn using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::UNO_QUERY; @@ -668,7 +534,7 @@ index a279b9d..33cd93b 100644 using ::rtl::OString; using ::rtl::OUString; using ::utl::OStreamWrapper; -@@ -673,6 +677,70 @@ void XclExpBiff8Encrypter::EncryptBytes( SvStream& rStrm, vector<sal_uInt8>& aBy +@@ -674,6 +677,70 @@ void XclExpBiff8Encrypter::EncryptBytes( mnOldPos = nStrmPos; } @@ -739,7 +605,7 @@ index a279b9d..33cd93b 100644 rtl::OUString XclXmlUtils::GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ) { rtl::OUStringBuffer sBuf; -@@ -750,6 +818,11 @@ static ScRange lcl_ToRange( const XclRange& rRange ) +@@ -765,6 +832,11 @@ static ScRange lcl_ToRange( const XclRan return aRange; } @@ -751,7 +617,7 @@ index a279b9d..33cd93b 100644 rtl::OString XclXmlUtils::ToOString( const XclRangeList& rRanges ) { ScRangeList aRanges; -@@ -782,7 +855,7 @@ OUString XclXmlUtils::ToOUString( const String& s ) +@@ -797,7 +869,7 @@ OUString XclXmlUtils::ToOUString( const rtl::OUString XclXmlUtils::ToOUString( ScDocument& rDocument, const ScAddress& rAddress, ScTokenArray* pTokenArray ) { ScCompiler aCompiler( &rDocument, rAddress, *pTokenArray); @@ -760,7 +626,7 @@ index a279b9d..33cd93b 100644 String s; aCompiler.CreateStringFromTokenArray( s ); return ToOUString( s ); -@@ -799,6 +872,100 @@ const char* XclXmlUtils::ToPsz( bool b ) +@@ -814,6 +886,100 @@ const char* XclXmlUtils::ToPsz( bool b ) return b ? "true" : "false"; } @@ -861,7 +727,7 @@ index a279b9d..33cd93b 100644 // ============================================================================ XclExpXmlStream::XclExpXmlStream( const Reference< XMultiServiceFactory >& rSMgr, SvStream& rStrm, const XclExpRoot& rRoot ) -@@ -821,6 +988,9 @@ XclExpXmlStream::XclExpXmlStream( const Reference< XMultiServiceFactory >& rSMgr +@@ -836,6 +1002,9 @@ XclExpXmlStream::XclExpXmlStream( const Reference< XOutputStream >(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" ) ); @@ -871,7 +737,7 @@ index a279b9d..33cd93b 100644 } XclExpXmlStream::~XclExpXmlStream() -@@ -883,75 +1053,6 @@ sax_fastparser::FSHelperPtr& XclExpXmlStream::WriteAttributes( sal_Int32 nAttrib +@@ -898,75 +1067,6 @@ sax_fastparser::FSHelperPtr& XclExpXmlSt return rStream; } @@ -944,13 +810,11 @@ index a279b9d..33cd93b 100644 - return rStream; -} - - sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream ( + sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream ( const OUString& sFullStream, const OUString& sRelativeStream, -diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx -index afcd334..088a7ce 100644 ---- sc/source/filter/xlsx/xlsx-xestring.cxx -+++ sc/source/filter/xlsx/xlsx-xestring.cxx +--- sc/source/filter/xlsx/xlsx-xestring.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xestring.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -33,6 +33,8 @@ #include <algorithm> @@ -960,7 +824,7 @@ index afcd334..088a7ce 100644 #include "xestream.hxx" #include "xlstyle.hxx" #include "xestyle.hxx" -@@ -561,7 +563,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXmlStream& rStrm, const ScfUInt16Vec& rBuf +@@ -493,7 +495,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXm { const XclFontData& rFontData = pFont->GetFontData(); rWorksheet->startElement( XML_rPr, FSEND ); @@ -969,7 +833,7 @@ index afcd334..088a7ce 100644 rWorksheet->endElement( XML_rPr ); } rWorksheet->startElement( XML_t, -@@ -570,7 +572,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXmlStream& rStrm, const ScfUInt16Vec& rBuf +@@ -502,7 +504,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXm rWorksheet->writeEscaped( XclXmlUtils::ToOUString( rBuffer, nStart, nLength ) ); rWorksheet->endElement( XML_t ); rWorksheet->endElement( XML_r ); @@ -978,11 +842,9 @@ index afcd334..088a7ce 100644 } void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const -diff --git sc/source/filter/excel/xestyle.cxx sc/source/filter/excel/xestyle.cxx -index de32a64..2925283 100644 ---- sc/source/filter/xlsx/xlsx-xestyle.cxx -+++ sc/source/filter/xlsx/xlsx-xestyle.cxx -@@ -869,7 +869,7 @@ void XclExpFont::SaveXml( XclExpXmlStream& rStrm ) +--- sc/source/filter/xlsx/xlsx-xestyle.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xestyle.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -869,7 +869,7 @@ void XclExpFont::SaveXml( XclExpXmlStrea { sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->startElement( XML_font, FSEND ); @@ -991,11 +853,9 @@ index de32a64..2925283 100644 // OOXTODO: XML_scheme; //scheme/@val values: "major", "minor", "none" rStyleSheet->endElement( XML_font ); } -diff --git sc/source/filter/excel/xetable.cxx sc/source/filter/excel/xetable.cxx -index 8d27d2d..3c2b1a5 100644 ---- sc/source/filter/xlsx/xlsx-xetable.cxx -+++ sc/source/filter/xlsx/xlsx-xetable.cxx -@@ -920,76 +920,12 @@ void XclExpFormulaCell::Save( XclExpStream& rStrm ) +--- sc/source/filter/xlsx/xlsx-xetable.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xetable.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -920,76 +920,12 @@ void XclExpFormulaCell::Save( XclExpStre mxStringRec->Save( rStrm ); } @@ -1073,13 +933,11 @@ index 8d27d2d..3c2b1a5 100644 sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_c, XML_r, XclXmlUtils::ToOString( GetXclPos() ).getStr(), -diff --git sc/source/filter/inc/XclExpChangeTrack.hxx sc/source/filter/inc/XclExpChangeTrack.hxx -index 053da60..59ec5db 100644 ---- sc/source/filter/xlsx/XclExpChangeTrack.hxx -+++ sc/source/filter/xlsx/XclExpChangeTrack.hxx +--- sc/source/filter/xlsx/XclExpChangeTrack.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/XclExpChangeTrack.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -241,6 +241,8 @@ public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1091,19 +949,19 @@ index 053da60..59ec5db 100644 private: XclExpString sUsername; + sal_Int32 mnLogNumber; - DateTime aDateTime; - sal_uInt8 aGUID[ 16 ]; + DateTime aDateTime; + sal_uInt8 aGUID[ 16 ]; @@ -259,15 +262,19 @@ public: - inline XclExpChTrInfo( - const String& rUsername, - const DateTime& rDateTime, -- const sal_uInt8* pGUID ); + inline XclExpChTrInfo( + const String& rUsername, + const DateTime& rDateTime, +- const sal_uInt8* pGUID ); + const sal_uInt8* pGUID, + sal_Int32 nLogNumber ); - virtual ~XclExpChTrInfo(); + virtual ~XclExpChTrInfo(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1111,32 +969,32 @@ index 053da60..59ec5db 100644 -inline XclExpChTrInfo::XclExpChTrInfo( const String& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID ) : +inline XclExpChTrInfo::XclExpChTrInfo( const String& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ) : - sUsername( rUsername ), + sUsername( rUsername ), + mnLogNumber( nLogNumber ), - aDateTime( rDateTime ) + aDateTime( rDateTime ) { - memcpy( aGUID, pGUID, 16 ); + memcpy( aGUID, pGUID, 16 ); @@ -325,6 +332,7 @@ class XclExpChTrTabId : public ExcRecord private: - sal_uInt16* pBuffer; - sal_uInt16 nTabCount; + sal_uInt16* pBuffer; + sal_uInt16 nTabCount; + bool mbInRevisionHeaders; - inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } + inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } @@ -332,14 +340,16 @@ private: public: - inline XclExpChTrTabId( sal_uInt16 nCount ) : -- pBuffer( NULL ), nTabCount( nCount ) {} -- XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ); + inline XclExpChTrTabId( sal_uInt16 nCount ) : +- pBuffer( NULL ), nTabCount( nCount ) {} +- XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ); + pBuffer( NULL ), nTabCount( nCount ), mbInRevisionHeaders( false ) {} + XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer, bool bInRevisionHeaders = false ); - virtual ~XclExpChTrTabId(); + virtual ~XclExpChTrTabId(); - void Copy( const XclExpChTrTabIdBuffer& rBuffer ); + void Copy( const XclExpChTrTabIdBuffer& rBuffer ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1145,33 +1003,33 @@ index 053da60..59ec5db 100644 //___________________________________________________________________ @@ -371,6 +381,7 @@ protected: - inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; - inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; + inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; + inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; + inline sal_uInt16 GetTabId( SCTAB nTabId ) const; - inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; + inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; - // save header data, call SaveActionData() + // save header data, call SaveActionData() @@ -387,6 +398,9 @@ protected: - // do something after writing the record - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + // do something after writing the record + virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + inline sal_uInt32 GetActionNumber() const { return nIndex; } + inline sal_Bool GetAccepted() const { return bAccepted; } + public: - XclExpChTrAction( - const ScChangeAction& rAction, + XclExpChTrAction( + const ScChangeAction& rAction, @@ -406,6 +420,8 @@ public: - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); virtual sal_Size GetLen() const; + + inline XclExpChTrAction* GetAddAction() { return pAddAction; } }; inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const -@@ -422,9 +438,14 @@ inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& - << (sal_uInt16) rRange.aEnd.Col(); +@@ -422,9 +438,14 @@ inline void XclExpChTrAction::Write2DRan + << (sal_uInt16) rRange.aEnd.Col(); } +inline sal_uInt16 XclExpChTrAction::GetTabId( SCTAB nTab ) const @@ -1186,7 +1044,7 @@ index 053da60..59ec5db 100644 } //___________________________________________________________________ -@@ -433,6 +454,8 @@ inline void XclExpChTrAction::WriteTabId( XclExpStream& rStrm, SCTAB nTab ) cons +@@ -433,6 +454,8 @@ inline void XclExpChTrAction::WriteTabId struct XclExpChTrData { XclExpString* pString; @@ -1194,18 +1052,18 @@ index 053da60..59ec5db 100644 + const ScFormulaCell* mpFormulaCell; XclTokenArrayRef mxTokArr; XclExpRefLog maRefLog; - double fValue; + double fValue; @@ -468,6 +491,7 @@ protected: - ScAddress aPosition; + ScAddress aPosition; - void GetCellData( + void GetCellData( + const XclExpRoot& rRoot, - const ScBaseCell* pScCell, - XclExpChTrData*& rpData, - sal_uInt32& rXclLength1, + const ScBaseCell* pScCell, + XclExpChTrData*& rpData, + sal_uInt32& rXclLength1, @@ -484,6 +508,8 @@ public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1214,7 +1072,7 @@ index 053da60..59ec5db 100644 //___________________________________________________________________ @@ -511,6 +537,8 @@ public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1223,7 +1081,7 @@ index 053da60..59ec5db 100644 //___________________________________________________________________ @@ -533,6 +561,8 @@ public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1232,7 +1090,7 @@ index 053da60..59ec5db 100644 //___________________________________________________________________ @@ -558,6 +588,8 @@ public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1241,7 +1099,7 @@ index 053da60..59ec5db 100644 //___________________________________________________________________ @@ -574,6 +606,8 @@ public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; + + virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -1250,36 +1108,32 @@ index 053da60..59ec5db 100644 //___________________________________________________________________ @@ -606,6 +640,7 @@ public: using List::Count; - void Append( ExcRecord* pNewRec ); - void Save( XclExpStream& rStrm ); + void Append( ExcRecord* pNewRec ); + void Save( XclExpStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ); }; //___________________________________________________________________ @@ -636,6 +671,7 @@ public: - ~XclExpChangeTrack(); + ~XclExpChangeTrack(); - void Write(); + void Write(); + void WriteXml( XclExpXmlStream& rStrm ); }; //___________________________________________________________________ -diff --git sc/source/filter/inc/excrecds.hxx sc/source/filter/inc/excrecds.hxx -index bb6a26f..6ad0f71 100644 ---- sc/source/filter/xlsx/excrecds.hxx -+++ sc/source/filter/xlsx/excrecds.hxx +--- sc/source/filter/xlsx/excrecds.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/excrecds.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -75,6 +75,7 @@ class ExcRecord : public XclExpRecord { public: - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); - virtual UINT16 GetNum() const = 0; + virtual UINT16 GetNum() const = 0; virtual sal_Size GetLen() const = 0; -diff --git sc/source/filter/inc/xcl97esc.hxx sc/source/filter/inc/xcl97esc.hxx -index 3703827..e112ff9 100644 ---- sc/source/filter/xlsx/xcl97esc.hxx -+++ sc/source/filter/xlsx/xcl97esc.hxx +--- sc/source/filter/xlsx/xcl97esc.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xcl97esc.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -36,6 +36,7 @@ #include <tools/stack.hxx> #include "xlescher.hxx" @@ -1288,10 +1142,8 @@ index 3703827..e112ff9 100644 // 0 = Export TBX form controls, 1 = Export OCX form controls. #define EXC_EXP_OCX_CTRL 0 -diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx -index c0bd309..f2edee3 100644 ---- sc/source/filter/xlsx/xcl97rec.hxx -+++ sc/source/filter/xlsx/xcl97rec.hxx +--- sc/source/filter/xlsx/xcl97rec.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xcl97rec.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -35,7 +35,7 @@ #include "xcl97esc.hxx" #include "xlstyle.hxx" @@ -1309,19 +1161,19 @@ index c0bd309..f2edee3 100644 + + SCTAB mnScTab; + - XclMsodrawing* pMsodrawingPerSheet; + XclMsodrawing* pMsodrawingPerSheet; XclMsodrawing* pSolverContainer; public: - XclObjList( const XclExpRoot& rRoot ); + XclObjList( const XclExpRoot& rRoot, SCTAB nScTab ); - virtual ~XclObjList(); + virtual ~XclObjList(); - XclObj* First() { return (XclObj*) List::First(); } + XclObj* First() { return (XclObj*) List::First(); } @@ -117,6 +121,9 @@ public: - void EndSheet(); + void EndSheet(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); + + static void ResetCounters(); @@ -1330,23 +1182,23 @@ index c0bd309..f2edee3 100644 @@ -134,6 +141,7 @@ protected: sal_uInt16 mnObjType; - UINT16 nObjId; - UINT16 nGrbit; + UINT16 nObjId; + UINT16 nGrbit; + SCTAB mnScTab; - BOOL bFirstOnSheet; + BOOL bFirstOnSheet; bool mbOwnEscher; /// true = Escher part created on the fly. @@ -153,6 +161,10 @@ public: inline sal_uInt16 GetObjType() const { return mnObjType; } - inline void SetId( UINT16 nId ) { nObjId = nId; } + inline void SetId( UINT16 nId ) { nObjId = nId; } + inline sal_uInt16 GetId() const { return nObjId; } + + inline void SetTab( SCTAB nScTab ) { mnScTab = nScTab; } + inline SCTAB GetTab() const { return mnScTab; } - inline void SetLocked( BOOL b ) - { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; } + inline void SetLocked( BOOL b ) + { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; } @@ -201,9 +213,13 @@ inline void XclObj::UpdateStopPos() class XclObjComment : public XclObj @@ -1359,13 +1211,13 @@ index c0bd309..f2edee3 100644 XclObjComment( const XclExpRoot& rRoot, - const Rectangle& rRect, const EditTextObject& rEditObj, SdrObject* pCaption, bool bVisible ); + const Rectangle& rRect, const EditTextObject& rEditObj, SdrCaptionObj* pCaption, bool bVisible, const ScAddress& rAddress ); - virtual ~XclObjComment(); + virtual ~XclObjComment(); /** c'tor process for formatted text objects above . @@ -213,6 +229,7 @@ public: - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); }; @@ -1377,13 +1229,13 @@ index c0bd309..f2edee3 100644 - XclObjAny( const XclExpRoot& rRoot ); + XclObjAny( const XclExpRoot& rRoot, + const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape ); - virtual ~XclObjAny(); + virtual ~XclObjAny(); + com::sun::star::uno::Reference< com::sun::star::drawing::XShape > + GetShape() const { return mxShape; } + + - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); + +private: @@ -1392,10 +1244,8 @@ index c0bd309..f2edee3 100644 }; -diff --git sc/source/filter/inc/xeescher.hxx sc/source/filter/inc/xeescher.hxx -index 8b3f9a6..3e5493a 100644 ---- sc/source/filter/xlsx/xeescher.hxx -+++ sc/source/filter/xlsx/xeescher.hxx +--- sc/source/filter/xlsx/xeescher.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xeescher.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -49,6 +49,7 @@ public: /** Writes the BITMAP record. */ @@ -1412,10 +1262,8 @@ index 8b3f9a6..3e5493a 100644 ScAddress maScPos; /// Calc cell address of the note. sal_uInt16 mnObjId; /// Escher object ID (BIFF8). bool mbVisible; /// true = permanently visible. -diff --git sc/source/filter/inc/xepivot.hxx sc/source/filter/inc/xepivot.hxx -index 2078003..a0f6dc9 100644 ---- sc/source/filter/xlsx/xepivot.hxx -+++ sc/source/filter/xlsx/xepivot.hxx +--- sc/source/filter/xlsx/xepivot.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xepivot.hxx 2010-03-03 17:00:06.000000000 +0100 @@ -378,6 +378,7 @@ public: /** Writes the entire pivot table. */ @@ -1424,11 +1272,9 @@ index 2078003..a0f6dc9 100644 // ------------------------------------------------------------------------ private: -diff --git sc/source/filter/inc/xestream.hxx sc/source/filter/inc/xestream.hxx -index 3b49017..172f054 100644 ---- sc/source/filter/xlsx/xestream.hxx -+++ sc/source/filter/xlsx/xestream.hxx -@@ -270,11 +270,13 @@ private: +--- sc/source/filter/xlsx/xestream.hxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xestream.hxx 2010-03-03 17:00:06.000000000 +0100 +@@ -269,11 +269,13 @@ private: class ScAddress; class ScDocument; @@ -1442,7 +1288,7 @@ index 3b49017..172f054 100644 class XclRangeList; class XclXmlUtils -@@ -284,6 +286,7 @@ class XclXmlUtils +@@ -283,6 +285,7 @@ class XclXmlUtils XclXmlUtils(const XclXmlUtils&); XclXmlUtils& operator=(const XclXmlUtils&); public: @@ -1450,7 +1296,7 @@ index 3b49017..172f054 100644 static ::rtl::OUString GetStreamName( const char* sStreamDir, const char* sStream, sal_Int32 nId ); static ::rtl::OString ToOString( const Color& rColor ); -@@ -295,6 +298,7 @@ public: +@@ -294,6 +297,7 @@ public: static ::rtl::OString ToOString( const ScRangeList& rRangeList ); static ::rtl::OString ToOString( const XclAddress& rAddress ); static ::rtl::OString ToOString( const XclExpString& s ); @@ -1458,7 +1304,7 @@ index 3b49017..172f054 100644 static ::rtl::OString ToOString( const XclRangeList& rRangeList ); static ::rtl::OUString ToOUString( const char* s ); -@@ -303,6 +307,11 @@ public: +@@ -302,6 +306,11 @@ public: static ::rtl::OUString ToOUString( ScDocument& rDocument, const ScAddress& rAddress, ScTokenArray* pTokenArray ); static ::rtl::OUString ToOUString( const XclExpString& s ); static const char* ToPsz( bool b ); @@ -1470,7 +1316,7 @@ index 3b49017..172f054 100644 }; class XclExpXmlStream : public oox::core::XmlFilterBase -@@ -322,7 +331,6 @@ public: +@@ -321,7 +330,6 @@ public: sax_fastparser::FSHelperPtr GetStreamForPath( const ::rtl::OUString& rPath ); sax_fastparser::FSHelperPtr& WriteAttributes( sal_Int32 nAttribute, ... ); @@ -1478,10 +1324,8 @@ index 3b49017..172f054 100644 sax_fastparser::FSHelperPtr CreateOutputStream ( const ::rtl::OUString& sFullStream, -diff --git sc/source/filter/xcl97/XclExpChangeTrack.cxx sc/source/filter/xcl97/XclExpChangeTrack.cxx -index 79563aa..0e49a81 100644 ---- sc/source/filter/xlsx/xlsx-XclExpChangeTrack.cxx -+++ sc/source/filter/xlsx/xlsx-XclExpChangeTrack.cxx +--- sc/source/filter/xlsx/xlsx-XclExpChangeTrack.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-XclExpChangeTrack.cxx 2010-03-03 17:00:06.000000000 +0100 @@ -34,12 +34,41 @@ //___________________________________________________________________ @@ -1524,8 +1368,8 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ // local functions -@@ -357,6 +386,26 @@ sal_Size XclExpChTrHeader::GetLen() const - return 50; +@@ -357,6 +386,26 @@ sal_Size XclExpChTrHeader::GetLen() cons + return 50; } +void XclExpChTrHeader::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) @@ -1552,7 +1396,7 @@ index 79563aa..0e49a81 100644 XclExpChTrInfo::~XclExpChTrInfo() @@ -387,6 +436,33 @@ sal_Size XclExpChTrInfo::GetLen() const - return 158; + return 158; } +void XclExpChTrInfo::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) @@ -1585,20 +1429,20 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ XclExpChTrTabIdBuffer::XclExpChTrTabIdBuffer( sal_uInt16 nCount ) : -@@ -469,8 +545,9 @@ XclExpChTrTabIdBufferList::~XclExpChTrTabIdBufferList() +@@ -469,8 +545,9 @@ XclExpChTrTabIdBufferList::~XclExpChTrTa //___________________________________________________________________ -XclExpChTrTabId::XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ) : -- nTabCount( rBuffer.GetBufferCount() ) +- nTabCount( rBuffer.GetBufferCount() ) +XclExpChTrTabId::XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer, bool bInRevisionHeaders ) + : nTabCount( rBuffer.GetBufferCount() ) + , mbInRevisionHeaders( bInRevisionHeaders ) { - pBuffer = new sal_uInt16[ nTabCount ]; - rBuffer.GetBufferCopy( pBuffer ); + pBuffer = new sal_uInt16[ nTabCount ]; + rBuffer.GetBufferCopy( pBuffer ); @@ -510,6 +587,29 @@ sal_Size XclExpChTrTabId::GetLen() const - return nTabCount << 1; + return nTabCount << 1; } +void XclExpChTrTabId::SaveXml( XclExpXmlStream& rRevisionLogStrm ) @@ -1627,7 +1471,7 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ // ! does not copy additional actions -@@ -616,6 +716,7 @@ sal_Size XclExpChTrAction::GetLen() const +@@ -616,6 +716,7 @@ sal_Size XclExpChTrAction::GetLen() cons XclExpChTrData::XclExpChTrData() : pString( NULL ), @@ -1642,39 +1486,39 @@ index 79563aa..0e49a81 100644 + mpFormulaCell = NULL; mxTokArr.reset(); maRefLog.clear(); - fValue = 0.0; -@@ -700,8 +802,8 @@ XclExpChTrCellContent::XclExpChTrCellContent( + fValue = 0.0; +@@ -700,8 +802,8 @@ XclExpChTrCellContent::XclExpChTrCellCon { - sal_uInt32 nDummy32; - sal_uInt16 nDummy16; -- GetCellData( rAction.GetOldCell(), pOldData, nDummy32, nOldLength ); -- GetCellData( rAction.GetNewCell(), pNewData, nLength, nDummy16 ); + sal_uInt32 nDummy32; + sal_uInt16 nDummy16; +- GetCellData( rAction.GetOldCell(), pOldData, nDummy32, nOldLength ); +- GetCellData( rAction.GetNewCell(), pNewData, nLength, nDummy16 ); + GetCellData( rRoot, rAction.GetOldCell(), pOldData, nDummy32, nOldLength ); + GetCellData( rRoot, rAction.GetNewCell(), pNewData, nLength, nDummy16 ); } XclExpChTrCellContent::~XclExpChTrCellContent() -@@ -721,6 +823,7 @@ void XclExpChTrCellContent::MakeEmptyChTrData( XclExpChTrData*& rpData ) +@@ -721,6 +823,7 @@ void XclExpChTrCellContent::MakeEmptyChT } void XclExpChTrCellContent::GetCellData( + const XclExpRoot& rRoot, - const ScBaseCell* pScCell, - XclExpChTrData*& rpData, - sal_uInt32& rXclLength1, + const ScBaseCell* pScCell, + XclExpChTrData*& rpData, + sal_uInt32& rXclLength1, @@ -763,9 +866,20 @@ void XclExpChTrCellContent::GetCellData( - { - String sCellStr; - if( pScCell->GetCellType() == CELLTYPE_STRING ) -- ((const ScStringCell*) pScCell)->GetString( sCellStr ); + { + String sCellStr; + if( pScCell->GetCellType() == CELLTYPE_STRING ) +- ((const ScStringCell*) pScCell)->GetString( sCellStr ); + { + const ScStringCell* pStrCell = static_cast< const ScStringCell* >( pScCell ); + pStrCell->GetString( sCellStr ); + rpData->mpFormattedString = XclExpStringHelper::CreateCellString( rRoot, + *pStrCell, NULL ); + } - else -- ((const ScEditCell*) pScCell)->GetString( sCellStr ); + else +- ((const ScEditCell*) pScCell)->GetString( sCellStr ); + { + const ScEditCell* pEditCell = static_cast< const ScEditCell* >( pScCell ); + pEditCell->GetString( sCellStr ); @@ -1683,19 +1527,19 @@ index 79563aa..0e49a81 100644 + *pEditCell, NULL, aLinkHelper ); + } rpData->pString = new XclExpString( sCellStr, EXC_STR_DEFAULT, 32766 ); - rpData->nType = EXC_CHTR_TYPE_STRING; + rpData->nType = EXC_CHTR_TYPE_STRING; rpData->nSize = 3 + rpData->pString->GetSize(); @@ -776,6 +890,8 @@ void XclExpChTrCellContent::GetCellData( - case CELLTYPE_FORMULA: - { - const ScFormulaCell* pFmlCell = (const ScFormulaCell*) pScCell; + case CELLTYPE_FORMULA: + { + const ScFormulaCell* pFmlCell = (const ScFormulaCell*) pScCell; + rpData->mpFormulaCell = pFmlCell; + - const ScTokenArray* pTokenArray = pFmlCell->GetCode(); - if( pTokenArray ) - { -@@ -831,6 +947,105 @@ sal_Size XclExpChTrCellContent::GetActionByteCount() const - return nLen; + const ScTokenArray* pTokenArray = pFmlCell->GetCode(); + if( pTokenArray ) + { +@@ -831,6 +947,105 @@ sal_Size XclExpChTrCellContent::GetActio + return nLen; } +static const char* lcl_GetType( XclExpChTrData* pData ) @@ -1800,8 +1644,8 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ XclExpChTrInsert::XclExpChTrInsert( -@@ -904,6 +1119,41 @@ sal_Size XclExpChTrInsert::GetActionByteCount() const - return 16; +@@ -904,6 +1119,41 @@ sal_Size XclExpChTrInsert::GetActionByte + return 16; } +static const char* lcl_GetAction( sal_uInt16 nOpCode ) @@ -1842,8 +1686,8 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ XclExpChTrInsertTab::XclExpChTrInsertTab( -@@ -941,6 +1191,19 @@ sal_Size XclExpChTrInsertTab::GetActionByteCount() const - return 276; +@@ -941,6 +1191,19 @@ sal_Size XclExpChTrInsertTab::GetActionB + return 276; } +void XclExpChTrInsertTab::SaveXml( XclExpXmlStream& rStrm ) @@ -1862,8 +1706,8 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ XclExpChTrMoveRange::XclExpChTrMoveRange( -@@ -997,6 +1260,29 @@ sal_Size XclExpChTrMoveRange::GetActionByteCount() const - return 24; +@@ -997,6 +1260,29 @@ sal_Size XclExpChTrMoveRange::GetActionB + return 24; } +void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm ) @@ -1892,8 +1736,8 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ XclExpChTr0x014A::XclExpChTr0x014A( const XclExpChTrInsert& rAction ) : -@@ -1028,6 +1314,23 @@ sal_Size XclExpChTr0x014A::GetActionByteCount() const - return 14; +@@ -1028,6 +1314,23 @@ sal_Size XclExpChTr0x014A::GetActionByte + return 14; } +void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm ) @@ -1916,8 +1760,8 @@ index 79563aa..0e49a81 100644 //___________________________________________________________________ XclExpChTrActionStack::~XclExpChTrActionStack() -@@ -1064,8 +1367,99 @@ void XclExpChTrRecordList::Save( XclExpStream& rStrm ) - pRec->Save( rStrm ); +@@ -1064,8 +1367,99 @@ void XclExpChTrRecordList::Save( XclExpS + pRec->Save( rStrm ); } +void XclExpChTrRecordList::SaveXml( XclExpXmlStream& rStrm ) @@ -2015,60 +1859,60 @@ index 79563aa..0e49a81 100644 + XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), - aRecList(), -@@ -1113,6 +1507,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : + aRecList(), +@@ -1113,6 +1507,7 @@ XclExpChangeTrack::XclExpChangeTrack( co - // build record list - pHeader = new XclExpChTrHeader; + // build record list + pHeader = new XclExpChTrHeader; + aRecList.Append( new StartXmlElement( XML_headers, StartXmlElement::WRITE_NAMESPACES ) ); - aRecList.Append( pHeader ); - aRecList.Append( new XclExpChTr0x0195 ); - aRecList.Append( new XclExpChTr0x0194( *pTempChangeTrack ) ); -@@ -1120,17 +1515,27 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : - String sLastUsername; - DateTime aLastDateTime; - sal_uInt32 nIndex = 1; + aRecList.Append( pHeader ); + aRecList.Append( new XclExpChTr0x0195 ); + aRecList.Append( new XclExpChTr0x0194( *pTempChangeTrack ) ); +@@ -1120,17 +1515,27 @@ XclExpChangeTrack::XclExpChangeTrack( co + String sLastUsername; + DateTime aLastDateTime; + sal_uInt32 nIndex = 1; + sal_Int32 nLogNumber = 1; - while( XclExpChTrAction* pAction = aActionStack.Pop() ) - { - if( (nIndex == 1) || pAction->ForceInfoRecord() || - (pAction->GetUsername() != sLastUsername) || - (pAction->GetDateTime() != aLastDateTime) ) - { + while( XclExpChTrAction* pAction = aActionStack.Pop() ) + { + if( (nIndex == 1) || pAction->ForceInfoRecord() || + (pAction->GetUsername() != sLastUsername) || + (pAction->GetDateTime() != aLastDateTime) ) + { + if( nIndex != 1 ) + { + aRecList.Append( new EndXmlElement( XML_revisions ) ); + aRecList.Append( new EndHeaderElement() ); + } + - lcl_GenerateGUID( aGUID, bValidGUID ); - sLastUsername = pAction->GetUsername(); - aLastDateTime = pAction->GetDateTime(); -- aRecList.Append( new XclExpChTrInfo( sLastUsername, aLastDateTime, aGUID ) ); -- aRecList.Append( new XclExpChTrTabId( pAction->GetTabIdBuffer() ) ); + lcl_GenerateGUID( aGUID, bValidGUID ); + sLastUsername = pAction->GetUsername(); + aLastDateTime = pAction->GetDateTime(); +- aRecList.Append( new XclExpChTrInfo( sLastUsername, aLastDateTime, aGUID ) ); +- aRecList.Append( new XclExpChTrTabId( pAction->GetTabIdBuffer() ) ); + + aRecList.Append( new StartXmlElement( XML_header, 0 ) ); + aRecList.Append( new XclExpChTrInfo( sLastUsername, aLastDateTime, aGUID, nLogNumber++ ) ); + aRecList.Append( new XclExpChTrTabId( pAction->GetTabIdBuffer(), true ) ); + aRecList.Append( new StartXmlElement( XML_revisions, StartXmlElement::WRITE_NAMESPACES | StartXmlElement::CLOSE_ELEMENT ) ); - pHeader->SetGUID( aGUID ); - } - pAction->SetIndex( nIndex ); -@@ -1139,6 +1544,12 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : + pHeader->SetGUID( aGUID ); + } + pAction->SetIndex( nIndex ); +@@ -1139,6 +1544,12 @@ XclExpChangeTrack::XclExpChangeTrack( co - pHeader->SetGUID( aGUID ); - pHeader->SetCount( nIndex - 1 ); + pHeader->SetGUID( aGUID ); + pHeader->SetCount( nIndex - 1 ); + if( nLogNumber > 1 ) + { + aRecList.Append( new EndXmlElement( XML_revisions ) ); + aRecList.Append( new EndHeaderElement() ); + } + aRecList.Append( new EndXmlElement( XML_headers ) ); - aRecList.Append( new ExcEof ); + aRecList.Append( new ExcEof ); } @@ -1249,3 +1660,45 @@ void XclExpChangeTrack::Write() - } + } } +static void lcl_WriteUserNamesXml( XclExpXmlStream& rWorkbookStrm ) @@ -2113,20 +1957,18 @@ index 79563aa..0e49a81 100644 + rWorkbookStrm.PopStream(); +} + -diff --git sc/source/filter/xcl97/xcl97esc.cxx sc/source/filter/xcl97/xcl97esc.cxx -index 97ef0bf..e4f2344 100644 ---- sc/source/filter/xlsx/xlsx-xcl97esc.cxx -+++ sc/source/filter/xlsx/xlsx-xcl97esc.cxx -@@ -201,7 +201,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen - pCurrAppData = new XclEscherHostAppData; +--- sc/source/filter/xlsx/xlsx-xcl97esc.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xcl97esc.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -201,7 +201,7 @@ EscherExHostAppData* XclEscherEx::StartS + pCurrAppData = new XclEscherHostAppData; SdrObject* pObj = GetSdrObjectFromXShape( rShape ); - if ( !pObj ) + if ( !pObj ) - pCurrXclObj = new XclObjAny( GetRoot() ); // just what is it?!? + pCurrXclObj = new XclObjAny( GetRoot(), rShape ); // just what is it?!? - else - { + else + { pCurrXclObj = NULL; -@@ -223,13 +223,13 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen +@@ -223,13 +223,13 @@ EscherExHostAppData* XclEscherEx::StartS pCurrXclObj = new XclObjOle( GetRoot(), *pObj ); } else // just a metafile @@ -2142,11 +1984,9 @@ index 97ef0bf..e4f2344 100644 } else if( !ScDrawLayer::IsNoteCaption( pObj ) ) { -diff --git sc/source/filter/xcl97/xcl97rec.cxx sc/source/filter/xcl97/xcl97rec.cxx -index 91da454..d22d954 100644 ---- sc/source/filter/xlsx/xlsx-xcl97rec.cxx -+++ sc/source/filter/xlsx/xlsx-xcl97rec.cxx -@@ -80,7 +80,12 @@ +--- sc/source/filter/xlsx/xlsx-xcl97rec.cxx.old 2010-03-03 17:00:05.000000000 +0100 ++++ sc/source/filter/xlsx/xlsx-xcl97rec.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -79,7 +79,12 @@ #include "patattr.hxx" #include "tabprotection.hxx" @@ -2159,7 +1999,7 @@ index 91da454..d22d954 100644 using ::rtl::OString; using ::rtl::OUString; -@@ -89,6 +94,13 @@ using ::com::sun::star::uno::Reference; +@@ -88,6 +93,13 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::drawing::XShape; @@ -2173,7 +2013,7 @@ index 91da454..d22d954 100644 //___________________________________________________________________ -@@ -233,8 +245,12 @@ void XclMsodrawing::WriteBody( XclExpStream& rStrm ) +@@ -232,8 +244,12 @@ void XclMsodrawing::WriteBody( XclExpStr // --- class XclObjList ---------------------------------------------- @@ -2187,15 +2027,15 @@ index 91da454..d22d954 100644 pMsodrawingPerSheet( new XclMsodrawing( rRoot, ESCHER_DgContainer ) ), pSolverContainer( NULL ) { -@@ -258,6 +274,7 @@ UINT16 XclObjList::Add( XclObj* pObj ) - Insert( pObj, LIST_APPEND ); - UINT16 nCnt = (UINT16) Count(); - pObj->SetId( nCnt ); +@@ -257,6 +273,7 @@ UINT16 XclObjList::Add( XclObj* pObj ) + Insert( pObj, LIST_APPEND ); + UINT16 nCnt = (UINT16) Count(); + pObj->SetId( nCnt ); + pObj->SetTab( mnScTab ); - return nCnt; - } - else -@@ -295,6 +312,129 @@ void XclObjList::Save( XclExpStream& rStrm ) + return nCnt; + } + else +@@ -294,6 +311,129 @@ void XclObjList::Save( XclExpStream& rSt } @@ -2325,21 +2165,21 @@ index 91da454..d22d954 100644 // --- class XclObj -------------------------------------------------- -@@ -429,69 +569,78 @@ void XclObj::SaveTextRecs( XclExpStream& rStrm ) +@@ -428,69 +568,78 @@ void XclObj::SaveTextRecs( XclExpStream& // --- class XclObjComment ------------------------------------------- -XclObjComment::XclObjComment( const XclExpRoot& rRoot, const Rectangle& rRect, const EditTextObject& rEditObj, SdrObject* pCaption, bool bVisible ) +XclObjComment::XclObjComment( const XclExpRoot& rRoot, const Rectangle& rRect, const EditTextObject& rEditObj, SdrCaptionObj* pCaption, bool bVisible, const ScAddress& rAddress ) - : + : XclObj( rRoot, EXC_OBJTYPE_NOTE, true ) + , maScPos( rAddress ) + , mpCaption( static_cast< SdrCaptionObj* >( pCaption->Clone() ) ) + , mbVisible( bVisible ) { ProcessEscherObj(rRoot, rRect, pCaption, bVisible); - // TXO - pTxo = new XclTxo( rRoot, rEditObj, pCaption ); + // TXO + pTxo = new XclTxo( rRoot, rEditObj, pCaption ); } -void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& rRect, SdrObject* pCaption, const bool bVisible ) @@ -2360,7 +2200,7 @@ index 91da454..d22d954 100644 + rPropOpt.CreateFillProperties( aXPropSet, sal_True); - aPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented -- aPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented +- aPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented + rPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented + rPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented @@ -2389,17 +2229,16 @@ index 91da454..d22d954 100644 } else - aPropOpt.AddOpt( ESCHER_Prop_fillColor, 0x08000050 ); -- ++ rPropOpt.AddOpt( ESCHER_Prop_fillColor, 0x08000050 ); + - if(!aPropOpt.GetOpt( ESCHER_Prop_fillBackColor, nValue )) - aPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0x08000050 ); -- if(!aPropOpt.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue )) +- if(!aPropOpt.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue )) - aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field -- if(!aPropOpt.GetOpt( ESCHER_Prop_shadowColor, nValue )) +- if(!aPropOpt.GetOpt( ESCHER_Prop_shadowColor, nValue )) - aPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x00000000 ); -- if(!aPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue )) // bool field +- if(!aPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue )) // bool field - aPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field -+ rPropOpt.AddOpt( ESCHER_Prop_fillColor, 0x08000050 ); -+ + if( !rPropOpt.GetOpt( ESCHER_Prop_fillBackColor, nValue ) ) + rPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0x08000050 ); + if( !rPropOpt.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) ) @@ -2423,17 +2262,17 @@ index 91da454..d22d954 100644 + + lcl_FillProps( aPropOpt, pCaption, bVisible ); + - nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked - XclEscherEx* pEx = pMsodrawing->GetEscherEx(); - pEx->OpenContainer( ESCHER_SpContainer ); - pEx->AddShape( ESCHER_ShpInst_TextBox, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT ); + nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked + XclEscherEx* pEx = pMsodrawing->GetEscherEx(); + pEx->OpenContainer( ESCHER_SpContainer ); + pEx->AddShape( ESCHER_ShpInst_TextBox, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT ); - sal_uInt32 nFlags = 0x000A0000; - ::set_flag( nFlags, sal_uInt32(2), !bVisible ); - aPropOpt.AddOpt( ESCHER_Prop_fPrint, nFlags ); // bool field - aPropOpt.Commit( pEx->GetStream() ); + aPropOpt.Commit( pEx->GetStream() ); XclExpDffNoteAnchor( rRoot, rRect ).WriteData( *pEx); -@@ -519,6 +668,72 @@ void XclObjComment::Save( XclExpStream& rStrm ) +@@ -518,6 +667,72 @@ void XclObjComment::Save( XclExpStream& } @@ -2506,7 +2345,7 @@ index 91da454..d22d954 100644 // --- class XclObjDropDown ------------------------------------------ XclObjDropDown::XclObjDropDown( const XclExpRoot& rRoot, const ScAddress& rPos, BOOL bFilt ) : -@@ -824,8 +1039,9 @@ void XclObjOle::Save( XclExpStream& rStrm ) +@@ -823,8 +1038,9 @@ void XclObjOle::Save( XclExpStream& rStr // --- class XclObjAny ------------------------------------------- @@ -2518,7 +2357,7 @@ index 91da454..d22d954 100644 { } -@@ -851,6 +1067,120 @@ void XclObjAny::Save( XclExpStream& rStrm ) +@@ -850,6 +1066,120 @@ void XclObjAny::Save( XclExpStream& rStr } @@ -2639,11 +2478,9 @@ index 91da454..d22d954 100644 // --- class ExcBof8_Base -------------------------------------------- ExcBof8_Base::ExcBof8_Base() -diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx -index 3742180..3134a07 100644 ---- sc/source/ui/docshell/docsh.cxx -+++ sc/source/ui/docshell/docsh.cxx -@@ -163,7 +163,7 @@ static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95"; +--- sc/source/ui/docshell/docsh.cxx.old 2010-03-03 16:59:38.000000000 +0100 ++++ sc/source/ui/docshell/docsh.cxx 2010-03-03 17:00:06.000000000 +0100 +@@ -169,7 +169,7 @@ static const sal_Char __FAR_DATA pFilter static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97"; static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; diff --git a/patches/dev300/xmloff_dis26300_conformance.diff b/patches/dev300/xmloff_dis26300_conformance.diff index dfaacfa01..7a5859734 100644 --- a/patches/dev300/xmloff_dis26300_conformance.diff +++ b/patches/dev300/xmloff_dis26300_conformance.diff @@ -1,29 +1,29 @@ ---- sw/source/filter/xml/xmltbli.cxx.old 2009-04-02 10:50:08.000000000 +0000 -+++ sw/source/filter/xml/xmltbli.cxx 2009-04-06 16:42:18.000000000 +0000 -@@ -2792,7 +2792,7 @@ const SwStartNode *SwXMLTableContext::In - bFirstSection = sal_False; - OUString sStyleName( RTL_CONSTASCII_USTRINGPARAM("Standard") ); - GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(), -- GetImport().GetTextImport()->GetCursor(), sStyleName, sal_True ); +--- sw/source/filter/xml/xmltbli.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/filter/xml/xmltbli.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -2893,7 +2893,7 @@ const SwStartNode *SwXMLTableContext::In + bFirstSection = sal_False; + OUString sStyleName( RTL_CONSTASCII_USTRINGPARAM("Standard") ); + GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(), +- GetImport().GetTextImport()->GetCursor(), sStyleName, sal_True ); + GetImport().GetTextImport()->GetCursor(), sStyleName, rtl::OUString(), sal_True ); - } - else - { ---- xmloff/inc/xmloff/txtimp.hxx.old 2009-04-02 10:36:09.000000000 +0000 -+++ xmloff/inc/xmloff/txtimp.hxx 2009-04-06 16:42:18.000000000 +0000 -@@ -630,6 +630,7 @@ public: - const ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextCursor >& rCursor, - const ::rtl::OUString& rStyleName, + } + else + { +--- xmloff/inc/xmloff/txtimp.hxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ xmloff/inc/xmloff/txtimp.hxx 2010-03-03 16:59:59.000000000 +0100 +@@ -634,6 +634,7 @@ public: + const ::com::sun::star::uno::Reference < + ::com::sun::star::text::XTextCursor >& rCursor, + const ::rtl::OUString& rStyleName, + const ::rtl::OUString& rClassNames, - sal_Bool bPara, + sal_Bool bPara, sal_Bool bOutlineLevelAttrFound = sal_False, sal_Int8 nOutlineLevel = -1, ---- xmloff/inc/xmloff/xmlimp.hxx.old 2009-04-02 10:36:09.000000000 +0000 -+++ xmloff/inc/xmloff/xmlimp.hxx 2009-04-06 16:42:18.000000000 +0000 -@@ -211,6 +211,12 @@ public: - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); - static SvXMLImport* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); +--- xmloff/inc/xmloff/xmlimp.hxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ xmloff/inc/xmloff/xmlimp.hxx 2010-03-03 16:59:59.000000000 +0100 +@@ -215,6 +215,12 @@ public: + static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); + static SvXMLImport* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw(); + + SvXMLImportContext *getTopContext(); @@ -31,12 +31,12 @@ + const ::rtl::OUString& rLocalName, + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); + - // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); ---- xmloff/inc/xmloff/xmltoken.hxx.old 2009-04-06 16:41:51.000000000 +0000 -+++ xmloff/inc/xmloff/xmltoken.hxx 2009-04-06 16:42:18.000000000 +0000 -@@ -1400,6 +1400,7 @@ namespace xmloff { namespace token { + // ::com::sun::star::xml::sax::XDocumentHandler + virtual void SAL_CALL startDocument(void) + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); +--- xmloff/inc/xmloff/xmltoken.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ xmloff/inc/xmloff/xmltoken.hxx 2010-03-03 16:59:59.000000000 +0100 +@@ -1406,6 +1406,7 @@ namespace xmloff { namespace token { XML_PRINTABLE, XML_PRINTED_BY, XML_PROCEEDINGS, @@ -44,7 +44,7 @@ XML_PRODUCT, XML_PROJECTION, XML_PROPERTIES, -@@ -1689,6 +1690,7 @@ namespace xmloff { namespace token { +@@ -1699,6 +1700,7 @@ namespace xmloff { namespace token { XML_STRUCTURE_PROTECTED, XML_STYLE, XML_STYLE_NAME, @@ -52,10 +52,10 @@ XML_STYLES, XML_STYLESHEET, XML_SUB_TABLE, ---- xmloff/source/core/xmlimp.cxx.old 2009-04-06 16:41:46.000000000 +0000 -+++ xmloff/source/core/xmlimp.cxx 2009-04-06 16:42:18.000000000 +0000 -@@ -718,6 +718,42 @@ void SAL_CALL SvXMLImport::startElement( - mpContexts->Insert( pContext, nCount ); +--- xmloff/source/core/xmlimp.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ xmloff/source/core/xmlimp.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -771,6 +771,42 @@ void SAL_CALL SvXMLImport::startElement( + mpContexts->Insert( pContext, nCount ); } +SvXMLImportContext *SvXMLImport::getTopContext() { @@ -97,9 +97,9 @@ void SAL_CALL SvXMLImport::endElement( const OUString& #ifndef PRODUCT rName ---- xmloff/source/core/xmltoken.cxx.old 2009-04-06 16:41:51.000000000 +0000 -+++ xmloff/source/core/xmltoken.cxx 2009-04-06 16:42:18.000000000 +0000 -@@ -1408,6 +1408,7 @@ namespace xmloff { namespace token { +--- xmloff/source/core/xmltoken.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ xmloff/source/core/xmltoken.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -1414,6 +1414,7 @@ namespace xmloff { namespace token { TOKEN( "printable", XML_PRINTABLE ), TOKEN( "printed-by", XML_PRINTED_BY ), TOKEN( "proceedings", XML_PROCEEDINGS ), @@ -107,7 +107,7 @@ TOKEN( "product", XML_PRODUCT ), TOKEN( "projection", XML_PROJECTION ), TOKEN( "properties", XML_PROPERTIES ), -@@ -1697,6 +1698,7 @@ namespace xmloff { namespace token { +@@ -1707,6 +1708,7 @@ namespace xmloff { namespace token { TOKEN( "structure-protected", XML_STRUCTURE_PROTECTED ), TOKEN( "style", XML_STYLE ), TOKEN( "style-name", XML_STYLE_NAME ), @@ -115,57 +115,57 @@ TOKEN( "styles", XML_STYLES ), TOKEN( "stylesheet", XML_STYLESHEET ), TOKEN( "sub-table", XML_SUB_TABLE ), ---- xmloff/source/draw/shapeimport.cxx.old 2009-04-02 10:36:08.000000000 +0000 -+++ xmloff/source/draw/shapeimport.cxx 2009-04-06 16:42:18.000000000 +0000 -@@ -834,8 +834,8 @@ SvXMLShapeContext* XMLShapeImportHelper: - return new SdXMLShapeLinkContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes ); - } - // add other shapes here... -- default: -- return new SvXMLShapeContext( rImport, p_nPrefix, rLocalName, bTemporaryShape ); +--- xmloff/source/draw/shapeimport.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/draw/shapeimport.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -910,8 +910,8 @@ SvXMLShapeContext* XMLShapeImportHelper: + return new SdXMLShapeLinkContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes ); + } + // add other shapes here... +- default: +- return new SvXMLShapeContext( rImport, p_nPrefix, rLocalName, bTemporaryShape ); + default: + return NULL; // no shape context... - } + } - // now parse the attribute list and call the child context for each unknown attribute ---- xmloff/source/text/txtimp.cxx.old 2009-04-02 10:36:05.000000000 +0000 -+++ xmloff/source/text/txtimp.cxx 2009-04-06 16:42:18.000000000 +0000 -@@ -336,6 +336,8 @@ static __FAR_DATA SvXMLTokenMapEntry aTe - { XML_NAMESPACE_TEXT, XML_IS_LIST_HEADER,XML_TOK_TEXT_P_IS_LIST_HEADER }, - { XML_NAMESPACE_TEXT, XML_RESTART_NUMBERING,XML_TOK_TEXT_P_RESTART_NUMBERING }, - { XML_NAMESPACE_TEXT, XML_START_VALUE,XML_TOK_TEXT_P_START_VALUE }, + // now parse the attribute list and call the child context for each unknown attribute +--- xmloff/source/text/txtimp.cxx.old 2010-03-03 16:59:58.000000000 +0100 ++++ xmloff/source/text/txtimp.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -340,6 +340,8 @@ static __FAR_DATA SvXMLTokenMapEntry aTe + { XML_NAMESPACE_TEXT, XML_IS_LIST_HEADER,XML_TOK_TEXT_P_IS_LIST_HEADER }, + { XML_NAMESPACE_TEXT, XML_RESTART_NUMBERING,XML_TOK_TEXT_P_RESTART_NUMBERING }, + { XML_NAMESPACE_TEXT, XML_START_VALUE,XML_TOK_TEXT_P_START_VALUE }, + + { XML_NAMESPACE_TEXT, XML_CLASS_NAMES, XML_TOK_TEXT_P_CLASS_NAMES }, - XML_TOKEN_MAP_END + XML_TOKEN_MAP_END }; -@@ -931,6 +933,7 @@ OUString XMLTextImportHelper::SetStyleAn - SvXMLImport& rImport, - const Reference < XTextCursor >& rCursor, - const OUString& rStyleName, +@@ -1063,6 +1065,7 @@ OUString XMLTextImportHelper::SetStyleAn + SvXMLImport& rImport, + const Reference < XTextCursor >& rCursor, + const OUString& rStyleName, + const OUString& rClassNames, - sal_Bool bPara, + sal_Bool bPara, sal_Bool bOutlineLevelAttrFound, sal_Int8 nOutlineLevel, -@@ -1158,8 +1161,11 @@ OUString XMLTextImportHelper::SetStyleAn - } +@@ -1298,8 +1301,11 @@ OUString XMLTextImportHelper::SetStyleAn + } - // hard paragraph properties -- if( pStyle ) -- { + // hard paragraph properties +- if( pStyle ) +- { + sal_Int32 nTokenIndex = 0; + rtl::OUString aToken; + do { +#if 1 + if (pStyle) { - pStyle->FillPropertySet( xPropSet ); - if( bPara && pStyle->HasMasterPageName() && - xPropSetInfo->hasPropertyByName( sPageDescName ) ) -@@ -1221,7 +1227,19 @@ OUString XMLTextImportHelper::SetStyleAn - } - } - } -- } + pStyle->FillPropertySet( xPropSet ); + if( bPara && pStyle->HasMasterPageName() && + xPropSetInfo->hasPropertyByName( sPageDescName ) ) +@@ -1361,7 +1367,19 @@ OUString XMLTextImportHelper::SetStyleAn + } + } + } +- } + } + aToken = rClassNames.getToken( 0, ' ', nTokenIndex ); + if (aToken.getLength() && xAutoStyles.Is() ) @@ -182,9 +182,9 @@ // outline level; set after list style has been set // --> OD 2005-08-25 #i53198# -@@ -1996,8 +2014,9 @@ SvXMLImportContext *XMLTextImportHelper: - } - } +@@ -2034,8 +2052,9 @@ SvXMLImportContext *XMLTextImportHelper: + } + } -// if( !pContext ) -// pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -192,11 +192,11 @@ + pContext=rImport.createUnknownContext(nPrefix, rLocalName, xAttrList); + } - // handle open redlines - if ( (XML_TOK_TEXT_CHANGE != nToken) && ---- xmloff/source/text/txtparai.cxx.old 2009-04-02 10:36:05.000000000 +0000 -+++ xmloff/source/text/txtparai.cxx 2009-04-06 16:42:18.000000000 +0000 -@@ -1599,23 +1599,22 @@ SvXMLImportContext *XMLImpSpanContext_Im + // handle open redlines + if ( (XML_TOK_TEXT_CHANGE != nToken) && +--- xmloff/source/text/txtparai.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/text/txtparai.cxx 2010-03-03 16:59:59.000000000 +0100 +@@ -1846,23 +1846,22 @@ SvXMLImportContext *XMLImpSpanContext_Im SvXMLShapeContext* pShapeContext = rImport.GetShapeImport()->CreateGroupChildContext( rImport, nPrefix, rLocalName, xAttrList, xShapes ); pContext = pShapeContext; @@ -215,41 +215,41 @@ + rHints.Count() ); + } } - if( !pContext ) - { -- // ignore unknown content -- pContext = -- new SvXMLImportContext( rImport, nPrefix, rLocalName ); + if( !pContext ) + { +- // ignore unknown content +- pContext = +- new SvXMLImportContext( rImport, nPrefix, rLocalName ); + pContext=rImport.createUnknownContext(nPrefix, rLocalName, xAttrList); - } - // Behind fields, shapes and any unknown content blanks aren't ignored - rIgnoreLeadingSpace = sal_False; - } + } + // Behind fields, shapes and any unknown content blanks aren't ignored + rIgnoreLeadingSpace = sal_False; + } - - return pContext; + return pContext; } -@@ -1672,7 +1671,7 @@ XMLParaContext::XMLParaContext( - const SvXMLTokenMap& rTokenMap = - GetImport().GetTextImport()->GetTextPAttrTokenMap(); +@@ -1920,7 +1919,7 @@ XMLParaContext::XMLParaContext( + const SvXMLTokenMap& rTokenMap = + GetImport().GetTextImport()->GetTextPAttrTokenMap(); -- OUString aCondStyleName, sClassNames; +- OUString aCondStyleName, sClassNames; + OUString sStyleName, aCondStyleName, sClassNames; - sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; - for( sal_Int16 i=0; i < nAttrCount; i++ ) -@@ -1742,18 +1741,24 @@ XMLParaContext::XMLParaContext( + sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; + for( sal_Int16 i=0; i < nAttrCount; i++ ) +@@ -2002,18 +2001,24 @@ XMLParaContext::XMLParaContext( break; - } - } + } + } - + m_sClassNames = sClassNames; - if( aCondStyleName.getLength() ) -- sStyleName = aCondStyleName; -- else if( sClassNames.getLength() ) -- { -- sal_Int32 nDummy = 0; -- sStyleName = sClassNames.getToken( 0, ' ', nDummy ); + if( aCondStyleName.getLength() ) +- sStyleName = aCondStyleName; +- else if( sClassNames.getLength() ) +- { +- sal_Int32 nDummy = 0; +- sStyleName = sClassNames.getToken( 0, ' ', nDummy ); + m_sStyleName = aCondStyleName; + else { + m_sStyleName = sStyleName; @@ -260,16 +260,16 @@ + sal_Int32 nDummy = 0; + m_sStyleName = m_sClassNames.getToken( 0, ' ', nDummy ); + m_sClassNames = m_sClassNames.copy(m_sStyleName.getLength()+1); - } + } } XMLParaContext::~XMLParaContext() { + rtl::OUString sStyleName = m_sStyleName; - UniReference < XMLTextImportHelper > xTxtImport( - GetImport().GetTextImport()); + UniReference < XMLTextImportHelper > xTxtImport( + GetImport().GetTextImport()); Reference < XTextRange > xCrsrRange( xTxtImport->GetCursorAsRange() ); -@@ -1812,6 +1817,7 @@ XMLParaContext::~XMLParaContext() +@@ -2078,6 +2083,7 @@ XMLParaContext::~XMLParaContext() // because of side effects of method <SetStyleAndAttrs(..)> xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor, sCellParaStyleName, @@ -277,7 +277,7 @@ sal_True, sal_False, -1, // suppress outline handling sal_False ); // suppress list attributes handling -@@ -1826,6 +1832,7 @@ XMLParaContext::~XMLParaContext() +@@ -2092,6 +2098,7 @@ XMLParaContext::~XMLParaContext() // --> OD 2007-07-25 #i73509# - add paramter <mbOutlineLevelAttrFound> sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor, sStyleName, @@ -285,33 +285,33 @@ sal_True, mbOutlineLevelAttrFound, bHeading ? nOutlineLevel : -1 ); -@@ -1888,7 +1895,7 @@ XMLParaContext::~XMLParaContext() - ((XMLStyleHint_Impl *)pHint)->GetStyleName(); - if( rStyleName.getLength() ) - xTxtImport->SetStyleAndAttrs( GetImport(), -- xAttrCursor, rStyleName, +@@ -2154,7 +2161,7 @@ XMLParaContext::~XMLParaContext() + ((XMLStyleHint_Impl *)pHint)->GetStyleName(); + if( rStyleName.getLength() ) + xTxtImport->SetStyleAndAttrs( GetImport(), +- xAttrCursor, rStyleName, + xAttrCursor, rStyleName, OUString(), sal_False ); - } - break; -@@ -2059,7 +2066,7 @@ SvXMLImportContext *XMLParaContext::Crea + } + break; +@@ -2314,7 +2321,7 @@ SvXMLImportContext *XMLParaContext::Crea void XMLParaContext::Characters( const OUString& rChars ) { - OUString sChars = -- GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName, + OUString sChars = +- GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName, + GetImport().GetTextImport()->ConvertStarFonts( rChars, m_sStyleName, - nStarFontsConvFlags, - sal_True, GetImport() ); - GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace ); ---- xmloff/source/text/txtparai.hxx.old 2009-04-02 10:36:05.000000000 +0000 -+++ xmloff/source/text/txtparai.hxx 2009-04-06 16:42:18.000000000 +0000 + nStarFontsConvFlags, + sal_True, GetImport() ); + GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace ); +--- xmloff/source/text/txtparai.hxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/text/txtparai.hxx 2010-03-03 16:59:59.000000000 +0100 @@ -48,7 +48,8 @@ class XMLParaContext : public SvXMLImpor { - ::com::sun::star::uno::Reference < - ::com::sun::star::text::XTextRange > xStart; // xub_StrLen nStart; -- ::rtl::OUString sStyleName; + ::com::sun::star::uno::Reference < + ::com::sun::star::text::XTextRange > xStart; // xub_StrLen nStart; +- ::rtl::OUString sStyleName; + ::rtl::OUString m_sStyleName; + ::rtl::OUString m_sClassNames; - ::rtl::OUString sId; - ::rtl::OUString sXmlId; - sal_Int8 nOutlineLevel; + ::rtl::OUString sId; + ::rtl::OUString m_sXmlId; + ::rtl::OUString m_sAbout; diff --git a/patches/evo2/buildfix-evo1-vs-evo2.diff b/patches/evo2/buildfix-evo1-vs-evo2.diff index 13e596041..b4790d0e2 100644 --- a/patches/evo2/buildfix-evo1-vs-evo2.diff +++ b/patches/evo2/buildfix-evo1-vs-evo2.diff @@ -1,5 +1,5 @@ ---- connectivity/source/drivers/evoab/makefile.mk.old 2008-12-30 15:32:01.000000000 +0100 -+++ connectivity/source/drivers/evoab/makefile.mk 2009-04-29 20:51:57.000000000 +0200 +--- connectivity/source/drivers/evoab/makefile.mk.old 2009-10-08 16:17:53.000000000 +0200 ++++ connectivity/source/drivers/evoab/makefile.mk 2010-03-03 16:59:30.000000000 +0100 @@ -36,6 +36,11 @@ TARGET=evoab VISIBILITY_HIDDEN=TRUE @@ -12,11 +12,10 @@ # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ -@@ -103,6 +108,7 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def - DEF1NAME= $(SHL1TARGET) - +@@ -104,5 +109,6 @@ DEF1NAME= $(SHL1TARGET) + dummy: + @echo "Nothing to build for GUI $(GUI)" .ENDIF +.ENDIF # --- Targets ---------------------------------- - - .INCLUDE : target.mk + .INCLUDE : $(PRJ)$/target.pmk diff --git a/patches/gstreamer/gstreamer-config-office.diff b/patches/gstreamer/gstreamer-config-office.diff index 9a4a8cbfe..175e2cfe1 100644 --- a/patches/gstreamer/gstreamer-config-office.diff +++ b/patches/gstreamer/gstreamer-config-office.diff @@ -1,8 +1,6 @@ -diff --git configure.in configure.in -index 4ff07ea..bfe9198 100644 ---- configure.in -+++ configure.in -@@ -304,6 +304,9 @@ +--- configure.in.old 2010-03-03 16:59:45.000000000 +0100 ++++ configure.in 2010-03-03 16:59:46.000000000 +0100 +@@ -304,6 +304,9 @@ AC_ARG_ENABLE(randr-link, [ --disable-randr-link disable linking with libXrandr, instead dynamically open it at runtime ],,enable_randr_link=yes) @@ -12,7 +10,7 @@ index 4ff07ea..bfe9198 100644 AC_ARG_WITH(myspell-dicts, [ --without-myspell-dicts Removes myspell dictionaries from openoffice.org installation set, for people building for specific -@@ -908,6 +908,7 @@ case "$build_os" in +@@ -930,6 +933,7 @@ case "$build_os" in solaris*) test_gtk=yes test_cairo=yes @@ -20,31 +18,31 @@ index 4ff07ea..bfe9198 100644 test_kde=yes test_cups=yes test_randr=yes -@@ -936,6 +937,7 @@ case "$build_os" in +@@ -963,6 +967,7 @@ case "$build_os" in linux-gnu*) test_gtk=yes test_cairo=yes + build_gstreamer=yes test_kde=yes + test_kde4=yes test_cups=yes - test_randr=yes -@@ -979,6 +982,7 @@ case "$build_os" in +@@ -1007,6 +1012,7 @@ case "$build_os" in freebsd*) test_gtk=yes test_cairo=yes + build_gstreamer=yes test_kde=yes + test_kde4=yes test_cups=yes - test_randr=yes -@@ -1012,6 +1016,7 @@ case "$build_os" in +@@ -1041,6 +1047,7 @@ case "$build_os" in netbsd) test_gtk=yes test_cairo=yes + build_gstreamer=yes test_kde=yes + test_kde4=yes test_cups=no - test_randr=yes -@@ -5565,6 +5570,26 @@ AC_SUBST(CAIRO_CFLAGS) +@@ -5857,6 +5864,26 @@ AC_SUBST(CAIRO_CFLAGS) AC_SUBST(CAIRO_LIBS) dnl =================================================================== @@ -71,11 +69,9 @@ index 4ff07ea..bfe9198 100644 dnl Check whether the OpenGL libraries are available dnl =================================================================== -diff --git set_soenv.in set_soenv.in -index 7f49931..7320345 100644 ---- set_soenv.in -+++ set_soenv.in -@@ -1756,6 +1756,7 @@ ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" ); +--- set_soenv.in.old 2010-03-03 16:59:44.000000000 +0100 ++++ set_soenv.in 2010-03-03 16:59:46.000000000 +0100 +@@ -1681,6 +1681,7 @@ ToFile( "ENABLE_DBUS", "@ENABLE_DB ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" ); ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" ); ToFile( "GNOMEVFS_HAS_LOCKING","@GNOMEVFS_HAS_LOCKING@", "e" ); diff --git a/patches/gstreamer/gstreamer-solenv.diff b/patches/gstreamer/gstreamer-solenv.diff index 8d2c01b89..ede0898e2 100644 --- a/patches/gstreamer/gstreamer-solenv.diff +++ b/patches/gstreamer/gstreamer-solenv.diff @@ -1,9 +1,8 @@ -diff -rup solenv-orig/inc/settings.mk solenv/inc/settings.mk ---- solenv-orig/inc/settings.mk 2006-08-17 16:01:59.000000000 +0200 -+++ solenv/inc/settings.mk 2006-08-17 16:02:36.000000000 +0200 -@@ -1126,6 +1126,10 @@ CDEFS+=-DEXCEPTIONS_ON - LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS) - LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON +--- solenv/inc/settings.mk.old 2010-03-03 16:59:22.000000000 +0100 ++++ solenv/inc/settings.mk 2010-03-03 16:59:46.000000000 +0100 +@@ -1185,6 +1185,10 @@ CDEFS+=-DENABLE_LAYOUT_EXPERIMENTAL=1 + CFLAGS+=-DENABLE_LAYOUT_EXPERIMENTAL=0 + .ENDIF # ENABLE_LAYOUT_EXPERIMENTAL != TRUE +.IF "$(ENABLE_GSTREAMER)" == "TRUE" +CDEFS+=-DGSTREAMER diff --git a/patches/mono/buildfix-testtool-disabled.diff b/patches/mono/buildfix-testtool-disabled.diff index 3f6f04f43..d2865d810 100644 --- a/patches/mono/buildfix-testtool-disabled.diff +++ b/patches/mono/buildfix-testtool-disabled.diff @@ -1,8 +1,6 @@ -diff --git testtools/source/bridgetest/idl/makefile.mk testtools/source/bridgetest/idl/makefile.mk -index 671f982..01b9e0c 100644 ---- testtools/source/bridgetest/idl/makefile.mk -+++ testtools/source/bridgetest/idl/makefile.mk -@@ -60,6 +60,8 @@ CLIMAKERFLAGS = +--- testtools/source/bridgetest/idl/makefile.mk.old 2009-10-08 16:17:37.000000000 +0200 ++++ testtools/source/bridgetest/idl/makefile.mk 2010-03-03 16:59:32.000000000 +0100 +@@ -59,6 +59,8 @@ CLIMAKERFLAGS = CLIMAKERFLAGS += --verbose .ENDIF @@ -11,7 +9,7 @@ index 671f982..01b9e0c 100644 ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \ $(MISC)$/$(TARGET).javamaker.done \ $(BIN)$/cli_types_bridgetest.dll -@@ -68,4 +70,8 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb +@@ -67,6 +69,10 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN) $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_uretypes.dll \ -X $(SOLARBINDIR)$/types.rdb $< $(TOUCH) $@ @@ -20,10 +18,10 @@ index 671f982..01b9e0c 100644 + $(MISC)$/$(TARGET).javamaker.done +.ENDIF -diff --git testtools/util/makefile.pmk testtools/util/makefile.pmk -index b52727a..b380d74 100644 ---- testtools/util/makefile.pmk -+++ testtools/util/makefile.pmk + .ENDIF + .ENDIF # GUI, WNT +--- testtools/util/makefile.pmk.old 2009-10-07 15:06:44.000000000 +0200 ++++ testtools/util/makefile.pmk 2010-03-03 16:59:32.000000000 +0100 @@ -31,7 +31,7 @@ # no translation here anyway diff --git a/patches/mono/mono-climaker-bridgetest.diff b/patches/mono/mono-climaker-bridgetest.diff index 048dc5e82..72534d84a 100644 --- a/patches/mono/mono-climaker-bridgetest.diff +++ b/patches/mono/mono-climaker-bridgetest.diff @@ -1,12 +1,12 @@ ---- testtools/source/bridgetest/idl/makefile.mk.O 2007-05-18 16:30:36.000000000 +0200 -+++ testtools/source/bridgetest/idl/makefile.mk 2007-05-18 16:32:27.000000000 +0200 -@@ -55,6 +55,9 @@ - - $(RM) $@ - $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/bridgetest.urd +--- testtools/source/bridgetest/idl/makefile.mk.old 2010-03-03 16:59:32.000000000 +0100 ++++ testtools/source/bridgetest/idl/makefile.mk 2010-03-03 16:59:32.000000000 +0100 +@@ -59,6 +59,9 @@ CLIMAKERFLAGS = + CLIMAKERFLAGS += --verbose + .ENDIF +.IF "$(ENABLE_MONO_CLIMAKER)" == "YES" +CLIMAKER=MONO_PATH=$(OUT)/bin:$(MONO_PATH) LD_LIBRARY_PATH=$(SOLARLIBDIR):$(OUT)/lib mono $(SOLARBINDIR)$/climaker.exe +.ENDIF - CLIMAKERFLAGS = - .IF "$(debug)" != "" + .IF "$(BUILD_FOR_CLI)" == "true" + ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \ diff --git a/patches/mono/mono-scp2.diff b/patches/mono/mono-scp2.diff index 704b0afda..d0fb606ab 100644 --- a/patches/mono/mono-scp2.diff +++ b/patches/mono/mono-scp2.diff @@ -1,11 +1,6 @@ -Index: scp2/source/ooo/makefile.mk -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/makefile.mk,v -retrieving revision 1.28 -diff -u -r1.28 makefile.mk ---- scp2/source/ooo/makefile.mk 30 Mar 2005 11:40:55 -0000 1.28 -+++ scp2/source/ooo/makefile.mk 7 Apr 2005 17:06:30 -0000 -@@ -142,6 +142,10 @@ +--- scp2/source/ooo/makefile.mk.old 2009-12-03 13:51:57.000000000 +0100 ++++ scp2/source/ooo/makefile.mk 2010-03-03 16:59:31.000000000 +0100 +@@ -155,6 +155,10 @@ SCPDEFS+=-DSYSTEM_CURL SCPDEFS+=-DSYSTEM_STDLIBS .ENDIF @@ -16,15 +11,9 @@ diff -u -r1.28 makefile.mk .IF "$(SYSTEM_SNDFILE)" == "YES" SCPDEFS+=-DSYSTEM_SNDFILE .ENDIF - -Index: file_library_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v -retrieving revision 1.299 -diff -u -r1.299 file_library_ooo.scp ---- scp2/source/ooo/file_library_ooo.scp 11 Jul 2008 10:32:04 -0000 1.299 -+++ scp2/source/ooo/file_library_ooo.scp 20 Jul 2008 01:13:29 -0000 -@@ -137,7 +137,7 @@ +--- scp2/source/ooo/file_library_ooo.scp.old 2010-03-03 16:59:30.000000000 +0100 ++++ scp2/source/ooo/file_library_ooo.scp 2010-03-03 16:59:31.000000000 +0100 +@@ -140,7 +140,7 @@ STD_UNO_LIB_FILE(gid_File_Lib_Charttools STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview) @@ -33,7 +22,7 @@ diff -u -r1.299 file_library_ooo.scp File gid_File_Lib_Cli_Oootypes_Assembly TXT_FILE_BODY; -@@ -156,7 +156,7 @@ +@@ -159,7 +159,7 @@ End #endif @@ -42,7 +31,7 @@ diff -u -r1.299 file_library_ooo.scp File gid_File_Lib_Policy_Cli_Oootypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); -@@ -173,7 +173,7 @@ +@@ -177,7 +177,7 @@ End #endif @@ -51,15 +40,10 @@ diff -u -r1.299 file_library_ooo.scp File gid_File_Lib_Policy_Cli_Oootypes_Config TXT_FILE_BODY; -Index: ure.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v -retrieving revision 1.10 -diff -u -r1.10 ure.scp ---- scp2/source/ooo/ure.scp 30 Jun 2008 15:25:02 -0000 1.10 -+++ scp2/source/ooo/ure.scp 20 Jul 2008 01:13:40 -0000 -@@ -410,7 +410,7 @@ - // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05"; +--- scp2/source/ooo/ure.scp.old 2009-10-08 16:17:46.000000000 +0200 ++++ scp2/source/ooo/ure.scp 2010-03-03 16:59:31.000000000 +0100 +@@ -417,7 +417,7 @@ File gid_File_Dl_LogUnoUno + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#if defined WNT && defined _MSC @@ -67,7 +51,7 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Cli_Uno TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; -@@ -420,7 +420,7 @@ +@@ -427,7 +427,7 @@ File gid_File_Dl_Cli_Uno End #endif @@ -76,7 +60,7 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; -@@ -439,7 +439,7 @@ +@@ -446,7 +446,7 @@ End #endif @@ -85,16 +69,16 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Policy_Cli_Ure_Assembly TXT_FILE_BODY; -@@ -458,7 +458,7 @@ +@@ -465,7 +465,7 @@ End #endif --#if defined WNT && defined _MSC +-#if defined WNT && defined _MSC +#if (defined WNT && defined _MSC) || defined ENABLE_MONO File gid_File_Dl_Policy_Cli_Ure_Config TXT_FILE_BODY; -@@ -470,7 +470,7 @@ +@@ -477,7 +477,7 @@ End #endif @@ -103,7 +87,7 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Cli_Basetypes_Assembly TXT_FILE_BODY; -@@ -489,7 +489,7 @@ +@@ -496,7 +496,7 @@ End #endif @@ -112,7 +96,7 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Policy_Cli_Basetypes_Assembly TXT_FILE_BODY; -@@ -507,7 +507,7 @@ +@@ -514,7 +514,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_As End #endif @@ -121,7 +105,7 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Policy_Cli_Basetypes_Config TXT_FILE_BODY; -@@ -520,7 +520,7 @@ +@@ -527,7 +527,7 @@ End #endif @@ -130,7 +114,7 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Cli_Uretypes_Assembly TXT_FILE_BODY; -@@ -539,7 +539,7 @@ +@@ -546,7 +546,7 @@ End #endif @@ -139,16 +123,16 @@ diff -u -r1.10 ure.scp File gid_File_Dl_Policy_Cli_Uretypes_Assembly TXT_FILE_BODY; -@@ -558,7 +558,7 @@ +@@ -565,7 +565,7 @@ End #endif --#if defined WNT && defined _MSC +-#if defined WNT && defined _MSC +#if (defined WNT && defined _MSC) || defined ENABLE_MONO File gid_File_Dl_Policy_Cli_Uretypes_Config TXT_FILE_BODY; -@@ -570,7 +570,7 @@ +@@ -577,7 +577,7 @@ End #endif @@ -157,7 +141,7 @@ diff -u -r1.10 ure.scp File gid_File_Lib_Cli_Cppuhelper_Assembly TXT_FILE_BODY; -@@ -589,7 +589,7 @@ +@@ -596,7 +596,7 @@ End #endif @@ -166,7 +150,7 @@ diff -u -r1.10 ure.scp File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly TXT_FILE_BODY; -@@ -607,7 +607,7 @@ +@@ -615,7 +615,7 @@ End #endif @@ -175,7 +159,7 @@ diff -u -r1.10 ure.scp File gid_File_Lib_Policy_Cli_Cppuhelper_Config TXT_FILE_BODY; -@@ -619,6 +619,33 @@ End +@@ -627,6 +627,33 @@ End #endif @@ -209,7 +193,7 @@ diff -u -r1.10 ure.scp #if defined SOLAR_JAVA File gid_File_Dl_Jpipe TXT_FILE_BODY; -@@ -1124,6 +1124,7 @@ +@@ -1135,6 +1162,7 @@ Module gid_Module_Root_Ure_Hidden gid_File_Lib_Cli_Cppuhelper_Assembly, gid_File_Lib_Policy_Cli_Cppuhelper_Assembly, gid_File_Lib_Policy_Cli_Cppuhelper_Config, diff --git a/patches/unittesting/unittesting-vcl.diff b/patches/unittesting/unittesting-vcl.diff index 5fe4e029e..f8ebaa0a3 100644 --- a/patches/unittesting/unittesting-vcl.diff +++ b/patches/unittesting/unittesting-vcl.diff @@ -1,12 +1,12 @@ ---- vcl/prj/build.lst.old 2009-04-02 10:44:28.000000000 +0000 -+++ vcl/prj/build.lst 2009-04-06 16:42:15.000000000 +0000 -@@ -39,4 +39,3 @@ vc vcl\mac\source\window nmake - m v +--- vcl/prj/build.lst.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/prj/build.lst 2010-03-03 16:59:55.000000000 +0100 +@@ -47,4 +47,3 @@ vc vcl\mac\source\window nmake - m v vc vcl\mac\source\src nmake - m vc__srcm vc_inc NULL - vc vcl\util nmake - all vc_util vc__plug.u vc__aquy.u vc__appa.u vc__appm.m vc__appu.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__hl.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_components NULL + vc vcl\util nmake - all vc_util vc__plug.u vc__desk.u vc__aquy.u vc__appa.u vc__dtra.u vc__appm.m vc__appu.u vc__dtru.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__kde4.u vc__hl.u vc__ftmu.u vc__prgu.u vc__prnu.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_fts vc_components NULL vc vcl\util\linksvp nmake - u vc_lsvp vc_util NULL -vc vcl\workben nmake - all vc_wrkb vc_util vc_salmain NULL ---- vcl/prj/tests.lst.old 1970-01-01 00:00:00.000000000 +0000 -+++ vcl/prj/tests.lst 2009-04-06 16:42:15.000000000 +0000 +--- vcl/prj/tests.lst.old 2010-03-03 16:59:55.000000000 +0100 ++++ vcl/prj/tests.lst 2010-03-03 16:59:55.000000000 +0100 @@ -0,0 +1,6 @@ +#does not build: vc vcl\qa\complex\memCheck nmake - all vc_qa_complex_memCheck NULL +#does not build: vc vcl\qa\complex\persistent_window_states nmake - all vc_qa_complex_persistent_window_states NULL diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff index 5e87f2f99..36781f246 100644 --- a/patches/vba/cws-vbasupportdev300.diff +++ b/patches/vba/cws-vbasupportdev300.diff @@ -1,7 +1,5 @@ -diff --git basctl/inc/basidesh.hrc basctl/inc/basidesh.hrc -index e499563..871ea72 100644 ---- basctl/inc/basidesh.hrc -+++ basctl/inc/basidesh.hrc +--- basctl/inc/basidesh.hrc.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/inc/basidesh.hrc 2010-03-03 16:59:34.000000000 +0100 @@ -184,6 +184,10 @@ #define RID_STR_DLGIMP_MISMATCH_OMIT ( RID_BASICIDE_START + 115 ) #define RID_STR_DLGIMP_MISMATCH_TITLE ( RID_BASICIDE_START + 116 ) @@ -13,10 +11,8 @@ index e499563..871ea72 100644 #endif // _SVX_NOIDERESIDS -diff --git basctl/source/basicide/baside2.cxx basctl/source/basicide/baside2.cxx -index 3b330d7..2ec681c 100644 ---- basctl/source/basicide/baside2.cxx -+++ basctl/source/basicide/baside2.cxx +--- basctl/source/basicide/baside2.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/source/basicide/baside2.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -49,6 +49,7 @@ #include <com/sun/star/script/XLibraryContainer2.hpp> #endif @@ -64,7 +60,7 @@ index 3b330d7..2ec681c 100644 { pMethod->SetDebugFlags( aStatus.nBasicFlags ); BasicDLL::SetDebugMode( TRUE ); -@@ -1359,7 +1364,39 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor() +@@ -1359,7 +1364,39 @@ BasicEntryDescriptor ModulWindow::Create ScriptDocument aDocument( GetDocument() ); String aLibName( GetLibName() ); LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName ); @@ -105,10 +101,8 @@ index 3b330d7..2ec681c 100644 } void ModulWindow::SetReadOnly( BOOL b ) -diff --git basctl/source/basicide/baside3.cxx basctl/source/basicide/baside3.cxx -index caceda3..211c105 100644 ---- basctl/source/basicide/baside3.cxx -+++ basctl/source/basicide/baside3.cxx +--- basctl/source/basicide/baside3.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/source/basicide/baside3.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -85,6 +85,7 @@ #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <com/sun/star/resource/StringResourceWithLocation.hpp> @@ -117,7 +111,7 @@ index caceda3..211c105 100644 using namespace comphelper; using namespace ::com::sun::star; -@@ -115,8 +116,16 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St +@@ -115,8 +116,16 @@ DialogWindow::DialogWindow( Window* pPar { InitSettings( TRUE, TRUE, TRUE ); @@ -144,7 +138,7 @@ index caceda3..211c105 100644 Reference< XInputStream > xInput( xISP->createInputStream() ); Reference< XSimpleFileAccess > xSFI( xMSF->createInstance -@@ -1013,7 +1022,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen +@@ -1013,7 +1022,7 @@ BOOL implImportDialog( Window* pWin, con Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
OSL_ASSERT( xProps.is() );
OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
@@ -153,7 +147,7 @@ index caceda3..211c105 100644 String aXmlDlgName;
Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY );
-@@ -1239,7 +1248,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen +@@ -1239,7 +1248,7 @@ BOOL implImportDialog( Window* pWin, con }
}
@@ -162,7 +156,7 @@ index caceda3..211c105 100644 bool bSuccess = rDocument.insertDialog( aLibName, aNewDlgName, xISP );
if( bSuccess )
{
-@@ -1300,8 +1309,9 @@ BasicEntryDescriptor DialogWindow::CreateEntryDescriptor() +@@ -1300,8 +1309,9 @@ BasicEntryDescriptor DialogWindow::Creat { ScriptDocument aDocument( GetDocument() ); String aLibName( GetLibName() ); @@ -182,11 +176,9 @@ index caceda3..211c105 100644 xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) ); } } -diff --git basctl/source/basicide/basides1.cxx basctl/source/basicide/basides1.cxx -index 07193c5..231aebd 100644 ---- basctl/source/basicide/basides1.cxx -+++ basctl/source/basicide/basides1.cxx -@@ -1201,10 +1201,16 @@ IDEBaseWindow* BasicIDEShell::FindWindow( const ScriptDocument& rDocument, const +--- basctl/source/basicide/basides1.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/basides1.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -1201,10 +1201,16 @@ IDEBaseWindow* BasicIDEShell::FindWindow // return any non-suspended window return pWin; } @@ -205,10 +197,8 @@ index 07193c5..231aebd 100644 return pWin; } } -diff --git basctl/source/basicide/basides2.cxx basctl/source/basicide/basides2.cxx -index aa933d8..7096170 100644 ---- basctl/source/basicide/basides2.cxx -+++ basctl/source/basicide/basides2.cxx +--- basctl/source/basicide/basides2.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/basides2.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -55,11 +55,38 @@ #include <tools/diagnose_ex.h> #include <sfx2/sfxdefs.hxx> @@ -248,7 +238,7 @@ index aa933d8..7096170 100644 IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG ) { ShowObjectDialog( FALSE, TRUE ); -@@ -232,7 +259,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const +@@ -232,7 +259,7 @@ ModulWindow* BasicIDEShell::CreateBasWin if ( !aLibName.Len() ) aLibName = String::CreateFromAscii( "Standard" ); @@ -257,7 +247,7 @@ index aa933d8..7096170 100644 if ( !aModName.Len() ) aModName = rDocument.createObjectName( E_SCRIPTS, aLibName ); -@@ -251,9 +278,12 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const +@@ -251,9 +278,12 @@ ModulWindow* BasicIDEShell::CreateBasWin if ( bSuccess ) { @@ -273,7 +263,7 @@ index aa933d8..7096170 100644 } } else -@@ -268,7 +298,21 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const +@@ -268,7 +298,21 @@ ModulWindow* BasicIDEShell::CreateBasWin } DBG_ASSERT( nKey, "CreateBasWin: Kein Key- Fenster nicht gefunden!" ); } @@ -296,11 +286,9 @@ index aa933d8..7096170 100644 pTabBar->Sort(); pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar ); if ( !pCurWin ) -diff --git basctl/source/basicide/basides3.cxx basctl/source/basicide/basides3.cxx -index e29d67e..23f70e0 100644 ---- basctl/source/basicide/basides3.cxx -+++ basctl/source/basicide/basides3.cxx -@@ -99,7 +99,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons +--- basctl/source/basicide/basides3.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/source/basicide/basides3.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -99,7 +99,7 @@ DialogWindow* BasicIDEShell::CreateDlgWi Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); OSL_ASSERT( xProps.is() ); OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); @@ -309,10 +297,8 @@ index e29d67e..23f70e0 100644 LocalizationMgr::setStringResourceAtDialog( rDocument, rLibName, aDlgName, xDialogModel ); // new dialog window -diff --git basctl/source/basicide/basidesh.cxx basctl/source/basicide/basidesh.cxx -index 62334ad..2727c90 100644 ---- basctl/source/basicide/basidesh.cxx -+++ basctl/source/basicide/basidesh.cxx +--- basctl/source/basicide/basidesh.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/basidesh.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -80,6 +80,9 @@ #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> @@ -395,7 +381,7 @@ index 62334ad..2727c90 100644 TYPEINIT1( BasicIDEShell, SfxViewShell ); -@@ -124,6 +192,7 @@ BasicIDEShell::BasicIDEShell( SfxViewFrame* pFrame_, SfxViewShell* /* pOldShell +@@ -124,6 +192,7 @@ BasicIDEShell::BasicIDEShell( SfxViewFra m_bAppBasicModified( FALSE ), m_aNotifier( *this ) { @@ -416,7 +402,7 @@ index 62334ad..2727c90 100644 // MI: Das gab einen GPF im SDT beim Schliessen da dann der ViewFrame die // ObjSh loslaesst. Es wusste auch keiner mehr wozu das gut war. // GetViewFrame()->GetObjectShell()->Broadcast( SfxSimpleHint( SFX_HINT_DYING ) ); -@@ -921,7 +996,15 @@ void BasicIDEShell::SetCurLib( const ScriptDocument& rDocument, String aLibName, +@@ -921,7 +996,15 @@ void BasicIDEShell::SetCurLib( const Scr { if ( !bCheck || ( rDocument != m_aCurDocument || aLibName != m_aCurLibName ) ) { @@ -432,10 +418,8 @@ index 62334ad..2727c90 100644 m_aCurLibName = aLibName; if ( bUpdateWindows ) UpdateWindows(); -diff --git basctl/source/basicide/basidesh.src basctl/source/basicide/basidesh.src -index 4eb1e53..c47d16e 100644 ---- basctl/source/basicide/basidesh.src -+++ basctl/source/basicide/basidesh.src +--- basctl/source/basicide/basidesh.src.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/source/basicide/basidesh.src 2010-03-03 16:59:34.000000000 +0100 @@ -639,6 +639,22 @@ String RID_STR_TRANSLATION_DEFAULT { Text [ en-US ] = "[Default Language]" ; @@ -459,10 +443,8 @@ index 4eb1e53..c47d16e 100644 String RID_STR_DLGIMP_CLASH_RENAME -diff --git basctl/source/basicide/bastype2.cxx basctl/source/basicide/bastype2.cxx -index 4d990e3..ab34938 100644 ---- basctl/source/basicide/bastype2.cxx -+++ basctl/source/basicide/bastype2.cxx +--- basctl/source/basicide/bastype2.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/bastype2.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -53,10 +53,25 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <comphelper/processfactory.hxx> @@ -489,7 +471,7 @@ index 4d990e3..ab34938 100644 BasicEntry::~BasicEntry() { -@@ -91,20 +106,22 @@ BasicEntryDescriptor::BasicEntryDescriptor() +@@ -91,20 +106,22 @@ BasicEntryDescriptor::BasicEntryDescript { } @@ -514,7 +496,7 @@ index 4d990e3..ab34938 100644 ,m_aName( rName ) ,m_aMethodName( rMethodName ) ,m_eType( eType ) -@@ -120,6 +137,7 @@ BasicEntryDescriptor::BasicEntryDescriptor( const BasicEntryDescriptor& rDesc ) +@@ -120,6 +137,7 @@ BasicEntryDescriptor::BasicEntryDescript :m_aDocument( rDesc.m_aDocument ) ,m_eLocation( rDesc.m_eLocation ) ,m_aLibName( rDesc.m_aLibName ) @@ -522,7 +504,7 @@ index 4d990e3..ab34938 100644 ,m_aName( rDesc.m_aName ) ,m_aMethodName( rDesc.m_aMethodName ) ,m_eType( rDesc.m_eType ) -@@ -131,6 +149,7 @@ BasicEntryDescriptor& BasicEntryDescriptor::operator=( const BasicEntryDescripto +@@ -131,6 +149,7 @@ BasicEntryDescriptor& BasicEntryDescript m_aDocument = rDesc.m_aDocument; m_eLocation = rDesc.m_eLocation; m_aLibName = rDesc.m_aLibName; @@ -530,7 +512,7 @@ index 4d990e3..ab34938 100644 m_aName = rDesc.m_aName; m_aMethodName = rDesc.m_aMethodName; m_eType = rDesc.m_eType; -@@ -143,6 +162,7 @@ bool BasicEntryDescriptor::operator==( const BasicEntryDescriptor& rDesc ) const +@@ -143,6 +162,7 @@ bool BasicEntryDescriptor::operator==( c return m_aDocument == rDesc.m_aDocument && m_eLocation == rDesc.m_eLocation && m_aLibName == rDesc.m_aLibName && @@ -538,7 +520,7 @@ index 4d990e3..ab34938 100644 m_aName == rDesc.m_aName && m_aMethodName == rDesc.m_aMethodName && m_eType == rDesc.m_eType; -@@ -286,50 +306,58 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const +@@ -286,50 +306,58 @@ void BasicTreeListBox::ImpCreateLibSubEn if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryLoaded( aOULibName ) ) { try @@ -636,7 +618,7 @@ index 4d990e3..ab34938 100644 } } -@@ -368,6 +396,139 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const +@@ -368,6 +396,139 @@ void BasicTreeListBox::ImpCreateLibSubEn } } @@ -789,7 +771,7 @@ index 4d990e3..ab34938 100644 { // check password, if library is password protected and not verified ::rtl::OUString aOULibName( aLibName ); -@@ -636,7 +798,7 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntryDescriptor& rDesc ) +@@ -636,7 +798,7 @@ void BasicTreeListBox::SetCurrentEntry( aDesc = BasicEntryDescriptor( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER, String::CreateFromAscii( "Standard" ), @@ -798,7 +780,7 @@ index 4d990e3..ab34938 100644 } ScriptDocument aDocument( aDesc.GetDocument() ); OSL_ENSURE( aDocument.isValid(), "BasicTreeListBox::SetCurrentEntry: invalid document!" ); -@@ -653,14 +815,24 @@ void BasicTreeListBox::SetCurrentEntry( BasicEntryDescriptor& rDesc ) +@@ -653,14 +815,24 @@ void BasicTreeListBox::SetCurrentEntry( if ( pLibEntry ) { pCurEntry = pLibEntry; @@ -825,10 +807,8 @@ index 4d990e3..ab34938 100644 if ( pEntry ) { pCurEntry = pEntry; -diff --git basctl/source/basicide/bastype2.hxx basctl/source/basicide/bastype2.hxx -index ed925e0..7079906 100644 ---- basctl/source/basicide/bastype2.hxx -+++ basctl/source/basicide/bastype2.hxx +--- basctl/source/basicide/bastype2.hxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/bastype2.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -42,7 +42,7 @@ #include <sbxitem.hxx> #include "basobj.hxx" @@ -876,11 +856,9 @@ index ed925e0..7079906 100644 // DocumentEventListener virtual void onDocumentCreated( const ScriptDocument& _rDocument ); -diff --git basctl/source/basicide/bastype3.cxx basctl/source/basicide/bastype3.cxx -index 929a48e..a372af8 100644 ---- basctl/source/basicide/bastype3.cxx -+++ basctl/source/basicide/bastype3.cxx -@@ -134,6 +134,14 @@ void __EXPORT BasicTreeListBox::RequestingChilds( SvLBoxEntry* pEntry ) +--- basctl/source/basicide/bastype3.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/bastype3.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -134,6 +134,14 @@ void __EXPORT BasicTreeListBox::Requesti } } } @@ -895,7 +873,7 @@ index 929a48e..a372af8 100644 else { DBG_ERROR( "BasicTreeListBox::RequestingChilds: Unknown Type!" ); } -@@ -204,6 +212,7 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry ) +@@ -204,6 +212,7 @@ SbxVariable* BasicTreeListBox::FindVaria } SbxVariable* pVar = 0; @@ -903,7 +881,7 @@ index 929a48e..a372af8 100644 if ( aEntries.Count() ) { for ( USHORT n = 0; n < aEntries.Count(); n++ ) -@@ -226,6 +235,12 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry ) +@@ -226,6 +235,12 @@ SbxVariable* BasicTreeListBox::FindVaria case OBJ_TYPE_MODULE: { DBG_ASSERT( pVar && pVar->IsA( TYPE(StarBASIC) ), "FindVariable: Ungueltiges Basic" ); @@ -916,7 +894,7 @@ index 929a48e..a372af8 100644 pVar = ((StarBASIC*)pVar)->FindModule( aName ); } break; -@@ -240,6 +255,15 @@ SbxVariable* BasicTreeListBox::FindVariable( SvLBoxEntry* pEntry ) +@@ -240,6 +255,15 @@ SbxVariable* BasicTreeListBox::FindVaria // sbx dialogs removed } break; @@ -932,7 +910,7 @@ index 929a48e..a372af8 100644 default: { DBG_ERROR( "FindVariable: Unbekannter Typ!" ); -@@ -260,12 +284,13 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry ) +@@ -260,12 +284,13 @@ BasicEntryDescriptor BasicTreeListBox::G ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() ); LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN; String aLibName; @@ -947,7 +925,7 @@ index 929a48e..a372af8 100644 EntryArray aEntries; -@@ -332,6 +357,15 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry ) +@@ -332,6 +357,15 @@ BasicEntryDescriptor BasicTreeListBox::G eType = pBE->GetType(); } break; @@ -963,7 +941,7 @@ index 929a48e..a372af8 100644 default: { DBG_ERROR( "GetEntryDescriptor: Unbekannter Typ!" ); -@@ -345,7 +379,7 @@ BasicEntryDescriptor BasicTreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry ) +@@ -345,7 +379,7 @@ BasicEntryDescriptor BasicTreeListBox::G } } @@ -972,7 +950,7 @@ index 929a48e..a372af8 100644 } USHORT BasicTreeListBox::ConvertType( BasicEntryType eType ) -@@ -427,6 +461,14 @@ bool BasicTreeListBox::IsValidEntry( SvLBoxEntry* pEntry ) +@@ -427,6 +461,14 @@ bool BasicTreeListBox::IsValidEntry( SvL bIsValid = BasicIDE::HasMethod( aDocument, aLibName, aName, aMethodName ); } break; @@ -987,10 +965,8 @@ index 929a48e..a372af8 100644 default: ; } -diff --git basctl/source/basicide/bastypes.cxx basctl/source/basicide/bastypes.cxx -index c3bf36d..a5aeb8c 100644 ---- basctl/source/basicide/bastypes.cxx -+++ basctl/source/basicide/bastypes.cxx +--- basctl/source/basicide/bastypes.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/source/basicide/bastypes.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -60,6 +60,7 @@ #include <com/sun/star/script/XLibraryContainer2.hpp> #endif @@ -999,7 +975,7 @@ index c3bf36d..a5aeb8c 100644 using namespace ::com::sun::star::uno; using namespace ::com::sun::star; -@@ -594,8 +595,30 @@ void __EXPORT BasicIDETabBar::Command( const CommandEvent& rCEvt ) +@@ -594,8 +595,30 @@ void __EXPORT BasicIDETabBar::Command( c aPopup.EnableItem( SID_BASICIDE_RENAMECURRENT, FALSE ); aPopup.RemoveDisabledEntries(); } @@ -1030,10 +1006,8 @@ index c3bf36d..a5aeb8c 100644 SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; if ( pDispatcher ) -diff --git basctl/source/basicide/macrodlg.cxx basctl/source/basicide/macrodlg.cxx -index 844e9d3..4a97e4a 100644 ---- basctl/source/basicide/macrodlg.cxx -+++ basctl/source/basicide/macrodlg.cxx +--- basctl/source/basicide/macrodlg.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/macrodlg.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -385,7 +385,15 @@ SbMethod* MacroChooser::CreateMacro() SbModule* pModule = 0; String aModName( aDesc.GetName() ); @@ -1050,7 +1024,7 @@ index 844e9d3..4a97e4a 100644 else if ( pBasic->GetModules()->Count() ) pModule = (SbModule*)pBasic->GetModules()->Get( 0 ); -@@ -713,6 +721,12 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) +@@ -713,6 +721,12 @@ IMPL_LINK( MacroChooser, ButtonHdl, Butt BasicManager* pBasMgr = aDocument.getBasicManager(); String aLib( aDesc.GetLibName() ); String aMod( aDesc.GetName() ); @@ -1063,11 +1037,9 @@ index 844e9d3..4a97e4a 100644 String aSub( aDesc.GetMethodName() ); SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, String() ); if ( pButton == &aEditButton ) -diff --git basctl/source/basicide/moduldlg.cxx basctl/source/basicide/moduldlg.cxx -index d37b7dc..cf38077 100644 ---- basctl/source/basicide/moduldlg.cxx -+++ basctl/source/basicide/moduldlg.cxx -@@ -87,7 +87,7 @@ BOOL __EXPORT ExtBasicTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& +--- basctl/source/basicide/moduldlg.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/moduldlg.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -87,7 +87,7 @@ BOOL __EXPORT ExtBasicTreeListBox::Editi if ( pEntry ) { USHORT nDepth = GetModel()->GetDepth( pEntry ); @@ -1076,7 +1048,7 @@ index d37b7dc..cf38077 100644 { BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) ); ScriptDocument aDocument( aDesc.GetDocument() ); -@@ -165,7 +165,7 @@ DragDropMode __EXPORT ExtBasicTreeListBox::NotifyStartDrag( TransferDataContaine +@@ -165,7 +165,7 @@ DragDropMode __EXPORT ExtBasicTreeListBo if ( pEntry ) { USHORT nDepth = GetModel()->GetDepth( pEntry ); @@ -1085,7 +1057,7 @@ index d37b7dc..cf38077 100644 { nMode_ = SV_DRAGDROP_CTRL_COPY; BasicEntryDescriptor aDesc( GetEntryDescriptor( pEntry ) ); -@@ -213,7 +213,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry ) +@@ -213,7 +213,7 @@ BOOL __EXPORT ExtBasicTreeListBox::Notif // don't drop on a library, which is not loaded, readonly or password protected // or which already has a module/dialog with this name @@ -1094,7 +1066,7 @@ index d37b7dc..cf38077 100644 { // get source module/dialog name BasicEntryDescriptor aSourceDesc( GetEntryDescriptor( pSelected ) ); -@@ -315,7 +315,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >& +@@ -315,7 +315,7 @@ void BasicIDEShell::CopyDialogResources( Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY ); OSL_ASSERT( xProps.is() ); OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext ); @@ -1103,7 +1075,7 @@ index d37b7dc..cf38077 100644 if( xDialogModel.is() ) { -@@ -332,7 +332,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >& +@@ -332,7 +332,7 @@ void BasicIDEShell::CopyDialogResources( { LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr ); } @@ -1112,7 +1084,7 @@ index d37b7dc..cf38077 100644 } } -@@ -351,7 +351,7 @@ BOOL __EXPORT ExtBasicTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, Sv +@@ -351,7 +351,7 @@ BOOL __EXPORT ExtBasicTreeListBox::Notif rpNewParent = pTarget; rNewChildPos = 0; } @@ -1175,7 +1147,7 @@ index d37b7dc..cf38077 100644 else aDelButton.Disable(); } -@@ -688,13 +704,20 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) +@@ -688,13 +704,20 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry(); DBG_ASSERT( pCurEntry, "Entry?!" ); @@ -1198,7 +1170,7 @@ index d37b7dc..cf38077 100644 pDispatcher->Execute( SID_BASICIDE_SHOWSBX, SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L ); } } -@@ -976,14 +999,14 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, +@@ -976,14 +999,14 @@ SbModule* createModImpl( Window* pWin, c try { ::rtl::OUString sModuleCode; @@ -1219,7 +1191,7 @@ index d37b7dc..cf38077 100644 SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName, aModName, BASICIDE_TYPE_MODULE ); BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; -@@ -1005,14 +1028,27 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, +@@ -1005,14 +1028,27 @@ SbModule* createModImpl( Window* pWin, c { if ( !rBasicBox.IsExpanded( pLibEntry ) ) rBasicBox.Expand( pLibEntry ); @@ -1249,10 +1221,8 @@ index d37b7dc..cf38077 100644 std::auto_ptr< BasicEntry >( new BasicEntry( OBJ_TYPE_MODULE ) ) ); DBG_ASSERT( pEntry, "InsertEntry fehlgeschlagen!" ); } -diff --git basctl/source/basicide/scriptdocument.cxx basctl/source/basicide/scriptdocument.cxx -index 2045842..afa4240 100644 ---- basctl/source/basicide/scriptdocument.cxx -+++ basctl/source/basicide/scriptdocument.cxx +--- basctl/source/basicide/scriptdocument.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/basicide/scriptdocument.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -56,6 +56,7 @@ #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/awt/XWindow2.hpp> @@ -1345,10 +1315,8 @@ index 2045842..afa4240 100644 return true; } -diff --git basctl/source/dlged/dlged.cxx basctl/source/dlged/dlged.cxx -index 82ede1a..d8578a6 100644 ---- basctl/source/dlged/dlged.cxx -+++ basctl/source/dlged/dlged.cxx +--- basctl/source/dlged/dlged.cxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/dlged/dlged.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -208,7 +208,7 @@ BOOL DlgEditor::RemarkDialog() //---------------------------------------------------------------------------- @@ -1393,10 +1361,8 @@ index 82ede1a..d8578a6 100644 } // get control models from clipboard dialog model -diff --git basctl/source/dlged/dlgedobj.cxx basctl/source/dlged/dlgedobj.cxx -index d060c90..96df719 100644 ---- basctl/source/dlged/dlgedobj.cxx -+++ basctl/source/dlged/dlgedobj.cxx +--- basctl/source/dlged/dlgedobj.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/source/dlged/dlgedobj.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -77,6 +77,22 @@ TYPEINIT1(DlgEdObj, SdrUnoObj); DBG_NAME(DlgEdObj); @@ -1420,7 +1386,7 @@ index d060c90..96df719 100644 DlgEdObj::DlgEdObj() :SdrUnoObj(String(), sal_False) -@@ -197,8 +213,9 @@ bool DlgEdObj::TransformSdrToControlCoordinates( +@@ -197,8 +213,9 @@ bool DlgEdObj::TransformSdrToControlCoor } // convert pixel to logic units @@ -1432,7 +1398,7 @@ index d060c90..96df719 100644 // set out parameters nXOut = aPos.Width(); -@@ -245,10 +262,10 @@ bool DlgEdObj::TransformSdrToFormCoordinates( +@@ -245,10 +262,10 @@ bool DlgEdObj::TransformSdrToFormCoordin aSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset; aSize.Height() -= aDeviceInfo.TopInset + aDeviceInfo.BottomInset; } @@ -1446,7 +1412,7 @@ index d060c90..96df719 100644 // set out parameters nXOut = aPos.Width(); -@@ -290,9 +307,10 @@ bool DlgEdObj::TransformControlToSdrCoordinates( +@@ -290,9 +307,10 @@ bool DlgEdObj::TransformControlToSdrCoor DBG_ASSERT( pDevice, "DlgEdObj::TransformControlToSdrCoordinates: missing default device!" ); if ( !pDevice ) return false; @@ -1460,7 +1426,7 @@ index d060c90..96df719 100644 // add form position aPos.Width() += aFormPos.Width(); -@@ -336,14 +354,16 @@ bool DlgEdObj::TransformFormToSdrCoordinates( +@@ -336,14 +354,16 @@ bool DlgEdObj::TransformFormToSdrCoordin DBG_ASSERT( pDevice, "DlgEdObj::TransformFormToSdrCoordinates: missing default device!" ); if ( !pDevice ) return false; @@ -1479,10 +1445,8 @@ index d060c90..96df719 100644 // take window borders into account Reference< beans::XPropertySet > xPSetForm( pForm->GetUnoControlModel(), UNO_QUERY ); DBG_ASSERT( xPSetForm.is(), "DlgEdObj::TransformFormToSdrCoordinates: no form property set!" ); -diff --git basctl/source/inc/basidesh.hxx basctl/source/inc/basidesh.hxx -index 40f5a06..001eac7 100644 ---- basctl/source/inc/basidesh.hxx -+++ basctl/source/inc/basidesh.hxx +--- basctl/source/inc/basidesh.hxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ basctl/source/inc/basidesh.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -49,6 +49,7 @@ #include <com/sun/star/io/XInputStreamProvider.hpp> #endif @@ -1491,7 +1455,7 @@ index 40f5a06..001eac7 100644 //---------------------------------------------------------------------------- -@@ -108,6 +109,8 @@ friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const Strin +@@ -108,6 +109,8 @@ friend bool BasicIDE::RemoveDialog( cons BOOL m_bAppBasicModified; ::basctl::DocumentEventNotifier m_aNotifier; @@ -1500,10 +1464,8 @@ index 40f5a06..001eac7 100644 #if _SOLAR__PRIVATE void Init(); -diff --git basctl/source/inc/dlged.hxx basctl/source/inc/dlged.hxx -index 324cdb3..2805d45 100644 ---- basctl/source/inc/dlged.hxx -+++ basctl/source/inc/dlged.hxx +--- basctl/source/inc/dlged.hxx.old 2009-10-07 15:07:22.000000000 +0200 ++++ basctl/source/inc/dlged.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -35,6 +35,7 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> @@ -1525,10 +1487,8 @@ index 324cdb3..2805d45 100644 ~DlgEditor(); void SetWindow( Window* pWindow ); -diff --git basic/inc/basic/basmgr.hxx basic/inc/basic/basmgr.hxx -index 7230d2c..e9e1f33 100644 ---- basic/inc/basic/basmgr.hxx -+++ basic/inc/basic/basmgr.hxx +--- basic/inc/basic/basmgr.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ basic/inc/basic/basmgr.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -239,7 +239,7 @@ public: takes the names of modules whose size exceeds the legacy limit */ @@ -1538,10 +1498,8 @@ index 7230d2c..e9e1f33 100644 private: BOOL IsReference( USHORT nLib ); -diff --git basic/inc/basic/sberrors.hxx basic/inc/basic/sberrors.hxx -index bd01967..0e44ebc 100644 ---- basic/inc/basic/sberrors.hxx -+++ basic/inc/basic/sberrors.hxx +--- basic/inc/basic/sberrors.hxx.old 2009-10-08 16:17:52.000000000 +0200 ++++ basic/inc/basic/sberrors.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -290,6 +290,8 @@ typedef ULONG SbError; #define ERRCODE_BASIC_LOOP_NOT_INIT ((LAST_SBX_ERROR_ID+109UL) | ERRCODE_AREA_SBX | \ ERRCODE_CLASS_COMPILER) // For loop not initialized @@ -1559,10 +1517,8 @@ index bd01967..0e44ebc 100644 #define SbERR_BASIC_ARRAY_FIX ERRCODE_BASIC_ARRAY_FIX #define SbERR_BASIC_STRING_OVERFLOW ERRCODE_BASIC_STRING_OVERFLOW #define SbERR_BASIC_EXPR_TOO_COMPLEX ERRCODE_BASIC_EXPR_TOO_COMPLEX -diff --git basic/inc/basic/sbmeth.hxx basic/inc/basic/sbmeth.hxx -index 2e1a8a1..ce4487f 100644 ---- basic/inc/basic/sbmeth.hxx -+++ basic/inc/basic/sbmeth.hxx +--- basic/inc/basic/sbmeth.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/inc/basic/sbmeth.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -49,6 +49,7 @@ class SbMethod : public SbxMethod friend class SbIfaceMapperMethod; @@ -1580,10 +1536,8 @@ index 2e1a8a1..ce4487f 100644 virtual void Broadcast( ULONG nHintId ); }; -diff --git basic/inc/basic/sbmod.hxx basic/inc/basic/sbmod.hxx -index b309179..153ead9 100644 ---- basic/inc/basic/sbmod.hxx -+++ basic/inc/basic/sbmod.hxx +--- basic/inc/basic/sbmod.hxx.old 2009-10-08 16:17:52.000000000 +0200 ++++ basic/inc/basic/sbmod.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -37,7 +37,8 @@ #ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> @@ -1639,11 +1593,8 @@ index b309179..153ead9 100644 }; #ifndef __SB_SBMODULEREF_HXX -diff --git basic/inc/basic/sbobjmod.hxx basic/inc/basic/sbobjmod.hxx -new file mode 100644 -index 0000000..5a9be63 ---- /dev/null -+++ basic/inc/basic/sbobjmod.hxx +--- basic/inc/basic/sbobjmod.hxx.old 2010-03-03 16:59:34.000000000 +0100 ++++ basic/inc/basic/sbobjmod.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,96 @@ +/************************************************************************* + * @@ -1741,10 +1692,8 @@ index 0000000..5a9be63 +#endif +#endif + -diff --git basic/inc/basic/sbstar.hxx basic/inc/basic/sbstar.hxx -index 1296a4b..ce9afcd 100644 ---- basic/inc/basic/sbstar.hxx -+++ basic/inc/basic/sbstar.hxx +--- basic/inc/basic/sbstar.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ basic/inc/basic/sbstar.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -40,6 +40,7 @@ #include <basic/sbdef.hxx> @@ -1780,11 +1729,9 @@ index 1296a4b..ce9afcd 100644 // #60175 TRUE: SFX-Resource is not displayed on basic errors static void StaticSuppressSfxResource( BOOL bSuppress ); -diff --git basic/inc/basic/sbuno.hxx basic/inc/basic/sbuno.hxx -index b4f9f4b..27eb4ef 100644 ---- basic/inc/basic/sbuno.hxx -+++ basic/inc/basic/sbuno.hxx -@@ -41,6 +41,7 @@ SbxObjectRef GetSbUnoObject( const String& aName, const com::sun::star::uno::Any +--- basic/inc/basic/sbuno.hxx.old 2009-10-08 16:17:52.000000000 +0200 ++++ basic/inc/basic/sbuno.hxx 2010-03-03 16:59:34.000000000 +0100 +@@ -41,6 +41,7 @@ SbxObjectRef GetSbUnoObject( const Strin // Force creation of all properties for debugging void createAllObjectProperties( SbxObject* pObj ); @@ -1792,20 +1739,16 @@ index b4f9f4b..27eb4ef 100644 ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar ); -diff --git basic/prj/build.lst basic/prj/build.lst -index 9949015..c319284 100644 ---- basic/prj/build.lst -+++ basic/prj/build.lst +--- basic/prj/build.lst.old 2009-10-08 16:17:52.000000000 +0200 ++++ basic/prj/build.lst 2010-03-03 16:59:34.000000000 +0100 @@ -1,4 +1,4 @@ -sb basic : l10n offuh svtools xmlscript framework NULL +sb basic : l10n offuh svtools xmlscript framework oovbaapi NULL sb basic usr1 - all sb_mkout NULL sb basic\inc nmake - all sb_inc NULL sb basic\source\app nmake - all sb_app sb_class sb_inc NULL -diff --git basic/prj/d.lst basic/prj/d.lst -index d2a083e..7256aa1 100644 ---- basic/prj/d.lst -+++ basic/prj/d.lst +--- basic/prj/d.lst.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/prj/d.lst 2010-03-03 16:59:34.000000000 +0100 @@ -7,6 +7,8 @@ mkdir: %COMMON_DEST%\res%_EXT% ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a @@ -1824,10 +1767,8 @@ index d2a083e..7256aa1 100644 +..\inc\basic\helperdecl.hxx %_DEST%\inc%_EXT%\basic\helperdecl.hxx +..\inc\basic\vbahelperinterface.hxx %_DEST%\inc%_EXT%\basic\vbahelperinterface.hxx ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx -diff --git basic/source/basmgr/basmgr.cxx basic/source/basmgr/basmgr.cxx -index 284177b..51ff20f 100644 ---- basic/source/basmgr/basmgr.cxx -+++ basic/source/basmgr/basmgr.cxx +--- basic/source/basmgr/basmgr.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ basic/source/basmgr/basmgr.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -44,6 +44,7 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> @@ -1845,7 +1786,7 @@ index 284177b..51ff20f 100644 #include <cppuhelper/implbase1.hxx> -@@ -244,9 +247,18 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr, +@@ -244,9 +247,18 @@ void BasMgrContainerListenerImpl::addLib { ::rtl::OUString aModuleName = pNames[ j ]; Any aElement = xLibNameAccess->getByName( aModuleName ); @@ -1867,7 +1808,7 @@ index 284177b..51ff20f 100644 } } -@@ -283,8 +295,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent +@@ -283,8 +295,6 @@ void SAL_CALL BasMgrContainerListenerImp } else { @@ -1876,7 +1817,7 @@ index 284177b..51ff20f 100644 StarBASIC* pLib = mpMgr->GetLib( maLibName ); DBG_ASSERT( pLib, "BasMgrContainerListenerImpl::elementInserted: Unknown lib!"); -@@ -293,7 +303,17 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const ContainerEvent +@@ -293,7 +303,17 @@ void SAL_CALL BasMgrContainerListenerImp SbModule* pMod = pLib->FindModule( aName ); if( !pMod ) { @@ -1895,7 +1836,7 @@ index 284177b..51ff20f 100644 pLib->SetModified( FALSE ); } } -@@ -317,15 +337,35 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const ContainerEvent +@@ -317,15 +337,35 @@ void SAL_CALL BasMgrContainerListenerImp DBG_ASSERT( !bLibContainer, "library container fired elementReplaced()"); StarBASIC* pLib = mpMgr->GetLib( maLibName ); @@ -1934,7 +1875,7 @@ index 284177b..51ff20f 100644 pLib->SetModified( FALSE ); } -@@ -1122,6 +1162,25 @@ void BasicManager::LegacyDeleteBasicManager( BasicManager*& _rpManager ) +@@ -1122,6 +1162,25 @@ void BasicManager::LegacyDeleteBasicMana _rpManager = NULL; } @@ -1960,11 +1901,8 @@ index 284177b..51ff20f 100644 void BasicManager::Init() { DBG_CHKTHIS( BasicManager, 0 ); -diff --git basic/source/classes/errobject.cxx basic/source/classes/errobject.cxx -new file mode 100644 -index 0000000..4005d85 ---- /dev/null -+++ basic/source/classes/errobject.cxx +--- basic/source/classes/errobject.cxx.old 2010-03-03 16:59:34.000000000 +0100 ++++ basic/source/classes/errobject.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,181 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_basic.hxx" @@ -2147,10 +2085,8 @@ index 0000000..4005d85 + return pGlobErr; +} + -diff --git basic/source/classes/eventatt.cxx basic/source/classes/eventatt.cxx -index b0c8f4b..81cf558 100644 ---- basic/source/classes/eventatt.cxx -+++ basic/source/classes/eventatt.cxx +--- basic/source/classes/eventatt.cxx.old 2009-12-17 14:34:39.000000000 +0100 ++++ basic/source/classes/eventatt.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -58,7 +58,10 @@ #include <com/sun/star/awt/XDialogProvider.hpp> @@ -2163,7 +2099,7 @@ index b0c8f4b..81cf558 100644 //================================================================================================== #include <xmlscript/xmldlg_imexp.hxx> -@@ -453,6 +456,43 @@ Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic ) +@@ -453,6 +456,43 @@ Any implFindDialogLibForDialog( const An return aRetDlgLibAny; } @@ -2207,7 +2143,7 @@ index b0c8f4b..81cf558 100644 static ::rtl::OUString aDecorationPropName = ::rtl::OUString::createFromAscii( "Decoration" ); static ::rtl::OUString aTitlePropName = -@@ -532,39 +572,51 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite ) +@@ -532,39 +572,51 @@ void RTL_Impl_CreateUnoDialog( StarBASIC {} } @@ -2288,10 +2224,8 @@ index b0c8f4b..81cf558 100644 aArgs[ 1 ] <<= xInput; aArgs[ 2 ] = aDlgLibAny; aArgs[ 3 ] <<= xScriptListener; -diff --git basic/source/classes/makefile.mk basic/source/classes/makefile.mk -index 92d0f11..09af033 100644 ---- basic/source/classes/makefile.mk -+++ basic/source/classes/makefile.mk +--- basic/source/classes/makefile.mk.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/classes/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -41,18 +41,28 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk @@ -2325,10 +2259,8 @@ index 92d0f11..09af033 100644 $(SLO)$/eventatt.obj OBJFILES= \ -diff --git basic/source/classes/sb.cxx basic/source/classes/sb.cxx -index bd25630..035898b 100644 ---- basic/source/classes/sb.cxx -+++ basic/source/classes/sb.cxx +--- basic/source/classes/sb.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ basic/source/classes/sb.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -52,12 +52,17 @@ #include "disas.hxx" #include "runtime.hxx" @@ -2347,7 +2279,7 @@ index bd25630..035898b 100644 // #pragma SW_SEGMENT_CLASS( SBASIC, SBASIC_CODE ) SV_IMPL_VARARR(SbTextPortions,SbTextPortion) -@@ -218,6 +223,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB_ErrorTab[] = +@@ -218,6 +223,7 @@ const SFX_VB_ErrorItem __FAR_DATA SFX_VB { 1004, SbERR_METHOD_FAILED }, { 1005, SbERR_SETPROP_FAILED }, { 1006, SbERR_GETPROP_FAILED }, @@ -2355,7 +2287,7 @@ index bd25630..035898b 100644 { 0xFFFF, 0xFFFFFFFFL } // End mark }; -@@ -263,6 +269,8 @@ SbxObject* SbiFactory::CreateObject( const String& rClass ) +@@ -263,6 +269,8 @@ SbxObject* SbiFactory::CreateObject( con else if( rClass.EqualsIgnoreCaseAscii( "Collection" ) ) { @@ -2364,7 +2296,7 @@ index bd25630..035898b 100644 String aCollectionName( RTL_CONSTASCII_USTRINGPARAM("Collection") ); return new BasicCollection( aCollectionName ); } -@@ -488,6 +496,7 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule ) +@@ -488,6 +496,7 @@ SbClassModuleObject::SbClassModuleObject } } } @@ -2372,7 +2304,7 @@ index bd25630..035898b 100644 } SbClassModuleObject::~SbClassModuleObject() -@@ -503,72 +512,7 @@ SbClassModuleObject::~SbClassModuleObject() +@@ -503,72 +512,7 @@ SbClassModuleObject::~SbClassModuleObjec void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) { @@ -2446,7 +2378,7 @@ index bd25630..035898b 100644 } SbxVariable* SbClassModuleObject::Find( const XubString& rName, SbxClassType t ) -@@ -685,6 +629,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL bIsDocBasic ) +@@ -685,6 +629,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL SetParent( p ); pLibInfo = NULL; bNoRtl = bBreak = FALSE; @@ -2454,7 +2386,7 @@ index bd25630..035898b 100644 pModules = new SbxArray; if( !GetSbData()->nInst++ ) -@@ -785,8 +730,37 @@ SbModule* StarBASIC::MakeModule( const String& rName, const String& rSrc ) +@@ -785,8 +730,37 @@ SbModule* StarBASIC::MakeModule( const S SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& rSrc ) { @@ -2494,7 +2426,7 @@ index bd25630..035898b 100644 p->SetParent( this ); pModules->Insert( p, pModules->Count() ); SetModified( TRUE ); -@@ -961,6 +935,11 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t ) +@@ -961,6 +935,11 @@ SbxVariable* StarBASIC::Find( const Stri } pNamed = p; } @@ -2506,10 +2438,8 @@ index bd25630..035898b 100644 // otherwise check if the element is available // unset GBLSEARCH-Flag (due to Rekursion) USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH; -diff --git basic/source/classes/sb.src basic/source/classes/sb.src -index 5b1454d..8124cad 100644 ---- basic/source/classes/sb.src -+++ basic/source/classes/sb.src +--- basic/source/classes/sb.src.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/classes/sb.src 2010-03-03 16:59:34.000000000 +0100 @@ -591,6 +591,12 @@ Resource RID_BASIC_START { Text [ en-US ] = "For loop not initialized." ; @@ -2523,10 +2453,8 @@ index 5b1454d..8124cad 100644 }; // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000. String IDS_SBERR_TERMINATED -diff --git basic/source/classes/sbunoobj.cxx basic/source/classes/sbunoobj.cxx -index 70f2150..42e047d 100644 ---- basic/source/classes/sbunoobj.cxx -+++ basic/source/classes/sbunoobj.cxx +--- basic/source/classes/sbunoobj.cxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ basic/source/classes/sbunoobj.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -63,6 +63,7 @@ #include <com/sun/star/script/XInvocationAdapterFactory.hpp> #include <com/sun/star/script/XTypeConverter.hpp> @@ -2544,7 +2472,7 @@ index 70f2150..42e047d 100644 using com::sun::star::uno::Reference; using namespace com::sun::star::uno; -@@ -141,20 +142,38 @@ bool SbUnoObject::getDefaultPropName( SbUnoObject* pUnoObj, String& sDfltProp ) +@@ -141,20 +142,38 @@ bool SbUnoObject::getDefaultPropName( Sb SbxVariable* getDefaultProp( SbxVariable* pRef ) { SbxVariable* pDefaultProp = NULL; @@ -2593,7 +2521,7 @@ index 70f2150..42e047d 100644 Reference< XComponentContext > getComponentContext_Impl( void ) { static Reference< XComponentContext > xContext; -@@ -750,11 +769,11 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) +@@ -750,11 +769,11 @@ void unoToSbxValue( SbxVariable* pVar, c // SbUnoObject instanzieren String aName; SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue ); @@ -2610,7 +2538,7 @@ index 70f2150..42e047d 100644 { String sDfltPropName; -@@ -1489,6 +1508,103 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty +@@ -1489,6 +1508,103 @@ Any sbxToUnoValue( SbxVariable* pVar, co return aRetVal; } @@ -2714,7 +2642,7 @@ index 70f2150..42e047d 100644 // Dbg-Hilfsmethode zum Auslesen der in einem Object implementierten Interfaces String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel ) { -@@ -1603,6 +1719,23 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, +@@ -1603,6 +1719,23 @@ bool checkUnoObjectType( SbUnoObject* pU break; } ::rtl::OUString sClassName = xClass->getName(); @@ -2738,7 +2666,7 @@ index 70f2150..42e047d 100644 OSL_TRACE("Checking if object implements %s", OUStringToOString( defaultNameSpace + aClass, RTL_TEXTENCODING_UTF8 ).getStr() ); -@@ -1972,11 +2105,26 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, +@@ -1972,11 +2105,26 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadca { try { @@ -2767,7 +2695,7 @@ index 70f2150..42e047d 100644 } catch( const Exception& ) { -@@ -2101,52 +2249,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, +@@ -2101,52 +2249,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadca else if( bInvocation && pParams && mxInvocation.is() ) { bool bOLEAutomation = true; @@ -2821,7 +2749,7 @@ index 70f2150..42e047d 100644 } // Methode callen -@@ -2181,26 +2284,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, +@@ -2181,26 +2284,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadca } else if( bInvocation && mxInvocation.is() ) { @@ -2849,7 +2777,7 @@ index 70f2150..42e047d 100644 } // #55460, Parameter hier weghauen, da das in unoToSbxValue() -@@ -3129,11 +3214,16 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot, +@@ -3129,11 +3214,16 @@ getTypeDescriptorEnumeration( const ::rt typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash; @@ -2870,7 +2798,7 @@ index 70f2150..42e047d 100644 if ( !isInited ) { Sequence< TypeClass > types(1); -@@ -3141,39 +3231,77 @@ SbxVariable* getVBAConstant( const String& rName ) +@@ -3141,39 +3231,77 @@ SbxVariable* getVBAConstant( const Strin Reference< XTypeDescriptionEnumeration > xEnum = getTypeDescriptorEnumeration( defaultNameSpace, types, TypeDescriptionSearchDepth_INFINITE ); if ( !xEnum.is() ) @@ -2955,10 +2883,8 @@ index 70f2150..42e047d 100644 return pConst; } -diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx -index 215898e..9589f86 100644 ---- basic/source/classes/sbxmod.cxx -+++ basic/source/classes/sbxmod.cxx +--- basic/source/classes/sbxmod.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ basic/source/classes/sbxmod.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -55,6 +55,8 @@ #include <basic/basrdll.hxx> @@ -2999,7 +2925,7 @@ index 215898e..9589f86 100644 SV_DECL_VARARR(SbiBreakpoints,USHORT,4,4) SV_IMPL_VARARR(SbiBreakpoints,USHORT) -@@ -119,7 +138,6 @@ IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ ) +@@ -119,7 +138,6 @@ IMPL_LINK( AsyncQuitHandler, OnAsyncQuit return 0L; } @@ -3007,7 +2933,7 @@ index 215898e..9589f86 100644 bool UnlockControllerHack( StarBASIC* pBasic ) { bool bRes = false; -@@ -145,18 +163,19 @@ bool UnlockControllerHack( StarBASIC* pBasic ) +@@ -145,18 +163,19 @@ bool UnlockControllerHack( StarBASIC* pB } return bRes; } @@ -3041,7 +2967,7 @@ index 215898e..9589f86 100644 if( !pRes && pImage ) { SbiInstance* pInst = pINST; -@@ -393,6 +415,64 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, +@@ -393,6 +415,64 @@ void SbModule::SFX_NOTIFY( SfxBroadcaste SbxVariable* pVar = pHint->GetVar(); SbProperty* pProp = PTR_CAST(SbProperty,pVar); SbMethod* pMeth = PTR_CAST(SbMethod,pVar); @@ -3106,7 +3032,7 @@ index 215898e..9589f86 100644 if( pProp ) { if( pProp->GetModule() != this ) -@@ -433,6 +513,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r ) +@@ -433,6 +513,7 @@ void SbModule::SetSource32( const ::rtl: aOUSource = r; StartDefinitions(); SbiTokenizer aTok( r ); @@ -3114,7 +3040,7 @@ index 215898e..9589f86 100644 while( !aTok.IsEof() ) { SbiToken eEndTok = NIL; -@@ -457,13 +538,6 @@ void SbModule::SetSource32( const ::rtl::OUString& r ) +@@ -457,13 +538,6 @@ void SbModule::SetSource32( const ::rtl: { eEndTok = ENDPROPERTY; break; } @@ -3128,7 +3054,7 @@ index 215898e..9589f86 100644 } eLastTok = eCurTok; } -@@ -592,7 +666,7 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic ) +@@ -592,7 +666,7 @@ void ClearUnoObjectsInRTL_Impl( StarBASI { // #67781 Rueckgabewerte der Uno-Methoden loeschen clearUnoMethods(); @@ -3137,7 +3063,7 @@ index 215898e..9589f86 100644 ClearUnoObjectsInRTL_Impl_Rek( pBasic ); -@@ -603,16 +677,26 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic ) +@@ -603,16 +677,26 @@ void ClearUnoObjectsInRTL_Impl( StarBASI if( ((StarBASIC*)p) != pBasic ) ClearUnoObjectsInRTL_Impl_Rek( (StarBASIC*)p ); } @@ -3296,7 +3222,7 @@ index 215898e..9589f86 100644 // Store only image, no source BOOL SbModule::StoreBinaryData( SvStream& rStrm ) -@@ -1246,7 +1408,6 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm ) +@@ -1246,7 +1408,6 @@ BOOL SbModule::LoadBinaryData( SvStream& return bRet; } @@ -3304,7 +3230,7 @@ index 215898e..9589f86 100644 BOOL SbModule::LoadCompleted() { SbxArray* p = GetMethods(); -@@ -1314,6 +1475,7 @@ SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p ) +@@ -1314,6 +1475,7 @@ SbMethod::SbMethod( const String& r, Sbx nLine1 = nLine2 = 0; refStatics = new SbxArray; @@ -3730,10 +3656,8 @@ index 215898e..9589f86 100644 SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p ) : SbxProperty( r, t ), pMod( p ) -diff --git basic/source/comp/codegen.cxx basic/source/comp/codegen.cxx -index 1b45d28..c9a1461 100644 ---- basic/source/comp/codegen.cxx -+++ basic/source/comp/codegen.cxx +--- basic/source/comp/codegen.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/comp/codegen.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -130,12 +130,12 @@ void SbiCodeGen::Save() // OPTION EXPLICIT-Flag uebernehmen if( pParser->bExplicit ) @@ -3770,10 +3694,8 @@ index 1b45d28..c9a1461 100644 pProcedureProperty = rMod.GetProcedureProperty( aPropName, ePropType ); } if( nPass == 1 ) -diff --git basic/source/comp/dim.cxx basic/source/comp/dim.cxx -index dfb9637..6227a6d 100644 ---- basic/source/comp/dim.cxx -+++ basic/source/comp/dim.cxx +--- basic/source/comp/dim.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/comp/dim.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -32,6 +32,8 @@ #include "precompiled_basic.hxx" #include <basic/sbx.hxx> @@ -3795,7 +3717,7 @@ index dfb9637..6227a6d 100644 SbxDataType t = eScanType; SbiSymDef* pDef = bConst ? new SbiConstDef( aSym ) : new SbiSymDef( aSym ); SbiDimList* pDim = NULL; -@@ -144,7 +149,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed ) +@@ -144,7 +149,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDe } } } @@ -3804,7 +3726,7 @@ index dfb9637..6227a6d 100644 { eType = SbxLONG; break; -@@ -222,6 +227,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) +@@ -222,6 +227,12 @@ void SbiParser::DefVar( SbiOpcode eOp, B Next(); DefStatic( bPrivate ); } @@ -3817,7 +3739,7 @@ index dfb9637..6227a6d 100644 else if( eCurTok == SUB || eCurTok == FUNCTION || eCurTok == PROPERTY ) { // End global chain if necessary (not done in -@@ -241,12 +252,12 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) +@@ -241,12 +252,12 @@ void SbiParser::DefVar( SbiOpcode eOp, B DefEnum( bPrivate ); return; } @@ -3836,7 +3758,7 @@ index dfb9637..6227a6d 100644 } #ifdef SHARED -@@ -401,7 +412,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic ) +@@ -401,7 +412,10 @@ void SbiParser::DefVar( SbiOpcode eOp, B aExpr.Gen(); SbiOpcode eOp_ = pDef->IsNew() ? _CREATE : _TCREATE; aGen.Gen( eOp_, pDef->GetId(), pDef->GetTypeId() ); @@ -3936,7 +3858,7 @@ index dfb9637..6227a6d 100644 if( !TestSymbol() ) return NULL; String aName( aSym ); SbxDataType eType = eScanType; -@@ -899,7 +913,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl ) +@@ -899,7 +913,7 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bD // if( pDef->GetType() == SbxOBJECT ) // pDef->SetType( SbxVARIANT ), // Error( SbERR_SYNTAX ); @@ -3945,7 +3867,7 @@ index dfb9637..6227a6d 100644 pDef->SetType( SbxEMPTY ); return pDef; } -@@ -908,11 +922,11 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bDecl ) +@@ -908,11 +922,11 @@ SbiProcDef* SbiParser::ProcDecl( BOOL bD void SbiParser::Declare() { @@ -3962,7 +3884,7 @@ index dfb9637..6227a6d 100644 Next(); if( eCurTok != SUB && eCurTok != FUNCTION ) Error( SbERR_UNEXPECTED, eCurTok ); -@@ -941,12 +955,30 @@ void SbiParser::DefDeclare( BOOL bPrivate ) +@@ -941,12 +955,30 @@ void SbiParser::DefDeclare( BOOL bPrivat else aPublics.Add( pDef ); @@ -3995,10 +3917,8 @@ index dfb9637..6227a6d 100644 // Aufruf einer SUB oder FUNCTION void SbiParser::Call() -diff --git basic/source/comp/exprtree.cxx basic/source/comp/exprtree.cxx -index b40ae4d..e12496c 100644 ---- basic/source/comp/exprtree.cxx -+++ basic/source/comp/exprtree.cxx +--- basic/source/comp/exprtree.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/comp/exprtree.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -378,8 +378,12 @@ SbiExprNode* SbiExpression::Term( void ) // Typ SbxOBJECT sein if( pDef->GetType() != SbxOBJECT && pDef->GetType() != SbxVARIANT ) @@ -4036,10 +3956,8 @@ index b40ae4d..e12496c 100644 { pParser->Error( SbERR_SYNTAX ); bError = TRUE; -diff --git basic/source/comp/parser.cxx basic/source/comp/parser.cxx -index c6e9b42..8d8e104 100644 ---- basic/source/comp/parser.cxx -+++ basic/source/comp/parser.cxx +--- basic/source/comp/parser.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/comp/parser.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -51,6 +51,7 @@ struct SbiStatement { #define N FALSE @@ -4048,7 +3966,7 @@ index c6e9b42..8d8e104 100644 { CALL, &SbiParser::Call, N, Y, }, // CALL { CLOSE, &SbiParser::Close, N, Y, }, // CLOSE { _CONST_, &SbiParser::Dim, Y, Y, }, // CONST -@@ -137,13 +138,15 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm ) +@@ -137,13 +138,15 @@ SbiParser::SbiParser( StarBASIC* pb, SbM pProc = NULL; pStack = NULL; pWithVar = NULL; @@ -4065,7 +3983,7 @@ index c6e9b42..8d8e104 100644 pPool = &aPublics; for( short i = 0; i < 26; i++ ) eDefTypes[ i ] = SbxVARIANT; // Kein expliziter Defaulttyp -@@ -156,6 +159,10 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm ) +@@ -156,6 +159,10 @@ SbiParser::SbiParser( StarBASIC* pb, SbM rTypeArray = new SbxArray; // Array fuer Benutzerdefinierte Typen rEnumArray = new SbxArray; // Array for Enum types @@ -4154,10 +4072,8 @@ index c6e9b42..8d8e104 100644 break; } } -diff --git basic/source/comp/sbcomp.cxx basic/source/comp/sbcomp.cxx -index 34342b5..d4203e7 100644 ---- basic/source/comp/sbcomp.cxx -+++ basic/source/comp/sbcomp.cxx +--- basic/source/comp/sbcomp.cxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/comp/sbcomp.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -134,6 +134,7 @@ BOOL SbModule::Compile() if( bRet ) { @@ -4166,11 +4082,9 @@ index 34342b5..d4203e7 100644 // clear all method statics for( USHORT i = 0; i < pMethods->Count(); i++ ) { -diff --git basic/source/comp/token.cxx basic/source/comp/token.cxx -index 5846c8c..469f537 100644 ---- basic/source/comp/token.cxx -+++ basic/source/comp/token.cxx -@@ -61,6 +61,7 @@ static TokenTable aTokTable_Basic [] = { // Token-Tabelle: +--- basic/source/comp/token.cxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/comp/token.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -61,6 +61,7 @@ static TokenTable aTokTable_Basic [] = { { ANY, "Any" }, { APPEND, "Append" }, { AS, "As" }, @@ -4192,10 +4106,8 @@ index 5846c8c..469f537 100644 // Sind Datentypen Keywords? // Nur nach AS, sonst sind es Symbole! // Es gibt ja ERROR(), DATA(), STRING() etc. -diff --git basic/source/inc/codegen.hxx basic/source/inc/codegen.hxx -index 3f6130b..558a4e4 100644 ---- basic/source/inc/codegen.hxx -+++ basic/source/inc/codegen.hxx +--- basic/source/inc/codegen.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/inc/codegen.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -56,6 +56,7 @@ public: void GenStmnt(); // evtl. Statement-Opcode erzeugen UINT32 GetPC(); @@ -4204,10 +4116,8 @@ index 3f6130b..558a4e4 100644 void Save(); // #29955 for-Schleifen-Ebene pflegen -diff --git basic/source/inc/dlgcont.hxx basic/source/inc/dlgcont.hxx -index f2d6164..ea87d64 100644 ---- basic/source/inc/dlgcont.hxx -+++ basic/source/inc/dlgcont.hxx +--- basic/source/inc/dlgcont.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/inc/dlgcont.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -96,7 +96,9 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) @@ -4219,11 +4129,8 @@ index f2d6164..ea87d64 100644 // Service static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(); static ::rtl::OUString getImplementationName_static(); -diff --git basic/source/inc/errobject.hxx basic/source/inc/errobject.hxx -new file mode 100644 -index 0000000..1a5c044 ---- /dev/null -+++ basic/source/inc/errobject.hxx +--- basic/source/inc/errobject.hxx.old 2010-03-03 16:59:34.000000000 +0100 ++++ basic/source/inc/errobject.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,16 @@ +#ifndef ERROBJECT_HXX +#define ERROBJECT_HXX @@ -4241,10 +4148,8 @@ index 0000000..1a5c044 + static com::sun::star::uno::Reference< ooo::vba::XErrObject > getUnoErrObject(); +}; +#endif -diff --git basic/source/inc/image.hxx basic/source/inc/image.hxx -index 7035e85..5e7c08c 100644 ---- basic/source/inc/image.hxx -+++ basic/source/inc/image.hxx +--- basic/source/inc/image.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/inc/image.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -109,6 +109,5 @@ public: #define SBIMG_COMPARETEXT 0x0002 // OPTION COMPARE TEXT ist aktiv #define SBIMG_INITCODE 0x0004 // Init-Code vorhanden @@ -4252,10 +4157,8 @@ index 7035e85..5e7c08c 100644 -#define SBIMG_VBASUPPORT 0x0020 // OPTION VBASupport is 1 #endif -diff --git basic/source/inc/namecont.hxx basic/source/inc/namecont.hxx -index a5e5284..7fbe37c 100644 ---- basic/source/inc/namecont.hxx -+++ basic/source/inc/namecont.hxx +--- basic/source/inc/namecont.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/inc/namecont.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -38,6 +38,7 @@ #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> @@ -4301,10 +4204,8 @@ index a5e5284..7fbe37c 100644 }; class LibraryContainerMethodGuard -diff --git basic/source/inc/parser.hxx basic/source/inc/parser.hxx -index 8c00ca2..64a470c 100644 ---- basic/source/inc/parser.hxx -+++ basic/source/inc/parser.hxx +--- basic/source/inc/parser.hxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/inc/parser.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -40,6 +40,7 @@ typedef ::std::vector< String > IfaceVector; @@ -4346,10 +4247,8 @@ index 8c00ca2..64a470c 100644 void Call(); // CALL void Close(); // CLOSE void Declare(); // DECLARE -diff --git basic/source/inc/runtime.hxx basic/source/inc/runtime.hxx -index 409f0d7..f6c7b9c 100644 ---- basic/source/inc/runtime.hxx -+++ basic/source/inc/runtime.hxx +--- basic/source/inc/runtime.hxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/inc/runtime.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -206,7 +206,6 @@ class SbiInstance BOOL bCompatibility; // Flag: TRUE = VBA runtime compatibility mode @@ -4385,10 +4284,8 @@ index 409f0d7..f6c7b9c 100644 SbxBase* FindElementExtern( const String& rName ); static bool isVBAEnabled(); -diff --git basic/source/inc/sbunoobj.hxx basic/source/inc/sbunoobj.hxx -index 5780113..2b54112 100644 ---- basic/source/inc/sbunoobj.hxx -+++ basic/source/inc/sbunoobj.hxx +--- basic/source/inc/sbunoobj.hxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/inc/sbunoobj.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -45,6 +45,7 @@ #include <com/sun/star/reflection/XIdlClass.hpp> #include <com/sun/star/reflection/XServiceTypeDescription2.hpp> @@ -4424,10 +4321,8 @@ index 5780113..2b54112 100644 #endif -diff --git basic/source/inc/scriptcont.hxx basic/source/inc/scriptcont.hxx -index 1475f2e..e9b4409 100644 ---- basic/source/inc/scriptcont.hxx -+++ basic/source/inc/scriptcont.hxx +--- basic/source/inc/scriptcont.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/inc/scriptcont.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -120,7 +120,9 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -4439,10 +4334,8 @@ index 1475f2e..e9b4409 100644 // Methods XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); -diff --git basic/source/inc/token.hxx basic/source/inc/token.hxx -index 1220f7e..b951b3e 100644 ---- basic/source/inc/token.hxx -+++ basic/source/inc/token.hxx +--- basic/source/inc/token.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/inc/token.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -75,7 +75,7 @@ enum SbiToken { IF, _IN_, INPUT, LET, LINE, LINEINPUT, LOCAL, LOOP, LPRINT, LSET, @@ -4463,10 +4356,8 @@ index 1220f7e..b951b3e 100644 }; -diff --git basic/source/runtime/methods.cxx basic/source/runtime/methods.cxx -index 5c1bae1..f726457 100644 ---- basic/source/runtime/methods.cxx -+++ basic/source/runtime/methods.cxx +--- basic/source/runtime/methods.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/runtime/methods.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -51,6 +51,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <tools/wldcrd.hxx> @@ -4612,7 +4503,7 @@ index 5c1bae1..f726457 100644 } RTLFUNC(IsNull) -@@ -3606,6 +3671,65 @@ String getBasicTypeName( SbxDataType eType ) +@@ -3606,6 +3671,65 @@ String getBasicTypeName( SbxDataType eTy return aRetStr; } @@ -4720,10 +4611,8 @@ index 5c1bae1..f726457 100644 { SbxVariable* pVar = ((SbxObject*)pObj)-> Find( String( RTL_CONSTASCII_USTRINGPARAM("Unload") ), SbxCLASS_METHOD ); -diff --git basic/source/runtime/methods1.cxx basic/source/runtime/methods1.cxx -index 08a94fe..e0019a5 100644 ---- basic/source/runtime/methods1.cxx -+++ basic/source/runtime/methods1.cxx +--- basic/source/runtime/methods1.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/runtime/methods1.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -44,6 +44,7 @@ #ifndef _SBX_HXX #include <basic/sbx.hxx> @@ -5322,10 +5211,8 @@ index 08a94fe..e0019a5 100644 - } } -diff --git basic/source/runtime/rtlproto.hxx basic/source/runtime/rtlproto.hxx -index 4ee88b3..7f4df3c 100644 ---- basic/source/runtime/rtlproto.hxx -+++ basic/source/runtime/rtlproto.hxx +--- basic/source/runtime/rtlproto.hxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/runtime/rtlproto.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -167,28 +167,41 @@ extern RTLFUNC(Kill); // JSM extern RTLFUNC(MkDir); // JSM extern RTLFUNC(RmDir); // JSM @@ -5384,10 +5271,8 @@ index 4ee88b3..7f4df3c 100644 extern RTLFUNC(GetGUIVersion); extern RTLFUNC(Choose); -diff --git basic/source/runtime/runtime.cxx basic/source/runtime/runtime.cxx -index 87f88ea..b1feac7 100644 ---- basic/source/runtime/runtime.cxx -+++ basic/source/runtime/runtime.cxx +--- basic/source/runtime/runtime.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/runtime/runtime.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -46,13 +46,17 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -5407,7 +5292,7 @@ index 87f88ea..b1feac7 100644 return result; } -@@ -63,6 +67,24 @@ void StarBASIC::StaticEnableReschedule( BOOL bReschedule ) +@@ -63,6 +67,24 @@ void StarBASIC::StaticEnableReschedule( { bStaticGlobalEnableReschedule = bReschedule; } @@ -5432,7 +5317,7 @@ index 87f88ea..b1feac7 100644 struct SbiArgvStack { // Argv stack: -@@ -495,7 +517,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth ) +@@ -495,7 +517,7 @@ SbxArray* SbiInstance::GetLocals( SbMeth SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart ) : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ), @@ -5441,7 +5326,7 @@ index 87f88ea..b1feac7 100644 { nFlags = pe ? pe->GetDebugFlags() : 0; pIosys = pInst->pIosys; -@@ -523,6 +545,7 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart ) +@@ -523,6 +545,7 @@ SbiRuntime::SbiRuntime( SbModule* pm, Sb nForLvl = 0; nOps = 0; refExprStk = new SbxArray; @@ -5449,7 +5334,7 @@ index 87f88ea..b1feac7 100644 #if defined GCC SetParameters( pe ? pe->GetParameters() : (class SbxArray *)NULL ); #else -@@ -530,7 +553,6 @@ SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart ) +@@ -530,7 +553,6 @@ SbiRuntime::SbiRuntime( SbModule* pm, Sb #endif pRefSaveList = NULL; pItemStoreList = NULL; @@ -5515,7 +5400,7 @@ index 87f88ea..b1feac7 100644 } void SbiRuntime::Error( SbError _errCode, const String& _details ) -@@ -917,7 +982,25 @@ SbxVariable* SbiRuntime::GetTOS( short n ) +@@ -917,7 +982,25 @@ SbxVariable* SbiRuntime::GetTOS( short n void SbiRuntime::TOSMakeTemp() { SbxVariable* p = refExprStk->Get( nExprLvl - 1 ); @@ -5550,10 +5435,8 @@ index 87f88ea..b1feac7 100644 void SbiRuntime::PushGosub( const BYTE* pc ) { if( ++nGosubLvl > MAXRECURSION ) -diff --git basic/source/runtime/stdobj.cxx basic/source/runtime/stdobj.cxx -index 01f4777..4c8c807 100644 ---- basic/source/runtime/stdobj.cxx -+++ basic/source/runtime/stdobj.cxx +--- basic/source/runtime/stdobj.cxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/runtime/stdobj.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -36,6 +36,7 @@ #include <basic/sbstdobj.hxx> #include "rtlproto.hxx" @@ -5770,7 +5653,7 @@ index 01f4777..4c8c807 100644 // Bereits eingetragen? SbxVariable* pVar = SbxObject::Find( rName, t ); if( !pVar ) -@@ -678,13 +798,15 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t ) +@@ -678,13 +798,15 @@ SbxVariable* SbiStdObject::Find( const S && ( p->nHash == nHash_ ) && ( rName.EqualsIgnoreCaseAscii( p->pName ) ) ) { @@ -5787,10 +5670,8 @@ index 01f4777..4c8c807 100644 break; } nIndex += ( p->nArgs & _ARGSMASK ) + 1; -diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx -index f4fe09a..81dec81 100644 ---- basic/source/runtime/step0.cxx -+++ basic/source/runtime/step0.cxx +--- basic/source/runtime/step0.cxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/runtime/step0.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -33,6 +33,7 @@ #include <vcl/msgbox.hxx> #include <tools/fsys.hxx> @@ -5811,7 +5692,7 @@ index f4fe09a..81dec81 100644 SbxVariable* getDefaultProp( SbxVariable* pRef ); void SbiRuntime::StepNOP() -@@ -58,34 +64,6 @@ void SbiRuntime::StepArith( SbxOperator eOp ) +@@ -58,34 +64,6 @@ void SbiRuntime::StepArith( SbxOperator TOSMakeTemp(); SbxVariable* p2 = GetTOS(); @@ -5846,7 +5727,7 @@ index f4fe09a..81dec81 100644 p2->ResetFlag( SBX_FIXED ); p2->Compute( eOp, *p1 ); -@@ -108,19 +86,24 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) +@@ -108,19 +86,24 @@ void SbiRuntime::StepCompare( SbxOperato // values ( and type ) set as appropriate SbxDataType p1Type = p1->GetType(); SbxDataType p2Type = p2->GetType(); @@ -5877,7 +5758,7 @@ index f4fe09a..81dec81 100644 { SbxVariable* pDflt = getDefaultProp( p1 ); if ( pDflt ) -@@ -140,8 +123,21 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) +@@ -140,8 +123,21 @@ void SbiRuntime::StepCompare( SbxOperato #ifndef WIN static SbxVariable* pTRUE = NULL; static SbxVariable* pFALSE = NULL; @@ -5901,7 +5782,7 @@ index f4fe09a..81dec81 100644 { if( !pTRUE ) { -@@ -162,9 +158,14 @@ void SbiRuntime::StepCompare( SbxOperator eOp ) +@@ -162,9 +158,14 @@ void SbiRuntime::StepCompare( SbxOperato PushVar( pFALSE ); } #else @@ -6003,10 +5884,8 @@ index f4fe09a..81dec81 100644 + pInst->Error( error ); } -diff --git basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx -index 1f0914d..669ada9 100644 ---- basic/source/runtime/step1.cxx -+++ basic/source/runtime/step1.cxx +--- basic/source/runtime/step1.cxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/runtime/step1.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -38,6 +38,7 @@ #include "iosys.hxx" #include "image.hxx" @@ -6031,7 +5910,7 @@ index 1f0914d..669ada9 100644 refArgv->Put( pVal, nArgc ); refArgv->PutAlias( aAlias, nArgc++ ); } -@@ -183,7 +193,9 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 ) +@@ -183,7 +193,9 @@ void SbiRuntime::StepJUMPT( UINT32 nOp1 void SbiRuntime::StepJUMPF( UINT32 nOp1 ) { SbxVariableRef p = PopVar(); @@ -6042,7 +5921,7 @@ index 1f0914d..669ada9 100644 StepJUMP( nOp1 ); } -@@ -363,6 +375,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 ) +@@ -363,6 +375,7 @@ void SbiRuntime::StepERRHDL( UINT32 nOp1 pInst->nErr = 0; pInst->nErl = 0; nError = 0; @@ -6050,7 +5929,7 @@ index 1f0914d..669ada9 100644 } // Resume nach Fehlern (+0=statement, 1=next or Label) -@@ -383,6 +396,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 ) +@@ -383,6 +396,8 @@ void SbiRuntime::StepRESUME( UINT32 nOp1 } else pCode = pErrStmnt; @@ -6059,10 +5938,8 @@ index 1f0914d..669ada9 100644 if( nOp1 > 1 ) StepJUMP( nOp1 ); -diff --git basic/source/runtime/step2.cxx basic/source/runtime/step2.cxx -index f1dd5e8..4550937 100644 ---- basic/source/runtime/step2.cxx -+++ basic/source/runtime/step2.cxx +--- basic/source/runtime/step2.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ basic/source/runtime/step2.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -144,7 +144,7 @@ SbxVariable* SbiRuntime::FindElement if ( pElem ) bSetName = false; // don't overwrite uno name @@ -6093,7 +5970,7 @@ index f1dd5e8..4550937 100644 } return CheckArray( pElem ); } -@@ -380,7 +381,8 @@ void SbiRuntime::SetupArgs( SbxVariable* p, UINT32 nOp1 ) +@@ -380,7 +381,8 @@ void SbiRuntime::SetupArgs( SbxVariable* bool bError_ = true; SbUnoMethod* pUnoMethod = PTR_CAST(SbUnoMethod,p); @@ -6103,7 +5980,7 @@ index f1dd5e8..4550937 100644 { SbUnoObject* pParentUnoObj = PTR_CAST( SbUnoObject,p->GetParent() ); if( pParentUnoObj ) -@@ -458,7 +460,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem ) +@@ -458,7 +460,7 @@ SbxVariable* SbiRuntime::CheckArray( Sbx { // Falls wir ein Array haben, wollen wir bitte das Array-Element! SbxArray* pPar; @@ -6112,7 +5989,7 @@ index f1dd5e8..4550937 100644 { SbxBase* pElemObj = pElem->GetObject(); SbxDimArray* pDimArray = PTR_CAST(SbxDimArray,pElemObj); -@@ -723,6 +725,8 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, UINT32 nOp2 ) +@@ -723,6 +725,8 @@ void SbiRuntime::StepPARAM( UINT32 nOp1, SaveRef( q ); *q = *p; p = q; @@ -6121,7 +5998,7 @@ index f1dd5e8..4550937 100644 } SetupArgs( p, nOp1 ); PushVar( CheckArray( p ) ); -@@ -1135,16 +1139,26 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 ) +@@ -1135,16 +1139,26 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1 if( pImg->GetFlag( SBIMG_CLASSMODULE ) ) StepPUBLIC_Impl( nOp1, nOp2, true ); @@ -6153,11 +6030,9 @@ index f1dd5e8..4550937 100644 if( p ) { p->SetFlag( SBX_DONTSTORE ); -diff --git basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvalue.cxx -index 4779a85..9d56dcb 100644 ---- basic/source/sbx/sbxvalue.cxx -+++ basic/source/sbx/sbxvalue.cxx -@@ -1147,8 +1147,8 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) +--- basic/source/sbx/sbxvalue.cxx.old 2009-10-08 16:17:53.000000000 +0200 ++++ basic/source/sbx/sbxvalue.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -1147,8 +1147,8 @@ BOOL SbxValue::Compute( SbxOperator eOp, { SbxValues aL, aR; bool bDecimal = false; @@ -6168,7 +6043,7 @@ index 4779a85..9d56dcb 100644 ( eOp == SbxMUL || eOp == SbxDIV || eOp == SbxPLUS || eOp == SbxMINUS ) ) { goto Lbl_OpIsDouble; -@@ -1195,6 +1195,8 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) +@@ -1195,6 +1195,8 @@ BOOL SbxValue::Compute( SbxOperator eOp, aL.eType = aR.eType = GetType(); // else if( GetType() == SbxDouble || GetType() == SbxSingle ) // aL.eType = aR.eType = SbxLONG64; @@ -6177,7 +6052,7 @@ index 4779a85..9d56dcb 100644 else aL.eType = aR.eType = SbxLONG; } -@@ -1281,7 +1283,12 @@ BOOL SbxValue::Compute( SbxOperator eOp, const SbxValue& rOp ) +@@ -1281,7 +1283,12 @@ BOOL SbxValue::Compute( SbxOperator eOp, break; case SbxNOT: if( aL.eType != SbxLONG && aL.eType != SbxULONG ) @@ -6191,7 +6066,7 @@ index 4779a85..9d56dcb 100644 else aL.nLong = ~aL.nLong; break; -@@ -1573,9 +1580,9 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const +@@ -1573,9 +1580,9 @@ BOOL SbxValue::Compare( SbxOperator eOp, { aL.eType = aR.eType = SbxDOUBLE; //if( Get( aL ) && rOp.Get( aR ) ) @@ -6204,7 +6079,7 @@ index 4779a85..9d56dcb 100644 switch( eOp ) { case SbxEQ: -@@ -1593,17 +1600,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, const SbxValue& rOp ) const +@@ -1593,17 +1600,17 @@ BOOL SbxValue::Compare( SbxOperator eOp, default: SetError( SbxERR_NOTIMP ); } @@ -6233,11 +6108,9 @@ index 4779a85..9d56dcb 100644 } } if( eOld != SbxERR_OK ) -diff --git basic/source/uno/dlgcont.cxx basic/source/uno/dlgcont.cxx -index ba67d5b..92294f1 100644 ---- basic/source/uno/dlgcont.cxx -+++ basic/source/uno/dlgcont.cxx -@@ -322,7 +322,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement +--- basic/source/uno/dlgcont.cxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/uno/dlgcont.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -322,7 +322,7 @@ Any SAL_CALL SfxDialogLibraryContainer:: try { // start parsing @@ -6246,7 +6119,7 @@ index ba67d5b..92294f1 100644 xParser->parseStream( source ); } catch( Exception& ) -@@ -336,7 +336,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement +@@ -336,7 +336,7 @@ Any SAL_CALL SfxDialogLibraryContainer:: // Create InputStream, TODO: Implement own InputStreamProvider // to avoid creating the DialogModel here! @@ -6255,7 +6128,7 @@ index ba67d5b..92294f1 100644 aRetAny <<= xISP; return aRetAny; } -@@ -484,7 +484,11 @@ void SfxDialogLibraryContainer::onNewRootStorage() +@@ -484,7 +484,11 @@ void SfxDialogLibraryContainer::onNewRoo } } @@ -6268,10 +6141,8 @@ index ba67d5b..92294f1 100644 //============================================================================ // Service -diff --git basic/source/uno/namecont.cxx basic/source/uno/namecont.cxx -index 3ad2332..4499663 100644 ---- basic/source/uno/namecont.cxx -+++ basic/source/uno/namecont.cxx +--- basic/source/uno/namecont.cxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ basic/source/uno/namecont.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -76,6 +76,9 @@ #include <cppuhelper/exc_hlp.hxx> #include <basic/sbmod.hxx> @@ -6282,7 +6153,7 @@ index 3ad2332..4499663 100644 namespace basic { -@@ -155,7 +158,7 @@ void NameContainer::replaceByName( const OUString& aName, const Any& aElement ) +@@ -155,7 +158,7 @@ void NameContainer::replaceByName( const throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { Type aAnyType = aElement.getValueType(); @@ -6291,7 +6162,7 @@ index 3ad2332..4499663 100644 throw IllegalArgumentException(); NameContainerNameMap::iterator aIt = mHashMap.find( aName ); -@@ -197,7 +200,7 @@ void NameContainer::insertByName( const OUString& aName, const Any& aElement ) +@@ -197,7 +200,7 @@ void NameContainer::insertByName( const throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { Type aAnyType = aElement.getValueType(); @@ -6300,7 +6171,7 @@ index 3ad2332..4499663 100644 throw IllegalArgumentException(); NameContainerNameMap::iterator aIt = mHashMap.find( aName ); -@@ -2729,6 +2732,39 @@ OUString SfxLibraryContainer::expand_url( const OUString& url ) +@@ -2729,6 +2732,39 @@ OUString SfxLibraryContainer::expand_url } } @@ -6340,10 +6211,8 @@ index 3ad2332..4499663 100644 // Methods XServiceInfo ::sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) -diff --git basic/source/uno/scriptcont.cxx basic/source/uno/scriptcont.cxx -index 2d7d8e8..8bebf5a 100644 ---- basic/source/uno/scriptcont.cxx -+++ basic/source/uno/scriptcont.cxx +--- basic/source/uno/scriptcont.cxx.old 2009-10-07 15:06:56.000000000 +0200 ++++ basic/source/uno/scriptcont.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -67,7 +67,8 @@ #include <xmlscript/xmlmod_imexp.hxx> #include <cppuhelper/factory.hxx> @@ -6354,7 +6223,7 @@ index 2d7d8e8..8bebf5a 100644 namespace basic { -@@ -138,7 +139,6 @@ sal_Bool SfxScriptLibraryContainer::hasLibraryPassword( const String& rLibraryNa +@@ -138,7 +139,6 @@ sal_Bool SfxScriptLibraryContainer::hasL return pImplLib->mbPasswordProtected; } @@ -6362,7 +6231,7 @@ index 2d7d8e8..8bebf5a 100644 // Ctor for service SfxScriptLibraryContainer::SfxScriptLibraryContainer( void ) :maScriptLanguage( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) ) -@@ -214,7 +214,12 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement +@@ -214,7 +214,12 @@ void SAL_CALL SfxScriptLibraryContainer: xmlscript::ModuleDescriptor aMod; aMod.aName = aElementName; aMod.aLanguage = maScriptLanguage; @@ -6376,7 +6245,7 @@ index 2d7d8e8..8bebf5a 100644 xmlscript::exportScriptModule( xHandler, aMod ); } -@@ -1050,6 +1055,17 @@ void SfxScriptLibraryContainer::onNewRootStorage() +@@ -1050,6 +1055,17 @@ void SfxScriptLibraryContainer::onNewRoo { } @@ -6394,7 +6263,7 @@ index 2d7d8e8..8bebf5a 100644 //============================================================================ // Service void createRegistryInfo_SfxScriptLibraryContainer() -@@ -1160,7 +1176,11 @@ void SfxScriptLibrary::storeResourcesToStorage( const ::com::sun::star::uno::Ref +@@ -1160,7 +1176,11 @@ void SfxScriptLibrary::storeResourcesToS bool SfxScriptLibrary::containsValidModule( const Any& aElement ) { OUString sModuleText; @@ -6407,11 +6276,8 @@ index 2d7d8e8..8bebf5a 100644 return ( sModuleText.getLength() > 0 ); } -diff --git comphelper/inc/comphelper/evtmethodhelper.hxx comphelper/inc/comphelper/evtmethodhelper.hxx -new file mode 100644 -index 0000000..1a07a07 ---- /dev/null -+++ comphelper/inc/comphelper/evtmethodhelper.hxx +--- comphelper/inc/comphelper/evtmethodhelper.hxx.old 2010-03-03 16:59:34.000000000 +0100 ++++ comphelper/inc/comphelper/evtmethodhelper.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,41 @@ +/************************************************************************* + * @@ -6454,11 +6320,8 @@ index 0000000..1a07a07 +} // namespace comphelper +//........................................................................ +#endif // COMPHELPER_EVENTMEHODHELPER_HXX -diff --git comphelper/source/misc/evtmethodhelper.cxx comphelper/source/misc/evtmethodhelper.cxx -new file mode 100644 -index 0000000..1f3ce38 ---- /dev/null -+++ comphelper/source/misc/evtmethodhelper.cxx +--- comphelper/source/misc/evtmethodhelper.cxx.old 2010-03-03 16:59:34.000000000 +0100 ++++ comphelper/source/misc/evtmethodhelper.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,77 @@ +/************************************************************************* + * @@ -6537,10 +6400,8 @@ index 0000000..1f3ce38 + + + -diff --git comphelper/source/misc/makefile.mk comphelper/source/misc/makefile.mk -index d0ffc36..05e5335 100644 ---- comphelper/source/misc/makefile.mk -+++ comphelper/source/misc/makefile.mk +--- comphelper/source/misc/makefile.mk.old 2009-10-08 16:17:47.000000000 +0200 ++++ comphelper/source/misc/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -60,6 +60,7 @@ SLOFILES= \ $(SLO)$/docpasswordhelper.obj \ $(SLO)$/docpasswordrequest.obj \ @@ -6549,10 +6410,8 @@ index d0ffc36..05e5335 100644 $(SLO)$/documentiologring.obj \ $(SLO)$/evtlistenerhlp.obj \ $(SLO)$/ihwrapnofilter.obj \ -diff --git dbaccess/source/ext/macromigration/migrationengine.cxx dbaccess/source/ext/macromigration/migrationengine.cxx -index 91adb0a..cf8acb0 100644 ---- dbaccess/source/ext/macromigration/migrationengine.cxx -+++ dbaccess/source/ext/macromigration/migrationengine.cxx +--- dbaccess/source/ext/macromigration/migrationengine.cxx.old 2009-10-08 16:17:07.000000000 +0200 ++++ dbaccess/source/ext/macromigration/migrationengine.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -1838,7 +1838,7 @@ namespace dbmm Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW ); @@ -6571,10 +6430,8 @@ index 91adb0a..cf8acb0 100644 _inout_rDialogLibraryElement <<= xISP; } catch( const Exception& ) -diff --git extensions/inc/extensio.hrc extensions/inc/extensio.hrc -index 5b50366..5d5ac00 100644 ---- extensions/inc/extensio.hrc -+++ extensions/inc/extensio.hrc +--- extensions/inc/extensio.hrc.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/inc/extensio.hrc 2010-03-03 16:59:34.000000000 +0100 @@ -459,9 +459,10 @@ #define HID_PROP_NOLABEL (HID_FORMS_START + 340) #define HID_PROP_WRITING_MODE (HID_FORMS_START + 341) @@ -6587,10 +6444,8 @@ index 5b50366..5d5ac00 100644 #if HID_LAST_FORMS_ID > HID_FORMS_END #error id overflow -diff --git extensions/source/ole/oleobjw.cxx extensions/source/ole/oleobjw.cxx -index 596fbdc..04d7848 100644 ---- extensions/source/ole/oleobjw.cxx -+++ extensions/source/ole/oleobjw.cxx +--- extensions/source/ole/oleobjw.cxx.old 2009-10-07 15:07:23.000000000 +0200 ++++ extensions/source/ole/oleobjw.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -72,6 +72,7 @@ using namespace boost; using namespace osl; using namespace rtl; @@ -6599,7 +6454,7 @@ index 596fbdc..04d7848 100644 using namespace com::sun::star::lang; using namespace com::sun::star::bridge; using namespace com::sun::star::bridge::oleautomation; -@@ -111,7 +112,7 @@ IUnknownWrapper_Impl::IUnknownWrapper_Impl( Reference<XMultiServiceFactory>& xFa +@@ -111,7 +112,7 @@ IUnknownWrapper_Impl::IUnknownWrapper_Im sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass): UnoConversionUtilities<IUnknownWrapper_Impl>( xFactory, unoWrapperClass, comWrapperClass), m_pxIdlClass( NULL), m_eJScript( JScriptUndefined), @@ -6608,7 +6463,7 @@ index 596fbdc..04d7848 100644 { } -@@ -150,17 +151,15 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl() +@@ -150,17 +151,15 @@ IUnknownWrapper_Impl::~IUnknownWrapper_I Any IUnknownWrapper_Impl::queryInterface(const Type& t) throw (RuntimeException) { @@ -6620,22 +6475,21 @@ index 596fbdc..04d7848 100644 - else - return Any(); - } -- -- return WeakImplHelper4<XInvocation, XBridgeSupplier2, -- XInitialization, XAutomationObject>::queryInterface(t); + if (t == getCppuType(static_cast<Reference<XDefaultMethod>*>( 0)) && !m_bHasDfltMethod ) + return Any(); + if (t == getCppuType(static_cast<Reference<XDefaultProperty>*>( 0)) && !m_bHasDfltProperty ) + return Any(); + if (t == getCppuType(static_cast<Reference<XInvocation>*>( 0)) && !m_spDispatch) + return Any(); -+ + +- return WeakImplHelper4<XInvocation, XBridgeSupplier2, +- XInitialization, XAutomationObject>::queryInterface(t); + return WeakImplHelper6<XInvocation, XBridgeSupplier2, + XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod>::queryInterface(t); } Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(void) -@@ -425,6 +424,46 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) +@@ -425,6 +424,46 @@ Any SAL_CALL IUnknownWrapper_Impl::getVa { o2u_attachCurrentThread(); ITypeInfo * pInfo = getTypeInfo(); @@ -6682,7 +6536,7 @@ index 596fbdc..04d7848 100644 FuncDesc aDescGet(pInfo); FuncDesc aDescPut(pInfo); VarDesc aVarDesc(pInfo); -@@ -1157,6 +1196,47 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument +@@ -1157,6 +1196,47 @@ void SAL_CALL IUnknownWrapper_Impl::init aArguments[1] >>= m_bOriginalDispatch; aArguments[2] >>= m_seqTypes; @@ -6730,7 +6584,7 @@ index 596fbdc..04d7848 100644 } // UnoConversionUtilities -------------------------------------------------------------------------------- -@@ -1408,6 +1488,9 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName, +@@ -1408,6 +1488,9 @@ Any IUnknownWrapper_Impl::invokeWithDis arDispidNamedArgs.reset(new DISPID[nSizeAr]); HRESULT hr = getTypeInfo()->GetIDsOfNames(arNames, nSizeAr, arDispidNamedArgs.get()); @@ -6740,10 +6594,8 @@ index 596fbdc..04d7848 100644 if (hr == S_OK) { // In a "property put" operation, the property value is a named param with the -diff --git extensions/source/ole/oleobjw.hxx extensions/source/ole/oleobjw.hxx -index 90f71a7..6c3b163 100644 ---- extensions/source/ole/oleobjw.hxx -+++ extensions/source/ole/oleobjw.hxx +--- extensions/source/ole/oleobjw.hxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/ole/oleobjw.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -53,11 +53,14 @@ #endif #include <cppuhelper/implbase3.hxx> @@ -6759,7 +6611,7 @@ index 90f71a7..6c3b163 100644 #include <typelib/typedescription.hxx> #include "unoconversionutilities.hxx" -@@ -81,7 +84,8 @@ typedef hash_multimap<OUString, unsigned int, hashOUString_Impl, equalOUString_I +@@ -81,7 +84,8 @@ typedef hash_multimap<OUString, unsigned // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object. // If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component. // The interface is not a real interface in terms of an abstract class but is realized through IDispatch. @@ -6799,10 +6651,8 @@ index 90f71a7..6c3b163 100644 }; } // end namespace -diff --git extensions/source/propctrlr/defaultforminspection.cxx extensions/source/propctrlr/defaultforminspection.cxx -index 4f5febd..ea9d90e 100644 ---- extensions/source/propctrlr/defaultforminspection.cxx -+++ extensions/source/propctrlr/defaultforminspection.cxx +--- extensions/source/propctrlr/defaultforminspection.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/propctrlr/defaultforminspection.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -154,7 +154,7 @@ namespace pcr { "com.sun.star.form.inspection.EventHandler", false }, @@ -6812,10 +6662,8 @@ index 4f5febd..ea9d90e 100644 // properties related to binding to an XForms DOM node { "com.sun.star.form.inspection.XMLFormsPropertyHandler", true }, -diff --git extensions/source/propctrlr/eventhandler.cxx extensions/source/propctrlr/eventhandler.cxx -index 8a4bac7..fa5af81 100644 ---- extensions/source/propctrlr/eventhandler.cxx -+++ extensions/source/propctrlr/eventhandler.cxx +--- extensions/source/propctrlr/eventhandler.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/propctrlr/eventhandler.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -66,6 +66,7 @@ /** === end UNO includes === **/ @@ -6870,10 +6718,8 @@ index 8a4bac7..fa5af81 100644 const ::rtl::OUString* pMethods = aMethods.getConstArray(); sal_uInt32 methodCount = aMethods.getLength(); -diff --git extensions/source/propctrlr/formmetadata.cxx extensions/source/propctrlr/formmetadata.cxx -index 6561d86..41260c0 100644 ---- extensions/source/propctrlr/formmetadata.cxx -+++ extensions/source/propctrlr/formmetadata.cxx +--- extensions/source/propctrlr/formmetadata.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/propctrlr/formmetadata.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -143,6 +143,7 @@ namespace pcr DEF_INFO_3( LABEL, LABEL, LABEL, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( CONTROLLABEL, LABELCONTROL, CONTROLLABEL, FORM_VISIBLE, COMPOSEABLE ), @@ -6882,10 +6728,8 @@ index 6561d86..41260c0 100644 DEF_INFO_2( TEXT, TEXT, TEXT, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( MAXTEXTLEN, MAXTEXTLEN, MAXTEXTLEN, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( EDITMASK, EDITMASK, EDITMASK, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), -diff --git extensions/source/propctrlr/formmetadata.hxx extensions/source/propctrlr/formmetadata.hxx -index e5d8a8f..6633c04 100644 ---- extensions/source/propctrlr/formmetadata.hxx -+++ extensions/source/propctrlr/formmetadata.hxx +--- extensions/source/propctrlr/formmetadata.hxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/propctrlr/formmetadata.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -166,6 +166,7 @@ namespace pcr #define PROPERTY_ID_ALLOWADDITIONS 20 #define PROPERTY_ID_ALLOWEDITS 21 @@ -6894,10 +6738,8 @@ index e5d8a8f..6633c04 100644 #define PROPERTY_ID_NAVIGATION 24 #define PROPERTY_ID_CYCLE 25 #define PROPERTY_ID_HIDDEN_VALUE 26 -diff --git extensions/source/propctrlr/formres.src extensions/source/propctrlr/formres.src -index fc63b37..7d587e6 100644 ---- extensions/source/propctrlr/formres.src -+++ extensions/source/propctrlr/formres.src +--- extensions/source/propctrlr/formres.src.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/propctrlr/formres.src 2010-03-03 16:59:34.000000000 +0100 @@ -234,6 +234,10 @@ String RID_STR_NAME { Text [ en-US ] = "Name" ; @@ -6909,10 +6751,8 @@ index fc63b37..7d587e6 100644 String RID_STR_TABINDEX { Text [ en-US ] = "Tab order" ; -diff --git extensions/source/propctrlr/formresid.hrc extensions/source/propctrlr/formresid.hrc -index 353080c..7e02917 100644 ---- extensions/source/propctrlr/formresid.hrc -+++ extensions/source/propctrlr/formresid.hrc +--- extensions/source/propctrlr/formresid.hrc.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/propctrlr/formresid.hrc 2010-03-03 16:59:34.000000000 +0100 @@ -152,6 +152,7 @@ #define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 ) #define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 ) @@ -6921,10 +6761,8 @@ index 353080c..7e02917 100644 // FREE // FREE // FREE -diff --git extensions/source/propctrlr/formstrings.hxx extensions/source/propctrlr/formstrings.hxx -index 17eaa55..6bbbe6f 100644 ---- extensions/source/propctrlr/formstrings.hxx -+++ extensions/source/propctrlr/formstrings.hxx +--- extensions/source/propctrlr/formstrings.hxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/source/propctrlr/formstrings.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -51,6 +51,7 @@ namespace pcr PCR_CONSTASCII_STRING( PROPERTY_WHEEL_BEHAVIOR, "MouseWheelBehavior"); PCR_CONSTASCII_STRING( PROPERTY_TAG, "Tag"); @@ -6933,11 +6771,9 @@ index 17eaa55..6bbbe6f 100644 PCR_CONSTASCII_STRING( PROPERTY_VALUE, "Value"); PCR_CONSTASCII_STRING( PROPERTY_TEXT, "Text"); PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION, "NavigationBarMode"); -diff --git extensions/util/hidother.src extensions/util/hidother.src -index 4c6848a..75b50ef 100644 ---- extensions/util/hidother.src -+++ extensions/util/hidother.src -@@ -213,6 +213,7 @@ hidspecial HID_PROP_FOCUSONCLICK { HelpId = HID_PROP_FOCUSONCLICK +--- extensions/util/hidother.src.old 2009-10-08 16:18:20.000000000 +0200 ++++ extensions/util/hidother.src 2010-03-03 16:59:34.000000000 +0100 +@@ -213,6 +213,7 @@ hidspecial HID_PROP_FOCUSONCLICK hidspecial HID_PROP_FONT { HelpId = HID_PROP_FONT; } hidspecial HID_PROP_FORMATKEY { HelpId = HID_PROP_FORMATKEY; } hidspecial HID_PROP_GROUPBOX { HelpId = HID_PROP_GROUPBOX; } @@ -6945,11 +6781,9 @@ index 4c6848a..75b50ef 100644 hidspecial HID_PROP_HEIGHT { HelpId = HID_PROP_HEIGHT; } hidspecial HID_PROP_HELPTEXT { HelpId = HID_PROP_HELPTEXT; } hidspecial HID_PROP_HELPURL { HelpId = HID_PROP_HELPURL; } -diff --git forms/source/component/FormComponent.cxx forms/source/component/FormComponent.cxx -index 5c68f20..fc2d288 100644 ---- forms/source/component/FormComponent.cxx -+++ forms/source/component/FormComponent.cxx -@@ -2753,8 +2753,8 @@ void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBindin +--- forms/source/component/FormComponent.cxx.old 2009-12-17 14:35:00.000000000 +0100 ++++ forms/source/component/FormComponent.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -2753,8 +2753,8 @@ void SAL_CALL OBoundControlModel::setVal OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::setValueBinding: How did you reach this method?" ); // the interface for this method should not have been exposed if we do not // support binding to external data @@ -6960,11 +6794,9 @@ index 5c68f20..fc2d288 100644 { throw IncompatibleTypesException( FRM_RES_STRING( RID_STR_INCOMPATIBLE_TYPES ), -diff --git forms/source/component/GroupManager.cxx forms/source/component/GroupManager.cxx -index e35bcbc..35a3129 100644 ---- forms/source/component/GroupManager.cxx -+++ forms/source/component/GroupManager.cxx -@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPo +--- forms/source/component/GroupManager.cxx.old 2009-10-07 15:07:24.000000000 +0200 ++++ forms/source/component/GroupManager.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<X ,m_xControlModel(rxSet,UNO_QUERY) ,m_nPos( nInsertPos ) ,m_nTabIndex(0) @@ -6980,7 +6812,7 @@ index e35bcbc..35a3129 100644 } } -@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const +@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(c aFind->second.RemoveComponent( _xSet ); // Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren @@ -6990,7 +6822,7 @@ index e35bcbc..35a3129 100644 { OActiveGroups::iterator aActiveFind = ::std::find( m_aActiveGroupMap.begin(), -@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const +@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(c { // the group is active. Deactivate it if the remaining component // is *no* radio button @@ -6999,7 +6831,7 @@ index e35bcbc..35a3129 100644 m_aActiveGroupMap.erase( aActiveFind ); } } -@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const +@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(c // Bei Component als PropertyChangeListener abmelden _xSet->removePropertyChangeListener( PROPERTY_NAME, this ); @@ -7008,7 +6840,7 @@ index e35bcbc..35a3129 100644 if (hasProperty(PROPERTY_TABINDEX, _xSet)) _xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this ); } -@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro +@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyCha // Component aus Gruppe entfernen ::rtl::OUString sGroupName; @@ -7034,7 +6866,7 @@ index e35bcbc..35a3129 100644 removeFromGroupMap(sGroupName,xSet); -@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet ) +@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const m_pCompGroup->InsertComponent( xSet ); // Component in Gruppe aufnehmen @@ -7044,7 +6876,7 @@ index e35bcbc..35a3129 100644 OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName); -@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet ) +@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const // Bei Component als PropertyChangeListener anmelden xSet->addPropertyChangeListener( PROPERTY_NAME, this ); @@ -7053,7 +6885,7 @@ index e35bcbc..35a3129 100644 // Tabindex muss nicht jeder unterstuetzen if (hasProperty(PROPERTY_TABINDEX, xSet)) -@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet ) +@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const return; // Component aus Gruppe entfernen @@ -7082,10 +6914,8 @@ index e35bcbc..35a3129 100644 //......................................................................... } // namespace frm //......................................................................... -diff --git forms/source/component/GroupManager.hxx forms/source/component/GroupManager.hxx -index 4e8d53a..5206f9d 100644 ---- forms/source/component/GroupManager.hxx -+++ forms/source/component/GroupManager.hxx +--- forms/source/component/GroupManager.hxx.old 2009-10-07 15:07:24.000000000 +0200 ++++ forms/source/component/GroupManager.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -220,6 +220,8 @@ public: void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name); void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup); @@ -7095,10 +6925,8 @@ index 4e8d53a..5206f9d 100644 }; -diff --git forms/source/component/ListBox.cxx forms/source/component/ListBox.cxx -index c50c10c..0842975 100644 ---- forms/source/component/ListBox.cxx -+++ forms/source/component/ListBox.cxx +--- forms/source/component/ListBox.cxx.old 2009-12-17 14:35:00.000000000 +0100 ++++ forms/source/component/ListBox.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -1556,6 +1556,8 @@ namespace frm void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException) { @@ -7117,10 +6945,8 @@ index c50c10c..0842975 100644 // and do the handling for the ChangeListeners ::osl::ClearableMutexGuard aGuard(m_aMutex); -diff --git forms/source/component/RadioButton.cxx forms/source/component/RadioButton.cxx -index d471d1a..3d16b39 100644 ---- forms/source/component/RadioButton.cxx -+++ forms/source/component/RadioButton.cxx +--- forms/source/component/RadioButton.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ forms/source/component/RadioButton.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -31,6 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" @@ -7129,7 +6955,7 @@ index d471d1a..3d16b39 100644 #include "property.hxx" #ifndef _FRM_PROPERTY_HRC_ #include "property.hrc" -@@ -122,6 +123,7 @@ ORadioButtonModel::ORadioButtonModel(const Reference<XMultiServiceFactory>& _rxF +@@ -122,6 +123,7 @@ ORadioButtonModel::ORadioButtonModel(con m_nClassId = FormComponentType::RADIOBUTTON; m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX; initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE ); @@ -7137,7 +6963,7 @@ index d471d1a..3d16b39 100644 } //------------------------------------------------------------------ -@@ -169,7 +171,11 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt +@@ -169,7 +171,11 @@ StringSequence SAL_CALL ORadioButtonMode void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue) { // mein Name @@ -7150,7 +6976,7 @@ index d471d1a..3d16b39 100644 // meine Siblings durchiterieren Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY); -@@ -177,8 +183,9 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons +@@ -177,8 +183,9 @@ void ORadioButtonModel::SetSiblingPropsT { Reference<XPropertySet> xMyProps; query_interface(static_cast<XWeak*>(this), xMyProps); @@ -7162,7 +6988,7 @@ index d471d1a..3d16b39 100644 { Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY); if (!xSiblingProperties.is()) -@@ -195,8 +202,8 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons +@@ -195,8 +202,8 @@ void ORadioButtonModel::SetSiblingPropsT continue; // das 'zur selben Gruppe gehoeren' wird am Namen festgemacht @@ -7173,7 +6999,7 @@ index d471d1a..3d16b39 100644 xSiblingProperties->setPropertyValue(rPropName, rValue); } } -@@ -223,40 +230,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons +@@ -223,40 +230,7 @@ void ORadioButtonModel::setFastPropertyV // die andere Richtung : wenn sich mein Name aendert ... if (nHandle == PROPERTY_ID_NAME) { @@ -7215,7 +7041,7 @@ index d471d1a..3d16b39 100644 } if (nHandle == PROPERTY_ID_DEFAULT_STATE) -@@ -274,6 +248,52 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons +@@ -274,6 +248,52 @@ void ORadioButtonModel::setFastPropertyV } } @@ -7268,7 +7094,7 @@ index d471d1a..3d16b39 100644 //------------------------------------------------------------------------------ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const { -@@ -363,6 +383,13 @@ void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) thr +@@ -363,6 +383,13 @@ void ORadioButtonModel::_propertyChanged SetSiblingPropsTo( PROPERTY_STATE, aZero ); } } @@ -7282,10 +7108,8 @@ index d471d1a..3d16b39 100644 OReferenceValueComponent::_propertyChanged( _rEvent ); } -diff --git forms/source/component/RadioButton.hxx forms/source/component/RadioButton.hxx -index 9517fb0..29a69db 100644 ---- forms/source/component/RadioButton.hxx -+++ forms/source/component/RadioButton.hxx +--- forms/source/component/RadioButton.hxx.old 2009-10-07 15:07:24.000000000 +0200 ++++ forms/source/component/RadioButton.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -87,6 +87,8 @@ private: our mutex is aquired exactly once */ @@ -7295,10 +7119,8 @@ index 9517fb0..29a69db 100644 }; //================================================================== -diff --git forms/source/inc/InterfaceContainer.hxx forms/source/inc/InterfaceContainer.hxx -index 3af34e1..a259c5e 100644 ---- forms/source/inc/InterfaceContainer.hxx -+++ forms/source/inc/InterfaceContainer.hxx +--- forms/source/inc/InterfaceContainer.hxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ forms/source/inc/InterfaceContainer.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -275,6 +275,9 @@ protected: void implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) ); @@ -7309,10 +7131,8 @@ index 3af34e1..a259c5e 100644 // the runtime event format has changed from version SO5.2 to OOo enum EventFormat { -diff --git forms/source/inc/frm_strings.hxx forms/source/inc/frm_strings.hxx -index b153321..6c242eb 100644 ---- forms/source/inc/frm_strings.hxx -+++ forms/source/inc/frm_strings.hxx +--- forms/source/inc/frm_strings.hxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ forms/source/inc/frm_strings.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -100,6 +100,7 @@ namespace frm FORMS_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex" ); FORMS_CONSTASCII_STRING( PROPERTY_TAG, "Tag" ); @@ -7321,10 +7141,8 @@ index b153321..6c242eb 100644 FORMS_CONSTASCII_STRING( PROPERTY_CLASSID, "ClassId" ); FORMS_CONSTASCII_STRING( PROPERTY_FETCHSIZE, "FetchSize" ); FORMS_CONSTASCII_STRING( PROPERTY_VALUE, "Value" ); -diff --git forms/source/inc/property.hrc forms/source/inc/property.hrc -index 100a693..64c440f 100644 ---- forms/source/inc/property.hrc -+++ forms/source/inc/property.hrc +--- forms/source/inc/property.hrc.old 2009-10-08 16:18:20.000000000 +0200 ++++ forms/source/inc/property.hrc 2010-03-03 16:59:34.000000000 +0100 @@ -63,7 +63,7 @@ namespace frm #define PROPERTY_ID_INPUT_REQUIRED (PROPERTY_ID_START + 19) #define PROPERTY_ID_WRITING_MODE (PROPERTY_ID_START + 20) @@ -7334,10 +7152,8 @@ index 100a693..64c440f 100644 // free // free // free -diff --git forms/source/misc/InterfaceContainer.cxx forms/source/misc/InterfaceContainer.cxx -index 18a8654..2879d2c 100644 ---- forms/source/misc/InterfaceContainer.cxx -+++ forms/source/misc/InterfaceContainer.cxx +--- forms/source/misc/InterfaceContainer.cxx.old 2009-10-08 16:18:20.000000000 +0200 ++++ forms/source/misc/InterfaceContainer.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -31,42 +31,49 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" @@ -7366,9 +7182,6 @@ index 18a8654..2879d2c 100644 -#include <rtl/logfile.hxx>
-#include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
-- --#include <algorithm>
--#include <memory>
+#include "frm_resource.hrc" +#include "frm_resource.hxx" +#include "InterfaceContainer.hxx" @@ -7393,7 +7206,9 @@ index 18a8654..2879d2c 100644 +#include <rtl/logfile.hxx> +#include <tools/debug.hxx> +#include <tools/diagnose_ex.h> -+ + +-#include <algorithm>
+-#include <memory>
+#include <algorithm> +#include <memory> @@ -7505,7 +7320,7 @@ index 18a8654..2879d2c 100644 //================================================================== //= ElementDescription //================================================================== -@@ -739,6 +829,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r +@@ -739,6 +829,7 @@ void OInterfaceContainer::approveNewElem void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XPropertySet >& _rxElement, sal_Bool _bEvents, ElementDescription* _pApprovalResult, sal_Bool _bFire ) throw( IllegalArgumentException ) { @@ -7513,7 +7328,7 @@ index 18a8654..2879d2c 100644 RTL_LOGFILE_CONTEXT( aLogger, "forms::OInterfaceContainer::implInsert" ); ::osl::ClearableMutexGuard aGuard( m_rMutex ); -@@ -788,6 +879,23 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper +@@ -788,6 +879,23 @@ void OInterfaceContainer::implInsert(sal { m_xEventAttacher->insertEntry(_nIndex); m_xEventAttacher->attach( _nIndex, pElementMetaData->xInterface, makeAny( _rxElement ) ); @@ -7537,7 +7352,7 @@ index 18a8654..2879d2c 100644 } // notify derived classes -@@ -1082,20 +1190,29 @@ void SAL_CALL OInterfaceContainer::removeByName(const ::rtl::OUString& Name) thr +@@ -1082,20 +1190,29 @@ void SAL_CALL OInterfaceContainer::remov //------------------------------------------------------------------------ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException) { @@ -7567,7 +7382,7 @@ index 18a8654..2879d2c 100644 if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam ); } -@@ -1124,9 +1241,16 @@ void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(Illegal +@@ -1124,9 +1241,16 @@ void SAL_CALL OInterfaceContainer::remov //------------------------------------------------------------------------ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) { @@ -7584,10 +7399,8 @@ index 18a8654..2879d2c 100644 return aReturn; } -diff --git forms/source/misc/makefile.mk forms/source/misc/makefile.mk -index b03109b..9422ba7 100644 ---- forms/source/misc/makefile.mk -+++ forms/source/misc/makefile.mk +--- forms/source/misc/makefile.mk.old 2009-10-07 15:07:24.000000000 +0200 ++++ forms/source/misc/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -45,6 +45,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Types ------------------------------------- @@ -7609,10 +7422,8 @@ index b03109b..9422ba7 100644 + +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ + echo $@ + -diff --git formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/FormulaCompiler.hxx -index 7d52b20..8710847 100644 ---- formula/inc/formula/FormulaCompiler.hxx -+++ formula/inc/formula/FormulaCompiler.hxx +--- formula/inc/formula/FormulaCompiler.hxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ formula/inc/formula/FormulaCompiler.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -222,6 +222,8 @@ public: void SetCompileForFAP( BOOL bVal ) { bCompileForFAP = bVal; bIgnoreErrors = bVal; } @@ -7622,11 +7433,9 @@ index 7d52b20..8710847 100644 static BOOL DeQuote( String& rStr ); static const String& GetNativeSymbol( OpCode eOp ); -diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx -index 94a7ae9..8df7933 100644 ---- formula/source/core/api/FormulaCompiler.cxx -+++ formula/source/core/api/FormulaCompiler.cxx -@@ -744,6 +744,30 @@ OpCode FormulaCompiler::GetEnglishOpCode( const String& rName ) const +--- formula/source/core/api/FormulaCompiler.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ formula/source/core/api/FormulaCompiler.cxx 2010-03-03 16:59:34.000000000 +0100 +@@ -744,6 +744,30 @@ OpCode FormulaCompiler::GetEnglishOpCode return bFound ? (*iLook).second : OpCode(ocNone); } @@ -7727,10 +7536,8 @@ index 94a7ae9..8df7933 100644 } if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR) { -diff --git framework/inc/uielement/generictoolbarcontroller.hxx framework/inc/uielement/generictoolbarcontroller.hxx -index 316c60d..377b685 100644 ---- framework/inc/uielement/generictoolbarcontroller.hxx -+++ framework/inc/uielement/generictoolbarcontroller.hxx +--- framework/inc/uielement/generictoolbarcontroller.hxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ framework/inc/uielement/generictoolbarcontroller.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -37,6 +37,9 @@ #include <svtools/toolboxcontroller.hxx> @@ -7741,7 +7548,7 @@ index 316c60d..377b685 100644 namespace framework { -@@ -64,7 +67,7 @@ class GenericToolbarController : public svt::ToolboxController +@@ -64,7 +67,7 @@ class GenericToolbarController : public DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); @@ -7750,7 +7557,7 @@ index 316c60d..377b685 100644 ToolBox* m_pToolbar; sal_uInt16 m_nID; sal_Bool m_bEnumCommand : 1, -@@ -72,6 +75,28 @@ class GenericToolbarController : public svt::ToolboxController +@@ -72,6 +75,28 @@ class GenericToolbarController : public rtl::OUString m_aEnumCommand; }; @@ -7779,10 +7586,8 @@ index 316c60d..377b685 100644 } #endif // __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_ -diff --git framework/inc/uielement/toolbarmanager.hxx framework/inc/uielement/toolbarmanager.hxx -index 9f1c2cd..7ba9286 100644 ---- framework/inc/uielement/toolbarmanager.hxx -+++ framework/inc/uielement/toolbarmanager.hxx +--- framework/inc/uielement/toolbarmanager.hxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/inc/uielement/toolbarmanager.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -50,10 +50,12 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -7796,7 +7601,7 @@ index 9f1c2cd..7ba9286 100644 #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> #include <com/sun/star/frame/XToolbarController.hpp> -@@ -200,6 +202,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener +@@ -200,6 +202,7 @@ class ToolBarManager : public ::com::sun typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XSubToolbarController > > SubToolBarControllerVector; typedef BaseHash< SubToolBarControllerVector > SubToolBarToSubToolBarControllerMap; @@ -7804,7 +7609,7 @@ index 9f1c2cd..7ba9286 100644 sal_Bool m_bDisposed : 1, m_bIsHiContrast : 1, m_bSmallSymbols : 1, -@@ -225,10 +228,14 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener +@@ -225,10 +228,14 @@ class ToolBarManager : public ::com::sun ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageManager; ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xImageOrientationListener; @@ -7819,10 +7624,8 @@ index 9f1c2cd..7ba9286 100644 }; } -diff --git framework/inc/xml/menuconfiguration.hxx framework/inc/xml/menuconfiguration.hxx -index cff0e8d..f24994b 100644 ---- framework/inc/xml/menuconfiguration.hxx -+++ framework/inc/xml/menuconfiguration.hxx +--- framework/inc/xml/menuconfiguration.hxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ framework/inc/xml/menuconfiguration.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -85,6 +85,7 @@ class MenuConfiguration ::rtl::OUString aTargetFrame; ::rtl::OUString aImageId; @@ -7831,11 +7634,9 @@ index cff0e8d..f24994b 100644 }; MenuConfiguration( -diff --git framework/inc/xml/menudocumenthandler.hxx framework/inc/xml/menudocumenthandler.hxx -index b6148ca..0ecad10 100644 ---- framework/inc/xml/menudocumenthandler.hxx -+++ framework/inc/xml/menudocumenthandler.hxx -@@ -109,13 +109,14 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right i +--- framework/inc/xml/menudocumenthandler.hxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/inc/xml/menudocumenthandler.hxx 2010-03-03 16:59:34.000000000 +0100 +@@ -109,13 +109,14 @@ class ReadMenuDocumentHandlerBase : publ ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler> m_xReader; void initPropertyCommon( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &rProps, const rtl::OUString &rCommandURL, const rtl::OUString &rHelpId, @@ -7860,10 +7661,8 @@ index b6148ca..0ecad10 100644 virtual void WriteMenuSeparator(); com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xMenuBarContainer; -diff --git framework/inc/xml/toolboxconfigurationdefines.hxx framework/inc/xml/toolboxconfigurationdefines.hxx -index 4b0cb68..3aee5d1 100644 ---- framework/inc/xml/toolboxconfigurationdefines.hxx -+++ framework/inc/xml/toolboxconfigurationdefines.hxx +--- framework/inc/xml/toolboxconfigurationdefines.hxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ framework/inc/xml/toolboxconfigurationdefines.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -29,6 +29,7 @@ #define ATTRIBUTE_WIDTH "width" #define ATTRIBUTE_USER "userdefined" @@ -7881,11 +7680,9 @@ index 4b0cb68..3aee5d1 100644 +#define ATTRIBUTE_ITEMSTYLE_IMAGE "image" #endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_ -diff --git framework/inc/xml/toolboxdocumenthandler.hxx framework/inc/xml/toolboxdocumenthandler.hxx -index e903135..fa1b143 100644 ---- framework/inc/xml/toolboxdocumenthandler.hxx -+++ framework/inc/xml/toolboxdocumenthandler.hxx -@@ -77,6 +77,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right +--- framework/inc/xml/toolboxdocumenthandler.hxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/inc/xml/toolboxdocumenthandler.hxx 2010-03-03 16:59:34.000000000 +0100 +@@ -77,6 +77,7 @@ class OReadToolBoxDocumentHandler : priv TB_ATTRIBUTE_HELPID, TB_ATTRIBUTE_STYLE, TB_ATTRIBUTE_UINAME, @@ -7893,7 +7690,7 @@ index e903135..fa1b143 100644 TB_XML_ENTRY_COUNT }; -@@ -159,10 +160,13 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right +@@ -159,10 +160,13 @@ class OReadToolBoxDocumentHandler : priv sal_Int32 m_nHashCode_Style_DropDown; sal_Int32 m_nHashCode_Style_Repeat; sal_Int32 m_nHashCode_Style_DropDownOnly; @@ -7907,7 +7704,7 @@ index e903135..fa1b143 100644 rtl::OUString m_aIsVisible; rtl::OUString m_aCommandURL; }; -@@ -181,7 +185,7 @@ class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right +@@ -181,7 +185,7 @@ class OWriteToolBoxDocumentHandler : pri ::com::sun::star::uno::RuntimeException ); protected: @@ -7916,10 +7713,8 @@ index e903135..fa1b143 100644 sal_Int16 nWidth, sal_Bool bVisible ) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); -diff --git framework/source/classes/menumanager.cxx framework/source/classes/menumanager.cxx -index b245cff..6c80d0b 100644 ---- framework/source/classes/menumanager.cxx -+++ framework/source/classes/menumanager.cxx +--- framework/source/classes/menumanager.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/source/classes/menumanager.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -171,6 +171,12 @@ MenuManager::MenuManager( for ( USHORT i = 0; i < nItemCount; i++ ) { @@ -7969,7 +7764,7 @@ index b245cff..6c80d0b 100644 { if ( AddonMenuManager::IsAddonMenuId( nItemId )) { -@@ -1131,7 +1137,13 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B +@@ -1131,7 +1137,13 @@ void MenuManager::FillMenuImages(Referen USHORT nId = _pMenu->GetItemId( nPos ); if ( _pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) { @@ -7984,10 +7779,8 @@ index b245cff..6c80d0b 100644 { sal_Bool bImageSet = sal_False; ::rtl::OUString aImageId; -diff --git framework/source/uielement/generictoolbarcontroller.cxx framework/source/uielement/generictoolbarcontroller.cxx -index 311776c..0a6d929 100644 ---- framework/source/uielement/generictoolbarcontroller.cxx -+++ framework/source/uielement/generictoolbarcontroller.cxx +--- framework/source/uielement/generictoolbarcontroller.cxx.old 2009-10-07 15:06:59.000000000 +0200 ++++ framework/source/uielement/generictoolbarcontroller.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -68,6 +68,9 @@ #include <classes/fwkresid.hxx> #include <dispatch/uieventloghelper.hxx> @@ -8006,7 +7799,7 @@ index 311776c..0a6d929 100644 namespace framework { -@@ -326,5 +330,67 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI +@@ -326,5 +330,67 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericTool return 0; } @@ -8074,10 +7867,8 @@ index 311776c..0a6d929 100644 +} } // namespace -diff --git framework/source/uielement/menubarmanager.cxx framework/source/uielement/menubarmanager.cxx -index f5991c9..6e71139 100644 ---- framework/source/uielement/menubarmanager.cxx -+++ framework/source/uielement/menubarmanager.cxx +--- framework/source/uielement/menubarmanager.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/source/uielement/menubarmanager.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -74,6 +74,7 @@ #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> @@ -8086,7 +7877,7 @@ index f5991c9..6e71139 100644 #include <com/sun/star/frame/status/Visibility.hpp> //_________________________________________________________________________________________________________________ -@@ -136,6 +137,7 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; +@@ -136,6 +137,7 @@ static const char ITEM_DESCRIPTOR_LABEL[ static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static const char ITEM_DESCRIPTOR_MODULEIDENTIFIER[] = "ModuleIdentifier"; static const char ITEM_DESCRIPTOR_DISPATCHPROVIDER[] = "DispatchProvider"; @@ -8094,7 +7885,7 @@ index f5991c9..6e71139 100644 const sal_Int32 LEN_DESCRIPTOR_COMMANDURL = 10; const sal_Int32 LEN_DESCRIPTOR_HELPURL = 7; -@@ -144,6 +146,7 @@ const sal_Int32 LEN_DESCRIPTOR_LABEL = 5; +@@ -144,6 +146,7 @@ const sal_Int32 LEN_DESCRIPTOR_LABEL const sal_Int32 LEN_DESCRIPTOR_TYPE = 4; const sal_Int32 LEN_DESCRIPTOR_MODULEIDENTIFIER = 16; const sal_Int32 LEN_DESCRIPTOR_DISPATCHPROVIDER = 16; @@ -8102,7 +7893,7 @@ index f5991c9..6e71139 100644 const sal_uInt16 ADDONMENU_MERGE_ITEMID_START = 1500; -@@ -1327,6 +1330,11 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF +@@ -1327,6 +1330,11 @@ void MenuBarManager::FillMenuManager( Me Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; PopupMenu* pPopup = pMenu->GetPopupMenu( nItemId ); @@ -8114,7 +7905,7 @@ index f5991c9..6e71139 100644 if ( pPopup ) { // Retrieve module identifier from Help Command entry -@@ -1422,7 +1430,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF +@@ -1422,7 +1430,7 @@ void MenuBarManager::FillMenuManager( Me pSubMenuManager->m_aMenuItemCommand = ::rtl::OUString(); // Set image for the addon popup menu item @@ -8123,7 +7914,7 @@ index f5991c9..6e71139 100644 { Reference< XFrame > xTemp( rFrame ); Image aImage = GetImageFromURL( xTemp, aItemCommand, FALSE, m_bWasHiContrast ); -@@ -1441,7 +1449,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF +@@ -1441,7 +1449,7 @@ void MenuBarManager::FillMenuManager( Me } else if ( pMenu->GetItemType( i ) != MENUITEM_SEPARATOR ) { @@ -8167,10 +7958,8 @@ index f5991c9..6e71139 100644 if ( xIndexContainer.is() ) { PopupMenu* pNewPopupMenu = new PopupMenu; -diff --git framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarmanager.cxx -index 7451f68..d7eb033 100644 ---- framework/source/uielement/toolbarmanager.cxx -+++ framework/source/uielement/toolbarmanager.cxx +--- framework/source/uielement/toolbarmanager.cxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ framework/source/uielement/toolbarmanager.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -71,7 +71,6 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XModuleManager.hpp> @@ -8187,7 +7976,7 @@ index 7451f68..d7eb033 100644 static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; -@@ -131,6 +131,7 @@ static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; +@@ -131,6 +131,7 @@ static const char ITEM_DESCRIPTOR_STYL static const sal_Int32 ITEM_DESCRIPTOR_COMMANDURL_LEN = 10; static const sal_Int32 ITEM_DESCRIPTOR_HELPURL_LEN = 7; @@ -8195,7 +7984,7 @@ index 7451f68..d7eb033 100644 static const sal_Int32 ITEM_DESCRIPTOR_CONTAINER_LEN = 23; static const sal_Int32 ITEM_DESCRIPTOR_LABEL_LEN = 5; static const sal_Int32 ITEM_DESCRIPTOR_TYPE_LEN = 4; -@@ -143,6 +144,7 @@ static const char HELPID_PREFIX_TESTTOOL[] = ".HelpId:"; +@@ -143,6 +144,7 @@ static const char HELPID_PREFIX_TESTTO //static sal_Int32 HELPID_PREFIX_LENGTH = 7; static const USHORT STARTID_CUSTOMIZE_POPUPMENU = 1000; @@ -8219,7 +8008,7 @@ index 7451f68..d7eb033 100644 } } else if ( pController ) -@@ -1101,6 +1108,10 @@ sal_uInt16 ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle ) +@@ -1101,6 +1108,10 @@ sal_uInt16 ToolBarManager::ConvertStyleT nItemBits |= TIB_REPEAT; if ( nStyle & ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY ) nItemBits |= TIB_DROPDOWNONLY; @@ -8230,7 +8019,7 @@ index 7451f68..d7eb033 100644 return nItemBits; } -@@ -1130,8 +1141,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine +@@ -1130,8 +1141,8 @@ void ToolBarManager::FillToolbar( const Reference< XUIConfigurationManagerSupplier > xSupplier( xModel, UNO_QUERY ); if ( xSupplier.is() ) { @@ -8241,7 +8030,7 @@ index 7451f68..d7eb033 100644 m_xDocImageManager->addConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY )); -@@ -1153,8 +1164,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine +@@ -1153,8 +1164,8 @@ void ToolBarManager::FillToolbar( const Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier( m_xServiceManager->createInstance( SERVICENAME_MODULEUICONFIGURATIONMANAGERSUPPLIER ), UNO_QUERY ); @@ -8252,7 +8041,7 @@ index 7451f68..d7eb033 100644 m_xModuleImageManager->addConfigurationListener( Reference< XUIConfigurationListener >( static_cast< OWeakObject* >( this ), UNO_QUERY )); } -@@ -1166,6 +1177,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine +@@ -1166,6 +1177,8 @@ void ToolBarManager::FillToolbar( const m_aControllerMap.clear(); m_aCommandMap.clear(); @@ -8261,7 +8050,7 @@ index 7451f68..d7eb033 100644 CommandInfo aCmdInfo; for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ ) { -@@ -1173,11 +1186,13 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine +@@ -1173,11 +1186,13 @@ void ToolBarManager::FillToolbar( const rtl::OUString aCommandURL; rtl::OUString aLabel; rtl::OUString aHelpURL; @@ -8275,7 +8064,7 @@ index 7451f68..d7eb033 100644 try { if ( rItemContainer->getByIndex( n ) >>= aProp ) -@@ -1185,9 +1200,44 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine +@@ -1185,9 +1200,44 @@ void ToolBarManager::FillToolbar( const for ( int i = 0; i < aProp.getLength(); i++ ) { if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_COMMANDURL, ITEM_DESCRIPTOR_COMMANDURL_LEN )) @@ -8320,7 +8109,7 @@ index 7451f68..d7eb033 100644 else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_LABEL, ITEM_DESCRIPTOR_LABEL_LEN )) aProp[i].Value >>= aLabel; else if ( aProp[i].Name.equalsAsciiL( ITEM_DESCRIPTOR_TYPE, ITEM_DESCRIPTOR_TYPE_LEN )) -@@ -1205,9 +1255,14 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine +@@ -1205,9 +1255,14 @@ void ToolBarManager::FillToolbar( const ::rtl::OUString aString( RetrieveLabelFromCommand( aCommandURL )); sal_uInt16 nItemBits = ConvertStyleToToolboxItemBits( nStyle ); @@ -8336,10 +8125,8 @@ index 7451f68..d7eb033 100644 if ( aLabel.getLength() > 0 ) m_pToolBar->SetItemText( nId, aLabel ); else -diff --git framework/source/xml/menudocumenthandler.cxx framework/source/xml/menudocumenthandler.cxx -index 66addd1..f3cfbda 100644 ---- framework/source/xml/menudocumenthandler.cxx -+++ framework/source/xml/menudocumenthandler.cxx +--- framework/source/xml/menudocumenthandler.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/source/xml/menudocumenthandler.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -47,6 +47,7 @@ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> @@ -8408,7 +8195,7 @@ index 66addd1..f3cfbda 100644 { for ( sal_Int32 i = 0; i < rProp.getLength(); i++ ) { -@@ -151,6 +173,12 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, +@@ -151,6 +173,12 @@ static void ExtractMenuParameters( const { rProp[i].Value >>= rType; } @@ -8421,7 +8208,7 @@ index 66addd1..f3cfbda 100644 } } -@@ -165,7 +193,8 @@ ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : +@@ -165,7 +193,8 @@ ReadMenuDocumentHandlerBase::ReadMenuDoc m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )), m_aContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER )), m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )), @@ -8636,7 +8423,7 @@ index 66addd1..f3cfbda 100644 { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); -@@ -894,6 +1004,24 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const ::rtl::OUString& aCommandUR +@@ -894,6 +1004,24 @@ void OWriteMenuDocumentHandler::WriteMen m_aAttributeType, aLabel ); } @@ -8661,10 +8448,8 @@ index 66addd1..f3cfbda 100644 m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() ); m_xWriteDocumentHandler->startElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList ); -diff --git framework/source/xml/toolboxdocumenthandler.cxx framework/source/xml/toolboxdocumenthandler.cxx -index 53098b1..28e5797 100644 ---- framework/source/xml/toolboxdocumenthandler.cxx -+++ framework/source/xml/toolboxdocumenthandler.cxx +--- framework/source/xml/toolboxdocumenthandler.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ framework/source/xml/toolboxdocumenthandler.cxx 2010-03-03 16:59:34.000000000 +0100 @@ -79,6 +79,7 @@ namespace framework // Property names of a menu/menu item ItemDescriptor static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; @@ -8673,7 +8458,7 @@ index 53098b1..28e5797 100644 static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; -@@ -89,6 +90,8 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp, +@@ -89,6 +90,8 @@ static void ExtractToolbarParameters( co ::rtl::OUString& rCommandURL, ::rtl::OUString& rLabel, ::rtl::OUString& rHelpURL, @@ -8682,7 +8467,7 @@ index 53098b1..28e5797 100644 sal_Int16& rWidth, sal_Bool& rVisible, sal_Int16& rType ) -@@ -102,6 +105,8 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp, +@@ -102,6 +105,8 @@ static void ExtractToolbarParameters( co } else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL )) rProp[i].Value >>= rHelpURL; @@ -8691,7 +8476,7 @@ index 53098b1..28e5797 100644 else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL )) rProp[i].Value >>= rLabel; else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE )) -@@ -110,9 +115,30 @@ static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp, +@@ -110,9 +115,30 @@ static void ExtractToolbarParameters( co rProp[i].Value >>= rVisible; else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH )) rProp[i].Value >>= rWidth; @@ -8722,7 +8507,7 @@ index 53098b1..28e5797 100644 struct ToolBarEntryProperty { OReadToolBoxDocumentHandler::ToolBox_XML_Namespace nNamespace; -@@ -135,7 +161,8 @@ ToolBarEntryProperty ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_CO +@@ -135,7 +161,8 @@ ToolBarEntryProperty ToolBoxEntries[ORea { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_USER }, { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_HELPID }, { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMSTYLE }, @@ -8732,7 +8517,7 @@ index 53098b1..28e5797 100644 }; OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XIndexContainer >& rItemContainer ) : -@@ -145,6 +172,7 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde +@@ -145,6 +172,7 @@ OReadToolBoxDocumentHandler::OReadToolBo m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )), m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE )), m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )), @@ -8740,7 +8525,7 @@ index 53098b1..28e5797 100644 m_aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_VISIBLE )), m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL )) { -@@ -179,6 +207,8 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde +@@ -179,6 +207,8 @@ OReadToolBoxDocumentHandler::OReadToolBo m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode(); m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode(); m_nHashCode_Style_DropDownOnly = ::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode(); @@ -8815,7 +8600,7 @@ index 53098b1..28e5797 100644 m_rItemContainer->insertByIndex( m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) ); } -@@ -718,13 +772,15 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw +@@ -718,13 +772,15 @@ void OWriteToolBoxDocumentHandler::Write ::rtl::OUString aCommandURL; ::rtl::OUString aLabel; ::rtl::OUString aHelpURL; @@ -8833,7 +8618,7 @@ index 53098b1..28e5797 100644 else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_SPACE ) WriteToolBoxSpace(); else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_LINE ) -@@ -748,6 +804,8 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem( +@@ -748,6 +804,8 @@ void OWriteToolBoxDocumentHandler::Write const ::rtl::OUString& rCommandURL, const ::rtl::OUString& rLabel, const ::rtl::OUString& rHelpURL, @@ -8876,11 +8661,8 @@ index 53098b1..28e5797 100644 if ( nWidth > 0 ) { -diff --git offapi/com/sun/star/document/VbaEventId.idl offapi/com/sun/star/document/VbaEventId.idl -new file mode 100644 -index 0000000..b5af431 ---- /dev/null -+++ offapi/com/sun/star/document/VbaEventId.idl +--- offapi/com/sun/star/document/VbaEventId.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/document/VbaEventId.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,89 @@ +/************************************************************************* + * @@ -8971,11 +8753,8 @@ index 0000000..b5af431 +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/document/VbaEventsHelper.idl offapi/com/sun/star/document/VbaEventsHelper.idl -new file mode 100644 -index 0000000..30f8f7e ---- /dev/null -+++ offapi/com/sun/star/document/VbaEventsHelper.idl +--- offapi/com/sun/star/document/VbaEventsHelper.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/document/VbaEventsHelper.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,55 @@ +/************************************************************************* + * @@ -9032,11 +8811,8 @@ index 0000000..30f8f7e +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/document/XCodeNameQuery.idl offapi/com/sun/star/document/XCodeNameQuery.idl -new file mode 100644 -index 0000000..7eee436 ---- /dev/null -+++ offapi/com/sun/star/document/XCodeNameQuery.idl +--- offapi/com/sun/star/document/XCodeNameQuery.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/document/XCodeNameQuery.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,56 @@ +/************************************************************************* + * @@ -9094,11 +8870,8 @@ index 0000000..7eee436 +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/document/XCompatWriterDocProperties.idl offapi/com/sun/star/document/XCompatWriterDocProperties.idl -new file mode 100644 -index 0000000..435ffb3 ---- /dev/null -+++ offapi/com/sun/star/document/XCompatWriterDocProperties.idl +--- offapi/com/sun/star/document/XCompatWriterDocProperties.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/document/XCompatWriterDocProperties.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,49 @@ +/************************************************************************* + * @@ -9149,11 +8922,8 @@ index 0000000..435ffb3 +}; }; }; }; +}; +#endif -diff --git offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl -new file mode 100644 -index 0000000..d10deab ---- /dev/null -+++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl +--- offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,53 @@ +/************************************************************************* + * @@ -9208,11 +8978,8 @@ index 0000000..d10deab +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/document/XVbaEventsHelper.idl offapi/com/sun/star/document/XVbaEventsHelper.idl -new file mode 100644 -index 0000000..0c5abc7 ---- /dev/null -+++ offapi/com/sun/star/document/XVbaEventsHelper.idl +--- offapi/com/sun/star/document/XVbaEventsHelper.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/document/XVbaEventsHelper.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -9274,11 +9041,8 @@ index 0000000..0c5abc7 +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/document/XVbaMethodParameter.idl offapi/com/sun/star/document/XVbaMethodParameter.idl -new file mode 100644 -index 0000000..7ef5296 ---- /dev/null -+++ offapi/com/sun/star/document/XVbaMethodParameter.idl +--- offapi/com/sun/star/document/XVbaMethodParameter.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/document/XVbaMethodParameter.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,68 @@ +/************************************************************************* + * @@ -9348,10 +9112,8 @@ index 0000000..7ef5296 + +}; }; }; }; +#endif -diff --git offapi/com/sun/star/document/makefile.mk offapi/com/sun/star/document/makefile.mk -index 3bc2db2..e0a5566 100644 ---- offapi/com/sun/star/document/makefile.mk -+++ offapi/com/sun/star/document/makefile.mk +--- offapi/com/sun/star/document/makefile.mk.old 2009-10-08 16:17:03.000000000 +0200 ++++ offapi/com/sun/star/document/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -116,7 +116,15 @@ IDLFILES=\ LinkUpdateModes.idl\ XDocumentRevisionListPersistence.idl\ @@ -9369,10 +9131,8 @@ index 3bc2db2..e0a5566 100644 # ------------------------------------------------------------------ -diff --git offapi/com/sun/star/drawing/Shape.idl offapi/com/sun/star/drawing/Shape.idl -index 70b6e89..1e1c1d4 100644 ---- offapi/com/sun/star/drawing/Shape.idl -+++ offapi/com/sun/star/drawing/Shape.idl +--- offapi/com/sun/star/drawing/Shape.idl.old 2009-10-07 15:06:09.000000000 +0200 ++++ offapi/com/sun/star/drawing/Shape.idl 2010-03-03 16:59:34.000000000 +0100 @@ -195,6 +195,10 @@ published service Shape the z-order. */ @@ -9384,11 +9144,8 @@ index 70b6e89..1e1c1d4 100644 }; //============================================================================= -diff --git offapi/com/sun/star/script/XLibraryQueryExecutable.idl offapi/com/sun/star/script/XLibraryQueryExecutable.idl -new file mode 100644 -index 0000000..48dbfaa ---- /dev/null -+++ offapi/com/sun/star/script/XLibraryQueryExecutable.idl +--- offapi/com/sun/star/script/XLibraryQueryExecutable.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/script/XLibraryQueryExecutable.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,51 @@ +/************************************************************************* + * @@ -9441,11 +9198,8 @@ index 0000000..48dbfaa +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/script/XVBACompat.idl offapi/com/sun/star/script/XVBACompat.idl -new file mode 100644 -index 0000000..e1b2d28 ---- /dev/null -+++ offapi/com/sun/star/script/XVBACompat.idl +--- offapi/com/sun/star/script/XVBACompat.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/script/XVBACompat.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,49 @@ +/************************************************************************* + * @@ -9496,10 +9250,8 @@ index 0000000..e1b2d28 +}; }; }; }; +}; +#endif -diff --git offapi/com/sun/star/script/makefile.mk offapi/com/sun/star/script/makefile.mk -index fce40ae..4e6d8e6 100644 ---- offapi/com/sun/star/script/makefile.mk -+++ offapi/com/sun/star/script/makefile.mk +--- offapi/com/sun/star/script/makefile.mk.old 2009-10-07 15:06:09.000000000 +0200 ++++ offapi/com/sun/star/script/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -51,6 +51,8 @@ IDLFILES=\ XLibraryContainerExport.idl\ XPersistentLibraryContainer.idl\ @@ -9509,11 +9261,8 @@ index fce40ae..4e6d8e6 100644 ModuleSizeExceededRequest.idl\ # ------------------------------------------------------------------ -diff --git offapi/com/sun/star/sheet/SpreadsheetDocumentVbaEventsHelper.idl offapi/com/sun/star/sheet/SpreadsheetDocumentVbaEventsHelper.idl -new file mode 100644 -index 0000000..b08a58c ---- /dev/null -+++ offapi/com/sun/star/sheet/SpreadsheetDocumentVbaEventsHelper.idl +--- offapi/com/sun/star/sheet/SpreadsheetDocumentVbaEventsHelper.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/sheet/SpreadsheetDocumentVbaEventsHelper.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,52 @@ +/************************************************************************* + * @@ -9567,10 +9316,8 @@ index 0000000..b08a58c +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/sheet/makefile.mk offapi/com/sun/star/sheet/makefile.mk -index 468e96b..6d245e7 100644 ---- offapi/com/sun/star/sheet/makefile.mk -+++ offapi/com/sun/star/sheet/makefile.mk +--- offapi/com/sun/star/sheet/makefile.mk.old 2009-10-08 16:17:03.000000000 +0200 ++++ offapi/com/sun/star/sheet/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -198,6 +198,7 @@ IDLFILES=\ Spreadsheet.idl\ SpreadsheetDocument.idl\ @@ -9579,11 +9326,8 @@ index 468e96b..6d245e7 100644 SpreadsheetDrawPage.idl\ SpreadsheetView.idl\ SpreadsheetViewPane.idl\ -diff --git offapi/com/sun/star/text/TextDocumentVbaEventsHelper.idl offapi/com/sun/star/text/TextDocumentVbaEventsHelper.idl -new file mode 100644 -index 0000000..b4f2707 ---- /dev/null -+++ offapi/com/sun/star/text/TextDocumentVbaEventsHelper.idl +--- offapi/com/sun/star/text/TextDocumentVbaEventsHelper.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ offapi/com/sun/star/text/TextDocumentVbaEventsHelper.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,52 @@ +/************************************************************************* + * @@ -9637,10 +9381,8 @@ index 0000000..b4f2707 +}; }; }; }; + +#endif -diff --git offapi/com/sun/star/text/makefile.mk offapi/com/sun/star/text/makefile.mk -index c018c94..c639d7b 100644 ---- offapi/com/sun/star/text/makefile.mk -+++ offapi/com/sun/star/text/makefile.mk +--- offapi/com/sun/star/text/makefile.mk.old 2009-10-08 16:17:03.000000000 +0200 ++++ offapi/com/sun/star/text/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -156,6 +156,7 @@ IDLFILES=\ TextContentCollection.idl\ TextCursor.idl\ @@ -9649,10 +9391,8 @@ index c018c94..c639d7b 100644 TextDocumentView.idl\ TextEmbeddedObject.idl\ TextEmbeddedObjects.idl\ -diff --git offapi/com/sun/star/ui/ItemStyle.idl offapi/com/sun/star/ui/ItemStyle.idl -index 1243c67..5728b4a 100644 ---- offapi/com/sun/star/ui/ItemStyle.idl -+++ offapi/com/sun/star/ui/ItemStyle.idl +--- offapi/com/sun/star/ui/ItemStyle.idl.old 2009-10-07 15:06:09.000000000 +0200 ++++ offapi/com/sun/star/ui/ItemStyle.idl 2010-03-03 16:59:34.000000000 +0100 @@ -149,6 +149,7 @@ constants ItemStyle <p>This style is only valid if the item describes a toolbar item.</p> */ @@ -9661,10 +9401,8 @@ index 1243c67..5728b4a 100644 }; }; }; }; }; -diff --git officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu -index def732a..f60d5d0 100644 ---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu -+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu.old 2010-03-03 16:59:14.000000000 +0100 ++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 2010-03-03 16:59:34.000000000 +0100 @@ -1197,6 +1197,12 @@ <value xml:lang="en-US">~Remove Filter</value> </prop> @@ -9678,10 +9416,8 @@ index def732a..f60d5d0 100644 <node oor:name=".uno:DataSubTotals" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Sub~totals...</value> -diff --git officecfg/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs -index 260eec4..a6cccce 100644 ---- officecfg/registry/schema/org/openoffice/Office/Calc.xcs -+++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs +--- officecfg/registry/schema/org/openoffice/Office/Calc.xcs.old 2010-03-03 16:59:16.000000000 +0100 ++++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs 2010-03-03 16:59:34.000000000 +0100 @@ -1397,7 +1397,7 @@ <desc>Indicates whether VBA macros are imported without comments to be executable.</desc> <label>Executable code</label> @@ -9691,10 +9427,8 @@ index 260eec4..a6cccce 100644 </prop> <prop oor:name="Save" oor:type="xs:boolean"> <!-- OldPath: Filter/MS_Office/Basic/Excel --> -diff --git officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs -index a0d9464..70e0888 100644 ---- officecfg/registry/schema/org/openoffice/Office/Writer.xcs -+++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs +--- officecfg/registry/schema/org/openoffice/Office/Writer.xcs.old 2010-03-03 16:44:08.000000000 +0100 ++++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs 2010-03-03 16:59:34.000000000 +0100 @@ -749,6 +749,17 @@ </group> </templates> @@ -9713,10 +9447,8 @@ index a0d9464..70e0888 100644 <group oor:name="MailMergeWizard"> <info> <desc>Settings of the mail merge wizard.</desc> -diff --git oovbaapi/ooo/vba/XDocumentBase.idl oovbaapi/ooo/vba/XDocumentBase.idl -index aab3c8e..0c74fa8 100644 ---- oovbaapi/ooo/vba/XDocumentBase.idl -+++ oovbaapi/ooo/vba/XDocumentBase.idl +--- oovbaapi/ooo/vba/XDocumentBase.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/XDocumentBase.idl 2010-03-03 16:59:34.000000000 +0100 @@ -58,7 +58,6 @@ interface XDocumentBase void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook); void Save(); @@ -9725,11 +9457,8 @@ index aab3c8e..0c74fa8 100644 void Unprotect( [in] any Password ); }; -diff --git oovbaapi/ooo/vba/XFileDialog.idl oovbaapi/ooo/vba/XFileDialog.idl -new file mode 100644 -index 0000000..776ffce ---- /dev/null -+++ oovbaapi/ooo/vba/XFileDialog.idl +--- oovbaapi/ooo/vba/XFileDialog.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/XFileDialog.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,36 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -9767,11 +9496,8 @@ index 0000000..776ffce + +#endif + -diff --git oovbaapi/ooo/vba/XFileDialogSelectedItems.idl oovbaapi/ooo/vba/XFileDialogSelectedItems.idl -new file mode 100644 -index 0000000..8401fbf ---- /dev/null -+++ oovbaapi/ooo/vba/XFileDialogSelectedItems.idl +--- oovbaapi/ooo/vba/XFileDialogSelectedItems.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/XFileDialogSelectedItems.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,36 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -9809,11 +9535,8 @@ index 0000000..8401fbf + +#endif + -diff --git oovbaapi/ooo/vba/XFileSearch.idl oovbaapi/ooo/vba/XFileSearch.idl -new file mode 100644 -index 0000000..5b24ef5 ---- /dev/null -+++ oovbaapi/ooo/vba/XFileSearch.idl +--- oovbaapi/ooo/vba/XFileSearch.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/XFileSearch.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,37 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -9852,10 +9575,8 @@ index 0000000..5b24ef5 +}; }; + +#endif -diff --git oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl -index 4a1bca8..6ccacda 100644 ---- oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl -+++ oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl +--- oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl.old 2009-10-07 15:07:00.000000000 +0200 ++++ oovbaapi/ooo/vba/XVBAToOOEventDescGen.idl 2010-03-03 16:59:34.000000000 +0100 @@ -41,8 +41,8 @@ module ooo { module vba { interface XVBAToOOEventDescGen : com::sun::star::uno::XInterface @@ -9867,10 +9588,8 @@ index 4a1bca8..6ccacda 100644 }; }; }; -diff --git oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XApplication.idl -index 72849da..6eeaa69 100644 ---- oovbaapi/ooo/vba/excel/XApplication.idl -+++ oovbaapi/ooo/vba/excel/XApplication.idl +--- oovbaapi/ooo/vba/excel/XApplication.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XApplication.idl 2010-03-03 16:59:34.000000000 +0100 @@ -42,6 +42,14 @@ #include <ooo/vba/XAssistant.idl> #endif @@ -9895,7 +9614,7 @@ index 72849da..6eeaa69 100644 interface XApplication : com::sun::star::uno::XInterface { -@@ -63,23 +73,29 @@ interface XApplication : com::sun::star::uno::XInterface +@@ -63,23 +73,29 @@ interface XApplication : com::sun::star: [attribute, readonly] XWindow ActiveWindow; [attribute, readonly] XWorksheet ActiveSheet; [attribute, readonly] ooo::vba::XAssistant Assistant; @@ -9925,7 +9644,7 @@ index 72849da..6eeaa69 100644 string LibraryPath() raises(com::sun::star::script::BasicErrorException); string TemplatesPath() raises(com::sun::star::script::BasicErrorException); string PathSeparator() raises(com::sun::star::script::BasicErrorException); -@@ -102,8 +118,8 @@ interface XApplication : com::sun::star::uno::XInterface +@@ -102,8 +118,8 @@ interface XApplication : com::sun::star: XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30) raises(com::sun::star::script::BasicErrorException); void Volatile([in] any Volatile); @@ -9935,11 +9654,9 @@ index 72849da..6eeaa69 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/excel/XGlobals.idl oovbaapi/ooo/vba/excel/XGlobals.idl -index b21e902..782da39 100644 ---- oovbaapi/ooo/vba/excel/XGlobals.idl -+++ oovbaapi/ooo/vba/excel/XGlobals.idl -@@ -76,6 +76,7 @@ XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, +--- oovbaapi/ooo/vba/excel/XGlobals.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XGlobals.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -76,6 +76,7 @@ XRange Intersect([in] XRange Arg1, [in] any Names( [in] any Index ); XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30) raises(com::sun::star::script::BasicErrorException); @@ -9947,11 +9664,8 @@ index b21e902..782da39 100644 }; -diff --git oovbaapi/ooo/vba/excel/XMenu.idl oovbaapi/ooo/vba/excel/XMenu.idl -new file mode 100644 -index 0000000..cb3698b ---- /dev/null -+++ oovbaapi/ooo/vba/excel/XMenu.idl +--- oovbaapi/ooo/vba/excel/XMenu.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XMenu.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -10015,11 +9729,8 @@ index 0000000..cb3698b +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/excel/XMenuBar.idl oovbaapi/ooo/vba/excel/XMenuBar.idl -new file mode 100644 -index 0000000..3ead272 ---- /dev/null -+++ oovbaapi/ooo/vba/excel/XMenuBar.idl +--- oovbaapi/ooo/vba/excel/XMenuBar.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XMenuBar.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,59 @@ +/************************************************************************* + * @@ -10080,11 +9791,8 @@ index 0000000..3ead272 +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/excel/XMenuBars.idl oovbaapi/ooo/vba/excel/XMenuBars.idl -new file mode 100644 -index 0000000..3a46c3b ---- /dev/null -+++ oovbaapi/ooo/vba/excel/XMenuBars.idl +--- oovbaapi/ooo/vba/excel/XMenuBars.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XMenuBars.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,66 @@ +/************************************************************************* + * @@ -10152,11 +9860,8 @@ index 0000000..3a46c3b +#endif + + -diff --git oovbaapi/ooo/vba/excel/XMenuItem.idl oovbaapi/ooo/vba/excel/XMenuItem.idl -new file mode 100644 -index 0000000..2dcfb2f ---- /dev/null -+++ oovbaapi/ooo/vba/excel/XMenuItem.idl +--- oovbaapi/ooo/vba/excel/XMenuItem.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XMenuItem.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -10220,11 +9925,8 @@ index 0000000..2dcfb2f +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/excel/XMenuItems.idl oovbaapi/ooo/vba/excel/XMenuItems.idl -new file mode 100644 -index 0000000..9ba7b38 ---- /dev/null -+++ oovbaapi/ooo/vba/excel/XMenuItems.idl +--- oovbaapi/ooo/vba/excel/XMenuItems.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XMenuItems.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,70 @@ +/************************************************************************* + * @@ -10296,11 +9998,8 @@ index 0000000..9ba7b38 +#endif + + -diff --git oovbaapi/ooo/vba/excel/XMenus.idl oovbaapi/ooo/vba/excel/XMenus.idl -new file mode 100644 -index 0000000..c8e4ea2 ---- /dev/null -+++ oovbaapi/ooo/vba/excel/XMenus.idl +--- oovbaapi/ooo/vba/excel/XMenus.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XMenus.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,70 @@ +/************************************************************************* + * @@ -10372,10 +10071,8 @@ index 0000000..c8e4ea2 +#endif + + -diff --git oovbaapi/ooo/vba/excel/XPivotCache.idl oovbaapi/ooo/vba/excel/XPivotCache.idl -index 9d5d8d2..a3aff98 100644 ---- oovbaapi/ooo/vba/excel/XPivotCache.idl -+++ oovbaapi/ooo/vba/excel/XPivotCache.idl +--- oovbaapi/ooo/vba/excel/XPivotCache.idl.old 2009-10-07 15:07:00.000000000 +0200 ++++ oovbaapi/ooo/vba/excel/XPivotCache.idl 2010-03-03 16:59:34.000000000 +0100 @@ -48,6 +48,7 @@ interface XPivotCache { interface ::ooo::vba::XHelperInterface; @@ -10384,11 +10081,8 @@ index 9d5d8d2..a3aff98 100644 void Refresh(); }; -diff --git oovbaapi/ooo/vba/excel/XQueryTable.idl oovbaapi/ooo/vba/excel/XQueryTable.idl -new file mode 100644 -index 0000000..3e04800 ---- /dev/null -+++ oovbaapi/ooo/vba/excel/XQueryTable.idl +--- oovbaapi/ooo/vba/excel/XQueryTable.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XQueryTable.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,41 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -10431,10 +10125,8 @@ index 0000000..3e04800 + +#endif + -diff --git oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XRange.idl -index 5e59bf4..d70f027 100644 ---- oovbaapi/ooo/vba/excel/XRange.idl -+++ oovbaapi/ooo/vba/excel/XRange.idl +--- oovbaapi/ooo/vba/excel/XRange.idl.old 2009-10-07 15:07:00.000000000 +0200 ++++ oovbaapi/ooo/vba/excel/XRange.idl 2010-03-03 16:59:34.000000000 +0100 @@ -45,6 +45,9 @@ #ifndef __com_sun_star_script_XDefaultMethod_idl__ #include <com/sun/star/script/XDefaultMethod.idl> @@ -10477,11 +10169,9 @@ index 5e59bf4..d70f027 100644 }; -diff --git oovbaapi/ooo/vba/excel/XWorkbook.idl oovbaapi/ooo/vba/excel/XWorkbook.idl -index 4aa9403..88a0d86 100644 ---- oovbaapi/ooo/vba/excel/XWorkbook.idl -+++ oovbaapi/ooo/vba/excel/XWorkbook.idl -@@ -65,6 +65,8 @@ interface XWorkbook : com::sun::star::uno::XInterface +--- oovbaapi/ooo/vba/excel/XWorkbook.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XWorkbook.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -65,6 +65,8 @@ interface XWorkbook : com::sun::star::un any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException); long FileFormat() raises (com::sun::star::script::BasicErrorException); void SaveCopyAs( [in] string Filename ); @@ -10490,10 +10180,8 @@ index 4aa9403..88a0d86 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/excel/XWorksheet.idl -index 7a2101f..4e037a5 100644 ---- oovbaapi/ooo/vba/excel/XWorksheet.idl -+++ oovbaapi/ooo/vba/excel/XWorksheet.idl +--- oovbaapi/ooo/vba/excel/XWorksheet.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/XWorksheet.idl 2010-03-03 16:59:34.000000000 +0100 @@ -42,6 +42,9 @@ #include <com/sun/star/script/XInvocation.idl> #endif @@ -10516,10 +10204,8 @@ index 7a2101f..4e037a5 100644 [attribute, readonly] long StandardHeight; [attribute, readonly] long StandardWidth; [attribute, readonly] boolean ProtectionMode; -diff --git oovbaapi/ooo/vba/excel/makefile.mk oovbaapi/ooo/vba/excel/makefile.mk -index 6f7c85c..08af54c 100644 ---- oovbaapi/ooo/vba/excel/makefile.mk -+++ oovbaapi/ooo/vba/excel/makefile.mk +--- oovbaapi/ooo/vba/excel/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/excel/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -108,7 +108,13 @@ IDLFILES= XGlobals.idl\ XVPageBreak.idl \ XVPageBreaks.idl \ @@ -10535,10 +10221,8 @@ index 6f7c85c..08af54c 100644 # ------------------------------------------------------------------ -diff --git oovbaapi/ooo/vba/makefile.mk oovbaapi/ooo/vba/makefile.mk -index e28257f..e699fec 100644 ---- oovbaapi/ooo/vba/makefile.mk -+++ oovbaapi/ooo/vba/makefile.mk +--- oovbaapi/ooo/vba/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -70,7 +70,10 @@ IDLFILES=\ XFontBase.idl\ XDialogsBase.idl\ @@ -10550,11 +10234,8 @@ index e28257f..e699fec 100644 # ------------------------------------------------------------------ .ENDIF -diff --git oovbaapi/ooo/vba/msforms/XCheckBox.idl oovbaapi/ooo/vba/msforms/XCheckBox.idl -new file mode 100644 -index 0000000..30bdee0 ---- /dev/null -+++ oovbaapi/ooo/vba/msforms/XCheckBox.idl +--- oovbaapi/ooo/vba/msforms/XCheckBox.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/msforms/XCheckBox.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,53 @@ +/************************************************************************* + * @@ -10609,11 +10290,9 @@ index 0000000..30bdee0 +#endif + + -diff --git oovbaapi/ooo/vba/msforms/XComboBox.idl oovbaapi/ooo/vba/msforms/XComboBox.idl -index 42fb76a..c0e8ee3 100644 ---- oovbaapi/ooo/vba/msforms/XComboBox.idl -+++ oovbaapi/ooo/vba/msforms/XComboBox.idl -@@ -50,6 +50,7 @@ interface XComboBox: ::com::sun::star::uno::XInterface +--- oovbaapi/ooo/vba/msforms/XComboBox.idl.old 2009-10-07 15:07:00.000000000 +0200 ++++ oovbaapi/ooo/vba/msforms/XComboBox.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -50,6 +50,7 @@ interface XComboBox: ::com::sun::star::u void AddItem( [in] any pvargItem, [in] any pvargIndex ); void removeItem( [in] any index ); void Clear(); @@ -10621,10 +10300,8 @@ index 42fb76a..c0e8ee3 100644 }; //============================================================================= -diff --git oovbaapi/ooo/vba/msforms/XControl.idl oovbaapi/ooo/vba/msforms/XControl.idl -index 303b211..12f33bb 100644 ---- oovbaapi/ooo/vba/msforms/XControl.idl -+++ oovbaapi/ooo/vba/msforms/XControl.idl +--- oovbaapi/ooo/vba/msforms/XControl.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/msforms/XControl.idl 2010-03-03 16:59:34.000000000 +0100 @@ -62,6 +62,7 @@ interface XControl [attribute] double Top; [attribute] string Name; @@ -10633,11 +10310,9 @@ index 303b211..12f33bb 100644 }; //============================================================================= -diff --git oovbaapi/ooo/vba/msforms/XLabel.idl oovbaapi/ooo/vba/msforms/XLabel.idl -index 35e10c8..c5e7e65 100644 ---- oovbaapi/ooo/vba/msforms/XLabel.idl -+++ oovbaapi/ooo/vba/msforms/XLabel.idl -@@ -42,6 +42,7 @@ interface XLabel: com::sun::star::uno::XInterface +--- oovbaapi/ooo/vba/msforms/XLabel.idl.old 2009-10-07 15:07:00.000000000 +0200 ++++ oovbaapi/ooo/vba/msforms/XLabel.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -42,6 +42,7 @@ interface XLabel: com::sun::star::uno::X { [attribute] string Caption; [attribute] any Value; @@ -10645,11 +10320,9 @@ index 35e10c8..c5e7e65 100644 }; //============================================================================= -diff --git oovbaapi/ooo/vba/msforms/XListBox.idl oovbaapi/ooo/vba/msforms/XListBox.idl -index 2ff4d6d..5a2153b 100644 ---- oovbaapi/ooo/vba/msforms/XListBox.idl -+++ oovbaapi/ooo/vba/msforms/XListBox.idl -@@ -43,7 +43,7 @@ interface XListBox: com::sun::star::uno::XInterface +--- oovbaapi/ooo/vba/msforms/XListBox.idl.old 2009-10-07 15:07:00.000000000 +0200 ++++ oovbaapi/ooo/vba/msforms/XListBox.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -43,7 +43,7 @@ interface XListBox: com::sun::star::uno: { [attribute] any Value; [attribute] string Text; @@ -10658,10 +10331,8 @@ index 2ff4d6d..5a2153b 100644 [attribute] any ListIndex; [attribute, readonly ] long ListCount; void AddItem( [in] any pvargItem, [in] any pvargIndex ); -diff --git oovbaapi/ooo/vba/msforms/XShapeRange.idl oovbaapi/ooo/vba/msforms/XShapeRange.idl -index 0ae1883..34dd2dc 100644 ---- oovbaapi/ooo/vba/msforms/XShapeRange.idl -+++ oovbaapi/ooo/vba/msforms/XShapeRange.idl +--- oovbaapi/ooo/vba/msforms/XShapeRange.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/msforms/XShapeRange.idl 2010-03-03 16:59:34.000000000 +0100 @@ -50,6 +50,7 @@ interface XShapeRange { interface ooo::vba::XCollection; @@ -10678,10 +10349,8 @@ index 0ae1883..34dd2dc 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/msforms/makefile.mk oovbaapi/ooo/vba/msforms/makefile.mk -index e08574a..ca6c3ad 100644 ---- oovbaapi/ooo/vba/msforms/makefile.mk -+++ oovbaapi/ooo/vba/msforms/makefile.mk +--- oovbaapi/ooo/vba/msforms/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/msforms/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -53,6 +53,7 @@ IDLFILES=\ XLabel.idl \ XTextBox.idl \ @@ -10690,11 +10359,9 @@ index e08574a..ca6c3ad 100644 XShape.idl \ XShapes.idl \ XLineFormat.idl \ -diff --git oovbaapi/ooo/vba/word/XApplication.idl oovbaapi/ooo/vba/word/XApplication.idl -index b3623e4..0b07dd8 100644 ---- oovbaapi/ooo/vba/word/XApplication.idl -+++ oovbaapi/ooo/vba/word/XApplication.idl -@@ -60,6 +60,7 @@ interface XApplication : com::sun::star::uno::XInterface +--- oovbaapi/ooo/vba/word/XApplication.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XApplication.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -60,6 +60,7 @@ interface XApplication : com::sun::star: any Documents( [in] any aIndex ); any Addins( [in] any aIndex ); any Dialogs( [in] any aIndex ); @@ -10702,11 +10369,8 @@ index b3623e4..0b07dd8 100644 float CentimetersToPoints([in] float Centimeters ); }; -diff --git oovbaapi/ooo/vba/word/XCell.idl oovbaapi/ooo/vba/word/XCell.idl -new file mode 100644 -index 0000000..700b9dc ---- /dev/null -+++ oovbaapi/ooo/vba/word/XCell.idl +--- oovbaapi/ooo/vba/word/XCell.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XCell.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,59 @@ +/************************************************************************* + * @@ -10767,11 +10431,8 @@ index 0000000..700b9dc +#endif + + -diff --git oovbaapi/ooo/vba/word/XCells.idl oovbaapi/ooo/vba/word/XCells.idl -new file mode 100644 -index 0000000..9a18c55 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XCells.idl +--- oovbaapi/ooo/vba/word/XCells.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XCells.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -10835,11 +10496,8 @@ index 0000000..9a18c55 +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XCheckBox.idl oovbaapi/ooo/vba/word/XCheckBox.idl -new file mode 100644 -index 0000000..1baafe5 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XCheckBox.idl +--- oovbaapi/ooo/vba/word/XCheckBox.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XCheckBox.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,54 @@ +/************************************************************************* + * @@ -10895,11 +10553,8 @@ index 0000000..1baafe5 +#endif + + -diff --git oovbaapi/ooo/vba/word/XColumn.idl oovbaapi/ooo/vba/word/XColumn.idl -new file mode 100644 -index 0000000..78266fc ---- /dev/null -+++ oovbaapi/ooo/vba/word/XColumn.idl +--- oovbaapi/ooo/vba/word/XColumn.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XColumn.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,56 @@ +/************************************************************************* + * @@ -10957,11 +10612,8 @@ index 0000000..78266fc +#endif + + -diff --git oovbaapi/ooo/vba/word/XColumns.idl oovbaapi/ooo/vba/word/XColumns.idl -new file mode 100644 -index 0000000..84ed9cb ---- /dev/null -+++ oovbaapi/ooo/vba/word/XColumns.idl +--- oovbaapi/ooo/vba/word/XColumns.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XColumns.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,59 @@ +/************************************************************************* + * @@ -11022,11 +10674,9 @@ index 0000000..84ed9cb +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XDocument.idl oovbaapi/ooo/vba/word/XDocument.idl -index a7ceb18..b3ec455 100644 ---- oovbaapi/ooo/vba/word/XDocument.idl -+++ oovbaapi/ooo/vba/word/XDocument.idl -@@ -52,6 +52,11 @@ interface XDocument : com::sun::star::script::XInvocation +--- oovbaapi/ooo/vba/word/XDocument.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XDocument.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -52,6 +52,11 @@ interface XDocument : com::sun::star::sc { [attribute, readonly] XRange Content; [attribute] any AttachedTemplate; @@ -11038,7 +10688,7 @@ index a7ceb18..b3ec455 100644 XRange Range( [in] any Start, [in] any End ); any BuiltInDocumentProperties( [in] any index ); -@@ -66,6 +71,14 @@ interface XDocument : com::sun::star::script::XInvocation +@@ -66,6 +71,14 @@ interface XDocument : com::sun::star::sc any Sections([in] any Index); void Activate(); any PageSetup(); @@ -11053,10 +10703,8 @@ index a7ceb18..b3ec455 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XField.idl oovbaapi/ooo/vba/word/XField.idl -index 19d3d3b..1acd208 100644 ---- oovbaapi/ooo/vba/word/XField.idl -+++ oovbaapi/ooo/vba/word/XField.idl +--- oovbaapi/ooo/vba/word/XField.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XField.idl 2010-03-03 16:59:34.000000000 +0100 @@ -44,6 +44,8 @@ module ooo { module vba { module word { interface XField { @@ -11066,11 +10714,8 @@ index 19d3d3b..1acd208 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XFormField.idl oovbaapi/ooo/vba/word/XFormField.idl -new file mode 100644 -index 0000000..23d2a83 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XFormField.idl +--- oovbaapi/ooo/vba/word/XFormField.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XFormField.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -11130,11 +10775,8 @@ index 0000000..23d2a83 +#endif + + -diff --git oovbaapi/ooo/vba/word/XFormFields.idl oovbaapi/ooo/vba/word/XFormFields.idl -new file mode 100644 -index 0000000..7a19d3b ---- /dev/null -+++ oovbaapi/ooo/vba/word/XFormFields.idl +--- oovbaapi/ooo/vba/word/XFormFields.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XFormFields.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,55 @@ +/************************************************************************* + * @@ -11191,11 +10833,8 @@ index 0000000..7a19d3b +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XFrame.idl oovbaapi/ooo/vba/word/XFrame.idl -new file mode 100644 -index 0000000..5007405 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XFrame.idl +--- oovbaapi/ooo/vba/word/XFrame.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XFrame.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -11255,11 +10894,8 @@ index 0000000..5007405 +#endif + + -diff --git oovbaapi/ooo/vba/word/XFrames.idl oovbaapi/ooo/vba/word/XFrames.idl -new file mode 100644 -index 0000000..4c81545 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XFrames.idl +--- oovbaapi/ooo/vba/word/XFrames.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XFrames.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,55 @@ +/************************************************************************* + * @@ -11316,11 +10952,9 @@ index 0000000..4c81545 +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XGlobals.idl oovbaapi/ooo/vba/word/XGlobals.idl -index 519499c..33106fa 100644 ---- oovbaapi/ooo/vba/word/XGlobals.idl -+++ oovbaapi/ooo/vba/word/XGlobals.idl -@@ -52,6 +52,7 @@ interface XGlobals : com::sun::star::uno::XInterface +--- oovbaapi/ooo/vba/word/XGlobals.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XGlobals.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -52,6 +52,7 @@ interface XGlobals : com::sun::star::uno any Documents( [in] any aIndex ); any Addins( [in] any aIndex ); any Dialogs( [in] any aIndex ); @@ -11328,11 +10962,8 @@ index 519499c..33106fa 100644 float CentimetersToPoints([in] float Centimeters ); }; -diff --git oovbaapi/ooo/vba/word/XHeadersFooters.idl oovbaapi/ooo/vba/word/XHeadersFooters.idl -new file mode 100644 -index 0000000..22066e8 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XHeadersFooters.idl +--- oovbaapi/ooo/vba/word/XHeadersFooters.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XHeadersFooters.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,55 @@ +/************************************************************************* + * @@ -11389,11 +11020,8 @@ index 0000000..22066e8 +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XListFormat.idl oovbaapi/ooo/vba/word/XListFormat.idl -new file mode 100644 -index 0000000..d9aa65a ---- /dev/null -+++ oovbaapi/ooo/vba/word/XListFormat.idl +--- oovbaapi/ooo/vba/word/XListFormat.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XListFormat.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -11455,11 +11083,8 @@ index 0000000..d9aa65a +#endif + + -diff --git oovbaapi/ooo/vba/word/XListGalleries.idl oovbaapi/ooo/vba/word/XListGalleries.idl -new file mode 100644 -index 0000000..9268afc ---- /dev/null -+++ oovbaapi/ooo/vba/word/XListGalleries.idl +--- oovbaapi/ooo/vba/word/XListGalleries.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XListGalleries.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,55 @@ +/************************************************************************* + * @@ -11516,11 +11141,8 @@ index 0000000..9268afc +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XListGallery.idl oovbaapi/ooo/vba/word/XListGallery.idl -new file mode 100644 -index 0000000..4bd83b9 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XListGallery.idl +--- oovbaapi/ooo/vba/word/XListGallery.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XListGallery.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,54 @@ +/************************************************************************* + * @@ -11576,11 +11198,8 @@ index 0000000..4bd83b9 +#endif + + -diff --git oovbaapi/ooo/vba/word/XListLevel.idl oovbaapi/ooo/vba/word/XListLevel.idl -new file mode 100644 -index 0000000..0ea1be7 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XListLevel.idl +--- oovbaapi/ooo/vba/word/XListLevel.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XListLevel.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,66 @@ +/************************************************************************* + * @@ -11648,11 +11267,8 @@ index 0000000..0ea1be7 +#endif + + -diff --git oovbaapi/ooo/vba/word/XListLevels.idl oovbaapi/ooo/vba/word/XListLevels.idl -new file mode 100644 -index 0000000..522d474 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XListLevels.idl +--- oovbaapi/ooo/vba/word/XListLevels.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XListLevels.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,55 @@ +/************************************************************************* + * @@ -11709,11 +11325,8 @@ index 0000000..522d474 +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XListTemplate.idl oovbaapi/ooo/vba/word/XListTemplate.idl -new file mode 100644 -index 0000000..403bfa9 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XListTemplate.idl +--- oovbaapi/ooo/vba/word/XListTemplate.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XListTemplate.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,54 @@ +/************************************************************************* + * @@ -11769,11 +11382,8 @@ index 0000000..403bfa9 +#endif + + -diff --git oovbaapi/ooo/vba/word/XListTemplates.idl oovbaapi/ooo/vba/word/XListTemplates.idl -new file mode 100644 -index 0000000..d6ec96d ---- /dev/null -+++ oovbaapi/ooo/vba/word/XListTemplates.idl +--- oovbaapi/ooo/vba/word/XListTemplates.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XListTemplates.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,55 @@ +/************************************************************************* + * @@ -11830,10 +11440,8 @@ index 0000000..d6ec96d +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XParagraph.idl oovbaapi/ooo/vba/word/XParagraph.idl -index 79ad7ae..7dd2b41 100644 ---- oovbaapi/ooo/vba/word/XParagraph.idl -+++ oovbaapi/ooo/vba/word/XParagraph.idl +--- oovbaapi/ooo/vba/word/XParagraph.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XParagraph.idl 2010-03-03 16:59:34.000000000 +0100 @@ -46,6 +46,7 @@ interface XParagraph interface ooo::vba::XHelperInterface; @@ -11842,11 +11450,9 @@ index 79ad7ae..7dd2b41 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XRange.idl oovbaapi/ooo/vba/word/XRange.idl -index 47e688e..8f19ad5 100644 ---- oovbaapi/ooo/vba/word/XRange.idl -+++ oovbaapi/ooo/vba/word/XRange.idl -@@ -48,13 +48,14 @@ module ooo { module vba { module word { +--- oovbaapi/ooo/vba/word/XRange.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XRange.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -48,13 +48,14 @@ module ooo { module vba { module word interface XParagraphFormat; interface XStyle; interface XFont; @@ -11881,10 +11487,8 @@ index 47e688e..8f19ad5 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XReplacement.idl oovbaapi/ooo/vba/word/XReplacement.idl -index daae501..b1d7a6c 100644 ---- oovbaapi/ooo/vba/word/XReplacement.idl -+++ oovbaapi/ooo/vba/word/XReplacement.idl +--- oovbaapi/ooo/vba/word/XReplacement.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XReplacement.idl 2010-03-03 16:59:34.000000000 +0100 @@ -45,6 +45,8 @@ interface XReplacement interface ooo::vba::XHelperInterface; @@ -11894,11 +11498,8 @@ index daae501..b1d7a6c 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XRevision.idl oovbaapi/ooo/vba/word/XRevision.idl -new file mode 100644 -index 0000000..bb3e570 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XRevision.idl +--- oovbaapi/ooo/vba/word/XRevision.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XRevision.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,56 @@ +/************************************************************************* + * @@ -11956,11 +11557,8 @@ index 0000000..bb3e570 +#endif + + -diff --git oovbaapi/ooo/vba/word/XRevisions.idl oovbaapi/ooo/vba/word/XRevisions.idl -new file mode 100644 -index 0000000..358face ---- /dev/null -+++ oovbaapi/ooo/vba/word/XRevisions.idl +--- oovbaapi/ooo/vba/word/XRevisions.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XRevisions.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -12020,11 +11618,8 @@ index 0000000..358face +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XRow.idl oovbaapi/ooo/vba/word/XRow.idl -new file mode 100644 -index 0000000..2c54828 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XRow.idl +--- oovbaapi/ooo/vba/word/XRow.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XRow.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -12084,11 +11679,8 @@ index 0000000..2c54828 +#endif + + -diff --git oovbaapi/ooo/vba/word/XRows.idl oovbaapi/ooo/vba/word/XRows.idl -new file mode 100644 -index 0000000..8d0ae61 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XRows.idl +--- oovbaapi/ooo/vba/word/XRows.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XRows.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,63 @@ +/************************************************************************* + * @@ -12153,10 +11745,8 @@ index 0000000..8d0ae61 +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XSection.idl oovbaapi/ooo/vba/word/XSection.idl -index c79a24b..6a8671c 100644 ---- oovbaapi/ooo/vba/word/XSection.idl -+++ oovbaapi/ooo/vba/word/XSection.idl +--- oovbaapi/ooo/vba/word/XSection.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XSection.idl 2010-03-03 16:59:34.000000000 +0100 @@ -46,8 +46,8 @@ interface XSection [attribute] boolean ProtectedForForms; @@ -12168,10 +11758,8 @@ index c79a24b..6a8671c 100644 any PageSetup(); }; -diff --git oovbaapi/ooo/vba/word/XSelection.idl oovbaapi/ooo/vba/word/XSelection.idl -index 44026da..696e7df 100644 ---- oovbaapi/ooo/vba/word/XSelection.idl -+++ oovbaapi/ooo/vba/word/XSelection.idl +--- oovbaapi/ooo/vba/word/XSelection.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XSelection.idl 2010-03-03 16:59:34.000000000 +0100 @@ -55,7 +55,7 @@ interface XSelection [attribute, readonly] XRange Range; [attribute] XParagraphFormat ParagraphFormat; @@ -12209,10 +11797,8 @@ index 44026da..696e7df 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XStyle.idl oovbaapi/ooo/vba/word/XStyle.idl -index af19517..9eb9381 100644 ---- oovbaapi/ooo/vba/word/XStyle.idl -+++ oovbaapi/ooo/vba/word/XStyle.idl +--- oovbaapi/ooo/vba/word/XStyle.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XStyle.idl 2010-03-03 16:59:34.000000000 +0100 @@ -38,17 +38,32 @@ #include <ooo/vba/XHelperInterface.idl> #endif @@ -12246,11 +11832,8 @@ index af19517..9eb9381 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XTabStop.idl oovbaapi/ooo/vba/word/XTabStop.idl -new file mode 100644 -index 0000000..b9cf94d ---- /dev/null -+++ oovbaapi/ooo/vba/word/XTabStop.idl +--- oovbaapi/ooo/vba/word/XTabStop.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XTabStop.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,52 @@ +/************************************************************************* + * @@ -12304,11 +11887,8 @@ index 0000000..b9cf94d +#endif + + -diff --git oovbaapi/ooo/vba/word/XTabStops.idl oovbaapi/ooo/vba/word/XTabStops.idl -new file mode 100644 -index 0000000..318d492 ---- /dev/null -+++ oovbaapi/ooo/vba/word/XTabStops.idl +--- oovbaapi/ooo/vba/word/XTabStops.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XTabStops.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,59 @@ +/************************************************************************* + * @@ -12369,10 +11949,8 @@ index 0000000..318d492 +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XTable.idl oovbaapi/ooo/vba/word/XTable.idl -index f677da6..ef6d441 100644 ---- oovbaapi/ooo/vba/word/XTable.idl -+++ oovbaapi/ooo/vba/word/XTable.idl +--- oovbaapi/ooo/vba/word/XTable.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XTable.idl 2010-03-03 16:59:34.000000000 +0100 @@ -77,7 +77,9 @@ interface XTable raises(com::sun::star::script::BasicErrorException); */ @@ -12384,11 +11962,8 @@ index f677da6..ef6d441 100644 }; }; }; }; -diff --git oovbaapi/ooo/vba/word/XTableOfContents.idl oovbaapi/ooo/vba/word/XTableOfContents.idl -new file mode 100644 -index 0000000..dcb7e8a ---- /dev/null -+++ oovbaapi/ooo/vba/word/XTableOfContents.idl +--- oovbaapi/ooo/vba/word/XTableOfContents.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XTableOfContents.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -12450,11 +12025,8 @@ index 0000000..dcb7e8a +#endif + + -diff --git oovbaapi/ooo/vba/word/XTablesOfContents.idl oovbaapi/ooo/vba/word/XTablesOfContents.idl -new file mode 100644 -index 0000000..53c557b ---- /dev/null -+++ oovbaapi/ooo/vba/word/XTablesOfContents.idl +--- oovbaapi/ooo/vba/word/XTablesOfContents.idl.old 2010-03-03 16:59:34.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XTablesOfContents.idl 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,59 @@ +/************************************************************************* + * @@ -12515,10 +12087,8 @@ index 0000000..53c557b +}; }; }; + +#endif -diff --git oovbaapi/ooo/vba/word/XTemplate.idl oovbaapi/ooo/vba/word/XTemplate.idl -index a2bd1d7..0b9cf6e 100644 ---- oovbaapi/ooo/vba/word/XTemplate.idl -+++ oovbaapi/ooo/vba/word/XTemplate.idl +--- oovbaapi/ooo/vba/word/XTemplate.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XTemplate.idl 2010-03-03 16:59:34.000000000 +0100 @@ -45,6 +45,7 @@ interface XTemplate interface ooo::vba::XHelperInterface; @@ -12527,11 +12097,9 @@ index a2bd1d7..0b9cf6e 100644 any AutoTextEntries( [in] any aIndex ); }; -diff --git oovbaapi/ooo/vba/word/XWindow.idl oovbaapi/ooo/vba/word/XWindow.idl -index 9235335..220d9ee 100644 ---- oovbaapi/ooo/vba/word/XWindow.idl -+++ oovbaapi/ooo/vba/word/XWindow.idl -@@ -47,6 +47,7 @@ module ooo { module vba { module word { +--- oovbaapi/ooo/vba/word/XWindow.idl.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/XWindow.idl 2010-03-03 16:59:34.000000000 +0100 +@@ -47,6 +47,7 @@ module ooo { module vba { module word interface XWindow : com::sun::star::uno::XInterface { [attribute] any View; @@ -12539,10 +12107,8 @@ index 9235335..220d9ee 100644 void Activate(); void Close([in] any SaveChanges, [in] any RouteDocument); any Panes( [in] any aIndex ); // this is a fake api for it seems not support in Write -diff --git oovbaapi/ooo/vba/word/makefile.mk oovbaapi/ooo/vba/word/makefile.mk -index 8126587..83b1f4f 100644 ---- oovbaapi/ooo/vba/word/makefile.mk -+++ oovbaapi/ooo/vba/word/makefile.mk +--- oovbaapi/ooo/vba/word/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ oovbaapi/ooo/vba/word/makefile.mk 2010-03-03 16:59:34.000000000 +0100 @@ -83,6 +83,31 @@ IDLFILES= XGlobals.idl\ XPageSetup.idl \ XSection.idl \ @@ -12575,11 +12141,9 @@ index 8126587..83b1f4f 100644 # ------------------------------------------------------------------ -diff --git sc/inc/address.hxx sc/inc/address.hxx -index 3e29f16..0f8f4e3 100644 ---- sc/inc/address.hxx -+++ sc/inc/address.hxx -@@ -230,6 +230,9 @@ inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTab ) +--- sc/inc/address.hxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/inc/address.hxx 2010-03-03 16:59:34.000000000 +0100 +@@ -230,6 +230,9 @@ inline SCTAB SanitizeTab( SCTAB nTab, SC #define SCA_VALID_ROW 0x0100 #define SCA_VALID_COL 0x0200 #define SCA_VALID_TAB 0x0400 @@ -12589,10 +12153,8 @@ index 3e29f16..0f8f4e3 100644 // somewhat cheesy kludge to force the display of the document name even for // local references. Requires TAB_3D to be valid #define SCA_FORCE_DOC 0x0800 -diff --git sc/inc/addruno.hxx sc/inc/addruno.hxx -index bc9391a..bd3491e 100644 ---- sc/inc/addruno.hxx -+++ sc/inc/addruno.hxx +--- sc/inc/addruno.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/inc/addruno.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -50,7 +50,7 @@ private: sal_Int32 nRefSheet; sal_Bool bIsRange; @@ -12602,10 +12164,8 @@ index bc9391a..bd3491e 100644 public: -diff --git sc/inc/cell.hxx sc/inc/cell.hxx -index c8289e3..41a4413 100644 ---- sc/inc/cell.hxx -+++ sc/inc/cell.hxx +--- sc/inc/cell.hxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/inc/cell.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -409,7 +409,7 @@ public: const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; @@ -12615,10 +12175,8 @@ index c8289e3..41a4413 100644 // If setting entire document dirty after load, no broadcasts but still append to FormulaTree. void SetDirtyAfterLoad(); inline void ResetTableOpDirtyVar() { bTableOpDirty = FALSE; } -diff --git sc/inc/document.hxx sc/inc/document.hxx -index 7158086..61e23c9 100644 ---- sc/inc/document.hxx -+++ sc/inc/document.hxx +--- sc/inc/document.hxx.old 2010-03-03 16:59:20.000000000 +0100 ++++ sc/inc/document.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -97,6 +97,7 @@ class ScDrawLayer; class ScExtDocOptions; class ScExternalRefManager; @@ -12627,7 +12185,7 @@ index 7158086..61e23c9 100644 class ScMarkData; class ScOutlineTable; class ScPatternAttr; -@@ -160,6 +161,9 @@ namespace com { namespace sun { namespace star { +@@ -160,6 +161,9 @@ namespace com { namespace sun { namespac } } } } @@ -12730,10 +12288,8 @@ index 7158086..61e23c9 100644 /** Should only be GRAM_PODF or GRAM_ODFF. */ void SetStorageGrammar( formula::FormulaGrammar::Grammar eGrammar ); formula::FormulaGrammar::Grammar GetStorageGrammar() const -diff --git sc/inc/docuno.hxx sc/inc/docuno.hxx -index 74b867b..eb6120a 100644 ---- sc/inc/docuno.hxx -+++ sc/inc/docuno.hxx +--- sc/inc/docuno.hxx.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/inc/docuno.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -56,6 +56,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sheet/XCellRangesAccess.hpp> @@ -12742,7 +12298,7 @@ index 74b867b..eb6120a 100644 #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase4.hxx> -@@ -90,6 +91,7 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseModel, +@@ -90,6 +91,7 @@ class SC_DLLPUBLIC ScModelObj : public S public com::sun::star::view::XRenderable, public com::sun::star::document::XLinkTargetSupplier, public com::sun::star::beans::XPropertySet, @@ -12759,11 +12315,9 @@ index 74b867b..eb6120a 100644 }; -diff --git sc/inc/global.hxx sc/inc/global.hxx -index a45bbf3..40730f5 100644 ---- sc/inc/global.hxx -+++ sc/inc/global.hxx -@@ -228,6 +228,7 @@ const USHORT IDF_HARDATTR = 0x0020; /// Hard cell attributes. +--- sc/inc/global.hxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/inc/global.hxx 2010-03-03 16:59:34.000000000 +0100 +@@ -228,6 +228,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. @@ -12771,10 +12325,8 @@ index a45bbf3..40730f5 100644 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; -diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc -index 5c0f48e..8faaf53 100644 ---- sc/inc/globstr.hrc -+++ sc/inc/globstr.hrc +--- sc/inc/globstr.hrc.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/inc/globstr.hrc 2010-03-03 16:59:34.000000000 +0100 @@ -576,7 +576,23 @@ #define STR_UNDO_SET_TAB_BG_COLOR 435 #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 436 @@ -12800,11 +12352,8 @@ index 5c0f48e..8faaf53 100644 #endif -diff --git sc/inc/macromgr.hxx sc/inc/macromgr.hxx -new file mode 100644 -index 0000000..35a3b2d ---- /dev/null -+++ sc/inc/macromgr.hxx +--- sc/inc/macromgr.hxx.old 2010-03-03 16:59:34.000000000 +0100 ++++ sc/inc/macromgr.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -0,0 +1,70 @@ +/************************************************************************* + * @@ -12876,10 +12425,8 @@ index 0000000..35a3b2d + +#endif + -diff --git sc/inc/rangenam.hxx sc/inc/rangenam.hxx -index 980f593..3991b8e 100644 ---- sc/inc/rangenam.hxx -+++ sc/inc/rangenam.hxx +--- sc/inc/rangenam.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/inc/rangenam.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -145,7 +145,7 @@ public: SC_DLLPUBLIC BOOL IsReference( ScRange& rRef ) const; @@ -12889,10 +12436,8 @@ index 980f593..3991b8e 100644 //UNUSED2009-05 BOOL IsRangeAtCursor( const ScAddress&, BOOL bStartOnly ) const; BOOL IsRangeAtBlock( const ScRange& ) const; -diff --git sc/inc/sc.hrc sc/inc/sc.hrc -index 950e374..a706de2 100644 ---- sc/inc/sc.hrc -+++ sc/inc/sc.hrc +--- sc/inc/sc.hrc.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/inc/sc.hrc 2010-03-03 16:59:34.000000000 +0100 @@ -593,11 +593,9 @@ // #i59082# assign macro to shape #define SID_ASSIGNMACRO (SC_VIEW_START + 95) @@ -12905,8 +12450,7 @@ index 950e374..a706de2 100644 // "Zoom / Synchronize sheets" in options dialog #define SID_SC_OPT_SYNCZOOM (SC_VIEW_START + 98) -@@ -1672,7 +1670,12 @@ - // Formula options page +@@ -1672,6 +1670,11 @@ #define RID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 3) #define HID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 4) @@ -12918,10 +12462,8 @@ index 950e374..a706de2 100644 #endif -diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx -index 81f190b..97f6513 100644 ---- sc/inc/scabstdlg.hxx -+++ sc/inc/scabstdlg.hxx +--- sc/inc/scabstdlg.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/inc/scabstdlg.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -43,6 +43,8 @@ #include "pivot.hxx" #include "i18npool/lang.h" @@ -12931,7 +12473,7 @@ index 81f190b..97f6513 100644 class ScAsciiOptions; class ScAutoFormat; class ScAutoFormatData; -@@ -112,6 +114,12 @@ public: +@@ -113,6 +115,12 @@ public: virtual DelCellCmd GetDelCellCmd() const = 0; }; @@ -12944,7 +12486,7 @@ index 81f190b..97f6513 100644 class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteContentsDlg { public: -@@ -308,7 +316,7 @@ public: +@@ -309,7 +317,7 @@ public: class ScAbstractDialogFactory { public: @@ -12953,7 +12495,7 @@ index 81f190b..97f6513 100644 virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg SvStream* pInStream, int nId, -@@ -342,6 +350,9 @@ public: +@@ -343,6 +351,9 @@ public: virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ) = 0 ; //add for ScDeleteCellDlg @@ -12963,10 +12505,8 @@ index 81f190b..97f6513 100644 virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg USHORT nCheckDefaults = 0 ) = 0; virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg -diff --git sc/inc/scextopt.hxx sc/inc/scextopt.hxx -index 206ff20..ba1eea2 100644 ---- sc/inc/scextopt.hxx -+++ sc/inc/scextopt.hxx +--- sc/inc/scextopt.hxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/inc/scextopt.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -127,6 +127,8 @@ public: const String& GetCodeName( size_t nIdx ) const; /** Appends a codename for a sheet. */ @@ -12976,10 +12516,8 @@ index 206ff20..ba1eea2 100644 private: ::std::auto_ptr< ScExtDocOptionsImpl > mxImpl; -diff --git sc/inc/servuno.hxx sc/inc/servuno.hxx -index f32dedc..bf0515d 100644 ---- sc/inc/servuno.hxx -+++ sc/inc/servuno.hxx +--- sc/inc/servuno.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/inc/servuno.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -93,8 +93,9 @@ class ScDocShell; #define SC_SERVICE_FORMULAPARS 38 @@ -12992,11 +12530,9 @@ index f32dedc..bf0515d 100644 #define SC_SERVICE_INVALID USHRT_MAX -diff --git sc/inc/shapeuno.hxx sc/inc/shapeuno.hxx -index 402aebc..3d8fc0f 100644 ---- sc/inc/shapeuno.hxx -+++ sc/inc/shapeuno.hxx -@@ -55,6 +55,7 @@ namespace com { namespace sun { namespace star { +--- sc/inc/shapeuno.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/inc/shapeuno.hxx 2010-03-03 16:59:34.000000000 +0100 +@@ -55,6 +55,7 @@ namespace com { namespace sun { namespac class SdrObject; struct SvEventDescription; class ShapeUnoEventAccessImpl; @@ -13004,7 +12540,7 @@ index 402aebc..3d8fc0f 100644 //------------------------------------------------------------------------ -@@ -73,6 +74,7 @@ class ScShapeObj :public ScShapeObj_Base +@@ -73,6 +74,7 @@ class ScShapeObj :public ScShapeObj_B ,public ScShapeObj_TextBase { private: @@ -13012,10 +12548,8 @@ index 402aebc..3d8fc0f 100644 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg; // cached pointers to avoid repeated queryAggregation calls: ::com::sun::star::beans::XPropertySet* pShapePropertySet; -diff --git sc/inc/table.hxx sc/inc/table.hxx -index 064f588..971420e 100644 ---- sc/inc/table.hxx -+++ sc/inc/table.hxx +--- sc/inc/table.hxx.old 2010-03-03 16:59:20.000000000 +0100 ++++ sc/inc/table.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -89,6 +89,8 @@ class ScFlatUInt16RowSegments; class ScFlatBoolRowSegments; class ScFlatBoolColSegments; @@ -13051,10 +12585,8 @@ index 064f588..971420e 100644 const String& GetUpperName() const; const String& GetPageStyle() const { return aPageStyle; } -diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx -index 589fa37..8b5ae77 100644 ---- sc/inc/unonames.hxx -+++ sc/inc/unonames.hxx +--- sc/inc/unonames.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/inc/unonames.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -186,6 +186,8 @@ #define SC_UNONAME_ANCHOR "Anchor" #define SC_UNONAME_HORIPOS "HoriOrientPosition" @@ -13080,10 +12612,8 @@ index 589fa37..8b5ae77 100644 #define SC_UNONAME_REFSHEET "ReferenceSheet" // --> PB 2004-08-23 #i33095# Security Options -diff --git sc/inc/userdat.hxx sc/inc/userdat.hxx -index 72f2663..f529458 100644 ---- sc/inc/userdat.hxx -+++ sc/inc/userdat.hxx +--- sc/inc/userdat.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/inc/userdat.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -102,16 +102,12 @@ public: void SetMacro( const rtl::OUString& rMacro ) { maMacro = rMacro; } const rtl::OUString& GetMacro() const { return maMacro; } @@ -13101,10 +12631,8 @@ index 72f2663..f529458 100644 }; //------------------------------------------------------------------------- -diff --git sc/inc/viewuno.hxx sc/inc/viewuno.hxx -index 1bc89be..1527612 100644 ---- sc/inc/viewuno.hxx -+++ sc/inc/viewuno.hxx +--- sc/inc/viewuno.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/inc/viewuno.hxx 2010-03-03 16:59:34.000000000 +0100 @@ -198,6 +198,7 @@ private: XMouseClickHandlerArr_Impl aMouseClickHandlers; XActivationEventListenerArr_Impl aActivationListeners; @@ -13113,10 +12641,8 @@ index 1bc89be..1527612 100644 ScViewPaneObj* GetObjectByIndex_Impl(USHORT nIndex) const; INT16 GetZoom(void) const; -diff --git sc/sdi/cellsh.sdi sc/sdi/cellsh.sdi -index 377b0d5..5f1c6e0 100644 ---- sc/sdi/cellsh.sdi -+++ sc/sdi/cellsh.sdi +--- sc/sdi/cellsh.sdi.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/sdi/cellsh.sdi 2010-03-03 16:59:34.000000000 +0100 @@ -60,6 +60,7 @@ interface CellSelection SID_SBA_BRW_INSERT [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_SELECT_DB [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] @@ -13125,10 +12651,8 @@ index 377b0d5..5f1c6e0 100644 FID_FILTER_OK [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_AUTO_FILTER [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] SID_AUTOFILTER_HIDE [ ExecMethod = ExecuteDB; StateMethod = GetDBState; ] -diff --git sc/sdi/drawsh.sdi sc/sdi/drawsh.sdi -index ea5e72d..862f1cf 100644 ---- sc/sdi/drawsh.sdi -+++ sc/sdi/drawsh.sdi +--- sc/sdi/drawsh.sdi.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/sdi/drawsh.sdi 2010-03-03 16:59:34.000000000 +0100 @@ -229,9 +229,9 @@ interface TableDraw SID_FONTWORK_CHARACTER_SPACING_DIALOG [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] @@ -13142,10 +12666,8 @@ index ea5e72d..862f1cf 100644 } -diff --git sc/sdi/scalc.sdi sc/sdi/scalc.sdi -index f8bce4e..b38e8aa 100644 ---- sc/sdi/scalc.sdi -+++ sc/sdi/scalc.sdi +--- sc/sdi/scalc.sdi.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/sdi/scalc.sdi 2010-03-03 16:59:34.000000000 +0100 @@ -1579,6 +1579,31 @@ SfxVoidItem DataSelect SID_DATA_SELECT SfxVoidItem DataSort SID_SORT (SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem NaturalSort SID_SORT_NATURALSORT,SfxBoolItem IncludeAttribs SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 FN_PARAM_5,SfxBoolItem Ascending3 FN_PARAM_6) @@ -13178,7 +12700,7 @@ index f8bce4e..b38e8aa 100644 /* flags: */ AutoUpdate = FALSE, Cachable = Cachable, -@@ -6271,55 +6296,55 @@ SfxVoidItem StandardFonts SID_STANDARD_FONTS +@@ -6271,55 +6296,55 @@ SfxVoidItem StandardFonts SID_STANDARD_F //-------------------------------------------------------------------------- // ISSUE66550_HLINK_FOR_SHAPES @@ -13279,10 +12801,8 @@ index f8bce4e..b38e8aa 100644 //-------------------------------------------------------------------------- SfxVoidItem StandardTextAttributes SID_TEXT_STANDARD -diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx -index 85be50e..7643365 100644 ---- sc/source/core/data/cell.cxx -+++ sc/source/core/data/cell.cxx +--- sc/source/core/data/cell.cxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/core/data/cell.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -54,6 +54,7 @@ #include "recursionhelper.hxx" #include "postit.hxx" @@ -13291,7 +12811,7 @@ index 85be50e..7643365 100644 #include <svx/editobj.hxx> #include <svtools/intitem.hxx> #include <svx/flditem.hxx> -@@ -822,6 +823,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons +@@ -822,6 +823,9 @@ ScFormulaCell::ScFormulaCell( const ScFo ScFormulaCell::~ScFormulaCell() { pDocument->RemoveFromFormulaTree( this ); @@ -13311,7 +12831,7 @@ index 85be50e..7643365 100644 } void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) -@@ -1741,6 +1748,36 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) +@@ -1741,6 +1748,36 @@ void ScFormulaCell::InterpretTail( ScInt // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent( pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE ); @@ -13348,7 +12868,7 @@ index 85be50e..7643365 100644 } else { -@@ -1808,7 +1845,7 @@ void __EXPORT ScFormulaCell::Notify( SvtBroadcaster&, const SfxHint& rHint) +@@ -1808,7 +1845,7 @@ void __EXPORT ScFormulaCell::Notify( Svt else { bForceTrack = !bDirty; @@ -13389,11 +12909,9 @@ index 85be50e..7643365 100644 void ScFormulaCell::SetDirtyAfterLoad() { if ( bDirty && !pDocument->GetHardRecalcState() ) -diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx -index 07d8a68..b4e62a0 100644 ---- sc/source/core/data/column3.cxx -+++ sc/source/core/data/column3.cxx -@@ -832,8 +832,10 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestD +--- sc/source/core/data/column3.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ sc/source/core/data/column3.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -832,8 +832,10 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n bool bCloneValue = (nFlags & IDF_VALUE) != 0; bool bCloneDateTime = (nFlags & IDF_DATETIME) != 0; bool bCloneString = (nFlags & IDF_STRING) != 0; @@ -13404,7 +12922,7 @@ index 07d8a68..b4e62a0 100644 ScBaseCell* pNew = 0; ScBaseCell& rSource = *pItems[nIndex].pCell; -@@ -857,7 +859,18 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestD +@@ -857,7 +859,18 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n break; case CELLTYPE_FORMULA: @@ -13424,10 +12942,8 @@ index 07d8a68..b4e62a0 100644 { // note will be cloned below pNew = rSource.CloneWithoutNote( rDestDoc, rDestPos ); -diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx -index 85485d6..2a34517 100644 ---- sc/source/core/data/documen2.cxx -+++ sc/source/core/data/documen2.cxx +--- sc/source/core/data/documen2.cxx.old 2010-03-03 16:59:11.000000000 +0100 ++++ sc/source/core/data/documen2.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -96,6 +96,8 @@ #include "tabprotection.hxx" #include "formulaparserpool.hxx" @@ -13437,15 +12953,15 @@ index 85485d6..2a34517 100644 // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and // dtor plus helpers are convenient. -@@ -156,6 +158,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, - pCacheFieldEditEngine( NULL ), +@@ -157,6 +159,7 @@ ScDocument::ScDocument( ScDocumentMode e pDocProtection( NULL ), mpClipParam( NULL), pExternalRefMgr( NULL ), + mpMacroMgr( NULL ), pViewOptions( NULL ), pDocOptions( NULL ), -@@ -1261,6 +1264,29 @@ void ScDocument::RemoveLookupCache( ScLookupCache & rCache ) + pExtDocOptions( NULL ), +@@ -1261,6 +1264,29 @@ void ScDocument::RemoveLookupCache( ScLo } } @@ -13475,10 +12991,8 @@ index 85485d6..2a34517 100644 void ScDocument::ClearLookupCaches() { if( pLookupCacheMapImpl ) -diff --git sc/source/core/data/documen7.cxx sc/source/core/data/documen7.cxx -index 907eb14..31fc961 100644 ---- sc/source/core/data/documen7.cxx -+++ sc/source/core/data/documen7.cxx +--- sc/source/core/data/documen7.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/data/documen7.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -59,7 +59,15 @@ @@ -13495,10 +13009,11 @@ index 907eb14..31fc961 100644 extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround // STATIC DATA ----------------------------------------------------------- -@@ -527,5 +535,35 @@ void ScDocument::SetAutoCalc( BOOL bNewAutoCalc ) +@@ -527,5 +535,35 @@ void ScDocument::SetAutoCalc( BOOL bNewA } } +- +BOOL ScDocument::FireCalculateEvent( SCTAB nTab ) +{ + BOOL bSuccess = FALSE; @@ -13520,7 +13035,7 @@ index 907eb14..31fc961 100644 + } + return bSuccess; +} - ++ +void ScDocument::AddCalculateTable( SCTAB nTab ) +{ + ::std::vector<SCTAB>::iterator iter; @@ -13531,10 +13046,8 @@ index 907eb14..31fc961 100644 + } +} -diff --git sc/source/core/data/documen8.cxx sc/source/core/data/documen8.cxx -index ac6c46d..f40f373 100644 ---- sc/source/core/data/documen8.cxx -+++ sc/source/core/data/documen8.cxx +--- sc/source/core/data/documen8.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ sc/source/core/data/documen8.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -96,6 +96,7 @@ #include "globstr.hrc" #include "sc.hrc" @@ -13543,7 +13056,7 @@ index ac6c46d..f40f373 100644 #include "dpobject.hxx" #define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() -@@ -421,6 +422,13 @@ BYTE ScDocument::GetEditTextDirection(SCTAB nTab) const +@@ -421,6 +422,13 @@ BYTE ScDocument::GetEditTextDirection(SC return sal::static_int_cast<BYTE>(eRet); } @@ -13557,10 +13070,8 @@ index ac6c46d..f40f373 100644 //------------------------------------------------------------------------ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, -diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx -index daacd45..a5ca0f1 100644 ---- sc/source/core/data/document.cxx -+++ sc/source/core/data/document.cxx +--- sc/source/core/data/document.cxx.old 2010-03-03 16:59:20.000000000 +0100 ++++ sc/source/core/data/document.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -95,6 +95,8 @@ #include "externalrefmgr.hxx" #include "tabprotection.hxx" @@ -13570,7 +13081,7 @@ index daacd45..a5ca0f1 100644 #include <map> #include <limits> -@@ -159,6 +161,39 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const +@@ -159,6 +161,39 @@ BOOL ScDocument::GetName( SCTAB nTab, St return FALSE; } @@ -13610,7 +13121,7 @@ index daacd45..a5ca0f1 100644 BOOL ScDocument::GetTable( const String& rName, SCTAB& rTab ) const { -@@ -298,6 +333,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, +@@ -298,6 +333,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, if (nPos == SC_TAB_APPEND || nPos == nTabCount) { pTab[nTabCount] = new ScTable(this, nTabCount, rName); @@ -13618,7 +13129,7 @@ index daacd45..a5ca0f1 100644 ++nMaxTableNumber; if ( bExternalDocument ) pTab[nTabCount]->SetVisible( FALSE ); -@@ -325,10 +361,16 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, +@@ -325,10 +361,16 @@ BOOL ScDocument::InsertTab( SCTAB nPos, for (i = 0; i <= MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateInsertTab(nPos); @@ -13635,7 +13146,7 @@ index daacd45..a5ca0f1 100644 // UpdateBroadcastAreas must be called between UpdateInsertTab, // which ends listening, and StartAllListeners, to not modify // areas that are to be inserted by starting listeners. -@@ -419,7 +461,10 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc ) +@@ -419,7 +461,10 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, pRefUndoDoc ? pRefUndoDoc->pTab[i] : 0); delete pTab[nTab]; for (i=nTab + 1; i < nTabCount; i++) @@ -13646,10 +13157,8 @@ index daacd45..a5ca0f1 100644 pTab[nTabCount - 1] = NULL; --nMaxTableNumber; // UpdateBroadcastAreas must be called between UpdateDeleteTab, -diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx -index 0134411..47fc6ff 100644 ---- sc/source/core/data/table1.cxx -+++ sc/source/core/data/table1.cxx +--- sc/source/core/data/table1.cxx.old 2010-03-03 16:59:20.000000000 +0100 ++++ sc/source/core/data/table1.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -126,6 +126,7 @@ extern BOOL bIsOlk, bOderSo; ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName, BOOL bColInfo, BOOL bRowInfo ) : @@ -13658,10 +13167,8 @@ index 0134411..47fc6ff 100644 bScenario( FALSE ), bLayoutRTL( FALSE ), bLoadingRTL( FALSE ), -diff --git sc/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx -index a4e5711..2bf9e62 100644 ---- sc/source/core/inc/interpre.hxx -+++ sc/source/core/inc/interpre.hxx +--- sc/source/core/inc/interpre.hxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/core/inc/interpre.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -146,6 +146,15 @@ public: static inline double div( const double& fNumerator, const double& fDenominator ); @@ -13687,11 +13194,9 @@ index a4e5711..2bf9e62 100644 sal_Unicode cDecSep; // decimal separator sal_Unicode cGrpSep; // group separator -diff --git sc/source/core/tool/address.cxx sc/source/core/tool/address.cxx -index abbc6ca..45c119f 100644 ---- sc/source/core/tool/address.cxx -+++ sc/source/core/tool/address.cxx -@@ -1377,7 +1377,7 @@ lcl_ScRange_Parse_OOo( ScRange &aRange, const String& r, ScDocument* pDoc, ScAdd +--- sc/source/core/tool/address.cxx.old 2010-03-03 16:44:05.000000000 +0100 ++++ sc/source/core/tool/address.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -1377,7 +1377,7 @@ lcl_ScRange_Parse_OOo( ScRange &aRange, } nRes1 = ( ( nRes1 | nRes2 ) & SCA_VALID ) | nRes1 @@ -13700,10 +13205,8 @@ index abbc6ca..45c119f 100644 return nRes1; } -diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx -index f036e18..3703d3a 100644 ---- sc/source/core/tool/interpr1.cxx -+++ sc/source/core/tool/interpr1.cxx +--- sc/source/core/tool/interpr1.cxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/core/tool/interpr1.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -74,6 +74,7 @@ #include "rangenam.hxx" #include "compiler.hxx" @@ -13734,10 +13237,8 @@ index f036e18..3703d3a 100644 if (pMatSrc) // The source data is matrix array. { -diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx -index 6f72ac3..9a3359f 100644 ---- sc/source/core/tool/interpr4.cxx -+++ sc/source/core/tool/interpr4.cxx +--- sc/source/core/tool/interpr4.cxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/core/tool/interpr4.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -36,10 +36,13 @@ #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> @@ -13924,7 +13425,7 @@ index 6f72ac3..9a3359f 100644 } -@@ -3567,7 +3632,8 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, +@@ -3567,7 +3632,8 @@ ScInterpreter::ScInterpreter( ScFormulaC pTokenMatrixMap( NULL ), pMyFormulaCell( pCell ), pFormatter( pDoc->GetFormatTable() ), @@ -13944,11 +13445,9 @@ index 6f72ac3..9a3359f 100644 // Remember result matrix in case it could be reused. if (pTokenMatrixMap && sp && GetStackType() == svMatrix) pTokenMatrixMap->insert( ScTokenMatrixMap::value_type( pCur, -diff --git sc/source/core/tool/interpr5.cxx sc/source/core/tool/interpr5.cxx -index 241bdfe..e7f0511 100644 ---- sc/source/core/tool/interpr5.cxx -+++ sc/source/core/tool/interpr5.cxx -@@ -324,6 +324,11 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR) +--- sc/source/core/tool/interpr5.cxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/core/tool/interpr5.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -324,6 +324,11 @@ ScMatrixRef ScInterpreter::GetNewMat(SCS return pMat; } @@ -13960,11 +13459,9 @@ index 241bdfe..e7f0511 100644 ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ) -diff --git sc/source/core/tool/rangelst.cxx sc/source/core/tool/rangelst.cxx -index dc12856..7ce1d61 100644 ---- sc/source/core/tool/rangelst.cxx -+++ sc/source/core/tool/rangelst.cxx -@@ -86,15 +86,18 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask, +--- sc/source/core/tool/rangelst.cxx.old 2010-03-03 16:59:17.000000000 +0100 ++++ sc/source/core/tool/rangelst.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -86,15 +86,18 @@ USHORT ScRangeList::Parse( const String& for ( USHORT i=0; i<nTCount; i++ ) { aOne = rStr.GetToken( i, cDelimiter ); @@ -13991,10 +13488,8 @@ index dc12856..7ce1d61 100644 if ( (nRes & nMask) == nMask ) Append( aRange ); nResult &= nRes; // alle gemeinsamen Bits bleiben erhalten -diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx -index a3c7413..53d0ba6 100644 ---- sc/source/filter/excel/excimp8.cxx -+++ sc/source/filter/excel/excimp8.cxx +--- sc/source/filter/excel/excimp8.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/filter/excel/excimp8.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -99,13 +99,16 @@ #include "stlpool.hxx" #include "stlsheet.hxx" @@ -14026,7 +13521,7 @@ index a3c7413..53d0ba6 100644 { delete pFormConv; -@@ -240,9 +244,15 @@ void ImportExcel8::Codename( BOOL bWorkbookGlobals ) +@@ -240,9 +244,15 @@ void ImportExcel8::Codename( BOOL bWorkb if( aName.Len() ) { if( bWorkbookGlobals ) @@ -14081,10 +13576,8 @@ index a3c7413..53d0ba6 100644 // #i11776# filtered ranges before outlines and hidden rows if( pExcRoot->pAutoFilterBuffer ) pExcRoot->pAutoFilterBuffer->Apply(); -diff --git sc/source/filter/excel/makefile.mk sc/source/filter/excel/makefile.mk -index 4c94b07..3d51ce0 100644 ---- sc/source/filter/excel/makefile.mk -+++ sc/source/filter/excel/makefile.mk +--- sc/source/filter/excel/makefile.mk.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/source/filter/excel/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -106,7 +106,8 @@ SLOFILES = \ $(SLO)$/xlstyle.obj \ $(SLO)$/xltools.obj \ @@ -14105,10 +13598,8 @@ index 4c94b07..3d51ce0 100644 # --- Targets ------------------------------------------------------- -diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx -index 4bc9870..02e9058 100644 ---- sc/source/filter/excel/read.cxx -+++ sc/source/filter/excel/read.cxx +--- sc/source/filter/excel/read.cxx.old 2010-03-03 16:59:13.000000000 +0100 ++++ sc/source/filter/excel/read.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -831,6 +831,12 @@ FltError ImportExcel8::Read( void ) sal_Size nProgressBasePos = 0; sal_Size nProgressBaseSize = 0; @@ -14223,11 +13714,9 @@ index 4bc9870..02e9058 100644 // #i45843# Convert pivot tables before calculation, so they are available // for the GETPIVOTDATA function. if( GetBiff() == EXC_BIFF8 ) -diff --git sc/source/filter/excel/xecontent.cxx sc/source/filter/excel/xecontent.cxx -index 789b8ae..4575fca 100644 ---- sc/source/filter/excel/xecontent.cxx -+++ sc/source/filter/excel/xecontent.cxx -@@ -527,12 +527,17 @@ void XclExpHyperlink::WriteBody( XclExpStream& rStrm ) +--- sc/source/filter/excel/xecontent.cxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/filter/excel/xecontent.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -527,12 +527,17 @@ void XclExpHyperlink::WriteBody( XclExpS { sal_uInt16 nXclCol = static_cast< sal_uInt16 >( maScPos.Col() ); sal_uInt16 nXclRow = static_cast< sal_uInt16 >( maScPos.Row() ); @@ -14248,10 +13737,8 @@ index 789b8ae..4575fca 100644 rStrm.CopyFromStream( *mxVarData ); } -diff --git sc/source/filter/excel/xeescher.cxx sc/source/filter/excel/xeescher.cxx -index e6ffbb9..7bbd4de 100644 ---- sc/source/filter/excel/xeescher.cxx -+++ sc/source/filter/excel/xeescher.cxx +--- sc/source/filter/excel/xeescher.cxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/filter/excel/xeescher.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -66,6 +66,9 @@ #include "xelink.hxx" #include "xename.hxx" @@ -14262,7 +13749,7 @@ index e6ffbb9..7bbd4de 100644 #include <oox/core/tokens.hxx> -@@ -333,7 +336,7 @@ void XclExpOcxControlObj::WriteSubRecs( XclExpStream& rStrm ) +@@ -333,7 +336,7 @@ void XclExpOcxControlObj::WriteSubRecs( XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) : XclObj( rRoot, EXC_OBJTYPE_UNKNOWN, true ), @@ -14271,7 +13758,7 @@ index e6ffbb9..7bbd4de 100644 mnHeight( 0 ), mnState( 0 ), mnLineCount( 0 ), -@@ -583,6 +586,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( const XclExpRoot& rRoot, Reference< XS +@@ -583,6 +586,8 @@ XclExpTbxControlObj::XclExpTbxControlObj bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent ) { @@ -14280,7 +13767,7 @@ index e6ffbb9..7bbd4de 100644 String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, meEventType ); if( aMacroName.Len() ) { -@@ -592,6 +597,7 @@ bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent ) +@@ -592,6 +597,7 @@ bool XclExpTbxControlObj::SetMacroLink( return true; } return false; @@ -14288,7 +13775,7 @@ index e6ffbb9..7bbd4de 100644 } void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm ) -@@ -732,12 +738,6 @@ void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm ) +@@ -732,12 +738,6 @@ void XclExpTbxControlObj::WriteSubRecs( } } @@ -14301,7 +13788,7 @@ index e6ffbb9..7bbd4de 100644 void XclExpTbxControlObj::WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId ) { if( const XclTokenArray* pCellLink = GetCellLinkTokArr() ) -@@ -766,6 +766,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm ) +@@ -766,6 +766,7 @@ void XclExpTbxControlObj::WriteSbs( XclE #endif @@ -14309,7 +13796,7 @@ index e6ffbb9..7bbd4de 100644 // ---------------------------------------------------------------------------- XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) : -@@ -911,6 +912,7 @@ void XclExpNote::Save( XclExpStream& rStrm ) +@@ -911,6 +912,7 @@ void XclExpNote::Save( XclExpStream& rSt } } @@ -14317,10 +13804,11 @@ index e6ffbb9..7bbd4de 100644 void XclExpNote::WriteBody( XclExpStream& rStrm ) { // BIFF5/BIFF7 is written separately -@@ -947,6 +949,70 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ) +@@ -946,6 +948,70 @@ void XclExpNote::WriteXml( sal_Int32 nAu + } // ============================================================================ - ++ +XclMacroHelper::XclMacroHelper( const XclExpRoot& rRoot ) : + XclExpControlHelper( rRoot ) +{ @@ -14384,14 +13872,11 @@ index e6ffbb9..7bbd4de 100644 +} + +// ============================================================================ -+ + XclExpComments::XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes ) : mnTab( nTab ), mrNotes( rNotes ) - { -diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx -index 48406eb..90a52d9 100644 ---- sc/source/filter/excel/xiescher.cxx -+++ sc/source/filter/excel/xiescher.cxx +--- sc/source/filter/excel/xiescher.cxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/filter/excel/xiescher.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -116,6 +116,8 @@ #include "xipage.hxx" #include "xichart.hxx" @@ -14401,7 +13886,7 @@ index 48406eb..90a52d9 100644 #include "namebuff.hxx" using ::rtl::OUString; -@@ -483,20 +485,15 @@ void XclImpDrawObjBase::ProcessSdrObject( SdrObject& rSdrObj ) const +@@ -483,20 +485,15 @@ void XclImpDrawObjBase::ProcessSdrObject } // macro and hyperlink @@ -14425,7 +13910,7 @@ index 48406eb..90a52d9 100644 // call virtual function for object type specific processing DoProcessSdrObj( rSdrObj ); -@@ -1686,22 +1683,15 @@ SdrObject* XclImpControlHelper::CreateSdrObjectFromShape( +@@ -1686,22 +1683,15 @@ SdrObject* XclImpControlHelper::CreateSd return xSdrObj.release(); } @@ -14451,7 +13936,7 @@ index 48406eb..90a52d9 100644 if( SfxObjectShell* pDocShell = mrRoot.GetDocShell() ) { Reference< XMultiServiceFactory > xFactory( pDocShell->GetModel(), UNO_QUERY ); -@@ -1764,7 +1754,26 @@ void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) co +@@ -1764,7 +1754,26 @@ void XclImpControlHelper::ProcessControl } } } @@ -14478,7 +13963,7 @@ index 48406eb..90a52d9 100644 // virtual call for type specific processing DoProcessControl( aPropSet ); } -@@ -1858,7 +1867,7 @@ void XclImpTbxObjBase::SetDffProperties( const DffPropSet& rDffPropSet ) +@@ -1858,7 +1867,7 @@ void XclImpTbxObjBase::SetDffProperties( bool XclImpTbxObjBase::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor ) const { @@ -14487,7 +13972,7 @@ index 48406eb..90a52d9 100644 } void XclImpTbxObjBase::ConvertFont( ScfPropertySet& rPropSet ) const -@@ -2095,6 +2104,45 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const +@@ -2095,6 +2104,45 @@ void XclImpOptionButtonObj::DoProcessCon { XclImpCheckBoxObj::DoProcessControl( rPropSet ); // TODO: grouping @@ -14533,7 +14018,7 @@ index 48406eb..90a52d9 100644 } OUString XclImpOptionButtonObj::DoGetServiceName() const -@@ -2731,6 +2779,17 @@ SdrObject* XclImpPictureObj::DoCreateSdrObj( const Rectangle& rAnchorRect, ScfPr +@@ -2731,6 +2779,17 @@ SdrObject* XclImpPictureObj::DoCreateSdr return xSdrObj.release(); } @@ -14575,7 +14060,7 @@ index 48406eb..90a52d9 100644 void XclImpDffManager::StartProgressBar( sal_Size nProgressSize ) { mxProgress.reset( new ScfProgressBar( GetDocShell(), STR_PROGRESS_CALCULATING ) ); -@@ -3511,27 +3587,27 @@ XclImpObjectManager::XclImpObjectManager( const XclImpRoot& rRoot ) : +@@ -3511,27 +3587,27 @@ XclImpObjectManager::XclImpObjectManager XclImpRoot( rRoot ) { maDefObjNames[ EXC_OBJTYPE_GROUP ] = CREATE_STRING( "Group" ); @@ -14616,10 +14101,8 @@ index 48406eb..90a52d9 100644 } XclImpObjectManager::~XclImpObjectManager() -diff --git sc/source/filter/excel/xiname.cxx sc/source/filter/excel/xiname.cxx -index 72f4701..8f52b17 100644 ---- sc/source/filter/excel/xiname.cxx -+++ sc/source/filter/excel/xiname.cxx +--- sc/source/filter/excel/xiname.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/filter/excel/xiname.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -38,7 +38,8 @@ #include "excform.hxx" // for filter manager @@ -14630,7 +14113,7 @@ index 72f4701..8f52b17 100644 // ============================================================================ // *** Implementation *** // ============================================================================ -@@ -130,6 +131,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : +@@ -130,6 +131,7 @@ XclImpName::XclImpName( XclImpStream& rS maScName = maXclName; ScfTools::ConvertToScDefinedName( maScName ); } @@ -14638,7 +14121,7 @@ index 72f4701..8f52b17 100644 // add index for local names if( nXclTab != EXC_NAME_GLOBAL ) -@@ -220,6 +222,25 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) : +@@ -220,6 +222,25 @@ XclImpName::XclImpName( XclImpStream& rS pData->GuessPosition(); // calculate base position for relative refs pData->SetIndex( nXclNameIdx ); // used as unique identifier in formulas rRangeNames.Insert( pData ); // takes ownership of pData @@ -14664,10 +14147,8 @@ index 72f4701..8f52b17 100644 mpScData = pData; // cache for later use } } -diff --git sc/source/filter/excel/xistyle.cxx sc/source/filter/excel/xistyle.cxx -index 30299b8..2adea30 100644 ---- sc/source/filter/excel/xistyle.cxx -+++ sc/source/filter/excel/xistyle.cxx +--- sc/source/filter/excel/xistyle.cxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/filter/excel/xistyle.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -68,10 +68,70 @@ #include "root.hxx" #include "colrowst.hxx" @@ -14740,7 +14221,7 @@ index 30299b8..2adea30 100644 { } -@@ -105,6 +165,7 @@ void XclImpPalette::ReadPalette( XclImpStream& rStrm ) +@@ -105,6 +165,7 @@ void XclImpPalette::ReadPalette( XclImpS rStrm >> aColor; maColorTable[ nIndex ] = aColor.GetColor(); } @@ -14748,10 +14229,8 @@ index 30299b8..2adea30 100644 } // FONT record - font information ============================================= -diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx -index 98312a2..066eb57 100644 ---- sc/source/filter/excel/xlescher.cxx -+++ sc/source/filter/excel/xlescher.cxx +--- sc/source/filter/excel/xlescher.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/filter/excel/xlescher.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -38,6 +38,14 @@ #include "document.hxx" #include "xistream.hxx" @@ -14767,7 +14246,7 @@ index 98312a2..066eb57 100644 using ::rtl::OUString; using ::com::sun::star::uno::Reference; -@@ -300,10 +308,16 @@ Reference< XControlModel > XclControlHelper::GetControlModel( Reference< XShape +@@ -300,10 +308,16 @@ Reference< XControlModel > XclControlHel #define EXC_MACRONAME_PRE "vnd.sun.star.script:Standard." #define EXC_MACRONAME_SUF "?language=Basic&location=document" @@ -14803,11 +14282,8 @@ index 98312a2..066eb57 100644 return true; } return false; -diff --git sc/source/filter/excel/xltoolbar.cxx sc/source/filter/excel/xltoolbar.cxx -new file mode 100644 -index 0000000..019a146 ---- /dev/null -+++ sc/source/filter/excel/xltoolbar.cxx +--- sc/source/filter/excel/xltoolbar.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/excel/xltoolbar.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,433 @@ +#include "xltoolbar.hxx" +#include <rtl/ustrbuf.hxx> @@ -15242,11 +14718,8 @@ index 0000000..019a146 +} + + -diff --git sc/source/filter/excel/xltoolbar.hxx sc/source/filter/excel/xltoolbar.hxx -new file mode 100644 -index 0000000..deef46c ---- /dev/null -+++ sc/source/filter/excel/xltoolbar.hxx +--- sc/source/filter/excel/xltoolbar.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/filter/excel/xltoolbar.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,95 @@ +#ifndef _XLTOOLBAR_HXX +#define _XLTOOLBAR_HXX @@ -15343,10 +14816,8 @@ index 0000000..deef46c + + +#endif //_XLTOOLBAR_HXX -diff --git sc/source/filter/inc/excimp8.hxx sc/source/filter/inc/excimp8.hxx -index 43e630d..8a54711 100644 ---- sc/source/filter/inc/excimp8.hxx -+++ sc/source/filter/inc/excimp8.hxx +--- sc/source/filter/inc/excimp8.hxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/filter/inc/excimp8.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -53,7 +53,11 @@ class XclImpStream; class ImportExcel8 : public ImportExcel @@ -15359,10 +14830,8 @@ index 43e630d..8a54711 100644 ExcScenarioList aScenList; BOOL bHasBasic; -diff --git sc/source/filter/inc/xcl97esc.hxx sc/source/filter/inc/xcl97esc.hxx -index c3af1fb..67a6e3f 100644 ---- sc/source/filter/inc/xcl97esc.hxx -+++ sc/source/filter/inc/xcl97esc.hxx +--- sc/source/filter/inc/xcl97esc.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/xcl97esc.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -54,6 +54,15 @@ class XclExpOcxControlObj; #else class XclExpTbxControlObj; @@ -15379,10 +14848,8 @@ index c3af1fb..67a6e3f 100644 class XclEscherEx : public EscherEx, protected XclExpRoot { -diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx -index 73f8f1f..30b6e8a 100644 ---- sc/source/filter/inc/xcl97rec.hxx -+++ sc/source/filter/inc/xcl97rec.hxx +--- sc/source/filter/inc/xcl97rec.hxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/filter/inc/xcl97rec.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -285,7 +285,7 @@ public: class XclObjAny : public XclObj @@ -15392,10 +14859,8 @@ index 73f8f1f..30b6e8a 100644 virtual void WriteSubRecs( XclExpStream& rStrm ); public: -diff --git sc/source/filter/inc/xecontent.hxx sc/source/filter/inc/xecontent.hxx -index 729d653..aeb6c13 100644 ---- sc/source/filter/inc/xecontent.hxx -+++ sc/source/filter/inc/xecontent.hxx +--- sc/source/filter/inc/xecontent.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/xecontent.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -116,6 +116,8 @@ public: inline const String* GetRepr() const { return mxRepr.get(); } @@ -15405,10 +14870,8 @@ index 729d653..aeb6c13 100644 private: /** Builds file name from the passed file URL. Tries to convert to relative file name. @param rnLevel (out-param) The parent directory level. -diff --git sc/source/filter/inc/xeescher.hxx sc/source/filter/inc/xeescher.hxx -index 1acb7ac..8b3f9a6 100644 ---- sc/source/filter/inc/xeescher.hxx -+++ sc/source/filter/inc/xeescher.hxx +--- sc/source/filter/inc/xeescher.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/xeescher.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -88,6 +88,34 @@ private: sal_uInt16 mnEntryCount; /// Number of entries in source range. }; @@ -15470,10 +14933,8 @@ index 1acb7ac..8b3f9a6 100644 XclTbxEventType meEventType; /// Type of supported macro event. sal_Int32 mnHeight; /// Height of the control. sal_uInt16 mnState; /// Checked/unchecked state. -diff --git sc/source/filter/inc/xiescher.hxx sc/source/filter/inc/xiescher.hxx -index c9d2daa..8450311 100644 ---- sc/source/filter/inc/xiescher.hxx -+++ sc/source/filter/inc/xiescher.hxx +--- sc/source/filter/inc/xiescher.hxx.old 2009-10-08 16:17:08.000000000 +0200 ++++ sc/source/filter/inc/xiescher.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -33,6 +33,7 @@ #include <vector> @@ -15520,7 +14981,7 @@ index c9d2daa..8450311 100644 sal_uInt16 mnNextInGroup; /// Next option button in a group. sal_uInt16 mnFirstInGroup; /// 1 = Button is the first in a group. }; -@@ -857,7 +860,8 @@ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper +@@ -857,7 +860,8 @@ class XclImpPictureObj : public XclImpRe { public: explicit XclImpPictureObj( const XclImpRoot& rRoot ); @@ -15562,10 +15023,8 @@ index c9d2daa..8450311 100644 /** Reads and returns a bitmap from WMF/PICT format. */ static void ReadWmf( Graphic& rGraphic, XclImpStream& rStrm ); /** Reads and returns a bitmap from BMP format. */ -diff --git sc/source/filter/inc/xistyle.hxx sc/source/filter/inc/xistyle.hxx -index 3a40903..baebad3 100644 ---- sc/source/filter/inc/xistyle.hxx -+++ sc/source/filter/inc/xistyle.hxx +--- sc/source/filter/inc/xistyle.hxx.old 2010-03-03 16:59:16.000000000 +0100 ++++ sc/source/filter/inc/xistyle.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -72,8 +72,10 @@ public: void ReadPalette( XclImpStream& rStrm ); @@ -15577,10 +15036,8 @@ index 3a40903..baebad3 100644 }; // FONT record - font information ============================================= -diff --git sc/source/filter/inc/xlescher.hxx sc/source/filter/inc/xlescher.hxx -index 97fb567..d6c9b7c 100644 ---- sc/source/filter/inc/xlescher.hxx -+++ sc/source/filter/inc/xlescher.hxx +--- sc/source/filter/inc/xlescher.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/inc/xlescher.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -432,7 +432,8 @@ public: GetControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); @@ -15600,10 +15057,8 @@ index 97fb567..d6c9b7c 100644 /** Tries to extract an Excel macro name from the passed macro descriptor. */ static String ExtractFromMacroDescriptor( const ::com::sun::star::script::ScriptEventDescriptor& rDescriptor, -diff --git sc/source/filter/xcl97/xcl97esc.cxx sc/source/filter/xcl97/xcl97esc.cxx -index 607832a..b2c0e7d 100644 ---- sc/source/filter/xcl97/xcl97esc.cxx -+++ sc/source/filter/xcl97/xcl97esc.cxx +--- sc/source/filter/xcl97/xcl97esc.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/filter/xcl97/xcl97esc.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -57,6 +57,9 @@ #include "global.hxx" #include "document.hxx" @@ -15614,7 +15069,7 @@ index 607832a..b2c0e7d 100644 #include "xcl97rec.hxx" #include "xehelper.hxx" #include "xechart.hxx" -@@ -232,7 +235,8 @@ EscherExHostAppData* XclEscherEx::StartShape( const com::sun::star::uno::Referen +@@ -232,7 +235,8 @@ EscherExHostAppData* XclEscherEx::StartS { // #107540# ignore permanent note shapes // #i12190# do not ignore callouts (do not filter by object type ID) @@ -15632,7 +15087,7 @@ index 607832a..b2c0e7d 100644 delete pCurrAppData; } } -@@ -576,4 +581,40 @@ void XclEscherClientTextbox::WriteData( EscherEx& /*rEx*/ ) const +@@ -576,4 +581,40 @@ void XclEscherClientTextbox::WriteData( pXclObj->SetText( GetRoot(), rTextObj ); } @@ -15673,11 +15128,9 @@ index 607832a..b2c0e7d 100644 + } +} -diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx -index a3ef874..42d3814 100644 ---- sc/source/filter/xml/xmlexprt.cxx -+++ sc/source/filter/xml/xmlexprt.cxx -@@ -3193,7 +3193,34 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, +--- sc/source/filter/xml/xmlexprt.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/filter/xml/xmlexprt.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -3213,7 +3213,34 @@ void ScXMLExport::ExportShape(const uno: } } if (!bIsChart) @@ -15712,10 +15165,8 @@ index a3ef874..42d3814 100644 IncrementProgressBar(sal_False); } -diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx -index cc9895a..a98476e 100644 ---- sc/source/ui/attrdlg/scdlgfact.cxx -+++ sc/source/ui/attrdlg/scdlgfact.cxx +--- sc/source/ui/attrdlg/scdlgfact.cxx.old 2010-03-03 16:59:12.000000000 +0100 ++++ sc/source/ui/attrdlg/scdlgfact.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -82,6 +82,8 @@ #include "tpstat.hxx" //add for ScDocStatPage #include "tpusrlst.hxx" //add for ScTpUserLists @@ -15725,7 +15176,7 @@ index cc9895a..a98476e 100644 #include "tpformula.hxx" // ause -@@ -96,6 +98,8 @@ IMPL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl); //add for ScDataPilotDat +@@ -96,6 +98,8 @@ IMPL_ABSTDLG_BASE(AbstractScDataPilotDat IMPL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl); //add for ScDataPilotSourceTypeDlg IMPL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl); //add for ScDataPilotServiceDlg IMPL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl); //add for ScDeleteCellDlg @@ -15734,7 +15185,7 @@ index cc9895a..a98476e 100644 IMPL_ABSTDLG_BASE(AbstractScDeleteContentsDlg_Impl); //add for ScDeleteContentsDlg IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl); //add for ScFillSeriesDlg IMPL_ABSTDLG_BASE(AbstractScGroupDlg_Impl); //add for ScGroupDlg -@@ -862,6 +866,26 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi +@@ -867,6 +871,26 @@ AbstractScDeleteCellDlg* ScAbstractDialo //add for ScDeleteCellDlg end @@ -15761,10 +15212,8 @@ index cc9895a..a98476e 100644 //add for ScDeleteContentsDlg begin AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg USHORT nCheckDefaults ) -diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx -index 059cc8e..611a107 100644 ---- sc/source/ui/attrdlg/scdlgfact.hxx -+++ sc/source/ui/attrdlg/scdlgfact.hxx +--- sc/source/ui/attrdlg/scdlgfact.hxx.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/attrdlg/scdlgfact.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -40,6 +40,7 @@ class ScDataPilotDatabaseDlg; class ScDataPilotSourceTypeDlg; class ScDataPilotServiceDlg; @@ -15773,7 +15222,7 @@ index 059cc8e..611a107 100644 class ScDeleteContentsDlg; class ScFillSeriesDlg; class ScGroupDlg; -@@ -166,6 +167,12 @@ class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for S +@@ -167,6 +168,12 @@ class AbstractScDeleteCellDlg_Impl : pub virtual DelCellCmd GetDelCellCmd() const; }; @@ -15786,7 +15235,7 @@ index 059cc8e..611a107 100644 class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg //add for ScDeleteContentsDlg { DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg) -@@ -429,6 +436,9 @@ public: +@@ -430,6 +437,9 @@ public: virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId, BOOL bDisallowCellMove = FALSE ); //add for ScDeleteCellDlg @@ -15796,10 +15245,8 @@ index 059cc8e..611a107 100644 virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg USHORT nCheckDefaults = 0 ); -diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx -index 248aa39..9955730 100644 ---- sc/source/ui/docshell/docfunc.cxx -+++ sc/source/ui/docshell/docfunc.cxx +--- sc/source/ui/docshell/docfunc.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/ui/docshell/docfunc.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -51,6 +51,12 @@ #include <svtools/zforlist.hxx> #include <svtools/PasswordHelper.hxx> @@ -15821,7 +15268,7 @@ index 248aa39..9955730 100644 // STATIC DATA ----------------------------------------------------------- //======================================================================== -@@ -2630,6 +2637,92 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, +@@ -2630,6 +2637,92 @@ BOOL ScDocFunc::MoveBlock( const ScRange } //------------------------------------------------------------------------ @@ -15914,7 +15361,7 @@ index 248aa39..9955730 100644 BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL bApi ) { -@@ -2639,8 +2732,18 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL +@@ -2639,8 +2732,18 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, ScDocShellModificator aModificator( rDocShell ); ScDocument* pDoc = rDocShell.GetDocument(); @@ -15935,7 +15382,7 @@ index 248aa39..9955730 100644 if (bRecord) pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage -@@ -2651,10 +2754,19 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, const String& rName, BOOL bRecord, BOOL +@@ -2651,10 +2754,19 @@ BOOL ScDocFunc::InsertTable( SCTAB nTab, if (pDoc->InsertTab( nTab, rName )) { @@ -15955,7 +15402,7 @@ index 248aa39..9955730 100644 rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) ); rDocShell.PostPaintExtras(); -@@ -2676,7 +2788,11 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) +@@ -2676,7 +2788,11 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bSuccess = FALSE; ScDocument* pDoc = rDocShell.GetDocument(); @@ -15968,7 +15415,7 @@ index 248aa39..9955730 100644 bRecord = FALSE; BOOL bWasLinked = pDoc->IsLinked(nTab); ScDocument* pUndoDoc = NULL; -@@ -2718,6 +2834,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) +@@ -2718,6 +2834,8 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, pUndoData = new ScRefUndoData( pDoc ); } @@ -15977,7 +15424,7 @@ index 248aa39..9955730 100644 if (pDoc->DeleteTab( nTab, pUndoDoc )) { if (bRecord) -@@ -2728,6 +2846,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, BOOL bRecord, BOOL /* bApi */ ) +@@ -2728,6 +2846,13 @@ BOOL ScDocFunc::DeleteTable( SCTAB nTab, new ScUndoDeleteTab( &rDocShell, theTabs, pUndoDoc, pUndoData )); } // Views updaten: @@ -15991,7 +15438,7 @@ index 248aa39..9955730 100644 rDocShell.Broadcast( ScTablesHint( SC_TAB_DELETED, nTab ) ); if (bWasLinked) -@@ -4085,6 +4210,13 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, +@@ -4085,6 +4210,13 @@ BOOL ScDocFunc::FillSeries( const ScRang BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi ) { @@ -16005,7 +15452,7 @@ index 248aa39..9955730 100644 ScDocShellModificator aModificator( rDocShell ); ScDocument* pDoc = rDocShell.GetDocument(); -@@ -4110,10 +4242,6 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, +@@ -4110,10 +4242,6 @@ BOOL ScDocFunc::FillAuto( ScRange& rRang ScRange aSourceArea = rRange; ScRange aDestArea = rRange; @@ -16016,10 +15463,8 @@ index 248aa39..9955730 100644 switch (eDir) { -diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx -index 29ff891..fa4028e 100644 ---- sc/source/ui/docshell/docsh.cxx -+++ sc/source/ui/docshell/docsh.cxx +--- sc/source/ui/docshell/docsh.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/docshell/docsh.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -128,9 +128,16 @@ #include <rtl/logfile.hxx> @@ -16037,7 +15482,7 @@ index 29ff891..fa4028e 100644 using ::rtl::OUString; using ::rtl::OUStringBuffer; -@@ -276,7 +283,12 @@ sal_uInt16 ScDocShell::GetHiddenInformationState( sal_uInt16 nStates ) +@@ -276,7 +283,12 @@ sal_uInt16 ScDocShell::GetHiddenInformat void ScDocShell::BeforeXMLLoading() { aDocument.DisableIdle( TRUE ); @@ -16051,7 +15496,7 @@ index 29ff891..fa4028e 100644 // prevent unnecessary broadcasts and updates DBG_ASSERT(pModificator == NULL, "The Modificator should not exist"); pModificator = new ScDocShellModificator( *this ); -@@ -381,7 +393,12 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) +@@ -381,7 +393,12 @@ void ScDocShell::AfterXMLLoading(sal_Boo BasicManager* pAppMgr = SFX_APP()->GetBasicManager(); if ( pAppMgr ) pAppMgr->SetGlobalUNOConstant( "ThisExcelDoc", aArgs[ 0 ] ); @@ -16065,7 +15510,7 @@ index 29ff891..fa4028e 100644 aDocument.SetImportingXML( FALSE ); aDocument.EnableExecuteLink( true ); aDocument.EnableUndo( TRUE ); -@@ -524,9 +541,71 @@ BOOL __EXPORT ScDocShell::Load( SfxMedium& rMedium ) +@@ -524,9 +541,71 @@ BOOL __EXPORT ScDocShell::Load( SfxMediu return bRet; } @@ -16137,7 +15582,7 @@ index 29ff891..fa4028e 100644 if (rHint.ISA(SfxSimpleHint)) // ohne Parameter { ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId(); -@@ -2209,6 +2288,16 @@ USHORT __EXPORT ScDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) +@@ -2209,6 +2288,16 @@ USHORT __EXPORT ScDocShell::PrepareClose DoEnterHandler(); @@ -16154,10 +15599,8 @@ index 29ff891..fa4028e 100644 USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing ); if (nRet == TRUE) // TRUE = schliessen aDocument.DisableIdle(TRUE); // nicht mehr drin rumpfuschen !!! -diff --git sc/source/ui/docshell/docsh5.cxx sc/source/ui/docshell/docsh5.cxx -index 0ad5e50..672dbcc 100644 ---- sc/source/ui/docshell/docsh5.cxx -+++ sc/source/ui/docshell/docsh5.cxx +--- sc/source/ui/docshell/docsh5.cxx.old 2009-11-20 11:38:03.000000000 +0100 ++++ sc/source/ui/docshell/docsh5.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -68,6 +68,11 @@ #include "sc.hrc" #include "waitoff.hxx" @@ -16170,7 +15613,7 @@ index 0ad5e50..672dbcc 100644 // --------------------------------------------------------------------------- -@@ -872,6 +877,43 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, BOOL bCopy, BOOL bRec +@@ -872,6 +877,43 @@ BOOL ScDocShell::MoveTable( SCTAB nSrcTa GetUndoManager()->AddUndoAction( new ScUndoCopyTab( this, aSrcList, aDestList ) ); } @@ -16214,11 +15657,8 @@ index 0ad5e50..672dbcc 100644 } Broadcast( ScTablesHint( SC_TAB_COPIED, nSrcTab, nDestTab ) ); -diff --git sc/source/ui/docshell/macromgr.cxx sc/source/ui/docshell/macromgr.cxx -new file mode 100644 -index 0000000..97623f3 ---- /dev/null -+++ sc/source/ui/docshell/macromgr.cxx +--- sc/source/ui/docshell/macromgr.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/docshell/macromgr.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,217 @@ +/************************************************************************* + * @@ -16437,10 +15877,8 @@ index 0000000..97623f3 + } +} + -diff --git sc/source/ui/docshell/makefile.mk sc/source/ui/docshell/makefile.mk -index f3179c4..00b6410 100644 ---- sc/source/ui/docshell/makefile.mk -+++ sc/source/ui/docshell/makefile.mk +--- sc/source/ui/docshell/makefile.mk.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/docshell/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -95,7 +95,8 @@ SLOFILES = \ $(SLO)$/hiranges.obj \ $(SLO)$/pntlock.obj \ @@ -16471,11 +15909,9 @@ index f3179c4..00b6410 100644 # --- Tagets ------------------------------------------------------- -diff --git sc/source/ui/drawfunc/drawsh.cxx sc/source/ui/drawfunc/drawsh.cxx -index 65f5f2b..7e27865 100644 ---- sc/source/ui/drawfunc/drawsh.cxx -+++ sc/source/ui/drawfunc/drawsh.cxx -@@ -211,7 +211,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) +--- sc/source/ui/drawfunc/drawsh.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/drawfunc/drawsh.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -211,7 +211,6 @@ void ScDrawShell::ExecDrawAttr( SfxReque ExecuteTextAttrDlg( rReq ); break; @@ -16483,7 +15919,7 @@ index 65f5f2b..7e27865 100644 case SID_DRAW_HLINK_EDIT: if ( pSingleSelectedObj ) pViewData->GetDispatcher().Execute( SID_HYPERLINK_DIALOG ); -@@ -239,7 +238,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) +@@ -239,7 +238,6 @@ void ScDrawShell::ExecDrawAttr( SfxReque ScGlobal::OpenURL( pInfo->GetHlink(), String::EmptyString() ); } break; @@ -16491,7 +15927,7 @@ index 65f5f2b..7e27865 100644 case SID_ATTR_TRANSFORM: { -@@ -494,7 +492,6 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ ) +@@ -494,7 +492,6 @@ void ScDrawShell::ExecuteTextAttrDlg( Sf delete( pDlg ); } @@ -16499,17 +15935,15 @@ index 65f5f2b..7e27865 100644 void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk ) { if ( pObj ) -@@ -504,5 +501,4 @@ void ScDrawShell::SetHlinkForObject( SdrObject* pObj, const rtl::OUString& rHlnk +@@ -504,5 +501,4 @@ void ScDrawShell::SetHlinkForObject( Sdr lcl_setModified( GetObjectShell() ); } } -#endif -diff --git sc/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh2.cxx -index 8daacf0..76a5e3e 100644 ---- sc/source/ui/drawfunc/drawsh2.cxx -+++ sc/source/ui/drawfunc/drawsh2.cxx -@@ -200,24 +200,20 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disablen +--- sc/source/ui/drawfunc/drawsh2.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/drawfunc/drawsh2.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -200,24 +200,20 @@ void ScDrawShell::GetDrawFuncState( SfxI BOOL bCanRename = FALSE; if ( nMarkCount > 1 ) { @@ -16534,11 +15968,9 @@ index 8daacf0..76a5e3e 100644 SdrLayerID nLayerID = pObj->GetLayer(); if ( nLayerID != SC_LAYER_INTERN ) bCanRename = TRUE; // #i51351# anything except internal objects can be renamed -diff --git sc/source/ui/drawfunc/drawsh5.cxx sc/source/ui/drawfunc/drawsh5.cxx -index 58918aa..c670fde 100644 ---- sc/source/ui/drawfunc/drawsh5.cxx -+++ sc/source/ui/drawfunc/drawsh5.cxx -@@ -95,14 +95,12 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink +--- sc/source/ui/drawfunc/drawsh5.cxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/drawfunc/drawsh5.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -95,14 +95,12 @@ void ScDrawShell::GetHLinkState( SfxItem if ( nMarkCount == 1 ) // URL-Button markiert ? { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); @@ -16553,7 +15985,7 @@ index 58918aa..c670fde 100644 SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObj); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { -@@ -245,13 +243,11 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) +@@ -245,13 +243,11 @@ void ScDrawShell::ExecuteHLink( SfxReque bDone = TRUE; } } @@ -16567,11 +15999,9 @@ index 58918aa..c670fde 100644 } } -diff --git sc/source/ui/drawfunc/fudraw.cxx sc/source/ui/drawfunc/fudraw.cxx -index 6c9574d..9e2b7e2 100644 ---- sc/source/ui/drawfunc/fudraw.cxx -+++ sc/source/ui/drawfunc/fudraw.cxx -@@ -831,11 +831,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) +--- sc/source/ui/drawfunc/fudraw.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/drawfunc/fudraw.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -831,11 +831,7 @@ void FuDraw::ForcePointer(const MouseEve SdrObjMacroHitRec aHitRec; //! muss da noch irgendwas gesetzt werden ???? pViewShell->SetActivePointer( pObj->GetMacroPointer(aHitRec) ); } @@ -16583,11 +16013,9 @@ index 6c9574d..9e2b7e2 100644 pWindow->SetPointer( Pointer( POINTER_REFHAND ) ); else if ( IsDetectiveHit( aPnt ) ) pViewShell->SetActivePointer( Pointer( POINTER_DETECTIVE ) ); -diff --git sc/source/ui/drawfunc/fusel.cxx sc/source/ui/drawfunc/fusel.cxx -index 8cf8c34..cdf7a45 100644 ---- sc/source/ui/drawfunc/fusel.cxx -+++ sc/source/ui/drawfunc/fusel.cxx -@@ -205,7 +205,6 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) +--- sc/source/ui/drawfunc/fusel.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/drawfunc/fusel.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -205,7 +205,6 @@ BOOL __EXPORT FuSelection::MouseButtonDo } ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, TRUE ); @@ -16595,7 +16023,7 @@ index 8cf8c34..cdf7a45 100644 // For interoperability favour links over macros if both are defined if ( pInfo->GetHlink().getLength() > 0 ) { -@@ -213,20 +212,27 @@ BOOL __EXPORT FuSelection::MouseButtonDown(const MouseEvent& rMEvt) +@@ -213,20 +212,27 @@ BOOL __EXPORT FuSelection::MouseButtonDo sURL = pInfo->GetHlink(); } else if ( pInfo->GetMacro().getLength() > 0 ) @@ -16627,10 +16055,8 @@ index 8cf8c34..cdf7a45 100644 pViewShell->FakeButtonUp( pViewShell->GetViewData()->GetActivePart() ); return TRUE; // kein CaptureMouse etc. } -diff --git sc/source/ui/drawfunc/makefile.mk sc/source/ui/drawfunc/makefile.mk -index 0e38184..bf06c61 100644 ---- sc/source/ui/drawfunc/makefile.mk -+++ sc/source/ui/drawfunc/makefile.mk +--- sc/source/ui/drawfunc/makefile.mk.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/drawfunc/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -79,6 +79,7 @@ SLOFILES = \ $(SLO)$/mediash.obj @@ -16639,10 +16065,8 @@ index 0e38184..bf06c61 100644 $(SLO)$/fuins2.obj NOOPTFILES=\ -diff --git sc/source/ui/drawfunc/objdraw.src sc/source/ui/drawfunc/objdraw.src -index dfe5292..6e88121 100644 ---- sc/source/ui/drawfunc/objdraw.src -+++ sc/source/ui/drawfunc/objdraw.src +--- sc/source/ui/drawfunc/objdraw.src.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/drawfunc/objdraw.src 2010-03-03 16:59:35.000000000 +0100 @@ -189,7 +189,6 @@ ITEM_FORMAT_PARA_DLG\ }; @@ -16689,11 +16113,8 @@ index dfe5292..6e88121 100644 }; }; -diff --git sc/source/ui/inc/datafdlg.hrc sc/source/ui/inc/datafdlg.hrc -new file mode 100644 -index 0000000..8fa8999 ---- /dev/null -+++ sc/source/ui/inc/datafdlg.hrc +--- sc/source/ui/inc/datafdlg.hrc.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/inc/datafdlg.hrc 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,49 @@ +/************************************************************************* + * @@ -16745,11 +16166,8 @@ index 0000000..8fa8999 +#define FT_DATAFORM_FIXEDTEXT1 2001 +#define ED_DATAFORM_EDIT1 2002 \ No newline at end of file -diff --git sc/source/ui/inc/datafdlg.hxx sc/source/ui/inc/datafdlg.hxx -new file mode 100644 -index 0000000..3e6d8e3 ---- /dev/null -+++ sc/source/ui/inc/datafdlg.hxx +--- sc/source/ui/inc/datafdlg.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/inc/datafdlg.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,121 @@ +/************************************************************************* + * @@ -16872,10 +16290,8 @@ index 0000000..3e6d8e3 +#endif // SC_DATAFDLG_HXX + + -diff --git sc/source/ui/inc/docfunc.hxx sc/source/ui/inc/docfunc.hxx -index c28fe5c..ecbcfda 100644 ---- sc/source/ui/inc/docfunc.hxx -+++ sc/source/ui/inc/docfunc.hxx +--- sc/source/ui/inc/docfunc.hxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/ui/inc/docfunc.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -173,6 +173,8 @@ public: double fStart, double fStep, double fMax, BOOL bRecord, BOOL bApi ); @@ -16885,10 +16301,8 @@ index c28fe5c..ecbcfda 100644 BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, ULONG nCount, BOOL bRecord, BOOL bApi ); -diff --git sc/source/ui/inc/docsh.hxx sc/source/ui/inc/docsh.hxx -index 90c1fd4..32539da 100644 ---- sc/source/ui/inc/docsh.hxx -+++ sc/source/ui/inc/docsh.hxx +--- sc/source/ui/inc/docsh.hxx.old 2010-03-03 16:44:02.000000000 +0100 ++++ sc/source/ui/inc/docsh.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -47,6 +47,7 @@ #include "refreshtimer.hxx" @@ -16897,10 +16311,8 @@ index 90c1fd4..32539da 100644 class ScEditEngineDefaulter; class FontList; -diff --git sc/source/ui/inc/drawsh.hxx sc/source/ui/inc/drawsh.hxx -index 65c7296..058f92a 100644 ---- sc/source/ui/inc/drawsh.hxx -+++ sc/source/ui/inc/drawsh.hxx +--- sc/source/ui/inc/drawsh.hxx.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/inc/drawsh.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -47,9 +47,7 @@ class ScDrawShell : public SfxShell DECL_LINK( NameObjectHdl, AbstractSvxNameDialog* ); @@ -16911,10 +16323,8 @@ index 65c7296..058f92a 100644 protected: ScViewData* GetViewData() { return pViewData; } -diff --git sc/source/ui/inc/tabvwsh.hxx sc/source/ui/inc/tabvwsh.hxx -index 4ef1594..29c7078 100644 ---- sc/source/ui/inc/tabvwsh.hxx -+++ sc/source/ui/inc/tabvwsh.hxx +--- sc/source/ui/inc/tabvwsh.hxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/inc/tabvwsh.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -252,7 +252,7 @@ public: virtual ~ScTabViewShell(); @@ -16924,10 +16334,8 @@ index 4ef1594..29c7078 100644 bool IsRefInputMode() const; void ExecuteInputDirect(); -diff --git sc/source/ui/inc/undodat.hxx sc/source/ui/inc/undodat.hxx -index ad46cb7..9859953 100644 ---- sc/source/ui/inc/undodat.hxx -+++ sc/source/ui/inc/undodat.hxx +--- sc/source/ui/inc/undodat.hxx.old 2010-03-03 16:44:03.000000000 +0100 ++++ sc/source/ui/inc/undodat.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -531,7 +531,43 @@ private: void Init(); }; @@ -16947,14 +16355,14 @@ index ad46cb7..9859953 100644 + BOOL bRedoIsFilled = TRUE + ); + virtual ~ScUndoDataForm(); -+ + + virtual void Undo(); + virtual void Redo(); + virtual void Repeat(SfxRepeatTarget& rTarget); + virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; + + virtual String GetComment() const; - ++ +private: + ScMarkData aMarkData; + ScDocument* pUndoDoc; @@ -16972,10 +16380,8 @@ index ad46cb7..9859953 100644 #endif -diff --git sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewfunc.hxx -index ab04c16..0f71150 100644 ---- sc/source/ui/inc/viewfunc.hxx -+++ sc/source/ui/inc/viewfunc.hxx +--- sc/source/ui/inc/viewfunc.hxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/ui/inc/viewfunc.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -341,6 +341,13 @@ public: void ForgetFormatArea() { bFormatValid = FALSE; } BOOL SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix = NULL ); @@ -16990,11 +16396,8 @@ index ab04c16..0f71150 100644 // interne Hilfsfunktionen protected: void UpdateLineAttrs( SvxBorderLine& rLine, -diff --git sc/source/ui/miscdlgs/datafdlg.cxx sc/source/ui/miscdlgs/datafdlg.cxx -new file mode 100644 -index 0000000..619355c ---- /dev/null -+++ sc/source/ui/miscdlgs/datafdlg.cxx +--- sc/source/ui/miscdlgs/datafdlg.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/miscdlgs/datafdlg.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,422 @@ +/************************************************************************* + * @@ -17418,10 +16821,8 @@ index 0000000..619355c + if ( pEdits ) + pEdits[0]->GrabFocus(); +} -diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk -index fe47653..52cf9ae 100644 ---- sc/source/ui/miscdlgs/makefile.mk -+++ sc/source/ui/miscdlgs/makefile.mk +--- sc/source/ui/miscdlgs/makefile.mk.old 2010-03-03 16:59:09.000000000 +0100 ++++ sc/source/ui/miscdlgs/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -45,6 +45,7 @@ LIBTARGET=no # --- Files -------------------------------------------------------- @@ -17430,11 +16831,8 @@ index fe47653..52cf9ae 100644 $(SLO)$/delcldlg.obj \ $(SLO)$/inscldlg.obj \ $(SLO)$/delcodlg.obj \ -diff --git sc/source/ui/src/datafdlg.src sc/source/ui/src/datafdlg.src -new file mode 100644 -index 0000000..535ec66 ---- /dev/null -+++ sc/source/ui/src/datafdlg.src +--- sc/source/ui/src/datafdlg.src.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/src/datafdlg.src 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,108 @@ +/************************************************************************* + * @@ -17544,10 +16942,8 @@ index 0000000..535ec66 + + + -diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src -index 3da9da5..0f48b1d 100644 ---- sc/source/ui/src/globstr.src -+++ sc/source/ui/src/globstr.src +--- sc/source/ui/src/globstr.src.old 2010-03-03 16:44:04.000000000 +0100 ++++ sc/source/ui/src/globstr.src 2010-03-03 16:59:35.000000000 +0100 @@ -1725,6 +1725,77 @@ Resource RID_GLOBSTR { Text [ en-US ] = "Unknown User"; @@ -17626,10 +17022,8 @@ index 3da9da5..0f48b1d 100644 String STR_STYLE_FAMILY_CELL { Text [ en-US ] = "Cell Styles"; -diff --git sc/source/ui/src/makefile.mk sc/source/ui/src/makefile.mk -index 4e17e44..c573d7e 100644 ---- sc/source/ui/src/makefile.mk -+++ sc/source/ui/src/makefile.mk +--- sc/source/ui/src/makefile.mk.old 2009-10-07 15:06:14.000000000 +0200 ++++ sc/source/ui/src/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -57,6 +57,7 @@ SRC1FILES = \ dbnamdlg.src \ subtdlg.src \ @@ -17638,10 +17032,8 @@ index 4e17e44..c573d7e 100644 autofmt.src \ solvrdlg.src \ optsolver.src \ -diff --git sc/source/ui/undo/undodat.cxx sc/source/ui/undo/undodat.cxx -index 4456b86..eb73af0 100644 ---- sc/source/ui/undo/undodat.cxx -+++ sc/source/ui/undo/undodat.cxx +--- sc/source/ui/undo/undodat.cxx.old 2010-03-03 16:59:18.000000000 +0100 ++++ sc/source/ui/undo/undodat.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -54,6 +54,8 @@ #include "dpobject.hxx" #include "attrib.hxx" @@ -17651,7 +17043,7 @@ index 4456b86..eb73af0 100644 // ----------------------------------------------------------------------- -@@ -74,6 +76,7 @@ TYPEINIT1(ScUndoRepeatDB, ScSimpleUndo); +@@ -74,6 +76,7 @@ TYPEINIT1(ScUndoRepeatDB, ScSi TYPEINIT1(ScUndoDataPilot, ScSimpleUndo); TYPEINIT1(ScUndoConsolidate, ScSimpleUndo); TYPEINIT1(ScUndoChartData, ScSimpleUndo); @@ -17659,7 +17051,7 @@ index 4456b86..eb73af0 100644 // ----------------------------------------------------------------------- -@@ -2182,8 +2185,210 @@ BOOL __EXPORT ScUndoChartData::CanRepeat(SfxRepeatTarget& /* rTarget */) const +@@ -2182,8 +2185,210 @@ BOOL __EXPORT ScUndoChartData::CanRepeat return FALSE; } @@ -17747,33 +17139,33 @@ index 4456b86..eb73af0 100644 +{ + return (rTarget.ISA(ScTabViewTarget)); +} - ++ +void ScUndoDataForm::DoChange( const BOOL bUndo ) +{ + ScDocument* pDoc = pDocShell->GetDocument(); - ++ + // RefUndoData for redo is created before first undo + // (with DeleteUnchanged after the DoUndo call) + BOOL bCreateRedoData = ( bUndo && pRefUndoData && !pRefRedoData ); + if ( bCreateRedoData ) + pRefRedoData = new ScRefUndoData( pDoc ); - -+ ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData; + ++ ScRefUndoData* pWorkRefData = bUndo ? pRefUndoData : pRefRedoData; + + // fuer Undo immer alle oder keine Inhalte sichern + USHORT nUndoFlags = IDF_NONE; + if (nFlags & IDF_CONTENTS) + nUndoFlags |= IDF_CONTENTS; + if (nFlags & IDF_ATTRIB) + nUndoFlags |= IDF_ATTRIB; -+ + + BOOL bPaintAll = FALSE; -+ -+ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); ++ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); ++ + // marking is in ScBlockUndo... + //ScUndoUtil::MarkSimpleBlock( pDocShell, aBlockRange ); - ++ + SCTAB nTabCount = pDoc->GetTableCount(); + if ( bUndo && !bRedoFilled ) + { @@ -17796,7 +17188,7 @@ index 4456b86..eb73af0 100644 + + USHORT nExtFlags = 0; + pDocShell->UpdatePaintExt( nExtFlags, aBlockRange ); -+ + + for ( sal_uInt16 i=0; i <= ( aBlockRange.aEnd.Col() - aBlockRange.aStart.Col() ); i++ ) + { + String aOldString; @@ -17805,7 +17197,7 @@ index 4456b86..eb73af0 100644 + } + + //ScRange aTabSelectRange = aBlockRange; -+ + + if (pWorkRefData) + { + pWorkRefData->DoUndo( pDoc, TRUE ); // TRUE = bSetChartRangeLists for SetChartListenerCollection @@ -17870,11 +17262,9 @@ index 4456b86..eb73af0 100644 + if (pViewShell) + pViewShell->CellContentChanged(); +} -diff --git sc/source/ui/unoobj/addruno.cxx sc/source/ui/unoobj/addruno.cxx -index f237a96..4bdf9bc 100644 ---- sc/source/ui/unoobj/addruno.cxx -+++ sc/source/ui/unoobj/addruno.cxx -@@ -72,7 +72,7 @@ void ScAddressConversionObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) +--- sc/source/ui/unoobj/addruno.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/unoobj/addruno.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -72,7 +72,7 @@ void ScAddressConversionObj::Notify( Sfx } } @@ -17883,7 +17273,7 @@ index f237a96..4bdf9bc 100644 { if (!pDocShell) return sal_False; -@@ -81,7 +81,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString ) +@@ -81,7 +81,7 @@ sal_Bool ScAddressConversionObj::ParseUI sal_Bool bSuccess = sal_False; if ( bIsRange ) { @@ -17892,7 +17282,7 @@ index f237a96..4bdf9bc 100644 if ( nResult & SCA_VALID ) { if ( ( nResult & SCA_TAB_3D ) == 0 ) -@@ -95,7 +95,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString ) +@@ -95,7 +95,7 @@ sal_Bool ScAddressConversionObj::ParseUI } else { @@ -17901,7 +17291,7 @@ index f237a96..4bdf9bc 100644 if ( nResult & SCA_VALID ) { if ( ( nResult & SCA_TAB_3D ) == 0 ) -@@ -119,6 +119,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp +@@ -119,6 +119,7 @@ uno::Reference<beans::XPropertySetInfo> { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellRangeAddress*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, @@ -17909,7 +17299,7 @@ index f237a96..4bdf9bc 100644 {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, {0,0,0,0,0,0} -@@ -132,6 +133,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp +@@ -132,6 +133,7 @@ uno::Reference<beans::XPropertySetInfo> { {MAP_CHAR_LEN(SC_UNONAME_ADDRESS), 0, &getCppuType((table::CellAddress*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, @@ -17917,7 +17307,7 @@ index f237a96..4bdf9bc 100644 {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_UIREPR), 0, &getCppuType((rtl::OUString*)0), 0, 0 }, {0,0,0,0,0,0} -@@ -193,8 +195,11 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr +@@ -193,8 +195,11 @@ void SAL_CALL ScAddressConversionObj::se bSuccess = ParseUIString( aUIString ); } } @@ -17930,7 +17320,7 @@ index f237a96..4bdf9bc 100644 // parse the file format string rtl::OUString sRepresentation; if (aValue >>= sRepresentation) -@@ -215,7 +220,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr +@@ -215,7 +220,7 @@ void SAL_CALL ScAddressConversionObj::se } // parse the rest like a UI string @@ -17939,7 +17329,7 @@ index f237a96..4bdf9bc 100644 } } else -@@ -268,17 +273,24 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString& +@@ -268,17 +273,24 @@ uno::Any SAL_CALL ScAddressConversionObj aRange.aStart.Format( aFormatStr, nFlags, pDoc ); aRet <<= rtl::OUString( aFormatStr ); } @@ -17967,10 +17357,8 @@ index f237a96..4bdf9bc 100644 aFormatStr.Append( aSecond ); } aRet <<= rtl::OUString( aFormatStr ); -diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx -index 9c380c7..51c16b1 100644 ---- sc/source/ui/unoobj/docuno.cxx -+++ sc/source/ui/unoobj/docuno.cxx +--- sc/source/ui/unoobj/docuno.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/ui/unoobj/docuno.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -100,7 +100,12 @@ #include <svx/unoshape.hxx> #endif @@ -17984,7 +17372,7 @@ index 9c380c7..51c16b1 100644 //------------------------------------------------------------------------ -@@ -116,6 +121,7 @@ const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap() +@@ -116,6 +121,7 @@ const SfxItemPropertyMapEntry* lcl_GetDo {MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, {MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0}, @@ -17992,7 +17380,7 @@ index 9c380c7..51c16b1 100644 {MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, &getBooleanCppuType(), 0, 0}, {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0}, -@@ -320,6 +326,7 @@ uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType ) +@@ -320,6 +326,7 @@ uno::Any SAL_CALL ScModelObj::queryInter SC_QUERYINTERFACE( view::XRenderable ) SC_QUERYINTERFACE( document::XLinkTargetSupplier ) SC_QUERYINTERFACE( beans::XPropertySet ) @@ -18000,7 +17388,7 @@ index 9c380c7..51c16b1 100644 SC_QUERYINTERFACE( lang::XMultiServiceFactory ) SC_QUERYINTERFACE( lang::XServiceInfo ) SC_QUERYINTERFACE( util::XChangesNotifier ) -@@ -1578,6 +1585,18 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa +@@ -1578,6 +1585,18 @@ uno::Any SAL_CALL ScModelObj::getPropert { aRet <<= pDocShell->GetDialogContainer(); } @@ -18019,7 +17407,7 @@ index 9c380c7..51c16b1 100644 else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) ) { aRet <<= getRuntimeUID(); -@@ -1751,6 +1770,39 @@ uno::Sequence<rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames() +@@ -1751,6 +1770,39 @@ uno::Sequence<rtl::OUString> SAL_CALL Sc return concatServiceNames( aMyServices, aDrawServices ); } @@ -18059,7 +17447,7 @@ index 9c380c7..51c16b1 100644 // XServiceInfo rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException) -@@ -1789,6 +1841,12 @@ sal_Int64 SAL_CALL ScModelObj::getSomething( +@@ -1789,6 +1841,12 @@ sal_Int64 SAL_CALL ScModelObj::getSometh return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this)); } @@ -18072,10 +17460,8 @@ index 9c380c7..51c16b1 100644 // aggregated number formats supplier has XUnoTunnel, too // interface from aggregated object must be obtained via queryAggregation -diff --git sc/source/ui/unoobj/servuno.cxx sc/source/ui/unoobj/servuno.cxx -index e36c88c..582a730 100644 ---- sc/source/ui/unoobj/servuno.cxx -+++ sc/source/ui/unoobj/servuno.cxx +--- sc/source/ui/unoobj/servuno.cxx.old 2009-10-19 13:27:16.000000000 +0200 ++++ sc/source/ui/unoobj/servuno.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -38,6 +38,7 @@ #include <svx/unofill.hxx> #include <svx/unonrule.hxx> @@ -18238,7 +17624,7 @@ index e36c88c..582a730 100644 //------------------------------------------------------------------------ // -@@ -119,7 +265,8 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] = +@@ -119,7 +265,8 @@ static const ProvNamesId_Type __FAR_DATA { SC_SERVICENAME_CHDATAPROV, SC_SERVICE_CHDATAPROV }, { SC_SERVICENAME_FORMULAPARS, SC_SERVICE_FORMULAPARS }, { SC_SERVICENAME_OPCODEMAPPER, SC_SERVICE_OPCODEMAPPER }, @@ -18248,7 +17634,7 @@ index e36c88c..582a730 100644 // case-correct versions of the service names (#i102468#) { "com.sun.star.text.textfield.URL", SC_SERVICE_URLFIELD }, { "com.sun.star.text.textfield.PageNumber", SC_SERVICE_PAGEFIELD }, -@@ -180,7 +327,9 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = +@@ -180,7 +327,9 @@ static const sal_Char* __FAR_DATA aOldNa "", // SC_SERVICE_SHEETDOCSET "", // SC_SERVICE_CHDATAPROV "", // SC_SERVICE_FORMULAPARS @@ -18259,7 +17645,7 @@ index e36c88c..582a730 100644 }; -@@ -385,6 +534,12 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( +@@ -385,6 +534,12 @@ uno::Reference<uno::XInterface> ScServic xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp)))); } break; @@ -18272,11 +17658,9 @@ index e36c88c..582a730 100644 } return xRet; } -diff --git sc/source/ui/unoobj/shapeuno.cxx sc/source/ui/unoobj/shapeuno.cxx -index 5396512..f4061da 100644 ---- sc/source/ui/unoobj/shapeuno.cxx -+++ sc/source/ui/unoobj/shapeuno.cxx -@@ -73,6 +73,8 @@ const SfxItemPropertyMapEntry* lcl_GetShapeMap() +--- sc/source/ui/unoobj/shapeuno.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/unoobj/shapeuno.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -73,6 +73,8 @@ const SfxItemPropertyMapEntry* lcl_GetSh {MAP_CHAR_LEN(SC_UNONAME_HORIPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_IMAGEMAP), 0, &getCppuType((uno::Reference<container::XIndexContainer>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_VERTPOS), 0, &getCppuType((sal_Int32*)0), 0, 0 }, @@ -18285,7 +17669,7 @@ index 5396512..f4061da 100644 {0,0,0,0,0,0} }; return aShapeMap_Impl; -@@ -87,6 +89,14 @@ const SvEventDescription* ScShapeObj::GetSupportedMacroItems() +@@ -87,6 +89,14 @@ const SvEventDescription* ScShapeObj::Ge }; return aMacroDescriptionsImpl; } @@ -18300,7 +17684,7 @@ index 5396512..f4061da 100644 //------------------------------------------------------------------------ -@@ -162,12 +172,12 @@ uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType ) +@@ -162,12 +172,12 @@ uno::Any SAL_CALL ScShapeObj::queryInter void SAL_CALL ScShapeObj::acquire() throw() { @@ -18315,7 +17699,7 @@ index 5396512..f4061da 100644 } void ScShapeObj::GetShapePropertySet() -@@ -638,6 +648,13 @@ void SAL_CALL ScShapeObj::setPropertyValue( +@@ -638,6 +648,13 @@ void SAL_CALL ScShapeObj::setPropertyVal } } } @@ -18329,7 +17713,7 @@ index 5396512..f4061da 100644 else { GetShapePropertySet(); -@@ -819,6 +836,13 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa +@@ -819,6 +836,13 @@ uno::Any SAL_CALL ScShapeObj::getPropert } } } @@ -18343,7 +17727,7 @@ index 5396512..f4061da 100644 else { GetShapePropertySet(); -@@ -1342,11 +1366,6 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() +@@ -1342,11 +1366,6 @@ SdrObject* ScShapeObj::GetSdrObject() co } #define SC_EVENTACC_ONCLICK ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ) @@ -18436,10 +17820,8 @@ index 5396512..f4061da 100644 } // XElementAccess -diff --git sc/source/ui/unoobj/viewuno.cxx sc/source/ui/unoobj/viewuno.cxx -index 7d14b34..1ce3b8c 100644 ---- sc/source/ui/unoobj/viewuno.cxx -+++ sc/source/ui/unoobj/viewuno.cxx +--- sc/source/ui/unoobj/viewuno.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/unoobj/viewuno.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -71,9 +71,13 @@ #include "gridwin.hxx" #include <com/sun/star/view/DocumentZoomType.hpp> @@ -18454,7 +17836,7 @@ index 7d14b34..1ce3b8c 100644 //------------------------------------------------------------------------ -@@ -459,6 +463,78 @@ void SAL_CALL ScViewPaneObj::release() throw() +@@ -459,6 +463,78 @@ void SAL_CALL ScViewPaneObj::release() t OWeakObject::release(); } @@ -18533,7 +17915,7 @@ index 7d14b34..1ce3b8c 100644 //------------------------------------------------------------------------ // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht -@@ -469,7 +545,8 @@ void SAL_CALL ScViewPaneObj::release() throw() +@@ -469,7 +545,8 @@ void SAL_CALL ScViewPaneObj::release() t //UNUSED2008-05 aPropSet( lcl_GetViewOptPropertyMap() ), //UNUSED2008-05 aMouseClickHandlers( 0 ), //UNUSED2008-05 aActivationListeners( 0 ), @@ -18543,16 +17925,15 @@ index 7d14b34..1ce3b8c 100644 //UNUSED2008-05 { //UNUSED2008-05 } -@@ -479,9 +556,22 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : +@@ -479,9 +556,22 @@ ScTabViewObj::ScTabViewObj( ScTabViewShe aPropSet( lcl_GetViewOptPropertyMap() ), aMouseClickHandlers( 0 ), aActivationListeners( 0 ), - bDrawSelModeSet(sal_False) --{ -- //! Listening oder so + bDrawSelModeSet(sal_False), + bFilteredRangeSelection(sal_True) -+{ + { +- //! Listening oder so + if( pViewSh ) + { + ScViewData* pViewData = pViewSh->GetViewData(); @@ -18569,7 +17950,7 @@ index 7d14b34..1ce3b8c 100644 } ScTabViewObj::~ScTabViewObj() -@@ -884,6 +974,15 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException) +@@ -884,6 +974,15 @@ uno::Any SAL_CALL ScTabViewObj::getSelec ScRange aRange; ScMarkType eMarkType = pViewData->GetSimpleArea(aRange); @@ -18585,7 +17966,7 @@ index 7d14b34..1ce3b8c 100644 if ( nTabs == 1 && (eMarkType == SC_MARK_SIMPLE) ) { if (aRange.aStart == aRange.aEnd) -@@ -1729,6 +1828,12 @@ void SAL_CALL ScTabViewObj::setPropertyValue( +@@ -1729,6 +1828,12 @@ void SAL_CALL ScTabViewObj::setPropertyV ScUnoGuard aGuard; String aString(aPropertyName); @@ -18598,7 +17979,7 @@ index 7d14b34..1ce3b8c 100644 ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { -@@ -1849,6 +1954,12 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty +@@ -1849,6 +1954,12 @@ uno::Any SAL_CALL ScTabViewObj::getPrope String aString(aPropertyName); uno::Any aRet; @@ -18611,10 +17992,8 @@ index 7d14b34..1ce3b8c 100644 ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) { -diff --git sc/source/ui/vba/excelvbahelper.cxx sc/source/ui/vba/excelvbahelper.cxx -index 49d1e34..9cb844a 100644 ---- sc/source/ui/vba/excelvbahelper.cxx -+++ sc/source/ui/vba/excelvbahelper.cxx +--- sc/source/ui/vba/excelvbahelper.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/excelvbahelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -44,6 +44,55 @@ namespace vba { namespace excel @@ -18671,7 +18050,7 @@ index 49d1e34..9cb844a 100644 void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ) { ScTabViewShell* pViewSh = excel::getBestViewShell( xModel ); -@@ -217,6 +266,7 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj ) +@@ -217,6 +266,7 @@ ScVbaCellRangeAccess::GetDataSet( ScCell return pDataSet; } @@ -18679,10 +18058,8 @@ index 49d1e34..9cb844a 100644 } //excel } //vba } //ooo -diff --git sc/source/ui/vba/excelvbahelper.hxx sc/source/ui/vba/excelvbahelper.hxx -index 9c95501..d97721e 100644 ---- sc/source/ui/vba/excelvbahelper.hxx -+++ sc/source/ui/vba/excelvbahelper.hxx +--- sc/source/ui/vba/excelvbahelper.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/excelvbahelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,6 +32,8 @@ #include<vbahelper/vbahelper.hxx> @@ -18703,10 +18080,8 @@ index 9c95501..d97721e 100644 class ScVbaCellRangeAccess { public: -diff --git sc/source/ui/vba/makefile.mk sc/source/ui/vba/makefile.mk -index 6aa6dda..8874026 100644 ---- sc/source/ui/vba/makefile.mk -+++ sc/source/ui/vba/makefile.mk +--- sc/source/ui/vba/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -35,7 +35,7 @@ PRJNAME=sc TARGET=vbaobj ENABLE_EXCEPTIONS=TRUE @@ -18755,10 +18130,8 @@ index 6aa6dda..8874026 100644 .ENDIF # --- Targets ------------------------------------------------------ -diff --git sc/source/ui/vba/service.cxx sc/source/ui/vba/service.cxx -index 43e8971..ae96007 100644 ---- sc/source/ui/vba/service.cxx -+++ sc/source/ui/vba/service.cxx +--- sc/source/ui/vba/service.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/service.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -69,6 +69,10 @@ namespace application { extern sdecl::ServiceDecl const serviceDecl; @@ -18799,11 +18172,8 @@ index 43e8971..ae96007 100644 OSL_TRACE("Ret is 0x%x", pRet); return pRet; } -diff --git sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log -new file mode 100644 -index 0000000..116f9f9 ---- /dev/null -+++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log +--- sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/testvba/TestDocuments/logs/unix/MiscOperatorTests.log 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,30 @@ +Test run started : 12/05/2009 12:36:15 +---------------------------------------------------------------- @@ -18835,11 +18205,9 @@ index 0000000..116f9f9 +END 'TestAddress + TEST OK : TestAddress +Test run finished : 12/05/2009 12:36:15 -diff --git sc/source/ui/vba/testvba/testvba.cxx sc/source/ui/vba/testvba/testvba.cxx -index 990a37a..058c874 100644 ---- sc/source/ui/vba/testvba/testvba.cxx -+++ sc/source/ui/vba/testvba/testvba.cxx -@@ -159,15 +159,15 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) +--- sc/source/ui/vba/testvba/testvba.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/vba/testvba/testvba.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -159,15 +159,15 @@ mxCompLoader( _xCompLoader ), msOutDirPa Reference< script::provider::XScript > xScript; try { @@ -18858,10 +18226,8 @@ index 990a37a..058c874 100644 } } OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); -diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx -index da8dc2f..0e3109a 100644 ---- sc/source/ui/vba/vbaapplication.cxx -+++ sc/source/ui/vba/vbaapplication.cxx +--- sc/source/ui/vba/vbaapplication.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaapplication.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -43,6 +43,9 @@ #include <ooo/vba/excel/XlMousePointer.hpp> #include <com/sun/star/sheet/XNamedRanges.hpp> @@ -18926,7 +18292,7 @@ index da8dc2f..0e3109a 100644 // Enable our own join detection for Intersection and Union // should be more efficient than using ScRangeList::Join ( because -@@ -147,16 +168,49 @@ ScVbaApplication::getAssistant() throw (uno::RuntimeException) +@@ -147,16 +168,49 @@ ScVbaApplication::getAssistant() throw ( return uno::Reference< XAssistant >( new ScVbaAssistant( this, mxContext ) ); } @@ -18964,7 +18330,8 @@ index da8dc2f..0e3109a 100644 + xPropSet->setPropertyValue( aPropName, aOldVal ); + + if (!aSelection.is()) -+ { + { +- uno::Reference< drawing::XShapes > xShapes( xModel->getCurrentSelection(), uno::UNO_QUERY_THROW ); + throw uno::RuntimeException( + rtl::OUString::createFromAscii("failed to obtain current selection"), + uno::Reference< uno::XInterface >() ); @@ -18974,13 +18341,12 @@ index da8dc2f..0e3109a 100644 + rtl::OUString sImplementationName = xServiceInfo->getImplementationName(); + + if( sImplementationName.equalsIgnoreAsciiCaseAscii("com.sun.star.drawing.SvxShapeCollection") ) - { -- uno::Reference< drawing::XShapes > xShapes( xModel->getCurrentSelection(), uno::UNO_QUERY_THROW ); ++ { + uno::Reference< drawing::XShapes > xShapes( aSelection, uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xShapes, uno::UNO_QUERY_THROW ); uno::Reference< drawing::XShape > xShape( xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW ); // if ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape -@@ -175,10 +229,10 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) +@@ -175,10 +229,10 @@ ScVbaApplication::getSelection() throw ( else if( xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRange")) || xServiceInfo->supportsService( rtl::OUString::createFromAscii("com.sun.star.sheet.SheetCellRanges"))) { @@ -18993,7 +18359,7 @@ index da8dc2f..0e3109a 100644 if ( xRanges.is() ) return uno::makeAny( uno::Reference< excel::XRange >( new ScVbaRange( this, mxContext, xRanges ) ) ); -@@ -187,7 +241,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) +@@ -187,7 +241,7 @@ ScVbaApplication::getSelection() throw ( } else { @@ -19002,7 +18368,7 @@ index da8dc2f..0e3109a 100644 } } -@@ -628,6 +682,33 @@ ScVbaApplication::getDisplayAlerts() throw (uno::RuntimeException) +@@ -628,6 +682,33 @@ ScVbaApplication::getDisplayAlerts() thr { return sal_True; } @@ -19036,7 +18402,7 @@ index da8dc2f..0e3109a 100644 void SAL_CALL ScVbaApplication::Calculate() throw( script::BasicErrorException , uno::RuntimeException ) { -@@ -1084,13 +1165,19 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc +@@ -1084,13 +1165,19 @@ ScVbaApplication::Volatile( const uno::A { sal_Bool bVolatile = sal_True; aVolatile >>= bVolatile; @@ -19060,7 +18426,7 @@ index da8dc2f..0e3109a 100644 ::sal_Bool SAL_CALL ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException ) { -@@ -1142,12 +1229,77 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeExcep +@@ -1142,12 +1229,77 @@ ScVbaApplication::Caller( const uno::Any return aRet; } @@ -19138,11 +18504,9 @@ index da8dc2f..0e3109a 100644 rtl::OUString& ScVbaApplication::getServiceImplName() { -diff --git sc/source/ui/vba/vbaapplication.hxx sc/source/ui/vba/vbaapplication.hxx -index 0679d1d..5418291 100644 ---- sc/source/ui/vba/vbaapplication.hxx -+++ sc/source/ui/vba/vbaapplication.hxx -@@ -47,6 +47,7 @@ class ScVbaApplication : public ScVbaApplication_BASE +--- sc/source/ui/vba/vbaapplication.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaapplication.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -47,6 +47,7 @@ class ScVbaApplication : public ScVbaApp private: sal_Int32 m_xCalculation; rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException ); @@ -19184,10 +18548,8 @@ index 0679d1d..5418291 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -diff --git sc/source/ui/vba/vbacomment.cxx sc/source/ui/vba/vbacomment.cxx -index 5d70dde..962f6fa 100644 ---- sc/source/ui/vba/vbacomment.cxx -+++ sc/source/ui/vba/vbacomment.cxx +--- sc/source/ui/vba/vbacomment.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/vba/vbacomment.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -34,6 +34,7 @@ #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp> #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp> @@ -19196,7 +18558,7 @@ index 5d70dde..962f6fa 100644 #include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/XCell.hpp> #include <com/sun/star/text/XText.hpp> -@@ -161,8 +162,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An +@@ -161,8 +162,7 @@ ScVbaComment::Text( const uno::Any& aTex aText >>= sText; uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY_THROW ); @@ -19206,7 +18568,7 @@ index 5d70dde..962f6fa 100644 if ( aStart.hasValue() ) { sal_Int16 nStart = 0; -@@ -194,8 +194,13 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An +@@ -194,8 +194,13 @@ ScVbaComment::Text( const uno::Any& aTex throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScVbaComment::Text - bad Start value " ) ), uno::Reference< uno::XInterface >() ); } else if ( aText.hasValue() ) @@ -19221,10 +18583,8 @@ index 5d70dde..962f6fa 100644 return sAnnoText; } -diff --git sc/source/ui/vba/vbadialog.cxx sc/source/ui/vba/vbadialog.cxx -index c8dd768..92274d7 100644 ---- sc/source/ui/vba/vbadialog.cxx -+++ sc/source/ui/vba/vbadialog.cxx +--- sc/source/ui/vba/vbadialog.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbadialog.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,42 +32,58 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; @@ -19324,10 +18684,8 @@ index c8dd768..92274d7 100644 + return nDialogSize; +} \ No newline at end of file -diff --git sc/source/ui/vba/vbadialog.hxx sc/source/ui/vba/vbadialog.hxx -index e35621b..a3ff40a 100644 ---- sc/source/ui/vba/vbadialog.hxx -+++ sc/source/ui/vba/vbadialog.hxx +--- sc/source/ui/vba/vbadialog.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbadialog.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -48,6 +48,9 @@ public: // XHelperInterface virtual rtl::OUString& getServiceImplName(); @@ -19338,10 +18696,8 @@ index e35621b..a3ff40a 100644 }; #endif /* SC_VBA_DIALOG_HXX */ -diff --git sc/source/ui/vba/vbadialogs.cxx sc/source/ui/vba/vbadialogs.cxx -index c5d92a8..f0841e4 100644 ---- sc/source/ui/vba/vbadialogs.cxx -+++ sc/source/ui/vba/vbadialogs.cxx +--- sc/source/ui/vba/vbadialogs.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbadialogs.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -67,5 +67,13 @@ ScVbaDialogs::getServiceNames() return aServiceNames; } @@ -19356,10 +18712,8 @@ index c5d92a8..f0841e4 100644 + -diff --git sc/source/ui/vba/vbadialogs.hxx sc/source/ui/vba/vbadialogs.hxx -index 32989a3..e63f29b 100644 ---- sc/source/ui/vba/vbadialogs.hxx -+++ sc/source/ui/vba/vbadialogs.hxx +--- sc/source/ui/vba/vbadialogs.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbadialogs.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -47,6 +47,7 @@ public: // XCollection @@ -19368,11 +18722,8 @@ index 32989a3..e63f29b 100644 // XDialogs virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); -diff --git sc/source/ui/vba/vbaeventshelper.cxx sc/source/ui/vba/vbaeventshelper.cxx -new file mode 100644 -index 0000000..a22702d ---- /dev/null -+++ sc/source/ui/vba/vbaeventshelper.cxx +--- sc/source/ui/vba/vbaeventshelper.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbaeventshelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,1065 @@ +/************************************************************************* + * @@ -20439,11 +19790,8 @@ index 0000000..a22702d + "ScVbaEventsHelper", + "com.sun.star.sheet.SpreadsheetDocumentVbaEventsHelper" ); +} -diff --git sc/source/ui/vba/vbaeventshelper.hxx sc/source/ui/vba/vbaeventshelper.hxx -new file mode 100644 -index 0000000..28b141e ---- /dev/null -+++ sc/source/ui/vba/vbaeventshelper.hxx +--- sc/source/ui/vba/vbaeventshelper.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbaeventshelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,90 @@ +/************************************************************************* + * @@ -20535,11 +19883,8 @@ index 0000000..28b141e + +#endif + -diff --git sc/source/ui/vba/vbafiledialog.cxx sc/source/ui/vba/vbafiledialog.cxx -new file mode 100644 -index 0000000..751233b ---- /dev/null -+++ sc/source/ui/vba/vbafiledialog.cxx +--- sc/source/ui/vba/vbafiledialog.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbafiledialog.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,168 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -20709,11 +20054,8 @@ index 0000000..751233b + + + -diff --git sc/source/ui/vba/vbafiledialog.hxx sc/source/ui/vba/vbafiledialog.hxx -new file mode 100644 -index 0000000..e9fd9c5 ---- /dev/null -+++ sc/source/ui/vba/vbafiledialog.hxx +--- sc/source/ui/vba/vbafiledialog.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbafiledialog.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,43 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -20759,11 +20101,8 @@ index 0000000..e9fd9c5 + +#endif \ No newline at end of file -diff --git sc/source/ui/vba/vbafiledialogselecteditems.cxx sc/source/ui/vba/vbafiledialogselecteditems.cxx -new file mode 100644 -index 0000000..1c23a60 ---- /dev/null -+++ sc/source/ui/vba/vbafiledialogselecteditems.cxx +--- sc/source/ui/vba/vbafiledialogselecteditems.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbafiledialogselecteditems.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,139 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -20904,11 +20243,8 @@ index 0000000..1c23a60 + + + -diff --git sc/source/ui/vba/vbafiledialogselecteditems.hxx sc/source/ui/vba/vbafiledialogselecteditems.hxx -new file mode 100644 -index 0000000..142b6fe ---- /dev/null -+++ sc/source/ui/vba/vbafiledialogselecteditems.hxx +--- sc/source/ui/vba/vbafiledialogselecteditems.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbafiledialogselecteditems.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,69 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -20979,11 +20315,8 @@ index 0000000..142b6fe +}; + +#endif -diff --git sc/source/ui/vba/vbafilesearch.cxx sc/source/ui/vba/vbafilesearch.cxx -new file mode 100644 -index 0000000..725cda7 ---- /dev/null -+++ sc/source/ui/vba/vbafilesearch.cxx +--- sc/source/ui/vba/vbafilesearch.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbafilesearch.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,201 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -21186,11 +20519,8 @@ index 0000000..725cda7 + m_bMatchTextExactly = false; +} + -diff --git sc/source/ui/vba/vbafilesearch.hxx sc/source/ui/vba/vbafilesearch.hxx -new file mode 100644 -index 0000000..4dc84d8 ---- /dev/null -+++ sc/source/ui/vba/vbafilesearch.hxx +--- sc/source/ui/vba/vbafilesearch.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbafilesearch.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,47 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -21239,11 +20569,9 @@ index 0000000..4dc84d8 + + +#endif /* SC_VBA_FILESEARCH_HXX */ -diff --git sc/source/ui/vba/vbaglobals.cxx sc/source/ui/vba/vbaglobals.cxx -index 048375a..8533e8a 100644 ---- sc/source/ui/vba/vbaglobals.cxx -+++ sc/source/ui/vba/vbaglobals.cxx -@@ -222,6 +222,12 @@ ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException) +--- sc/source/ui/vba/vbaglobals.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaglobals.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -222,6 +222,12 @@ ScVbaGlobals::Rows( const uno::Any& aInd } @@ -21256,11 +20584,9 @@ index 048375a..8533e8a 100644 uno::Sequence< ::rtl::OUString > SAL_CALL ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) { -diff --git sc/source/ui/vba/vbaglobals.hxx sc/source/ui/vba/vbaglobals.hxx -index 4955f5e..9e508ed 100644 ---- sc/source/ui/vba/vbaglobals.hxx -+++ sc/source/ui/vba/vbaglobals.hxx -@@ -86,6 +86,8 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc +--- sc/source/ui/vba/vbaglobals.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaglobals.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -86,6 +86,8 @@ typedef ::cppu::ImplInheritanceHelper1< virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException); @@ -21269,11 +20595,8 @@ index 4955f5e..9e508ed 100644 // XMultiServiceFactory -diff --git sc/source/ui/vba/vbamenu.cxx sc/source/ui/vba/vbamenu.cxx -new file mode 100644 -index 0000000..58972b0 ---- /dev/null -+++ sc/source/ui/vba/vbamenu.cxx +--- sc/source/ui/vba/vbamenu.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenu.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,91 @@ +/************************************************************************* + * @@ -21366,11 +20689,8 @@ index 0000000..58972b0 + } + return aServiceNames; +} -diff --git sc/source/ui/vba/vbamenu.hxx sc/source/ui/vba/vbamenu.hxx -new file mode 100644 -index 0000000..cd96857 ---- /dev/null -+++ sc/source/ui/vba/vbamenu.hxx +--- sc/source/ui/vba/vbamenu.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenu.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -21434,11 +20754,8 @@ index 0000000..cd96857 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif//SC_VBA_MENU_HXX -diff --git sc/source/ui/vba/vbamenubar.cxx sc/source/ui/vba/vbamenubar.cxx -new file mode 100644 -index 0000000..9386028 ---- /dev/null -+++ sc/source/ui/vba/vbamenubar.cxx +--- sc/source/ui/vba/vbamenubar.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenubar.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,74 @@ +/************************************************************************* + * @@ -21514,11 +20831,8 @@ index 0000000..9386028 + } + return aServiceNames; +} -diff --git sc/source/ui/vba/vbamenubar.hxx sc/source/ui/vba/vbamenubar.hxx -new file mode 100644 -index 0000000..fa39054 ---- /dev/null -+++ sc/source/ui/vba/vbamenubar.hxx +--- sc/source/ui/vba/vbamenubar.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenubar.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -21578,11 +20892,8 @@ index 0000000..fa39054 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif//SC_VBA_MENUBAR_HXX -diff --git sc/source/ui/vba/vbamenubars.cxx sc/source/ui/vba/vbamenubars.cxx -new file mode 100644 -index 0000000..a5f9e9b ---- /dev/null -+++ sc/source/ui/vba/vbamenubars.cxx +--- sc/source/ui/vba/vbamenubars.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenubars.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,146 @@ +/************************************************************************* + * @@ -21730,11 +21041,8 @@ index 0000000..a5f9e9b + return aServiceNames; +} + -diff --git sc/source/ui/vba/vbamenubars.hxx sc/source/ui/vba/vbamenubars.hxx -new file mode 100644 -index 0000000..0d8ea58 ---- /dev/null -+++ sc/source/ui/vba/vbamenubars.hxx +--- sc/source/ui/vba/vbamenubars.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenubars.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,69 @@ +/************************************************************************* + * @@ -21805,11 +21113,8 @@ index 0000000..0d8ea58 +}; + +#endif//SC_VBA_MENUBARS_HXX -diff --git sc/source/ui/vba/vbamenuitem.cxx sc/source/ui/vba/vbamenuitem.cxx -new file mode 100644 -index 0000000..48254cc ---- /dev/null -+++ sc/source/ui/vba/vbamenuitem.cxx +--- sc/source/ui/vba/vbamenuitem.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenuitem.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,90 @@ +/************************************************************************* + * @@ -21901,11 +21206,8 @@ index 0000000..48254cc + } + return aServiceNames; +} -diff --git sc/source/ui/vba/vbamenuitem.hxx sc/source/ui/vba/vbamenuitem.hxx -new file mode 100644 -index 0000000..bf4c087 ---- /dev/null -+++ sc/source/ui/vba/vbamenuitem.hxx +--- sc/source/ui/vba/vbamenuitem.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenuitem.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,63 @@ +/************************************************************************* + * @@ -21970,11 +21272,8 @@ index 0000000..bf4c087 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif//SC_VBA_MENUITEM_HXX -diff --git sc/source/ui/vba/vbamenuitems.cxx sc/source/ui/vba/vbamenuitems.cxx -new file mode 100644 -index 0000000..3a5cd79 ---- /dev/null -+++ sc/source/ui/vba/vbamenuitems.cxx +--- sc/source/ui/vba/vbamenuitems.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenuitems.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,159 @@ +/************************************************************************* + * @@ -22135,11 +21434,8 @@ index 0000000..3a5cd79 + return aServiceNames; +} + -diff --git sc/source/ui/vba/vbamenuitems.hxx sc/source/ui/vba/vbamenuitems.hxx -new file mode 100644 -index 0000000..8aeb931 ---- /dev/null -+++ sc/source/ui/vba/vbamenuitems.hxx +--- sc/source/ui/vba/vbamenuitems.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenuitems.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,68 @@ +/************************************************************************* + * @@ -22209,11 +21505,8 @@ index 0000000..8aeb931 +}; + +#endif//SC_VBA_MENUITEMS_HXX -diff --git sc/source/ui/vba/vbamenus.cxx sc/source/ui/vba/vbamenus.cxx -new file mode 100644 -index 0000000..7d5a21b ---- /dev/null -+++ sc/source/ui/vba/vbamenus.cxx +--- sc/source/ui/vba/vbamenus.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenus.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,145 @@ +/************************************************************************* + * @@ -22360,11 +21653,8 @@ index 0000000..7d5a21b + return aServiceNames; +} + -diff --git sc/source/ui/vba/vbamenus.hxx sc/source/ui/vba/vbamenus.hxx -new file mode 100644 -index 0000000..596127e ---- /dev/null -+++ sc/source/ui/vba/vbamenus.hxx +--- sc/source/ui/vba/vbamenus.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbamenus.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,68 @@ +/************************************************************************* + * @@ -22434,11 +21724,9 @@ index 0000000..596127e +}; + +#endif//SC_VBA_MENUS_HXX -diff --git sc/source/ui/vba/vbaname.cxx sc/source/ui/vba/vbaname.cxx -index eb01e88..7e60666 100644 ---- sc/source/ui/vba/vbaname.cxx -+++ sc/source/ui/vba/vbaname.cxx -@@ -72,8 +72,8 @@ ScVbaName::getWorkSheet() throw (css::uno::RuntimeException) +--- sc/source/ui/vba/vbaname.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaname.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -72,8 +72,8 @@ ScVbaName::getWorkSheet() throw (css::un ScVbaName::getName() throw (css::uno::RuntimeException) { String sName; @@ -22449,11 +21737,9 @@ index eb01e88..7e60666 100644 sName += UniString ( mxNamedRange->getName() ); return ::rtl::OUString( sName ); } -diff --git sc/source/ui/vba/vbapagebreaks.cxx sc/source/ui/vba/vbapagebreaks.cxx -index 29d6b23..9b49f83 100644 ---- sc/source/ui/vba/vbapagebreaks.cxx -+++ sc/source/ui/vba/vbapagebreaks.cxx -@@ -118,10 +118,13 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount( ) throw (uno::RuntimeException) +--- sc/source/ui/vba/vbapagebreaks.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbapagebreaks.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -118,10 +118,13 @@ sal_Int32 SAL_CALL RangePageBreaks::getC for( sal_Int32 i=0; i<nLength; i++ ) { sal_Int32 nPos = aTablePageBreakData[i].Position; @@ -22471,7 +21757,7 @@ index 29d6b23..9b49f83 100644 } return nCount; -@@ -156,17 +159,9 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI +@@ -156,17 +159,9 @@ sheet::TablePageBreakData RangePageBreak uno::Sequence<sheet::TablePageBreakData> aTablePageBreakDataList = getAllPageBreaks(); sal_Int32 nLength = aTablePageBreakDataList.getLength(); @@ -22492,11 +21778,9 @@ index 29d6b23..9b49f83 100644 return aTablePageBreakData; } -diff --git sc/source/ui/vba/vbapivotcache.cxx sc/source/ui/vba/vbapivotcache.cxx -index 59326c2..1a2f603 100644 ---- sc/source/ui/vba/vbapivotcache.cxx -+++ sc/source/ui/vba/vbapivotcache.cxx -@@ -37,6 +37,17 @@ ScVbaPivotCache::ScVbaPivotCache( const uno::Reference< XHelperInterface >& xPar +--- sc/source/ui/vba/vbapivotcache.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/vba/vbapivotcache.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -37,6 +37,17 @@ ScVbaPivotCache::ScVbaPivotCache( const { } @@ -22514,11 +21798,9 @@ index 59326c2..1a2f603 100644 void SAL_CALL ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException) { -diff --git sc/source/ui/vba/vbapivotcache.hxx sc/source/ui/vba/vbapivotcache.hxx -index 5d2570e..e00662c 100644 ---- sc/source/ui/vba/vbapivotcache.hxx -+++ sc/source/ui/vba/vbapivotcache.hxx -@@ -43,6 +43,10 @@ class ScVbaPivotCache : public PivotCacheImpl_BASE +--- sc/source/ui/vba/vbapivotcache.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbapivotcache.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -43,6 +43,10 @@ class ScVbaPivotCache : public PivotCach css::uno::Reference< css::sheet::XDataPilotTable > m_xTable; public: ScVbaPivotCache( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); @@ -22529,11 +21811,8 @@ index 5d2570e..e00662c 100644 virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString& getServiceImplName(); -diff --git sc/source/ui/vba/vbaquerytable.cxx sc/source/ui/vba/vbaquerytable.cxx -new file mode 100644 -index 0000000..81a1d9b ---- /dev/null -+++ sc/source/ui/vba/vbaquerytable.cxx +--- sc/source/ui/vba/vbaquerytable.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbaquerytable.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,71 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -22606,11 +21885,8 @@ index 0000000..81a1d9b +} + + -diff --git sc/source/ui/vba/vbaquerytable.hxx sc/source/ui/vba/vbaquerytable.hxx -new file mode 100644 -index 0000000..5458b33 ---- /dev/null -+++ sc/source/ui/vba/vbaquerytable.hxx +--- sc/source/ui/vba/vbaquerytable.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sc/source/ui/vba/vbaquerytable.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,41 @@ +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -22653,10 +21929,8 @@ index 0000000..5458b33 +}; + +#endif -diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx -index 0783ed8..f9ab354 100644 ---- sc/source/ui/vba/vbarange.cxx -+++ sc/source/ui/vba/vbarange.cxx +--- sc/source/ui/vba/vbarange.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbarange.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -94,6 +94,15 @@ #include <com/sun/star/sheet/XSubTotalDescriptor.hpp> #include <com/sun/star/sheet/GeneralFunction.hdl> @@ -22696,7 +21970,7 @@ index 0783ed8..f9ab354 100644 if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) ) { uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW ); -@@ -1102,6 +1114,24 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S +@@ -1102,6 +1114,24 @@ bool getScRangeListForAddress( const rtl formula::FormulaGrammar::AddressConvention eConv = aConv; // spaces are illegal ( but the user of course can enter them ) rtl::OUString sAddress = (*it).trim(); @@ -22721,7 +21995,7 @@ index 0783ed8..f9ab354 100644 if ( xNameAccess->hasByName( sAddress ) ) { uno::Reference< sheet::XNamedRange > xNamed( xNameAccess->getByName( sAddress ), uno::UNO_QUERY_THROW ); -@@ -1739,7 +1769,16 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException) +@@ -1739,7 +1769,16 @@ ScVbaRange::getFormulaArray() throw (uno uno::Reference< sheet::XCellRangeFormula> xCellRangeFormula( mxRange, uno::UNO_QUERY_THROW ); uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext ); uno::Any aMatrix; @@ -22739,7 +22013,7 @@ index 0783ed8..f9ab354 100644 return aMatrix; } -@@ -2242,7 +2281,8 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) +@@ -2242,7 +2281,8 @@ ScVbaRange::Cut(const ::uno::Any& Destin uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY); xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() ); } @@ -22749,7 +22023,7 @@ index 0783ed8..f9ab354 100644 uno::Reference< frame::XModel > xModel = getModelFromRange( mxRange ); Select(); excel::implnCut( xModel ); -@@ -2557,8 +2597,6 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons +@@ -2557,8 +2597,6 @@ ScVbaRange::PasteSpecial( const uno::Any uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW ); uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -22758,7 +22032,7 @@ index 0783ed8..f9ab354 100644 // select this range xSelection->select( uno::makeAny( mxRange ) ); // set up defaults -@@ -2579,8 +2617,6 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons +@@ -2579,8 +2617,6 @@ ScVbaRange::PasteSpecial( const uno::Any USHORT nFlags = getPasteFlags(nPaste); USHORT nFormulaBits = getPasteFormulaBits(nOperation); excel::implnPasteSpecial(pShell->GetModel(), nFlags,nFormulaBits,bSkipBlanks,bTranspose); @@ -22767,7 +22041,7 @@ index 0783ed8..f9ab354 100644 } uno::Reference< excel::XRange > -@@ -2630,11 +2666,12 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException) +@@ -2630,11 +2666,12 @@ ScVbaRange::AddComment( const uno::Any& { uno::Reference< excel::XComment > xComment( new ScVbaComment( this, mxContext, mxRange ) ); @@ -22785,7 +22059,7 @@ index 0783ed8..f9ab354 100644 return xComment; } -@@ -2943,6 +2980,13 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L +@@ -2943,6 +2980,13 @@ ScVbaRange::Find( const uno::Any& What, uno::Reference< util::XSearchDescriptor > xSearchDescriptor( xDescriptor, uno::UNO_QUERY ); uno::Reference< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xSearchDescriptor) : xSearch->findFirst( xSearchDescriptor ); uno::Reference< table::XCellRange > xCellRange( xInterface, uno::UNO_QUERY ); @@ -22799,7 +22073,7 @@ index 0783ed8..f9ab354 100644 if ( xCellRange.is() ) { uno::Reference< excel::XRange > xResultRange = new ScVbaRange( this, mxContext, xCellRange ); -@@ -3929,56 +3973,12 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC +@@ -3929,56 +3973,12 @@ ScVbaRange::ApplicationRange( const uno: return pRange->Range( Cell1, Cell2, true ); } @@ -22857,7 +22131,7 @@ index 0783ed8..f9ab354 100644 OSL_TRACE("lcl_GetDBData_Impl got autofilter range %s for sheet %d", rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() , nSheet ); ScDBData* pRet = NULL; -@@ -4145,7 +4145,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const +@@ -4145,7 +4145,7 @@ ScVbaRange::AutoFilter( const uno::Any& ScDocShell* pShell = getScDocShell(); sal_Bool bHasAuto = sal_False; rtl::OUString sAutofiltRangeName; @@ -22866,7 +22140,7 @@ index 0783ed8..f9ab354 100644 if ( xDataBaseRange.is() ) bHasAuto = true; -@@ -4178,7 +4178,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const +@@ -4178,7 +4178,7 @@ ScVbaRange::AutoFilter( const uno::Any& autoFiltAddress = multiCellRange.getCellRangeAddressable()->getRangeAddress(); } @@ -22875,7 +22149,7 @@ index 0783ed8..f9ab354 100644 if ( xDBRanges.is() ) { rtl::OUString sGenName( RTL_CONSTASCII_USTRINGPARAM("VBA_Autofilter_") ); -@@ -4691,6 +4691,24 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru +@@ -4691,6 +4691,24 @@ void ScVbaRange::setShowDetail(const uno } } @@ -22900,7 +22174,7 @@ index 0783ed8..f9ab354 100644 uno::Reference< excel::XRange > SAL_CALL ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException) { -@@ -4720,6 +4738,118 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio +@@ -4720,6 +4738,118 @@ ScVbaRange::MergeArea() throw (script::B return new ScVbaRange( getParent(),mxContext,mxRange ); } @@ -23019,7 +22293,7 @@ index 0783ed8..f9ab354 100644 void SAL_CALL ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException) { -@@ -5378,6 +5508,42 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: +@@ -5378,6 +5508,42 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGrou } } @@ -23088,10 +22362,8 @@ index 0783ed8..f9ab354 100644 namespace range { namespace sdecl = comphelper::service_decl; -diff --git sc/source/ui/vba/vbarange.hxx sc/source/ui/vba/vbarange.hxx -index 74d1875..bf12860 100644 ---- sc/source/ui/vba/vbarange.hxx -+++ sc/source/ui/vba/vbarange.hxx +--- sc/source/ui/vba/vbarange.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbarange.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -38,6 +38,7 @@ #include <ooo/vba/excel/XFont.hpp> #include <ooo/vba/excel/XComment.hpp> @@ -23108,7 +22380,7 @@ index 74d1875..bf12860 100644 //#include <vbahelper/vbahelperinterface.hxx> #include "vbaformat.hxx" -@@ -100,6 +102,7 @@ class ScVbaRange : public ScVbaRange_BASE +@@ -100,6 +102,7 @@ class ScVbaRange : public ScVbaRange_BAS sal_Bool mbIsRows; sal_Bool mbIsColumns; css::uno::Reference< ov::excel::XValidation > m_xValidation; @@ -23144,10 +22416,8 @@ index 74d1875..bf12860 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -diff --git sc/source/ui/vba/vbawindow.cxx sc/source/ui/vba/vbawindow.cxx -index c05b314..a612f59 100644 ---- sc/source/ui/vba/vbawindow.cxx -+++ sc/source/ui/vba/vbawindow.cxx +--- sc/source/ui/vba/vbawindow.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbawindow.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -59,7 +59,7 @@ using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; @@ -23157,11 +22427,9 @@ index c05b314..a612f59 100644 typedef std::hash_map< rtl::OUString, SCTAB, ::rtl::OUStringHash, -diff --git sc/source/ui/vba/vbaworkbook.cxx sc/source/ui/vba/vbaworkbook.cxx -index 5a97ed8..08a3195 100644 ---- sc/source/ui/vba/vbaworkbook.cxx -+++ sc/source/ui/vba/vbaworkbook.cxx -@@ -187,6 +187,24 @@ ScVbaWorkbook::FileFormat( ) throw (::script::BasicErrorException, ::uno::Runti +--- sc/source/ui/vba/vbaworkbook.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaworkbook.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -187,6 +187,24 @@ ScVbaWorkbook::FileFormat( ) throw (::s return aFileFormat; } @@ -23186,7 +22454,7 @@ index 5a97ed8..08a3195 100644 void ScVbaWorkbook::init() { -@@ -264,6 +282,12 @@ ScVbaWorkbook::Activate() throw (uno::RuntimeException) +@@ -264,6 +282,12 @@ ScVbaWorkbook::Activate() throw (uno::Ru VbaDocumentBase::Activate(); } @@ -23199,7 +22467,7 @@ index 5a97ed8..08a3195 100644 ::sal_Bool ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException) { -@@ -299,6 +323,24 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::Runtime +@@ -299,6 +323,24 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OU xStor->storeToURL( aURL, storeProps ); } @@ -23224,11 +22492,9 @@ index 5a97ed8..08a3195 100644 css::uno::Any SAL_CALL ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException) { -diff --git sc/source/ui/vba/vbaworkbook.hxx sc/source/ui/vba/vbaworkbook.hxx -index 8d3d493..8583c5d 100644 ---- sc/source/ui/vba/vbaworkbook.hxx -+++ sc/source/ui/vba/vbaworkbook.hxx -@@ -44,6 +44,8 @@ class ScVbaWorkbook : public ScVbaWorkbook_BASE +--- sc/source/ui/vba/vbaworkbook.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaworkbook.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -44,6 +44,8 @@ class ScVbaWorkbook : public ScVbaWorkbo static css::uno::Sequence< sal_Int32 > ColorData; void initColorData( const css::uno::Sequence< sal_Int32 >& sColors ); void init(); @@ -23254,10 +22520,8 @@ index 8d3d493..8583c5d 100644 // code name virtual ::rtl::OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); virtual void SAL_CALL setCodeName( const ::rtl::OUString& sGlobCodeName ) throw (css::uno::RuntimeException); -diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx -index 0b8ac90..5584cab 100644 ---- sc/source/ui/vba/vbaworksheet.cxx -+++ sc/source/ui/vba/vbaworksheet.cxx +--- sc/source/ui/vba/vbaworksheet.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaworksheet.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -77,7 +77,7 @@ #include "cellsuno.hxx" @@ -23276,7 +22540,7 @@ index 0b8ac90..5584cab 100644 { if (!xSpreadDoc.is()) throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); -@@ -409,6 +409,18 @@ ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException) +@@ -409,6 +409,18 @@ ScVbaWorksheet::getProtectContents()thro sal_Bool ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException) { @@ -23295,7 +22559,7 @@ index 0b8ac90..5584cab 100644 return false; } -@@ -557,13 +569,25 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException) +@@ -557,13 +569,25 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB o uno::Reference< excel::XWorksheet > ScVbaWorksheet::getNext() throw (uno::RuntimeException) { @@ -23323,7 +22587,7 @@ index 0b8ac90..5584cab 100644 } -@@ -647,7 +671,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti +@@ -647,7 +671,7 @@ ScVbaWorksheet::ChartObjects( const uno: uno::Reference< table::XTableChartsSupplier > xChartSupplier( getSheet(), uno::UNO_QUERY_THROW ); uno::Reference< table::XTableCharts > xTableCharts = xChartSupplier->getCharts(); @@ -23341,7 +22605,7 @@ index 0b8ac90..5584cab 100644 uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); SCTAB nTab = 0; rtl::OUString aSheetName = getName(); -@@ -906,7 +930,7 @@ ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException) +@@ -906,7 +930,7 @@ ScVbaWorksheet::getCodeName() throw (css throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); #endif } @@ -23350,7 +22614,7 @@ index 0b8ac90..5584cab 100644 void SAL_CALL ScVbaWorksheet::setCodeName( const rtl::OUString& sCodeName ) throw (css::uno::RuntimeException) { -@@ -936,7 +960,7 @@ ScVbaWorksheet::setCodeName( const rtl::OUString& ) throw (css::uno::RuntimeExce +@@ -936,7 +960,7 @@ ScVbaWorksheet::setCodeName( const rtl:: sal_Int16 ScVbaWorksheet::getSheetID() throw (uno::RuntimeException) { @@ -23359,7 +22623,7 @@ index 0b8ac90..5584cab 100644 return xAddressable->getRangeAddress().Sheet; } -@@ -963,6 +987,50 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::A +@@ -963,6 +987,50 @@ ScVbaWorksheet::PrintOut( const uno::Any PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection ); } @@ -23410,10 +22674,8 @@ index 0b8ac90..5584cab 100644 namespace worksheet { namespace sdecl = comphelper::service_decl; -diff --git sc/source/ui/vba/vbaworksheet.hxx sc/source/ui/vba/vbaworksheet.hxx -index 09a2dfd..3324753 100644 ---- sc/source/ui/vba/vbaworksheet.hxx -+++ sc/source/ui/vba/vbaworksheet.hxx +--- sc/source/ui/vba/vbaworksheet.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/source/ui/vba/vbaworksheet.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -46,6 +46,7 @@ #include <ooo/vba/excel/XHPageBreaks.hpp> #include <ooo/vba/excel/XVPageBreaks.hpp> @@ -23432,11 +22694,9 @@ index 09a2dfd..3324753 100644 virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); -diff --git sc/source/ui/vba/vbawsfunction.cxx sc/source/ui/vba/vbawsfunction.cxx -index 1cad91c..c82b753 100644 ---- sc/source/ui/vba/vbawsfunction.cxx -+++ sc/source/ui/vba/vbawsfunction.cxx -@@ -74,13 +74,58 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< +--- sc/source/ui/vba/vbawsfunction.cxx.old 2009-10-07 15:06:15.000000000 +0200 ++++ sc/source/ui/vba/vbawsfunction.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -74,13 +74,58 @@ ScVbaWSFunction::invoke(const rtl::OUStr for (int i=0; i < Params.getLength();i++) { @@ -23496,7 +22756,7 @@ index 1cad91c..c82b753 100644 } for ( int count=0; count < aParamTemp.getLength(); ++count ) -@@ -88,12 +133,13 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< +@@ -88,12 +133,13 @@ ScVbaWSFunction::invoke(const rtl::OUStr count, rtl::OUStringToOString( comphelper::anyToString( aParamTemp[count] ), RTL_TEXTENCODING_UTF8 ).getStr() ); uno::Any aRet = xFunctionAccess->callFunction(FunctionName,aParamTemp); @@ -23511,11 +22771,9 @@ index 1cad91c..c82b753 100644 { double fVal = 0.0; if( aRet >>= fVal ) -diff --git sc/source/ui/view/cellsh2.cxx sc/source/ui/view/cellsh2.cxx -index 974c086..a54ea74 100644 ---- sc/source/ui/view/cellsh2.cxx -+++ sc/source/ui/view/cellsh2.cxx -@@ -336,6 +336,20 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) +--- sc/source/ui/view/cellsh2.cxx.old 2010-03-03 16:59:10.000000000 +0100 ++++ sc/source/ui/view/cellsh2.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -336,6 +336,20 @@ void ScCellShell::ExecuteDB( SfxRequest& } break; @@ -23536,10 +22794,8 @@ index 974c086..a54ea74 100644 case SID_SUBTOTALS: { const SfxItemSet* pArgs = rReq.GetArgs(); -diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx -index 328934a..014dbde 100644 ---- sc/source/ui/view/gridwin.cxx -+++ sc/source/ui/view/gridwin.cxx +--- sc/source/ui/view/gridwin.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/ui/view/gridwin.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -132,7 +132,13 @@ #include <vcl/svapp.hxx> #include <svx/sdr/overlay/overlayselection.hxx> @@ -23554,7 +22810,7 @@ index 328934a..014dbde 100644 using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; -@@ -374,6 +380,32 @@ void lcl_UnLockComment( ScDrawView* pView, SdrPageView* pPV, SdrModel* pDrDoc, c +@@ -374,6 +380,32 @@ void lcl_UnLockComment( ScDrawView* pVie } } @@ -23587,7 +22843,7 @@ index 328934a..014dbde 100644 // --------------------------------------------------------------------------- // WB_DIALOGCONTROL noetig fuer UNO-Controls ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) -@@ -1491,6 +1523,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) +@@ -1495,6 +1527,7 @@ void ScGridWindow::HandleMouseButtonDown SCCOL nOldColFBox = bWasFilterBox ? pFilterBox->GetCol() : 0; SCROW nOldRowFBox = bWasFilterBox ? pFilterBox->GetRow() : 0; #endif @@ -23595,7 +22851,7 @@ index 328934a..014dbde 100644 ClickExtern(); // loescht FilterBox, wenn vorhanden -@@ -2126,6 +2159,26 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) +@@ -2130,6 +2163,26 @@ void __EXPORT ScGridWindow::MouseButtonU { nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen ScGlobal::OpenURL( aUrl, aTarget ); @@ -23622,7 +22878,7 @@ index 328934a..014dbde 100644 return; } } -@@ -2456,7 +2509,7 @@ long ScGridWindow::PreNotify( NotifyEvent& rNEvt ) +@@ -2460,7 +2513,7 @@ long ScGridWindow::PreNotify( NotifyEven lcl_InitMouseEvent( aEvent, *rNEvt.GetMouseEvent() ); if ( rNEvt.GetWindow() ) aEvent.Source = rNEvt.GetWindow()->GetComponentInterface(); @@ -23631,7 +22887,7 @@ index 328934a..014dbde 100644 pImp->MousePressed( aEvent ); else pImp->MouseReleased( aEvent ); -@@ -4891,26 +4944,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, +@@ -4895,26 +4948,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO ScDocument* pDoc = pDocSh->GetDocument(); ScBaseCell* pCell = NULL; @@ -23661,11 +22917,9 @@ index 328934a..014dbde 100644 ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed) -diff --git sc/source/ui/view/gridwin5.cxx sc/source/ui/view/gridwin5.cxx -index 2b4a32b..d7355b6 100644 ---- sc/source/ui/view/gridwin5.cxx -+++ sc/source/ui/view/gridwin5.cxx -@@ -346,14 +346,12 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) +--- sc/source/ui/view/gridwin5.cxx.old 2009-10-08 16:17:09.000000000 +0200 ++++ sc/source/ui/view/gridwin5.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -346,14 +346,12 @@ void ScGridWindow::RequestHelp(const Hel if ( pDrView->PickObj(aMDPos, pDrView->getHitTolLog(), pHit, pPV, SDRSEARCH_DEEP ) ) pObj = pHit; } @@ -23680,12 +22934,10 @@ index 2b4a32b..d7355b6 100644 } } } -diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx -index 30adc63..80e0fd7 100644 ---- sc/source/ui/view/tabview3.cxx -+++ sc/source/ui/view/tabview3.cxx -@@ -82,6 +82,10 @@ - #include "tabprotection.hxx" +--- sc/source/ui/view/tabview3.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/ui/view/tabview3.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -83,6 +83,10 @@ + #include "formula/FormulaCompiler.hxx" #include <com/sun/star/chart2/data/HighlightedRange.hpp> +#include <com/sun/star/document/XVbaEventsHelper.hpp> @@ -23695,7 +22947,7 @@ index 30adc63..80e0fd7 100644 namespace { -@@ -1425,10 +1429,15 @@ void ScTabView::MarkRange( const ScRange& rRange, BOOL bSetCursor, BOOL bContinu +@@ -1426,10 +1430,15 @@ void ScTabView::MarkRange( const ScRange { SCCOL nAlignX = rRange.aStart.Col(); SCROW nAlignY = rRange.aStart.Row(); @@ -23715,7 +22967,7 @@ index 30adc63..80e0fd7 100644 AlignToCursor( nAlignX, nAlignY, SC_FOLLOW_JUMP ); } InitBlockMode( rRange.aStart.Col(), rRange.aStart.Row(), nTab ); -@@ -1541,6 +1550,17 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) +@@ -1542,6 +1551,17 @@ void ScTabView::SetTabNo( SCTAB nTab, BO // nicht InputEnterHandler wegen Referenzeingabe ! ScDocument* pDoc = aViewData.GetDocument(); @@ -23733,7 +22985,7 @@ index 30adc63..80e0fd7 100644 pDoc->MakeTable( nTab ); // Update pending row heights before switching the sheet, so Reschedule from the progress bar -@@ -1645,8 +1665,20 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) +@@ -1646,8 +1666,20 @@ void ScTabView::SetTabNo( SCTAB nTab, BO if ( pGridWin[i]->IsVisible() ) pGridWin[i]->UpdateEditViewPos(); } @@ -23755,10 +23007,8 @@ index 30adc63..80e0fd7 100644 aViewData.GetViewShell()->WindowChanged(); // falls das aktive Fenster anders ist if ( !bUnoRefDialog ) aViewData.GetViewShell()->DisconnectAllClients(); // important for floating frames -diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx -index 098245e..a3b828a 100644 ---- sc/source/ui/view/viewfun2.cxx -+++ sc/source/ui/view/viewfun2.cxx +--- sc/source/ui/view/viewfun2.cxx.old 2010-03-03 16:59:14.000000000 +0100 ++++ sc/source/ui/view/viewfun2.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -57,6 +57,11 @@ #include <vcl/sound.hxx> #include <vcl/waitobj.hxx> @@ -23771,7 +23021,7 @@ index 098245e..a3b828a 100644 #include "viewfunc.hxx" #include "sc.hrc" -@@ -2210,15 +2215,42 @@ BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord ) +@@ -2210,15 +2215,42 @@ BOOL ScViewFunc::DeleteTable( SCTAB nTab return bSuccess; } @@ -23814,7 +23064,7 @@ index 098245e..a3b828a 100644 while ( nNewTab > 0 && !pDoc->IsVisible( nNewTab ) ) --nNewTab; -@@ -2285,9 +2317,18 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) +@@ -2285,9 +2317,18 @@ BOOL ScViewFunc::DeleteTables(const SvSh for(i=TheTabs.Count()-1;i>=0;i--) { @@ -23833,7 +23083,7 @@ index 098245e..a3b828a 100644 pDocSh->Broadcast( ScTablesHint( SC_TAB_DELETED, TheTabs[sal::static_int_cast<USHORT>(i)] ) ); } } -@@ -2315,6 +2356,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) +@@ -2315,6 +2356,7 @@ BOOL ScViewFunc::DeleteTables(const SvSh pDocSh->PostPaintExtras(); pDocSh->SetDocumentModified(); @@ -23841,10 +23091,8 @@ index 098245e..a3b828a 100644 SfxApplication* pSfxApp = SFX_APP(); // Navigator pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); -diff --git sc/source/ui/view/viewfun3.cxx sc/source/ui/view/viewfun3.cxx -index a9e9008..6d78f83 100644 ---- sc/source/ui/view/viewfun3.cxx -+++ sc/source/ui/view/viewfun3.cxx +--- sc/source/ui/view/viewfun3.cxx.old 2010-03-03 16:59:19.000000000 +0100 ++++ sc/source/ui/view/viewfun3.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -213,6 +213,7 @@ #include "drwtrans.hxx" #include "docuno.hxx" @@ -23853,7 +23101,7 @@ index a9e9008..6d78f83 100644 using namespace com::sun::star; -@@ -1787,6 +1788,85 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B +@@ -1787,6 +1788,85 @@ BOOL ScViewFunc::LinkBlock( const ScRang return TRUE; } @@ -23890,7 +23138,7 @@ index a9e9008..6d78f83 100644 + SCCOL nUndoEndCol = nStartCol+aColLength-1; + SCROW nUndoEndRow = nCurrentRow; + USHORT nUndoFlags = IDF_NONE; -+ + + if ( bRecord ) + { + pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); @@ -23931,7 +23179,7 @@ index a9e9008..6d78f83 100644 + nPaint |= PAINT_LEFT; + nUndoEndRow = MAXROW; // nur zum Zeichnen ! + } - ++ + pDocSh->PostPaint( nStartCol, nCurrentRow, nStartTab, + nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags ); + pDocSh->UpdateOle(GetViewData()); @@ -23939,10 +23187,8 @@ index a9e9008..6d78f83 100644 +} -diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml -index 43d51f5..54d2c6b 100644 ---- sc/uiconfig/scalc/menubar/menubar.xml -+++ sc/uiconfig/scalc/menubar/menubar.xml +--- sc/uiconfig/scalc/menubar/menubar.xml.old 2010-03-03 16:59:24.000000000 +0100 ++++ sc/uiconfig/scalc/menubar/menubar.xml 2010-03-03 16:59:35.000000000 +0100 @@ -399,6 +399,7 @@ <menu:menuitem menu:id=".uno:DataFilterHideAutoFilter"/> </menu:menupopup> @@ -23951,10 +23197,8 @@ index 43d51f5..54d2c6b 100644 <menu:menuitem menu:id=".uno:DataSubTotals"/> <menu:menuitem menu:id=".uno:Validation"/> <menu:menuseparator/> -diff --git sc/util/makefile.mk sc/util/makefile.mk -index 163be1d..9dd9be3 100644 ---- sc/util/makefile.mk -+++ sc/util/makefile.mk +--- sc/util/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ sc/util/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -279,6 +279,7 @@ LIB8OBJFILES = \ $(SLO)$/filldlg.obj \ $(SLO)$/delcodlg.obj \ @@ -23963,10 +23207,8 @@ index 163be1d..9dd9be3 100644 $(SLO)$/dapitype.obj \ $(SLO)$/dapidata.obj \ $(SLO)$/crdlg.obj \ -diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp -index 5c1c13b..35d3ea1 100644 ---- scp2/source/ooo/file_library_ooo.scp -+++ scp2/source/ooo/file_library_ooo.scp +--- scp2/source/ooo/file_library_ooo.scp.old 2010-03-03 16:59:33.000000000 +0100 ++++ scp2/source/ooo/file_library_ooo.scp 2010-03-03 16:59:35.000000000 +0100 @@ -70,6 +70,20 @@ File gid_File_Lib_Basprov #endif End @@ -23988,10 +23230,8 @@ index 5c1c13b..35d3ea1 100644 STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib) File gid_File_Lib_Cached1 -diff --git scripting/prj/build.lst scripting/prj/build.lst -index 26b905b..f216009 100644 ---- scripting/prj/build.lst -+++ scripting/prj/build.lst +--- scripting/prj/build.lst.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/prj/build.lst 2010-03-03 16:59:35.000000000 +0100 @@ -1,8 +1,9 @@ -tc scripting : bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL +tc scripting : oovbaapi svx bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper NULL @@ -24003,16 +23243,14 @@ index 26b905b..f216009 100644 tc scripting\source\dlgprov nmake - all tc1_scriptingdlgprov tc1_inc NULL tc scripting\source\stringresource nmake - all tc1_scriptingstringresource tc1_inc NULL tc scripting\source\pyprov nmake - all tc1_scriptingpyprov tc1_inc NULL -@@ -10,4 +11,4 @@ tc scripting\source\protocolhandler nmake - all tc1_scriptingprotocolhandler t +@@ -10,4 +11,4 @@ tc scripting\source\protocolhandler nm tc scripting\java nmake - all tc1_scriptingjava tc1_scriptingprovider tc1_scriptingprotocolhandler NULL tc scripting\examples\java nmake - all tc1_scriptingexamplesjava tc1_scriptingjava NULL tc scripting\examples nmake - all tc1_scriptingexamples tc1_scriptingexamplesjava tc1_inc NULL -tc scripting\util nmake - all tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL +tc scripting\util nmake - all tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL -diff --git scripting/source/basprov/basprov.cxx scripting/source/basprov/basprov.cxx -index 562e605..562a8e5 100644 ---- scripting/source/basprov/basprov.cxx -+++ scripting/source/basprov/basprov.cxx +--- scripting/source/basprov/basprov.cxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/source/basprov/basprov.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -374,7 +374,33 @@ namespace basprov ::rtl::OUString::createFromAscii( "location" ) ); @@ -24064,10 +23302,8 @@ index 562e605..562a8e5 100644 if ( pBasicMgr ) { -diff --git scripting/source/basprov/basscript.cxx scripting/source/basprov/basscript.cxx -index 2fedb5f..e1ea656 100644 ---- scripting/source/basprov/basscript.cxx -+++ scripting/source/basprov/basscript.cxx +--- scripting/source/basprov/basscript.cxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/source/basprov/basscript.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -39,7 +39,10 @@ #include <basic/sbmeth.hxx> #include <basic/basmgr.hxx> @@ -24088,7 +23324,7 @@ index 2fedb5f..e1ea656 100644 extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar ); extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& aValue ); -@@ -57,6 +61,10 @@ extern void unoToSbxValue( SbxVariable* pVar, const ::com::sun::star::uno::Any& +@@ -57,6 +61,10 @@ extern void unoToSbxValue( SbxVariable* namespace basprov { //......................................................................... @@ -24196,10 +23432,8 @@ index 2fedb5f..e1ea656 100644 if ( m_documentBasicManager && m_xDocumentScriptContext.is() ) m_documentBasicManager->SetGlobalUNOConstant( "ThisComponent", aOldThisComponent ); } -diff --git scripting/source/basprov/basscript.hxx scripting/source/basprov/basscript.hxx -index 7f7db41..cbd0ec5 100644 ---- scripting/source/basprov/basscript.hxx -+++ scripting/source/basprov/basscript.hxx +--- scripting/source/basprov/basscript.hxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/source/basprov/basscript.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -31,12 +31,14 @@ #ifndef SCRIPTING_BASSCRIPT_HXX #define SCRIPTING_BASSCRIPT_HXX @@ -24269,10 +23503,8 @@ index 7f7db41..cbd0ec5 100644 }; //......................................................................... -diff --git scripting/source/dlgprov/dlgevtatt.cxx scripting/source/dlgprov/dlgevtatt.cxx -index 2284884..29f815d 100644 ---- scripting/source/dlgprov/dlgevtatt.cxx -+++ scripting/source/dlgprov/dlgevtatt.cxx +--- scripting/source/dlgprov/dlgevtatt.cxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/source/dlgprov/dlgevtatt.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -112,27 +112,30 @@ namespace dlgprov { protected: @@ -24419,10 +23651,8 @@ index 2284884..29f815d 100644 Any aReturn; firing_impl( aScriptEvent, &aReturn ); -diff --git scripting/source/dlgprov/dlgevtatt.hxx scripting/source/dlgprov/dlgevtatt.hxx -index b78dad8..39285ce 100644 ---- scripting/source/dlgprov/dlgevtatt.hxx -+++ scripting/source/dlgprov/dlgevtatt.hxx +--- scripting/source/dlgprov/dlgevtatt.hxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/source/dlgprov/dlgevtatt.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -46,6 +46,9 @@ #include <com/sun/star/script/XScriptEventsSupplier.hpp> @@ -24451,11 +23681,9 @@ index b78dad8..39285ce 100644 virtual ~DialogEventsAttacherImpl(); // XScriptEventsAttacher -diff --git scripting/source/dlgprov/dlgprov.cxx scripting/source/dlgprov/dlgprov.cxx -index c22f5a9..a07f403 100644 ---- scripting/source/dlgprov/dlgprov.cxx -+++ scripting/source/dlgprov/dlgprov.cxx -@@ -196,7 +196,15 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs +--- scripting/source/dlgprov/dlgprov.cxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/source/dlgprov/dlgprov.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -196,7 +196,15 @@ static ::rtl::OUString aResourceResolver Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY ); xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL ); @@ -24472,7 +23700,7 @@ index c22f5a9..a07f403 100644 // Set resource property if( xStringResourceManager.is() ) { -@@ -410,6 +418,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs +@@ -410,6 +418,7 @@ static ::rtl::OUString aResourceResolver if ( xISP.is() ) xInput = xISP->createInputStream(); @@ -24480,7 +23708,7 @@ index c22f5a9..a07f403 100644 } // import dialog model -@@ -527,7 +536,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs +@@ -527,7 +536,7 @@ static ::rtl::OUString aResourceResolver const Reference< XControl >& rxControl, const Reference< XInterface >& rxHandler, const Reference< XIntrospectionAccess >& rxIntrospectionAccess, @@ -24489,7 +23717,7 @@ index c22f5a9..a07f403 100644 { if ( rxControl.is() ) { -@@ -551,7 +560,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs +@@ -551,7 +560,7 @@ static ::rtl::OUString aResourceResolver Reference< XScriptEventsAttacher > xScriptEventsAttacher = new DialogEventsAttacherImpl ( m_xContext, m_xModel, rxControl, rxHandler, rxIntrospectionAccess, @@ -24498,7 +23726,7 @@ index c22f5a9..a07f403 100644 Any aHelper; xScriptEventsAttacher->attachEvents( aObjects, Reference< XScriptListener >(), aHelper ); -@@ -656,7 +665,10 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs +@@ -656,7 +665,10 @@ static ::rtl::OUString aResourceResolver aArguments[0] >>= m_xModel; m_BasicInfo.reset( new BasicRTLParams() ); m_BasicInfo->mxInput.set( aArguments[ 1 ], UNO_QUERY_THROW ); @@ -24510,7 +23738,7 @@ index c22f5a9..a07f403 100644 // leave the possibility to optionally allow the old dialog creation // to use the new XScriptListener ( which converts the old style macro // to a SF url ) -@@ -731,7 +743,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs +@@ -731,7 +743,7 @@ static ::rtl::OUString aResourceResolver { //xDialog = Reference< XDialog >( xCtrl, UNO_QUERY ); Reference< XIntrospectionAccess > xIntrospectionAccess = inspectHandler( xHandler ); @@ -24519,10 +23747,8 @@ index c22f5a9..a07f403 100644 } } -diff --git scripting/source/dlgprov/dlgprov.hxx scripting/source/dlgprov/dlgprov.hxx -index d0a5c6b..950c688 100644 ---- scripting/source/dlgprov/dlgprov.hxx -+++ scripting/source/dlgprov/dlgprov.hxx +--- scripting/source/dlgprov/dlgprov.hxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ scripting/source/dlgprov/dlgprov.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -84,9 +84,9 @@ namespace dlgprov ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; @@ -24544,11 +23770,8 @@ index d0a5c6b..950c688 100644 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > inspectHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxHandler ); // helper methods -diff --git scripting/source/vbaevents/eventhelper.cxx scripting/source/vbaevents/eventhelper.cxx -new file mode 100644 -index 0000000..6928530 ---- /dev/null -+++ scripting/source/vbaevents/eventhelper.cxx +--- scripting/source/vbaevents/eventhelper.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ scripting/source/vbaevents/eventhelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,1075 @@ +#include <comphelper/processfactory.hxx> +#include <comphelper/uno3.hxx> @@ -25625,11 +24848,8 @@ index 0000000..6928530 + return Sequence< ::rtl::OUString >( &strName, 1 ); + } +} -diff --git scripting/source/vbaevents/makefile.mk scripting/source/vbaevents/makefile.mk -new file mode 100644 -index 0000000..96f4e3d ---- /dev/null -+++ scripting/source/vbaevents/makefile.mk +--- scripting/source/vbaevents/makefile.mk.old 2010-03-03 16:59:35.000000000 +0100 ++++ scripting/source/vbaevents/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,59 @@ +PRJ=..$/.. + @@ -25690,11 +24910,8 @@ index 0000000..96f4e3d +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk -diff --git scripting/source/vbaevents/service.cxx scripting/source/vbaevents/service.cxx -new file mode 100644 -index 0000000..a5cfb49 ---- /dev/null -+++ scripting/source/vbaevents/service.cxx +--- scripting/source/vbaevents/service.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ scripting/source/vbaevents/service.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,99 @@ +#include "cppuhelper/implementationentry.hxx" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" @@ -25795,11 +25012,8 @@ index 0000000..a5cfb49 + pImplName, pServiceManager, pRegistryKey, s_component_entries ); + } +} -diff --git scripting/source/vbaevents/vbaevents.map scripting/source/vbaevents/vbaevents.map -new file mode 100644 -index 0000000..832e82c ---- /dev/null -+++ scripting/source/vbaevents/vbaevents.map +--- scripting/source/vbaevents/vbaevents.map.old 2010-03-03 16:59:35.000000000 +0100 ++++ scripting/source/vbaevents/vbaevents.map 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,9 @@ +OOO_1.1 { + global: @@ -25810,11 +25024,8 @@ index 0000000..832e82c + local: + *; +}; -diff --git scripting/source/vbaevents/vbaevents.xml scripting/source/vbaevents/vbaevents.xml -new file mode 100644 -index 0000000..875a246 ---- /dev/null -+++ scripting/source/vbaevents/vbaevents.xml +--- scripting/source/vbaevents/vbaevents.xml.old 2010-03-03 16:59:35.000000000 +0100 ++++ scripting/source/vbaevents/vbaevents.xml 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd"> @@ -25842,10 +25053,8 @@ index 0000000..875a246 + <runtime-module-dependency>sal3</runtime-module-dependency> + +</module-description> -diff --git sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/objsh.hxx -index 68157cd..930e4c2 100644 ---- sfx2/inc/sfx2/objsh.hxx -+++ sfx2/inc/sfx2/objsh.hxx +--- sfx2/inc/sfx2/objsh.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sfx2/inc/sfx2/objsh.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -304,6 +304,7 @@ public: sal_Bool IsReadOnlyUI() const; void SetNoName(); @@ -25877,10 +25086,8 @@ index 68157cd..930e4c2 100644 ); /** adjusts the internal macro mode, according to the current security settings -diff --git sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfx.hrc -index ce6b09a..4eb5d6d 100644 ---- sfx2/inc/sfx2/sfx.hrc -+++ sfx2/inc/sfx2/sfx.hrc +--- sfx2/inc/sfx2/sfx.hrc.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/inc/sfx2/sfx.hrc 2010-03-03 16:59:35.000000000 +0100 @@ -395,8 +395,10 @@ #define MID_DOCINFO_ENCRYPTED 0x2c #define MID_DOCINFO_STATISTIC 0x33 @@ -25894,10 +25101,8 @@ index ce6b09a..4eb5d6d 100644 // Config-Ids ----------------------------------------------------------- -diff --git sfx2/inc/sfx2/sfxbasemodel.hxx sfx2/inc/sfx2/sfxbasemodel.hxx -index e6d6888..aa1bb18 100644 ---- sfx2/inc/sfx2/sfxbasemodel.hxx -+++ sfx2/inc/sfx2/sfxbasemodel.hxx +--- sfx2/inc/sfx2/sfxbasemodel.hxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/inc/sfx2/sfxbasemodel.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -1487,6 +1487,7 @@ protected: /* returns true if the document signatures are valid, otherwise false */ sal_Bool hasValidSignatures() const; @@ -25906,11 +25111,9 @@ index e6d6888..aa1bb18 100644 //________________________________________________________________________________________________________ // private methods //________________________________________________________________________________________________________ -diff --git sfx2/source/appl/app.cxx sfx2/source/appl/app.cxx -index d1aa10f..5917aa2 100644 ---- sfx2/source/appl/app.cxx -+++ sfx2/source/appl/app.cxx -@@ -761,7 +761,7 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) +--- sfx2/source/appl/app.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/source/appl/app.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -761,7 +761,7 @@ IMPL_LINK( SfxApplication, GlobalBasicEr basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData ); // call basicide_handle_basic_error in basctl @@ -25919,11 +25122,9 @@ index d1aa10f..5917aa2 100644 return nRet; } -diff --git sfx2/source/appl/appuno.cxx sfx2/source/appl/appuno.cxx -index 81d1984..ebffdc2 100644 ---- sfx2/source/appl/appuno.cxx -+++ sfx2/source/appl/appuno.cxx -@@ -2285,6 +2285,16 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( +--- sfx2/source/appl/appuno.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/source/appl/appuno.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -2285,6 +2285,16 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL compone xNewKey = xKey->createKey( aTempStr ); xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") ); @@ -25940,7 +25141,7 @@ index 81d1984..ebffdc2 100644 return sal_True; } -@@ -2344,6 +2354,16 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( +@@ -2344,6 +2354,16 @@ SFX2_DLLPUBLIC void* SAL_CALL component_ ::comp_SfxDocumentMetaData::_getImplementationName(), ::comp_SfxDocumentMetaData::_getSupportedServiceNames()); } @@ -25957,10 +25158,8 @@ index 81d1984..ebffdc2 100644 // Factory is valid - service was found. if ( xFactory.is() ) -diff --git sfx2/source/doc/SfxDocumentMetaData.cxx sfx2/source/doc/SfxDocumentMetaData.cxx -index 93fbfa1..a5b3e7f 100644 ---- sfx2/source/doc/SfxDocumentMetaData.cxx -+++ sfx2/source/doc/SfxDocumentMetaData.cxx +--- sfx2/source/doc/SfxDocumentMetaData.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/source/doc/SfxDocumentMetaData.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -89,6 +89,10 @@ #include <cstring> #include <limits> @@ -26051,7 +25250,7 @@ index 93fbfa1..a5b3e7f 100644 // NB: do not copy the modification listeners, only DOM css::uno::Reference<css::xml::dom::XDocument> xDoc = createDOM(); -@@ -2289,6 +2341,32 @@ void SfxDocumentMetaData::createUserDefined() +@@ -2289,6 +2341,32 @@ void SfxDocumentMetaData::createUserDefi // component helper namespace @@ -26084,10 +25283,8 @@ index 93fbfa1..a5b3e7f 100644 namespace comp_SfxDocumentMetaData { ::rtl::OUString SAL_CALL _getImplementationName() { -diff --git sfx2/source/doc/docinf.cxx sfx2/source/doc/docinf.cxx -index d1e7203..da6816f 100644 ---- sfx2/source/doc/docinf.cxx -+++ sfx2/source/doc/docinf.cxx +--- sfx2/source/doc/docinf.cxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ sfx2/source/doc/docinf.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -37,6 +37,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> @@ -26104,10 +25301,11 @@ index d1e7203..da6816f 100644 // ============================================================================ // stream names -@@ -175,6 +175,28 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( +@@ -174,6 +174,28 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropert + } } } - ++ + uno::Reference< document::XCompatWriterDocProperties > xWriterProps( i_xDocProps, uno::UNO_QUERY ); + if ( xWriterProps.is() ) + { @@ -26129,14 +25327,11 @@ index d1e7203..da6816f 100644 + } + } + } -+ + // return code return (nGlobError != ERRCODE_NONE) ? nGlobError : nDocError; - } -diff --git sfx2/source/doc/docmacromode.cxx sfx2/source/doc/docmacromode.cxx -index a2e2963..131ff7c 100644 ---- sfx2/source/doc/docmacromode.cxx -+++ sfx2/source/doc/docmacromode.cxx +--- sfx2/source/doc/docmacromode.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/source/doc/docmacromode.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -41,6 +41,7 @@ #include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp> #include <com/sun/star/task/InteractionClassification.hpp> @@ -26170,10 +25365,8 @@ index a2e2963..131ff7c 100644 } } } -diff --git sfx2/source/doc/objmisc.cxx sfx2/source/doc/objmisc.cxx -index 8fb219d..1909e6b 100644 ---- sfx2/source/doc/objmisc.cxx -+++ sfx2/source/doc/objmisc.cxx +--- sfx2/source/doc/objmisc.cxx.old 2010-01-21 01:00:49.000000000 +0100 ++++ sfx2/source/doc/objmisc.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -1686,7 +1686,7 @@ namespace } @@ -26183,7 +25376,7 @@ index 8fb219d..1909e6b 100644 { OSL_TRACE( "in CallXScript" ); ErrCode nErr = ERRCODE_NONE; -@@ -1717,7 +1717,16 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon +@@ -1717,7 +1717,16 @@ ErrCode SfxObjectShell::CallXScript( con // obtain the script, and execute it Reference< provider::XScript > xScript( xScriptProvider->getScript( _rScriptURL ), UNO_QUERY_THROW ); @@ -26201,7 +25394,7 @@ index 8fb219d..1909e6b 100644 aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam ); } catch ( const uno::Exception& ) -@@ -1727,7 +1736,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon +@@ -1727,7 +1736,7 @@ ErrCode SfxObjectShell::CallXScript( con nErr = ERRCODE_BASIC_INTERNAL_ERROR; } @@ -26210,7 +25403,7 @@ index 8fb219d..1909e6b 100644 { ::std::auto_ptr< VclAbstractDialog > pScriptErrDlg; SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); -@@ -1751,9 +1760,9 @@ ErrCode SfxObjectShell::CallXScript( const String& rScriptURL, +@@ -1751,9 +1760,9 @@ ErrCode SfxObjectShell::CallXScript( con ::com::sun::star::uno::Any& aRet, ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& @@ -26222,10 +25415,8 @@ index 8fb219d..1909e6b 100644 } //------------------------------------------------------------------------- -diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx -index 71bf58a..52b51eb 100644 ---- sfx2/source/doc/objserv.cxx -+++ sfx2/source/doc/objserv.cxx +--- sfx2/source/doc/objserv.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sfx2/source/doc/objserv.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -103,6 +103,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/util/XCloneable.hpp> @@ -26234,7 +25425,7 @@ index 71bf58a..52b51eb 100644 #include "helpid.hrc" -@@ -507,6 +508,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) +@@ -507,6 +508,18 @@ void SfxObjectShell::ExecFile_Impl(SfxRe case SID_SAVEASDOC: case SID_SAVEDOC: { @@ -26253,10 +25444,8 @@ index 71bf58a..52b51eb 100644 //!! detaillierte Auswertung eines Fehlercodes SfxObjectShellRef xLock( this ); -diff --git sfx2/source/doc/objuno.cxx sfx2/source/doc/objuno.cxx -index e9e37a4..712498b 100644 ---- sfx2/source/doc/objuno.cxx -+++ sfx2/source/doc/objuno.cxx +--- sfx2/source/doc/objuno.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/source/doc/objuno.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -48,6 +48,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/XModifiable.hpp> @@ -26265,7 +25454,7 @@ index e9e37a4..712498b 100644 #include <unotools/configmgr.hxx> #include <tools/inetdef.hxx> -@@ -107,6 +108,9 @@ const SfxItemPropertyMapEntry* lcl_GetDocInfoPropertyMap() +@@ -107,6 +108,9 @@ const SfxItemPropertyMapEntry* lcl_GetDo { "AutoloadEnabled" , 15, MID_DOCINFO_AUTOLOADENABLED, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, { "AutoloadSecs" , 12, MID_DOCINFO_AUTOLOADSECS, &::getCppuType((const sal_Int32*)0), PROPERTY_UNBOUND, 0 }, { "AutoloadURL" , 11, MID_DOCINFO_AUTOLOADURL, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, @@ -26275,7 +25464,7 @@ index e9e37a4..712498b 100644 { "CreationDate" , 12, WID_DATE_CREATED, &::getCppuType((const ::com::sun::star::util::DateTime*)0),PROPERTY_MAYBEVOID, 0 }, { "DefaultTarget" , 13, MID_DOCINFO_DEFAULTTARGET, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, { "Description" , 11, MID_DOCINFO_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, -@@ -810,6 +814,22 @@ void SAL_CALL SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co +@@ -810,6 +814,22 @@ void SAL_CALL SfxDocumentInfoObject::se _pImp->m_xDocProps->setDefaultTarget(sTemp); break; // case WID_CONTENT_TYPE : // this is readonly! @@ -26298,7 +25487,7 @@ index e9e37a4..712498b 100644 default: break; } -@@ -1027,6 +1047,23 @@ void SAL_CALL SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co +@@ -1027,6 +1047,23 @@ void SAL_CALL SfxDocumentInfoObject::se case MID_DOCINFO_CHARLOCALE: aValue <<= _pImp->m_xDocProps->getLanguage(); break; @@ -26322,10 +25511,8 @@ index e9e37a4..712498b 100644 default: aValue <<= ::rtl::OUString(); break; -diff --git sfx2/source/doc/objxtor.cxx sfx2/source/doc/objxtor.cxx -index d7470e9..2de9682 100644 ---- sfx2/source/doc/objxtor.cxx -+++ sfx2/source/doc/objxtor.cxx +--- sfx2/source/doc/objxtor.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/source/doc/objxtor.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -137,6 +137,40 @@ DBG_NAME(SfxObjectShell) extern svtools::AsynchronLink* pPendingCloser; static WeakReference< XInterface > s_xCurrentComponent; @@ -26367,7 +25554,7 @@ index d7470e9..2de9682 100644 //========================================================================= -@@ -171,6 +205,7 @@ void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::Even +@@ -171,6 +205,7 @@ void SAL_CALL SfxModelListener_Impl::dis ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); if ( SfxObjectShell::GetCurrentComponent() == _rEvent.Source ) { @@ -26375,7 +25562,7 @@ index d7470e9..2de9682 100644 // remove ThisComponent reference from AppBasic SfxObjectShell::SetCurrentComponent( Reference< XInterface >() ); } -@@ -539,6 +574,13 @@ SfxObjectShell* SfxObjectShell::Current() +@@ -539,6 +574,13 @@ SfxObjectShell* SfxObjectShell::Current( return pFrame ? pFrame->GetObjectShell() : 0; } @@ -26389,7 +25576,7 @@ index d7470e9..2de9682 100644 //------------------------------------------------------------------------ struct BoolEnv_Impl -@@ -971,7 +1013,10 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp +@@ -971,7 +1013,10 @@ void SfxObjectShell::SetCurrentComponent BasicManager* pAppMgr = SFX_APP()->GetBasicManager(); s_xCurrentComponent = _rxComponent; if ( pAppMgr ) @@ -26400,11 +25587,9 @@ index d7470e9..2de9682 100644 #if OSL_DEBUG_LEVEL > 0 const char* pComponentImplName = _rxComponent.get() ? typeid( *_rxComponent.get() ).name() : "void"; -diff --git sfx2/source/doc/oleprops.hxx sfx2/source/doc/oleprops.hxx -index 7ed7655..924e131 100755 ---- sfx2/source/doc/oleprops.hxx -+++ sfx2/source/doc/oleprops.hxx -@@ -83,6 +83,10 @@ const sal_Int32 PROPID_CREATED = 12; +--- sfx2/source/doc/oleprops.hxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ sfx2/source/doc/oleprops.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -83,6 +83,10 @@ const sal_Int32 PROPID_CREATED const sal_Int32 PROPID_LASTSAVED = 13; const sal_Int32 PROPID_THUMBNAIL = 17; @@ -26415,11 +25600,9 @@ index 7ed7655..924e131 100755 // predefined codepages const sal_uInt16 CODEPAGE_UNKNOWN = 0; const sal_uInt16 CODEPAGE_UNICODE = 1200; -diff --git sfx2/source/doc/sfxbasemodel.cxx sfx2/source/doc/sfxbasemodel.cxx -index 25d2d96..94bcce1 100644 ---- sfx2/source/doc/sfxbasemodel.cxx -+++ sfx2/source/doc/sfxbasemodel.cxx -@@ -888,7 +888,15 @@ uno::Reference< document::XDocumentInfo > SAL_CALL SfxBaseModel::getDocumentInfo +--- sfx2/source/doc/sfxbasemodel.cxx.old 2009-10-08 16:17:54.000000000 +0200 ++++ sfx2/source/doc/sfxbasemodel.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -888,7 +888,15 @@ uno::Reference< document::XDocumentInfo return m_pData->m_xDocumentInfo; } @@ -26436,7 +25619,7 @@ index 25d2d96..94bcce1 100644 // document::XDocumentPropertiesSupplier: uno::Reference< document::XDocumentProperties > SAL_CALL SfxBaseModel::getDocumentProperties() -@@ -3608,15 +3616,23 @@ void SAL_CALL SfxBaseModel::switchToStorage( const uno::Reference< XSTORAGE >& x +@@ -3608,15 +3616,23 @@ void SAL_CALL SfxBaseModel::switchToStor throw IOEXCEPTION(); // TODO: // the persistence should be switched only if the storage is different @@ -26469,11 +25652,9 @@ index 25d2d96..94bcce1 100644 m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = FALSE; } -diff --git sfx2/source/inc/SfxDocumentMetaData.hxx sfx2/source/inc/SfxDocumentMetaData.hxx -index e955439..0c90f22 100644 ---- sfx2/source/inc/SfxDocumentMetaData.hxx -+++ sfx2/source/inc/SfxDocumentMetaData.hxx -@@ -48,5 +48,16 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( +--- sfx2/source/inc/SfxDocumentMetaData.hxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ sfx2/source/inc/SfxDocumentMetaData.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -48,5 +48,16 @@ css::uno::Reference< css::uno::XInterfac } // closing component helper namespace @@ -26490,10 +25671,8 @@ index e955439..0c90f22 100644 +} #endif -diff --git sfx2/source/view/viewprn.cxx sfx2/source/view/viewprn.cxx -index 0f1ae3d..d992f57 100644 ---- sfx2/source/view/viewprn.cxx -+++ sfx2/source/view/viewprn.cxx +--- sfx2/source/view/viewprn.cxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ sfx2/source/view/viewprn.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,6 +32,7 @@ #include "precompiled_sfx2.hxx" @@ -26511,7 +25690,7 @@ index 0f1ae3d..d992f57 100644 TYPEINIT1(SfxPrintingHint, SfxHint); // ----------------------------------------------------------------------- -@@ -449,6 +452,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) +@@ -449,6 +452,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRe case SID_SETUPPRINTER: case SID_PRINTER_NAME : { @@ -26534,7 +25713,7 @@ index 0f1ae3d..d992f57 100644 // quiet mode (AppEvent, API call) SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE); bSilent = pSilentItem && pSilentItem->GetValue(); -@@ -761,6 +780,15 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) +@@ -761,6 +780,15 @@ void SfxViewShell::ExecPrint_Impl( SfxRe if ( SID_PRINTDOCDIRECT == nId ) { SfxObjectShell* pDoc = GetObjectShell(); @@ -26550,11 +25729,8 @@ index 0f1ae3d..d992f57 100644 bool bDetectHidden = ( !bSilent && pDoc ); if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES ) return; -diff --git svtools/inc/bindablecontrolhelper.hxx svtools/inc/bindablecontrolhelper.hxx -new file mode 100644 -index 0000000..e9cd3e6 ---- /dev/null -+++ svtools/inc/bindablecontrolhelper.hxx +--- svtools/inc/bindablecontrolhelper.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ svtools/inc/bindablecontrolhelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -26618,11 +25794,8 @@ index 0000000..e9cd3e6 + +#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX + -diff --git svtools/inc/filterutils.hxx svtools/inc/filterutils.hxx -new file mode 100644 -index 0000000..a05025f ---- /dev/null -+++ svtools/inc/filterutils.hxx +--- svtools/inc/filterutils.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ svtools/inc/filterutils.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,22 @@ +#ifndef SVTOOLS_INC_FILTERUTILS_HXX +#define SVTOOLS_INC_FILTERUTILS_HXX @@ -26646,10 +25819,8 @@ index 0000000..a05025f +//........................................................................ + +#endif -diff --git svtools/prj/d.lst svtools/prj/d.lst -index 3dc9c0b..684c3a1 100644 ---- svtools/prj/d.lst -+++ svtools/prj/d.lst +--- svtools/prj/d.lst.old 2009-10-08 16:17:47.000000000 +0200 ++++ svtools/prj/d.lst 2010-03-03 16:59:35.000000000 +0100 @@ -172,6 +172,8 @@ mkdir: %_DEST%\inc%_EXT%\svtools ..\inc\svtools\logindlg.hxx %_DEST%\inc%_EXT%\svtools\logindlg.hxx ..\inc\svtools\httpcook.hxx %_DEST%\inc%_EXT%\svtools\httpcook.hxx @@ -26659,11 +25830,8 @@ index 3dc9c0b..684c3a1 100644 ..\inc\svtools\itemprop.hxx %_DEST%\inc%_EXT%\svtools\itemprop.hxx ..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx ..\inc\svtools\genericunodialog.hxx %_DEST%\inc%_EXT%\svtools\genericunodialog.hxx -diff --git svtools/source/misc/bindablecontrolhelper.cxx svtools/source/misc/bindablecontrolhelper.cxx -new file mode 100644 -index 0000000..ba842f0 ---- /dev/null -+++ svtools/source/misc/bindablecontrolhelper.cxx +--- svtools/source/misc/bindablecontrolhelper.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ svtools/source/misc/bindablecontrolhelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,162 @@ +/************************************************************************* + * @@ -26827,11 +25995,8 @@ index 0000000..ba842f0 +} // namespace svt +//........................................................................ + -diff --git svtools/source/misc/filterutils.cxx svtools/source/misc/filterutils.cxx -new file mode 100644 -index 0000000..91a6ca4 ---- /dev/null -+++ svtools/source/misc/filterutils.cxx +--- svtools/source/misc/filterutils.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ svtools/source/misc/filterutils.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,56 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svtools.hxx" @@ -26889,10 +26054,8 @@ index 0000000..91a6ca4 +} // namespace svt +//........................................................................ + -diff --git svtools/source/misc/makefile.mk svtools/source/misc/makefile.mk -index a23092e..7177e22 100644 ---- svtools/source/misc/makefile.mk -+++ svtools/source/misc/makefile.mk +--- svtools/source/misc/makefile.mk.old 2009-10-07 15:06:52.000000000 +0200 ++++ svtools/source/misc/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -85,6 +85,8 @@ SLOFILES=\ $(SLO)$/lockfilecommon.obj \ $(SLO)$/sharecontrolfile.obj \ @@ -26902,10 +26065,8 @@ index a23092e..7177e22 100644 $(SLO)$/langtab.obj # --- Targets ------------------------------------------------------- -diff --git svx/inc/svx/escherex.hxx svx/inc/svx/escherex.hxx -index d021a13..cbb8352 100644 ---- svx/inc/svx/escherex.hxx -+++ svx/inc/svx/escherex.hxx +--- svx/inc/svx/escherex.hxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/inc/svx/escherex.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -47,6 +47,7 @@ #include <com/sun/star/drawing/Hatch.hpp> #include <svx/msdffdef.hxx> @@ -26962,10 +26123,8 @@ index d021a13..cbb8352 100644 EscherExClientAnchor_Base* GetClientAnchor() const { return pClientAnchor; } EscherExClientRecord_Base* GetClientData() const -diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx -index c9b7b81..403ca61 100644 ---- svx/inc/svx/msocximex.hxx -+++ svx/inc/svx/msocximex.hxx +--- svx/inc/svx/msocximex.hxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/inc/svx/msocximex.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,6 +32,7 @@ #include <sot/storage.hxx> @@ -27028,7 +26187,7 @@ index c9b7b81..403ca61 100644 sal_uInt32 nTop; sal_uInt32 nLeft; -@@ -502,54 +509,8 @@ typedef std::vector<OCX_Control*>::iterator CtrlIterator; +@@ -502,54 +509,8 @@ typedef std::vector<OCX_Control*>::itera typedef std::vector<OCX_Control*>::const_iterator CtrlIteratorConst; typedef std::vector<OCX_Control*> CtrlList; @@ -27134,7 +26293,7 @@ index c9b7b81..403ca61 100644 mnBackColor = 0x80000005L; mnForeColor = 0x80000008L; aFontData.SetHasAlign(TRUE); -@@ -1063,7 +1026,7 @@ class OCX_ComboBox : public OCX_ModernControl +@@ -1063,7 +1026,7 @@ class OCX_ComboBox : public OCX_ModernCo public: OCX_ComboBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ComboBox")){ msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox"); @@ -27143,7 +26302,7 @@ index c9b7b81..403ca61 100644 mnBackColor = 0x80000005; mnForeColor = 0x80000008; nBorderColor = 0x80000006; -@@ -1088,7 +1051,8 @@ class OCX_ListBox : public OCX_ModernControl +@@ -1088,7 +1051,8 @@ class OCX_ListBox : public OCX_ModernCon public: OCX_ListBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ListBox")){ msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox"); @@ -27189,11 +26348,8 @@ index c9b7b81..403ca61 100644 static OCX_Control *Create() { return new OCX_Label;} -diff --git svx/inc/svx/mstoolbar.hxx svx/inc/svx/mstoolbar.hxx -new file mode 100644 -index 0000000..1dde9d0 ---- /dev/null -+++ svx/inc/svx/mstoolbar.hxx +--- svx/inc/svx/mstoolbar.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ svx/inc/svx/mstoolbar.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,334 @@ +#ifndef _MSTOOLBAR_HXX +#define _MSTOOLBAR_HXX @@ -27529,10 +26685,8 @@ index 0000000..1dde9d0 + void Print( FILE* ); +}; +#endif -diff --git svx/inc/svx/msvbahelper.hxx svx/inc/svx/msvbahelper.hxx -index 294f26e..7d89456 100644 ---- svx/inc/svx/msvbahelper.hxx -+++ svx/inc/svx/msvbahelper.hxx +--- svx/inc/svx/msvbahelper.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ svx/inc/svx/msvbahelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -56,3 +56,61 @@ namespace ooo { namespace vba } } @@ -27595,10 +26749,8 @@ index 294f26e..7d89456 100644 +} } + +#endif -diff --git svx/inc/svxmsbas.hxx svx/inc/svxmsbas.hxx -index e5f9908..c7ca0ad 100644 ---- svx/inc/svxmsbas.hxx -+++ svx/inc/svxmsbas.hxx +--- svx/inc/svxmsbas.hxx.old 2009-10-07 15:07:00.000000000 +0200 ++++ svx/inc/svxmsbas.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -35,6 +35,8 @@ #include "svx/svxdllapi.h" @@ -27674,10 +26826,8 @@ index e5f9908..c7ca0ad 100644 }; #endif -diff --git svx/prj/d.lst svx/prj/d.lst -index acbb689..c7189ba 100644 ---- svx/prj/d.lst -+++ svx/prj/d.lst +--- svx/prj/d.lst.old 2010-03-03 16:59:33.000000000 +0100 ++++ svx/prj/d.lst 2010-03-03 16:59:35.000000000 +0100 @@ -658,6 +658,8 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table ..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx ..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx @@ -27687,11 +26837,9 @@ index acbb689..c7189ba 100644 ..\inc\svx\msvbahelper.hxx %_DEST%\inc%_EXT%\svx\msvbahelper.hxx ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* -diff --git svx/source/cui/cfg.cxx svx/source/cui/cfg.cxx -index 2931be6..4ed79a3 100644 ---- svx/source/cui/cfg.cxx -+++ svx/source/cui/cfg.cxx -@@ -5724,7 +5724,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( +--- svx/source/cui/cfg.cxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/cui/cfg.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -5724,7 +5724,7 @@ bool SvxIconSelectorDialog::ReplaceGraph if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) ) { BitmapEx aBitmap = aImage.GetBitmapEx(); @@ -27700,7 +26848,7 @@ index 2931be6..4ed79a3 100644 aImage = Image( aBitmapex); } aTbSymbol.InsertItem( nId,aImage, aURL, 0, 0 ); //modify -@@ -5888,7 +5888,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) +@@ -5888,7 +5888,7 @@ bool SvxIconSelectorDialog::ImportGraphi if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) ) { BitmapEx aBitmap = aImage.GetBitmapEx(); @@ -27709,10 +26857,8 @@ index 2931be6..4ed79a3 100644 aImage = Image( aBitmapex); } if ( bOK && !!aImage ) -diff --git svx/source/form/fmscriptingenv.cxx svx/source/form/fmscriptingenv.cxx -index 875afd7..e92693c 100644 ---- svx/source/form/fmscriptingenv.cxx -+++ svx/source/form/fmscriptingenv.cxx +--- svx/source/form/fmscriptingenv.cxx.old 2009-10-07 15:07:01.000000000 +0200 ++++ svx/source/form/fmscriptingenv.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -39,6 +39,8 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp> @@ -27766,10 +26912,8 @@ index 875afd7..e92693c 100644 } //................................................................ -diff --git svx/source/form/fmtools.cxx svx/source/form/fmtools.cxx -index 6f3c9f5..3f978a5 100644 ---- svx/source/form/fmtools.cxx -+++ svx/source/form/fmtools.cxx +--- svx/source/form/fmtools.cxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/form/fmtools.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -103,7 +103,7 @@ #include <comphelper/extract.hxx> #include <comphelper/uno3.hxx> @@ -27779,7 +26923,7 @@ index 6f3c9f5..3f978a5 100644 #include <cppuhelper/typeprovider.hxx> #include <algorithm> #include <rtl/logfile.hxx> -@@ -720,37 +720,6 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi +@@ -720,37 +720,6 @@ sal_Int16 getControlTypeByObject(const R return ::rtl::OUString(); } //------------------------------------------------------------------------------ @@ -27817,7 +26961,7 @@ index 6f3c9f5..3f978a5 100644 void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel>& xModel, const Reference< ::com::sun::star::awt::XControl>& xControl, const Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable) { -@@ -824,7 +793,8 @@ void TransferEventScripts(const Reference< ::com::sun::star::awt::XControlModel> +@@ -824,7 +793,8 @@ void TransferEventScripts(const Referenc continue; // now check the methods @@ -27827,11 +26971,9 @@ index 6f3c9f5..3f978a5 100644 const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray(); for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames) { -diff --git svx/source/form/fmundo.cxx svx/source/form/fmundo.cxx -index 2fc7022..c438b74 100644 ---- svx/source/form/fmundo.cxx -+++ svx/source/form/fmundo.cxx -@@ -87,6 +87,90 @@ using namespace ::com::sun::star::reflection; +--- svx/source/form/fmundo.cxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/form/fmundo.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -87,6 +87,90 @@ using namespace ::com::sun::star::reflec using namespace ::com::sun::star::form::binding; using namespace ::svxform; @@ -27922,7 +27064,7 @@ index 2fc7022..c438b74 100644 //------------------------------------------------------------------------------ // some helper structs for caching property infos //------------------------------------------------------------------------------ -@@ -130,6 +214,13 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel) +@@ -130,6 +214,13 @@ FmXUndoEnvironment::FmXUndoEnvironment(F { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXUndoEnvironment::FmXUndoEnvironment" ); DBG_CTOR(FmXUndoEnvironment,NULL); @@ -27936,7 +27078,7 @@ index 2fc7022..c438b74 100644 } //------------------------------------------------------------------------------ -@@ -771,9 +862,17 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r +@@ -771,9 +862,17 @@ void FmXUndoEnvironment::switchListening if ( xManager.is() ) { if ( _bStartListening ) @@ -27954,10 +27096,8 @@ index 2fc7022..c438b74 100644 } // also handle all children of this element -diff --git svx/source/form/makefile.mk svx/source/form/makefile.mk -index b649be9..437d23f 100644 ---- svx/source/form/makefile.mk -+++ svx/source/form/makefile.mk +--- svx/source/form/makefile.mk.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/form/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -44,6 +44,10 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- @@ -27969,10 +27109,8 @@ index b649be9..437d23f 100644 SRS1NAME=form SRC1FILES= \ fmexpl.src \ -diff --git svx/source/inc/fmundo.hxx svx/source/inc/fmundo.hxx -index fab29db..67d88b8 100644 ---- svx/source/inc/fmundo.hxx -+++ svx/source/inc/fmundo.hxx +--- svx/source/inc/fmundo.hxx.old 2009-10-08 16:17:55.000000000 +0200 ++++ svx/source/inc/fmundo.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -217,7 +217,7 @@ private: void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(()); @@ -27982,11 +27120,9 @@ index fab29db..67d88b8 100644 public: // Methoden zur Zuordnung von Controls zu Forms, // werden von der Seite und der UndoUmgebung genutzt -diff --git svx/source/msfilter/eschesdo.cxx svx/source/msfilter/eschesdo.cxx -index 86a1bd1..3d3b6dc 100644 ---- svx/source/msfilter/eschesdo.cxx -+++ svx/source/msfilter/eschesdo.cxx -@@ -251,6 +251,19 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, +--- svx/source/msfilter/eschesdo.cxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ svx/source/msfilter/eschesdo.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -251,6 +251,19 @@ UINT32 ImplEESdrWriter::ImplWriteShape( // #i51348# shape name if( aShapeName.Len() > 0 ) aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName ); @@ -28006,10 +27142,8 @@ index 86a1bd1..3d3b6dc 100644 if ( rObj.GetType().EqualsAscii( "drawing.Custom" ) ) { -diff --git svx/source/msfilter/makefile.mk svx/source/msfilter/makefile.mk -index c6a4bd4..d533004 100644 ---- svx/source/msfilter/makefile.mk -+++ svx/source/msfilter/makefile.mk +--- svx/source/msfilter/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ svx/source/msfilter/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -54,7 +54,8 @@ LIB1OBJFILES= \ $(SLO)$/svxmsbas.obj \ $(SLO)$/msocximex.obj \ @@ -28030,10 +27164,8 @@ index c6a4bd4..d533004 100644 $(SLO)$/msvbahelper.obj\ .INCLUDE : target.mk -diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx -index 493e097..218f324 100644 ---- svx/source/msfilter/msocximex.cxx -+++ svx/source/msfilter/msocximex.cxx +--- svx/source/msfilter/msocximex.cxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ svx/source/msfilter/msocximex.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -49,6 +49,10 @@ #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> @@ -28077,7 +27209,7 @@ index 493e097..218f324 100644 static char sWW8_form[] = "WW-Standard"; -@@ -130,126 +150,48 @@ long ReadAlign(SvStorageStream *pS, long nPos, int nAmount) +@@ -130,126 +150,48 @@ long ReadAlign(SvStorageStream *pS, long return 0; } @@ -28096,7 +27228,8 @@ index 493e097..218f324 100644 -// returns, true if successful - -bool storePictureInFileSystem( OUString& location, sal_uInt8* data, sal_uInt32 dataLen ) --{ ++uno::Reference< graphic::XGraphicObject> lcl_readGraphicObject( SotStorageStream *pS ) + { - bool result = true; - OUString origPath = location; - try @@ -28130,8 +27263,6 @@ index 493e097..218f324 100644 - result = false; - } - return result; -+uno::Reference< graphic::XGraphicObject> lcl_readGraphicObject( SotStorageStream *pS ) -+{ + uno::Reference< graphic::XGraphicObject > xGrfObj; + uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); + if( xServiceManager.is() ) @@ -28239,7 +27370,7 @@ index 493e097..218f324 100644 long WriteAlign(SvStorageStream *pS, int nAmount) { -@@ -413,35 +355,11 @@ void lclReadCharArray( SvStorageStream& rStrm, char*& rpcCharArr, sal_uInt32 nLe +@@ -413,35 +355,11 @@ void lclReadCharArray( SvStorageStream& */ OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld ) { @@ -28278,7 +27409,7 @@ index 493e097..218f324 100644 } // export --------------------------------------------------------------------- -@@ -561,8 +479,129 @@ const sal_uInt16 TOGGLEBUTTON = (sal_uInt16)0x1C; +@@ -561,8 +479,129 @@ const sal_uInt16 TOGGLEBUTTON = (sal_uIn const sal_uInt16 SCROLLBAR = (sal_uInt16)0x2F; const sal_uInt16 MULTIPAGE = (sal_uInt16)0x39; @@ -28655,7 +27786,7 @@ index 493e097..218f324 100644 uno::Reference<lang::XMultiServiceFactory> xFactory(rDialog, uno::UNO_QUERY); -@@ -1177,11 +1071,15 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog +@@ -1177,11 +1071,15 @@ sal_Bool OCX_Control::Import(uno::Refere if (!xModel.is()) return sal_False; @@ -28671,7 +27802,7 @@ index 493e097..218f324 100644 } catch( uno::Exception& ) { -@@ -1197,16 +1095,32 @@ sal_Bool OCX_Control::Import(uno::Reference<container::XNameContainer> &rDialog +@@ -1197,16 +1095,32 @@ sal_Bool OCX_Control::Import(uno::Refere if (!Import(xPropSet)) return sal_False; @@ -28713,7 +27844,7 @@ index 493e097..218f324 100644 if ( msToolTip.Len() > 0 ) xPropSet->setPropertyValue(WW8_ASCII2STR("HelpText"), uno::Any(OUString(msToolTip))); -@@ -1421,6 +1335,12 @@ sal_Bool OCX_CommandButton::Import( com::sun::star::uno::Reference< +@@ -1421,6 +1335,12 @@ sal_Bool OCX_CommandButton::Import( com: rPropSet->setPropertyValue( WW8_ASCII2STR( "FocusOnClick" ), aTmp ); aFontData.Import(rPropSet); @@ -28726,7 +27857,7 @@ index 493e097..218f324 100644 return sal_True; } -@@ -1668,6 +1588,99 @@ sal_Bool OCX_ImageButton::Export(SvStorageRef &rObj, +@@ -1668,6 +1588,99 @@ sal_Bool OCX_ImageButton::Export(SvStora return WriteContents(xContents,rPropSet,rSize); } @@ -28826,7 +27957,7 @@ index 493e097..218f324 100644 sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> &rPropSet) -@@ -1700,12 +1713,51 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference< +@@ -1700,12 +1713,51 @@ sal_Bool OCX_OptionButton::Import(com::s aTmp <<= ImportSpecEffect( nSpecialEffect ); rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp); @@ -28881,7 +28012,7 @@ index 493e097..218f324 100644 if (pCaption) { -@@ -1717,6 +1769,14 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference< +@@ -1717,6 +1769,14 @@ sal_Bool OCX_OptionButton::Import(com::s aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE; rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp ); @@ -28896,7 +28027,7 @@ index 493e097..218f324 100644 aFontData.Import(rPropSet); return sal_True; } -@@ -2352,6 +2412,12 @@ sal_Bool OCX_ToggleButton::Import(com::sun::star::uno::Reference< +@@ -2352,6 +2412,12 @@ sal_Bool OCX_ToggleButton::Import(com::s } aFontData.Import(rPropSet); @@ -28909,7 +28040,7 @@ index 493e097..218f324 100644 return sal_True; } -@@ -2608,6 +2674,8 @@ sal_Bool OCX_ComboBox::Import(com::sun::star::uno::Reference< +@@ -2608,6 +2674,8 @@ sal_Bool OCX_ComboBox::Import(com::sun:: rPropSet->setPropertyValue( WW8_ASCII2STR("MaxTextLen"), aTmp); aFontData.Import(rPropSet); @@ -28918,7 +28049,7 @@ index 493e097..218f324 100644 return sal_True; } -@@ -2827,7 +2895,8 @@ sal_Bool OCX_ListBox::Import(com::sun::star::uno::Reference< +@@ -2827,7 +2895,8 @@ sal_Bool OCX_ListBox::Import(com::sun::s aTmp <<= ImportColor( nBorderColor ); rPropSet->setPropertyValue( WW8_ASCII2STR("BorderColor"), aTmp); @@ -28928,7 +28059,7 @@ index 493e097..218f324 100644 aFontData.Import(rPropSet); return sal_True; } -@@ -3205,8 +3274,15 @@ sal_Bool OCX_ModernControl::Read(SvStorageStream *pS) +@@ -3205,8 +3274,15 @@ sal_Bool OCX_ModernControl::Read(SvStora { pS->Read(pPictureHeader,20); *pS >> nPictureLen; @@ -28946,7 +28077,7 @@ index 493e097..218f324 100644 } return sal_True; -@@ -3296,8 +3372,15 @@ sal_Bool OCX_CommandButton::Read(SvStorageStream *pS) +@@ -3296,8 +3372,15 @@ sal_Bool OCX_CommandButton::Read(SvStora { pS->Read(pPictureHeader,20); *pS >> nPictureLen; @@ -28964,7 +28095,7 @@ index 493e097..218f324 100644 } return sal_True; -@@ -3418,7 +3501,7 @@ OCX_ContainerControl::OCX_ContainerControl( SotStorageRef& parent, +@@ -3418,7 +3501,7 @@ OCX_ContainerControl::OCX_ContainerContr const ::rtl::OUString& sN, const uno::Reference< container::XNameContainer > &rParent, OCX_Control* pParent ) : @@ -28973,7 +28104,7 @@ index 493e097..218f324 100644 { mContainerStorage = parent->OpenSotStorage(storageName, -@@ -3481,9 +3564,18 @@ OUString OCX_ContainerControl::createSubStreamName( const sal_uInt32& subStorage +@@ -3481,9 +3564,18 @@ OUString OCX_ContainerControl::createSub return buf.makeStringAndClear(); } @@ -28993,7 +28124,7 @@ index 493e097..218f324 100644 switch ( record.nTypeIdent) { case CMDBUTTON: -@@ -3591,8 +3683,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream* +@@ -3591,8 +3683,7 @@ void OCX_ContainerControl::ProcessContro SotStorageStreamRef oStream = mContainedControlsStream; // can insert into OO Dialog (e.g is this a supported dialog control)?? @@ -29003,7 +28134,7 @@ index 493e097..218f324 100644 { // skip the record in the stream, discard the control oStream->SeekRel( rec.nSubStreamLen ); -@@ -3602,15 +3693,27 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream* +@@ -3602,15 +3693,27 @@ void OCX_ContainerControl::ProcessContro { // A container control needs to read the f stream in // the folder ( substorage ) associated with this control @@ -29038,7 +28169,7 @@ index 493e097..218f324 100644 pControl->sName = rec.cName; pControl->msToolTip = rec.controlTip; // Position of controls is relative to the container -@@ -3630,6 +3733,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream* +@@ -3630,6 +3733,7 @@ void OCX_ContainerControl::ProcessContro // applied to all containees pControl->mnStep = mnStep; } @@ -29046,7 +28177,7 @@ index 493e097..218f324 100644 // #117490# DR: container records provide size of substream, use it here... -@@ -3640,17 +3744,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream* +@@ -3640,17 +3744,7 @@ void OCX_ContainerControl::ProcessContro // set stream to position behind substream of this control oStream->Seek( nStrmPos + rec.nSubStreamLen ); @@ -29065,7 +28196,7 @@ index 493e097..218f324 100644 } } -@@ -3673,7 +3767,6 @@ sal_Bool OCX_ContainerControl::Read(SvStorageStream *pS) +@@ -3673,7 +3767,6 @@ sal_Bool OCX_ContainerControl::Read(SvSt // this ensures that the default tab index created by Star/Open office // reflects the "flattened" ms tab order. ::std::sort( mpControls.begin(), mpControls.end(), SortOrderByTabPos() ); @@ -29073,7 +28204,7 @@ index 493e097..218f324 100644 return true; } -@@ -3691,7 +3784,8 @@ OCX_MultiPage::OCX_MultiPage( SotStorageRef& parent, +@@ -3691,7 +3784,8 @@ OCX_MultiPage::OCX_MultiPage( SotStorage nScrollWidth(0), nScrollHeight(0), nIconLen(0), pIcon(0), nPictureLen(0), pPicture(0) { @@ -29083,7 +28214,7 @@ index 493e097..218f324 100644 mnForeColor = 0x80000012L, mnBackColor = 0x8000000FL; bSetInDialog = true;// UserForm control only -@@ -3755,7 +3849,6 @@ sal_Bool OCX_MultiPage::Read(SvStorageStream *pS) +@@ -3755,7 +3849,6 @@ sal_Bool OCX_MultiPage::Read(SvStorageSt sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet> &rPropSet) { @@ -29091,7 +28222,7 @@ index 493e097..218f324 100644 OCX_ContainerControl::Import( rPropSet ); return sal_True; } -@@ -3776,6 +3869,43 @@ sal_Bool OCX_MultiPage::Import(com::sun::star::uno::Reference< +@@ -3776,6 +3869,43 @@ sal_Bool OCX_MultiPage::Import(com::sun: if ( xPropSet.is() ) { @@ -29135,7 +28266,7 @@ index 493e097..218f324 100644 // Calls import on contained pages return OCX_ContainerControl::Import( xPropSet ); } -@@ -4062,8 +4192,7 @@ OCX_UserForm::OCX_UserForm( SotStorageRef& parent, +@@ -4062,8 +4192,7 @@ OCX_UserForm::OCX_UserForm( SotStorageRe nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0), nPicture(0), nPictureAlignment(2), nPictureSizeMode(0), bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0), @@ -29145,7 +28276,7 @@ index 493e097..218f324 100644 { mnForeColor = 0x80000012; mnBackColor = 0x8000000F; -@@ -4193,24 +4322,30 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS) +@@ -4193,24 +4322,30 @@ sal_Bool OCX_UserForm::Read(SvStorageStr pS->Read(pIcon,nIconLen); } @@ -29190,7 +28321,7 @@ index 493e097..218f324 100644 sal_Int16 numTrailingRecs = 0; *pS >> numTrailingRecs; -@@ -4219,10 +4354,14 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS) +@@ -4219,10 +4354,14 @@ sal_Bool OCX_UserForm::Read(SvStorageStr // ( unknown what these trailing records are for) if ( numTrailingRecs ) { @@ -29279,7 +28410,7 @@ index 493e097..218f324 100644 return sal_True; } -@@ -4780,11 +4955,14 @@ sal_Bool OCX_CheckBox::Import(com::sun::star::uno::Reference< +@@ -4780,11 +4955,14 @@ sal_Bool OCX_CheckBox::Import(com::sun:: aTmp <<= ImportSpecEffect( nSpecialEffect ); rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp); @@ -29296,7 +28427,7 @@ index 493e097..218f324 100644 } if (pCaption) -@@ -5194,12 +5372,6 @@ sal_Bool OCX_TabStrip::ReadFontData(SotStorageStream *pS) +@@ -5194,12 +5372,6 @@ sal_Bool OCX_TabStrip::ReadFontData(SotS sal_Bool OCX_Image::Read(SotStorageStream *pS) { @@ -29309,7 +28440,7 @@ index 493e097..218f324 100644 ULONG nStart = pS->Tell(); *pS >> nIdentifier; DBG_ASSERT(nStandardId==nIdentifier, -@@ -5290,16 +5462,14 @@ sal_Bool OCX_Image::Read(SotStorageStream *pS) +@@ -5290,16 +5462,14 @@ sal_Bool OCX_Image::Read(SotStorageStrea long imagePos = pS->Tell(); @@ -29343,7 +28474,7 @@ index 493e097..218f324 100644 mnBackColor = 0x8000000F; mnForeColor = 0x80000012; } -@@ -5504,8 +5674,8 @@ sal_Bool OCX_SpinButton::Read( SvStorageStream *pS ) +@@ -5504,8 +5674,8 @@ sal_Bool OCX_SpinButton::Read( SvStorage if( mnBlockFlags & 0x00000080 ) rStrm >> mnValue; if( mnBlockFlags & 0x00000100 ) rStrm.SeekRel( 4 ); // unknown if( mnBlockFlags & 0x00000200 ) rStrm.SeekRel( 4 ); // unknown @@ -29354,7 +28485,7 @@ index 493e097..218f324 100644 if( mnBlockFlags & 0x00001000 ) rStrm >> mnPageStep; if( mnBlockFlags & 0x00002000 ) rStrm >> mnOrient; if( mnBlockFlags & 0x00004000 ) -@@ -5590,6 +5760,9 @@ sal_Bool OCX_SpinButton::Import(com::sun::star::uno::Reference< +@@ -5590,6 +5760,9 @@ sal_Bool OCX_SpinButton::Import(com::sun aTmp <<= sal_Int16( 0 ); rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp); @@ -29373,7 +28504,7 @@ index 493e097..218f324 100644 } -@@ -5823,6 +5996,9 @@ sal_Bool OCX_ScrollBar::Import(com::sun::star::uno::Reference< +@@ -5823,6 +5996,9 @@ sal_Bool OCX_ScrollBar::Import(com::sun: aTmp <<= sal_Int16( 0 ); rPropSet->setPropertyValue( WW8_ASCII2STR("Border"), aTmp); @@ -29383,11 +28514,9 @@ index 493e097..218f324 100644 return sal_True; } -diff --git svx/source/msfilter/msoleexp.cxx svx/source/msfilter/msoleexp.cxx -index b01fe6b..04495b5 100644 ---- svx/source/msfilter/msoleexp.cxx -+++ svx/source/msfilter/msoleexp.cxx -@@ -231,7 +231,12 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto +--- svx/source/msfilter/msoleexp.cxx.old 2009-10-07 15:07:01.000000000 +0200 ++++ svx/source/msfilter/msoleexp.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -231,7 +231,12 @@ void SvxMSExportOLEObjects::ExportOLEObj aSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) ); aSeq[1].Value <<= ::rtl::OUString( pExpFilter->GetName() ); uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY ); @@ -29400,11 +28529,8 @@ index b01fe6b..04495b5 100644 SotStorageRef xOLEStor = new SotStorage( pStream, TRUE ); xOLEStor->CopyTo( &rDestStg ); rDestStg.Commit(); -diff --git svx/source/msfilter/mstoolbar.cxx svx/source/msfilter/mstoolbar.cxx -new file mode 100644 -index 0000000..698f19e ---- /dev/null -+++ svx/source/msfilter/mstoolbar.cxx +--- svx/source/msfilter/mstoolbar.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ svx/source/msfilter/mstoolbar.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,817 @@ +#include <svx/mstoolbar.hxx> +#include <rtl/ustrbuf.hxx> @@ -30223,10 +29349,8 @@ index 0000000..698f19e + rcFloat.Print( fp ); +} + -diff --git svx/source/msfilter/msvbahelper.cxx svx/source/msfilter/msvbahelper.cxx -index f814fe6..7919fb6 100644 ---- svx/source/msfilter/msvbahelper.cxx -+++ svx/source/msfilter/msvbahelper.cxx +--- svx/source/msfilter/msvbahelper.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ svx/source/msfilter/msvbahelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -40,6 +40,7 @@ #include <com/sun/star/document/XDocumentInfoSupplier.hpp> #include <tools/urlobj.hxx> @@ -30235,7 +29359,7 @@ index f814fe6..7919fb6 100644 using namespace ::com::sun::star; -@@ -99,7 +100,17 @@ SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath ) +@@ -99,7 +100,17 @@ SfxObjectShell* findShellForUrl( const r } else { @@ -30254,7 +29378,7 @@ index f814fe6..7919fb6 100644 { pFoundShell = pShell; break; -@@ -206,9 +217,19 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin +@@ -206,9 +217,19 @@ VBAMacroResolvedInfo resolveVBAMacro( Sf String sDocUrlOrPath = MacroName.copy( 0, nDocSepIndex ); sMacroUrl = MacroName.copy( nDocSepIndex + 1 ); OSL_TRACE("doc search, current shell is 0x%x", pShell ); @@ -30276,10 +29400,8 @@ index f814fe6..7919fb6 100644 } else { -diff --git svx/source/msfilter/msvbasic.cxx svx/source/msfilter/msvbasic.cxx -index b8df285..7163037 100644 ---- svx/source/msfilter/msvbasic.cxx -+++ svx/source/msfilter/msvbasic.cxx +--- svx/source/msfilter/msvbasic.cxx.old 2009-10-07 15:07:01.000000000 +0200 ++++ svx/source/msfilter/msvbasic.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -40,6 +40,801 @@ #include <osl/endian.h> #include <rtl/tencinfo.h> //rtl_getTextEncodingFromWindowsCodePage @@ -31082,7 +30204,7 @@ index b8df285..7163037 100644 /* A few urls which may in the future be of some use -@@ -153,7 +948,21 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage) +@@ -153,7 +948,21 @@ int VBA_Impl::ReadVBAProject(const SvSto xVBAProject = rxVBAStorage->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "_VBA_PROJECT" ) ), STREAM_STD_READ | STREAM_NOCREATE ); @@ -31105,7 +30227,7 @@ index b8df285..7163037 100644 if( !xVBAProject.Is() || SVSTREAM_OK != xVBAProject->GetError() ) { DBG_WARNING("Not able to find vba project, cannot find macros"); -@@ -432,7 +1241,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage) +@@ -432,7 +1241,7 @@ int VBA_Impl::ReadVBAProject(const SvSto * */ @@ -31114,7 +30236,7 @@ index b8df285..7163037 100644 { ModuleTypeHash::iterator iter = mhModHash.find( rModuleName ); ModuleTypeHash::iterator iterEnd = mhModHash.end(); -@@ -440,7 +1249,7 @@ ModuleType VBA_Impl::GetModuleType( const UniString& rModuleName ) +@@ -440,7 +1249,7 @@ ModuleType VBA_Impl::GetModuleType( cons { return iter->second; } @@ -31123,7 +30245,7 @@ index b8df285..7163037 100644 } bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel ) -@@ -453,6 +1262,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel ) +@@ -453,6 +1262,7 @@ bool VBA_Impl::Open( const String &rTopl if( !xMacros.Is() || SVSTREAM_OK != xMacros->GetError() ) { DBG_WARNING("No Macros Storage"); @@ -31131,7 +30253,7 @@ index b8df285..7163037 100644 } else { -@@ -462,6 +1272,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel ) +@@ -462,6 +1272,7 @@ bool VBA_Impl::Open( const String &rTopl if( !xVBA.Is() || SVSTREAM_OK != xVBA->GetError() ) { DBG_WARNING("No Visual Basic in Storage"); @@ -31139,7 +30261,7 @@ index b8df285..7163037 100644 } else { -@@ -476,6 +1287,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel ) +@@ -476,6 +1287,7 @@ bool VBA_Impl::Open( const String &rTopl * ( value ) is either a Class Module, Form Module or a plain VB Module. */ SvStorageStreamRef xProject = xMacros->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "PROJECT" ) ) ); @@ -31147,7 +30269,7 @@ index b8df285..7163037 100644 SvStorageStream* pStp = xProject; UniString tmp; static const String sThisDoc( RTL_CONSTASCII_USTRINGPARAM( "ThisDocument" ) ); -@@ -483,7 +1295,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel ) +@@ -483,7 +1295,7 @@ bool VBA_Impl::Open( const String &rTopl static const String sClass( RTL_CONSTASCII_USTRINGPARAM( "Class" ) ); static const String sBaseClass( RTL_CONSTASCII_USTRINGPARAM( "BaseClass" ) ); static const String sDocument( RTL_CONSTASCII_USTRINGPARAM( "Document" ) ); @@ -31156,7 +30278,7 @@ index b8df285..7163037 100644 while ( pStp->ReadByteStringLine( tmp, meCharSet ) ) { xub_StrLen index = tmp.Search( '=' ); -@@ -493,14 +1305,14 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel ) +@@ -493,14 +1305,14 @@ bool VBA_Impl::Open( const String &rTopl String value = tmp.Copy( index + 1 ); if ( key == sClass ) { @@ -31173,7 +30295,7 @@ index b8df285..7163037 100644 OSL_TRACE("Module %s is of type Form", ::rtl::OUStringToOString( value , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); -@@ -513,14 +1325,14 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel ) +@@ -513,14 +1325,14 @@ bool VBA_Impl::Open( const String &rTopl // value is of form <name>/&H<identifier>, strip the identifier value.Erase( value.Search( '/' ) ); @@ -31190,10 +30312,8 @@ index b8df285..7163037 100644 OSL_TRACE("Module %s is of type Normal VBA", ::rtl::OUStringToOString( value , RTL_TEXTENCODING_ASCII_US ).pData->buffer ); -diff --git svx/source/msfilter/msvbasic.hxx svx/source/msfilter/msvbasic.hxx -index 8492062..93ae0a2 100644 ---- svx/source/msfilter/msvbasic.hxx -+++ svx/source/msfilter/msvbasic.hxx +--- svx/source/msfilter/msvbasic.hxx.old 2009-10-07 15:07:01.000000000 +0200 ++++ svx/source/msfilter/msvbasic.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -45,6 +45,8 @@ #include <vector> #endif @@ -31246,10 +30366,8 @@ index 8492062..93ae0a2 100644 }; #endif -diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx -index a2448c8..3660afb 100644 ---- svx/source/msfilter/svxmsbas.cxx -+++ svx/source/msfilter/svxmsbas.cxx +--- svx/source/msfilter/svxmsbas.cxx.old 2009-10-08 16:17:56.000000000 +0200 ++++ svx/source/msfilter/svxmsbas.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -53,6 +53,7 @@ using namespace com::sun::star::awt; #include <com/sun/star/container/XNameContainer.hpp> @@ -31306,7 +30424,7 @@ index a2448c8..3660afb 100644 if( bCopy && CopyStorage_Impl( rStorageName, rSubStorageName )) nRet |= 2; -@@ -80,9 +109,44 @@ int SvxImportMSVBasic::Import( const String& rStorageName, +@@ -80,9 +109,44 @@ int SvxImportMSVBasic::Import( const Str } bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName, @@ -31353,7 +30471,7 @@ index a2448c8..3660afb 100644 STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL)); if (!xVBAStg.Is() || xVBAStg->GetError()) return false; -@@ -115,6 +179,10 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName, +@@ -115,6 +179,10 @@ bool SvxImportMSVBasic::ImportForms_Impl DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" ); String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); @@ -31364,7 +30482,7 @@ index a2448c8..3660afb 100644 Reference<XNameContainer> xLib; if (xLibContainer.is()) { -@@ -164,7 +232,17 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName, +@@ -164,7 +232,17 @@ bool SvxImportMSVBasic::ImportForms_Impl xSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel"))), uno::UNO_QUERY); @@ -31383,7 +30501,7 @@ index a2448c8..3660afb 100644 OCX_UserForm aForm(xVBAStg, *aIter, *aIter, xDialog, xSF ); aForm.pDocSh = &rDocSh; sal_Bool bOk = aForm.Read(xTypes); -@@ -228,29 +306,80 @@ BOOL SvxImportMSVBasic::CopyStorage_Impl( const String& rStorageName, +@@ -228,29 +306,80 @@ BOOL SvxImportMSVBasic::CopyStorage_Impl BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, const String &rSubStorageName, @@ -31466,7 +30584,7 @@ index a2448c8..3660afb 100644 for( UINT16 i=0; i<nStreamCount;i++) { StringArray aDecompressed = aVBA.Decompress(i); -@@ -284,7 +413,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, +@@ -284,7 +413,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( // is the same as the encoding for the names // that are keys in the map used by GetModuleType method const String &sOrigVBAModName = aVBA.GetStreamName( i ); @@ -31475,7 +30593,7 @@ index a2448c8..3660afb 100644 rtl::OUString sClassRem( RTL_CONSTASCII_USTRINGPARAM( "Rem Attribute VBA_ModuleType=" ) ); -@@ -292,23 +421,23 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, +@@ -292,23 +421,23 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( switch( mType ) { @@ -31504,7 +30622,7 @@ index a2448c8..3660afb 100644 modeTypeComment = sClassRem + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VBAUnknown\n" ) ); break; -@@ -316,12 +445,11 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, +@@ -316,12 +445,11 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( DBG_ERRORFILE( "SvxImportMSVBasic::ImportCode_Impl - unknown module type" ); break; } @@ -31519,7 +30637,7 @@ index a2448c8..3660afb 100644 modeTypeComment = modeTypeComment + sClassOption; } -@@ -369,7 +497,12 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, +@@ -369,7 +497,12 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( if( nEnd == STRING_NOTFOUND ) pStr->Erase(); else @@ -31532,7 +30650,7 @@ index a2448c8..3660afb 100644 } } if( aDecompressed.Get(j)->Len() ) -@@ -383,24 +516,79 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName, +@@ -383,24 +516,79 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( aSource += rtl::OUString::createFromAscii("\nEnd Sub"); } ::rtl::OUString aModName( sModule ); @@ -31625,10 +30743,8 @@ index a2448c8..3660afb 100644 } /* vi:set tabstop=4 shiftwidth=4 expandtab: */ -diff --git sw/inc/doc.hxx sw/inc/doc.hxx -index 66695ef..a619442 100644 ---- sw/inc/doc.hxx -+++ sw/inc/doc.hxx +--- sw/inc/doc.hxx.old 2009-10-21 11:49:24.000000000 +0200 ++++ sw/inc/doc.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -82,6 +82,7 @@ class SwList; #include "comphelper/implementationreference.hxx" #include <com/sun/star/chart2/data/XDataProvider.hpp> @@ -31656,11 +30772,9 @@ index 66695ef..a619442 100644 ::sfx2::IXmlIdRegistry& GetXmlIdRegistry(); ::sw::MetaFieldManager & GetMetaFieldManager(); -diff --git sw/inc/docsh.hxx sw/inc/docsh.hxx -index 62b4848..5ada9e7 100644 ---- sw/inc/docsh.hxx -+++ sw/inc/docsh.hxx -@@ -85,6 +85,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener +--- sw/inc/docsh.hxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/inc/docsh.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -85,6 +85,7 @@ class SW_DLLPUBLIC SwDocShell: public Sf comphelper::EmbeddedObjectContainer* pOLEChildList; sal_Int16 nUpdateDocMode; // contains the com::sun::star::document::UpdateDocMode bool bInUpdateFontList; //prevent nested calls of UpdateFontList @@ -31677,10 +30791,8 @@ index 62b4848..5ada9e7 100644 virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const; }; -diff --git sw/inc/unocoll.hxx sw/inc/unocoll.hxx -index a1d5139..cb7fb96 100644 ---- sw/inc/unocoll.hxx -+++ sw/inc/unocoll.hxx +--- sw/inc/unocoll.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/inc/unocoll.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -198,8 +198,11 @@ class SwUnoCollection #define SW_SERVICE_TYPE_FIELDMARK 107 #define SW_SERVICE_TYPE_FORMFIELDMARK 108 @@ -31694,10 +30806,8 @@ index a1d5139..cb7fb96 100644 #define SW_SERVICE_INVALID USHRT_MAX -diff --git sw/inc/unotbl.hxx sw/inc/unotbl.hxx -index 20b769f..cff829f 100644 ---- sw/inc/unotbl.hxx -+++ sw/inc/unotbl.hxx +--- sw/inc/unotbl.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/inc/unotbl.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -323,7 +323,7 @@ public: SwXTextTable(SwFrmFmt& rFrmFmt); @@ -31707,10 +30817,8 @@ index 20b769f..cff829f 100644 //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); -diff --git sw/source/core/doc/doc.cxx sw/source/core/doc/doc.cxx -index d5fc279..503025d 100644 ---- sw/source/core/doc/doc.cxx -+++ sw/source/core/doc/doc.cxx +--- sw/source/core/doc/doc.cxx.old 2009-10-21 11:49:24.000000000 +0200 ++++ sw/source/core/doc/doc.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -2007,6 +2007,28 @@ void SwDoc::ChkCondColls() } } @@ -31740,10 +30848,8 @@ index d5fc279..503025d 100644 void SwDoc::setExternalData(::sw::tExternalDataType eType, ::sw::tExternalDataPointer pPayload) { -diff --git sw/source/core/unocore/unocoll.cxx sw/source/core/unocore/unocoll.cxx -index 06bbca4..7b1d66e 100644 ---- sw/source/core/unocore/unocoll.cxx -+++ sw/source/core/unocore/unocoll.cxx +--- sw/source/core/unocore/unocoll.cxx.old 2009-10-19 13:27:30.000000000 +0200 ++++ sw/source/core/unocore/unocoll.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -78,7 +78,14 @@ #include "unometa.hxx" @@ -31945,7 +31051,7 @@ index 06bbca4..7b1d66e 100644 /****************************************************************************** * ******************************************************************************/ -@@ -210,6 +395,9 @@ const ProvNamesId_Type __FAR_DATA aProvNamesId[] = +@@ -210,6 +395,9 @@ const ProvNamesId_Type __FAR_DATA aProvN { "com.sun.star.text.Fieldmark", SW_SERVICE_TYPE_FIELDMARK }, { "com.sun.star.text.FormFieldmark", SW_SERVICE_TYPE_FORMFIELDMARK }, { "com.sun.star.text.InContentMetadata", SW_SERVICE_TYPE_META }, @@ -31955,7 +31061,7 @@ index 06bbca4..7b1d66e 100644 // case-correct versions of the service names (see #i67811) { CSS_TEXT_TEXTFIELD_DATE_TIME, SW_SERVICE_FIELDTYPE_DATETIME }, -@@ -390,6 +578,30 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 +@@ -390,6 +578,30 @@ uno::Reference< uno::XInterface > SwXS xRet = (cppu::OWeakObject*)pFieldmark; } break; @@ -31986,11 +31092,9 @@ index 06bbca4..7b1d66e 100644 case SW_SERVICE_TYPE_FOOTNOTE : xRet = (cppu::OWeakObject*)new SwXFootnote(sal_False); break; -diff --git sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unomap.cxx -index 4d535f1..a3cd81f 100644 ---- sw/source/core/unocore/unomap.cxx -+++ sw/source/core/unocore/unomap.cxx -@@ -1591,11 +1591,13 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s +--- sw/source/core/unocore/unomap.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/core/unocore/unomap.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -1591,11 +1591,13 @@ const SfxItemPropertyMapEntry* SwUnoProp { SW_PROP_NMID(UNO_NAME_CHAR_LOCALE), RES_CHRATR_LANGUAGE , CPPU_E2T(CPPUTYPE_LOCALE), PropertyAttribute::MAYBEVOID, MID_LANG_LOCALE }, { SW_PROP_NMID(UNO_NAME_CHARACTER_COUNT), WID_DOC_CHAR_COUNT, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::READONLY, 0}, { SW_PROP_NMID(UNO_NAME_DIALOG_LIBRARIES), WID_DOC_DIALOG_LIBRARIES, CPPU_E2T(CPPUTYPE_REFLIBCONTAINER), PropertyAttribute::READONLY, 0}, @@ -32004,10 +31108,8 @@ index 4d535f1..a3cd81f 100644 { SW_PROP_NMID(UNO_NAME_WORD_SEPARATOR), WID_DOC_WORD_SEPARATOR, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, { SW_PROP_NMID(UNO_NAME_HIDE_FIELD_TIPS), WID_DOC_HIDE_TIPS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, { SW_PROP_NMID(UNO_NAME_REDLINE_DISPLAY_TYPE), WID_DOC_REDLINE_DISPLAY, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0}, -diff --git sw/source/core/unocore/unoprnms.cxx sw/source/core/unocore/unoprnms.cxx -index fc0cddd..85ff600 100644 ---- sw/source/core/unocore/unoprnms.cxx -+++ sw/source/core/unocore/unoprnms.cxx +--- sw/source/core/unocore/unoprnms.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/core/unocore/unoprnms.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -781,6 +781,9 @@ const SwPropNameTab aPropNameTab = { /* 0736 UNO_NAME_OUTLINE_LEVEL */ {MAP_CHAR_LEN("OutlineLevel")},//#outline level,add<-zhaojianwei Outlinelevel /* 0737 UNO_NAME_DESCRIPTION */ {MAP_CHAR_LEN("Description")}, @@ -32018,10 +31120,8 @@ index fc0cddd..85ff600 100644 }; const SwPropNameLen& SwGetPropName( USHORT nId ) -diff --git sw/source/filter/ww8/makefile.mk sw/source/filter/ww8/makefile.mk -index 164a8fe..455cca2 100644 ---- sw/source/filter/ww8/makefile.mk -+++ sw/source/filter/ww8/makefile.mk +--- sw/source/filter/ww8/makefile.mk.old 2009-10-21 11:49:24.000000000 +0200 ++++ sw/source/filter/ww8/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -71,6 +71,7 @@ EXCEPTIONSFILES = \ $(SLO)$/WW8TableInfo.obj \ $(SLO)$/WW8FFData.obj \ @@ -32038,10 +31138,8 @@ index 164a8fe..455cca2 100644 $(SLO)$/WW8FibData.obj -diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx -index 9b5a785..1ff40fc 100644 ---- sw/source/filter/ww8/ww8par.cxx -+++ sw/source/filter/ww8/ww8par.cxx +--- sw/source/filter/ww8/ww8par.cxx.old 2010-01-21 01:00:04.000000000 +0100 ++++ sw/source/filter/ww8/ww8par.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -132,11 +132,19 @@ #include <svtools/itemiter.hxx> //SfxItemIter @@ -32150,7 +31248,7 @@ index 9b5a785..1ff40fc 100644 SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr ) : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo, -@@ -3730,11 +3819,164 @@ void SwWW8ImplReader::ReadDocInfo() +@@ -3733,11 +3822,164 @@ void SwWW8ImplReader::ReadDocInfo() DBG_ASSERT(xDocProps.is(), "DocumentProperties is null"); if (xDocProps.is()) { @@ -32315,7 +31413,7 @@ index 9b5a785..1ff40fc 100644 ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) { ULONG nErrRet = 0; -@@ -4018,7 +4260,59 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) +@@ -4021,7 +4263,59 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Gloss } else //ordinary case { @@ -32375,7 +31473,7 @@ index 9b5a785..1ff40fc 100644 } ::SetProgressState(nProgress, mpDocShell); // Update -@@ -4092,26 +4386,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) +@@ -4095,26 +4389,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Gloss eMode |= nsRedlineMode_t::REDLINE_ON; if( pWDop->fRMView ) eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; @@ -32402,10 +31500,8 @@ index 9b5a785..1ff40fc 100644 } maInsertedTables.DelAndMakeTblFrms(); -diff --git sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par.hxx -index a377602..5401ba8 100644 ---- sw/source/filter/ww8/ww8par.hxx -+++ sw/source/filter/ww8/ww8par.hxx +--- sw/source/filter/ww8/ww8par.hxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/filter/ww8/ww8par.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -1425,7 +1425,7 @@ private: // determine object attribute "Layout in Table Cell" bool IsObjectLayoutInTableCell( const UINT32 nLayoutInTableCell ) const; @@ -32415,11 +31511,8 @@ index a377602..5401ba8 100644 //No copying SwWW8ImplReader(const SwWW8ImplReader &); SwWW8ImplReader& operator=(const SwWW8ImplReader&); -diff --git sw/source/filter/ww8/ww8toolbar.cxx sw/source/filter/ww8/ww8toolbar.cxx -new file mode 100644 -index 0000000..42f22d1 ---- /dev/null -+++ sw/source/filter/ww8/ww8toolbar.cxx +--- sw/source/filter/ww8/ww8toolbar.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/filter/ww8/ww8toolbar.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,1288 @@ +#include "ww8toolbar.hxx" +#include <rtl/ustrbuf.hxx> @@ -33709,11 +32802,8 @@ index 0000000..42f22d1 + indent_printf( fp, " reserved7 0x%x\n", static_cast< unsigned int >( reserved7 ) ); +} + -diff --git sw/source/filter/ww8/ww8toolbar.hxx sw/source/filter/ww8/ww8toolbar.hxx -new file mode 100644 -index 0000000..3dcf2de ---- /dev/null -+++ sw/source/filter/ww8/ww8toolbar.hxx +--- sw/source/filter/ww8/ww8toolbar.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/filter/ww8/ww8toolbar.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,347 @@ +#ifndef _WW8TOOLBAR_HXX +#define _WW8TOOLBAR_HXX @@ -34062,11 +33152,9 @@ index 0000000..3dcf2de +}; + +#endif -diff --git sw/source/ui/app/docsh.cxx sw/source/ui/app/docsh.cxx -index ec29858..2998a60 100644 ---- sw/source/ui/app/docsh.cxx -+++ sw/source/ui/app/docsh.cxx -@@ -495,16 +495,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium ) +--- sw/source/ui/app/docsh.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/ui/app/docsh.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -495,16 +495,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& xDocSh->DoClose(); } @@ -34083,10 +33171,8 @@ index ec29858..2998a60 100644 // TabellenBox Edit beenden! if( pWrtShell ) -diff --git sw/source/ui/app/docsh2.cxx sw/source/ui/app/docsh2.cxx -index 1b0a0c1..f923905 100644 ---- sw/source/ui/app/docsh2.cxx -+++ sw/source/ui/app/docsh2.cxx +--- sw/source/ui/app/docsh2.cxx.old 2009-10-08 16:17:18.000000000 +0200 ++++ sw/source/ui/app/docsh2.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -151,6 +151,8 @@ #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> @@ -34136,7 +33222,7 @@ index 1b0a0c1..f923905 100644 /*-------------------------------------------------------------------- Beschreibung: Benachrichtigung bei geaenderter DocInfo -@@ -235,6 +263,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) +@@ -235,6 +263,9 @@ void SwDocShell::Notify( SfxBroadcaster& // ASSERT( !this, "DocShell ist nicht richtig initialisiert!" ); return ; } @@ -34146,7 +33232,7 @@ index 1b0a0c1..f923905 100644 USHORT nAction = 0; if( rHint.ISA(SfxSimpleHint) ) -@@ -317,6 +348,16 @@ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) +@@ -317,6 +348,16 @@ USHORT SwDocShell::PrepareClose( BOOL bU if( TRUE == nRet ) //Unbedingt auf TRUE abfragen! (RET_NEWTASK) EndListening( *this ); @@ -34163,10 +33249,8 @@ index 1b0a0c1..f923905 100644 return nRet; } -diff --git sw/source/ui/uno/unotxdoc.cxx sw/source/ui/uno/unotxdoc.cxx -index 1ebfda6..7143f4d 100644 ---- sw/source/ui/uno/unotxdoc.cxx -+++ sw/source/ui/uno/unotxdoc.cxx +--- sw/source/ui/uno/unotxdoc.cxx.old 2009-10-08 16:17:19.000000000 +0200 ++++ sw/source/ui/uno/unotxdoc.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -166,6 +166,7 @@ using ::osl::FileBase; #define SW_CREATE_MARKER_TABLE 0x06 #define SW_CREATE_DRAW_DEFAULTS 0x07 @@ -34175,7 +33259,7 @@ index 1ebfda6..7143f4d 100644 /****************************************************************************** * -@@ -220,6 +221,12 @@ sal_Int64 SAL_CALL SwXTextDocument::getSomething( const Sequence< sal_Int8 >& rI +@@ -220,6 +221,12 @@ sal_Int64 SAL_CALL SwXTextDocument::getS { return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); } @@ -34188,7 +33272,7 @@ index 1ebfda6..7143f4d 100644 sal_Int64 nRet = SfxBaseModel::getSomething( rId ); if ( nRet ) -@@ -366,6 +373,9 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell) : +@@ -366,6 +373,9 @@ SwXTextDocument::SwXTextDocument(SwDocSh pxXRedlines(0), m_pHiddenViewFrame(0) { @@ -34198,7 +33282,7 @@ index 1ebfda6..7143f4d 100644 } /*-- 18.12.98 11:53:00--------------------------------------------------- -@@ -2145,6 +2155,9 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) +@@ -2145,6 +2155,9 @@ Any SwXTextDocument::getPropertyValue(co Any aAny; switch(pEntry->nWID) { @@ -34208,7 +33292,7 @@ index 1ebfda6..7143f4d 100644 case WID_DOC_CHAR_COUNT : case WID_DOC_PARA_COUNT : case WID_DOC_WORD_COUNT : -@@ -2253,6 +2266,14 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) +@@ -2253,6 +2266,14 @@ Any SwXTextDocument::getPropertyValue(co case WID_DOC_DIALOG_LIBRARIES: aAny <<= pDocShell->GetDialogContainer(); break; @@ -34223,7 +33307,7 @@ index 1ebfda6..7143f4d 100644 case WID_DOC_RUNTIME_UID: aAny <<= getRuntimeUID(); break; -@@ -2902,6 +2923,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( +@@ -2902,6 +2923,7 @@ uno::Sequence< lang::Locale > SAL_CALL S { ::vos::OGuard aGuard(Application::GetSolarMutex()); @@ -34231,10 +33315,8 @@ index 1ebfda6..7143f4d 100644 // possible canonical values for nScriptTypes // any bit wise combination is allowed const sal_Int16 nLatin = 0x001; -diff --git sw/source/ui/vba/makefile.mk sw/source/ui/vba/makefile.mk -index f51ef26..741ad0c 100644 ---- sw/source/ui/vba/makefile.mk -+++ sw/source/ui/vba/makefile.mk +--- sw/source/ui/vba/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -86,6 +86,7 @@ SLOFILES= \ $(SLO)$/vbaborders.obj \ $(SLO)$/vbadocuments.obj \ @@ -34274,10 +33356,8 @@ index f51ef26..741ad0c 100644 # --- Targets ------------------------------------------------------ -diff --git sw/source/ui/vba/service.cxx sw/source/ui/vba/service.cxx -index 0ed9492..ae34ec0 100644 ---- sw/source/ui/vba/service.cxx -+++ sw/source/ui/vba/service.cxx +--- sw/source/ui/vba/service.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/service.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -55,6 +55,11 @@ namespace wrapformat extern sdecl::ServiceDecl const serviceDecl; } @@ -34308,10 +33388,8 @@ index 0ed9492..ae34ec0 100644 OSL_TRACE("Ret is 0x%x", pRet); return pRet; } -diff --git sw/source/ui/vba/vbaapplication.cxx sw/source/ui/vba/vbaapplication.cxx -index ba57192..0d5dadb 100644 ---- sw/source/ui/vba/vbaapplication.cxx -+++ sw/source/ui/vba/vbaapplication.cxx +--- sw/source/ui/vba/vbaapplication.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaapplication.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -43,6 +43,7 @@ #include <svx/acorrcfg.hxx> #include "wordvbahelper.hxx" @@ -34320,7 +33398,7 @@ index ba57192..0d5dadb 100644 using namespace ::ooo; using namespace ::ooo::vba; -@@ -154,6 +155,16 @@ SwVbaApplication::Dialogs( const uno::Any& index ) throw (uno::RuntimeException) +@@ -154,6 +155,16 @@ SwVbaApplication::Dialogs( const uno::An return uno::makeAny( xCol ); } @@ -34337,10 +33415,8 @@ index ba57192..0d5dadb 100644 sal_Bool SAL_CALL SwVbaApplication::getDisplayAutoCompleteTips() throw (css::uno::RuntimeException) { return SvxAutoCorrCfg::Get()->IsAutoTextTip(); -diff --git sw/source/ui/vba/vbaapplication.hxx sw/source/ui/vba/vbaapplication.hxx -index 935a03c..88736ff 100644 ---- sw/source/ui/vba/vbaapplication.hxx -+++ sw/source/ui/vba/vbaapplication.hxx +--- sw/source/ui/vba/vbaapplication.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaapplication.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -63,6 +63,7 @@ public: virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -34349,10 +33425,8 @@ index 935a03c..88736ff 100644 virtual sal_Bool SAL_CALL getDisplayAutoCompleteTips() throw (css::uno::RuntimeException); virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException); -diff --git sw/source/ui/vba/vbaautotextentry.cxx sw/source/ui/vba/vbaautotextentry.cxx -index 30bdc2a..47745d3 100644 ---- sw/source/ui/vba/vbaautotextentry.cxx -+++ sw/source/ui/vba/vbaautotextentry.cxx +--- sw/source/ui/vba/vbaautotextentry.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaautotextentry.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -29,7 +29,9 @@ ************************************************************************/ #include "vbaautotextentry.hxx" @@ -34363,7 +33437,7 @@ index 30bdc2a..47745d3 100644 #include "vbarange.hxx" using namespace ::ooo::vba; -@@ -44,7 +46,7 @@ SwVbaAutoTextEntry::~SwVbaAutoTextEntry() +@@ -44,7 +46,7 @@ SwVbaAutoTextEntry::~SwVbaAutoTextEntry( { } @@ -34372,7 +33446,7 @@ index 30bdc2a..47745d3 100644 { SwVbaRange* pWhere = dynamic_cast<SwVbaRange*>( _where.get() ); if( pWhere ) -@@ -58,8 +60,28 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R +@@ -58,8 +60,28 @@ uno::Reference< word::XRange > SAL_CALL uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() ); xTC->goRight( 1, sal_True ); xTC->setString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("") ) ); // remove marker @@ -34402,7 +33476,7 @@ index 30bdc2a..47745d3 100644 pWhere->setXTextCursor( xTC ); } return uno::Reference< word::XRange >( pWhere ); -@@ -98,8 +120,9 @@ SwVbaAutoTextEntries::getElementType() throw (uno::RuntimeException) +@@ -98,8 +120,9 @@ SwVbaAutoTextEntries::getElementType() t uno::Reference< container::XEnumeration > SwVbaAutoTextEntries::createEnumeration() throw (uno::RuntimeException) { @@ -34414,10 +33488,8 @@ index 30bdc2a..47745d3 100644 } uno::Any -diff --git sw/source/ui/vba/vbabookmark.cxx sw/source/ui/vba/vbabookmark.cxx -index 0c7bacf..9e77b51 100644 ---- sw/source/ui/vba/vbabookmark.cxx -+++ sw/source/ui/vba/vbabookmark.cxx +--- sw/source/ui/vba/vbabookmark.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbabookmark.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,9 +32,12 @@ #include <tools/diagnose_ex.h> #include <com/sun/star/text/XTextDocument.hpp> @@ -34431,7 +33503,7 @@ index 0c7bacf..9e77b51 100644 using namespace ::ooo::vba; using namespace ::com::sun::star; -@@ -68,8 +71,8 @@ void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException ) +@@ -68,8 +71,8 @@ void SAL_CALL SwVbaBookmark::Delete() th void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException ) { checkVality(); @@ -34442,11 +33514,9 @@ index 0c7bacf..9e77b51 100644 } rtl::OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException ) -diff --git sw/source/ui/vba/vbabookmarks.cxx sw/source/ui/vba/vbabookmarks.cxx -index e7d73cf..86a82a9 100644 ---- sw/source/ui/vba/vbabookmarks.cxx -+++ sw/source/ui/vba/vbabookmarks.cxx -@@ -123,7 +123,7 @@ SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParen +--- sw/source/ui/vba/vbabookmarks.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbabookmarks.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -123,7 +123,7 @@ SwVbaBookmarks::SwVbaBookmarks( const un uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW ); // use view cursor to insert bookmark, or it will fail if insert bookmark in table // mxText = xDocument->getText(); @@ -34455,7 +33525,7 @@ index e7d73cf..86a82a9 100644 } // XEnumerationAccess uno::Type -@@ -149,16 +149,16 @@ SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource ) +@@ -149,16 +149,16 @@ SwVbaBookmarks::createCollectionObject( void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException) { uno::Reference< text::XTextContent > xBookmark( m_xNameAccess->getByName( rName ), uno::UNO_QUERY_THROW ); @@ -34476,7 +33546,7 @@ index e7d73cf..86a82a9 100644 } uno::Any SAL_CALL -@@ -184,7 +184,7 @@ SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw +@@ -184,7 +184,7 @@ SwVbaBookmarks::Add( const rtl::OUString if( m_xNameAccess->hasByName( aName ) ) removeBookmarkByName( aName ); @@ -34485,10 +33555,8 @@ index e7d73cf..86a82a9 100644 return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); } -diff --git sw/source/ui/vba/vbabookmarks.hxx sw/source/ui/vba/vbabookmarks.hxx -index 6047788..fc7539c 100644 ---- sw/source/ui/vba/vbabookmarks.hxx -+++ sw/source/ui/vba/vbabookmarks.hxx +--- sw/source/ui/vba/vbabookmarks.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbabookmarks.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -50,12 +50,12 @@ private: private: @@ -34503,11 +33571,9 @@ index 6047788..fc7539c 100644 // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); -diff --git sw/source/ui/vba/vbaborders.cxx sw/source/ui/vba/vbaborders.cxx -index 0c7c4f7..f10864c 100644 ---- sw/source/ui/vba/vbaborders.cxx -+++ sw/source/ui/vba/vbaborders.cxx -@@ -351,14 +351,19 @@ SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeEx +--- sw/source/ui/vba/vbaborders.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaborders.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -351,14 +351,19 @@ SwVbaBorders::getItemByIntIndex( const s sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException) { @@ -34528,11 +33594,8 @@ index 0c7c4f7..f10864c 100644 } rtl::OUString& -diff --git sw/source/ui/vba/vbacell.cxx sw/source/ui/vba/vbacell.cxx -new file mode 100644 -index 0000000..59e2f22 ---- /dev/null -+++ sw/source/ui/vba/vbacell.cxx +--- sw/source/ui/vba/vbacell.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacell.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,120 @@ +/************************************************************************* + * @@ -34654,11 +33717,8 @@ index 0000000..59e2f22 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbacell.hxx sw/source/ui/vba/vbacell.hxx -new file mode 100644 -index 0000000..1350288 ---- /dev/null -+++ sw/source/ui/vba/vbacell.hxx +--- sw/source/ui/vba/vbacell.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacell.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,67 @@ +/************************************************************************* + * @@ -34727,11 +33787,8 @@ index 0000000..1350288 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_CELL_HXX */ -diff --git sw/source/ui/vba/vbacells.cxx sw/source/ui/vba/vbacells.cxx -new file mode 100644 -index 0000000..919306b ---- /dev/null -+++ sw/source/ui/vba/vbacells.cxx +--- sw/source/ui/vba/vbacells.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacells.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,223 @@ +/************************************************************************* + * @@ -34956,11 +34013,8 @@ index 0000000..919306b + } + return sNames; +} -diff --git sw/source/ui/vba/vbacells.hxx sw/source/ui/vba/vbacells.hxx -new file mode 100644 -index 0000000..3468b29 ---- /dev/null -+++ sw/source/ui/vba/vbacells.hxx +--- sw/source/ui/vba/vbacells.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacells.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,75 @@ +/************************************************************************* + * @@ -35037,11 +34091,8 @@ index 0000000..3468b29 +}; + +#endif /* SW_VBA_CELLS_HXX */ -diff --git sw/source/ui/vba/vbacheckbox.cxx sw/source/ui/vba/vbacheckbox.cxx -new file mode 100644 -index 0000000..307f7a2 ---- /dev/null -+++ sw/source/ui/vba/vbacheckbox.cxx +--- sw/source/ui/vba/vbacheckbox.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacheckbox.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,98 @@ +/************************************************************************* + * @@ -35141,11 +34192,8 @@ index 0000000..307f7a2 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbacheckbox.hxx sw/source/ui/vba/vbacheckbox.hxx -new file mode 100644 -index 0000000..7b12ed5 ---- /dev/null -+++ sw/source/ui/vba/vbacheckbox.hxx +--- sw/source/ui/vba/vbacheckbox.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacheckbox.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -35205,11 +34253,8 @@ index 0000000..7b12ed5 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_CHECKBOX_HXX */ -diff --git sw/source/ui/vba/vbacolumn.cxx sw/source/ui/vba/vbacolumn.cxx -new file mode 100644 -index 0000000..3dd4eb1 ---- /dev/null -+++ sw/source/ui/vba/vbacolumn.cxx +--- sw/source/ui/vba/vbacolumn.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacolumn.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,201 @@ +/************************************************************************* + * @@ -35412,11 +34457,8 @@ index 0000000..3dd4eb1 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbacolumn.hxx sw/source/ui/vba/vbacolumn.hxx -new file mode 100644 -index 0000000..6d67bdd ---- /dev/null -+++ sw/source/ui/vba/vbacolumn.hxx +--- sw/source/ui/vba/vbacolumn.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacolumn.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,68 @@ +/************************************************************************* + * @@ -35486,11 +34528,8 @@ index 0000000..6d67bdd + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_COLUMN_HXX */ -diff --git sw/source/ui/vba/vbacolumns.cxx sw/source/ui/vba/vbacolumns.cxx -new file mode 100644 -index 0000000..1ce3bf9 ---- /dev/null -+++ sw/source/ui/vba/vbacolumns.cxx +--- sw/source/ui/vba/vbacolumns.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacolumns.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,160 @@ +/************************************************************************* + * @@ -35652,11 +34691,8 @@ index 0000000..1ce3bf9 + } + return sNames; +} -diff --git sw/source/ui/vba/vbacolumns.hxx sw/source/ui/vba/vbacolumns.hxx -new file mode 100644 -index 0000000..3fd2b4a ---- /dev/null -+++ sw/source/ui/vba/vbacolumns.hxx +--- sw/source/ui/vba/vbacolumns.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbacolumns.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,75 @@ +/************************************************************************* + * @@ -35733,10 +34769,8 @@ index 0000000..3fd2b4a +}; + +#endif /* SW_VBA_COLUMNS_HXX */ -diff --git sw/source/ui/vba/vbadocument.cxx sw/source/ui/vba/vbadocument.cxx -index 1409dbb..fa1ee0e 100644 ---- sw/source/ui/vba/vbadocument.cxx -+++ sw/source/ui/vba/vbadocument.cxx +--- sw/source/ui/vba/vbadocument.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbadocument.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -41,7 +41,9 @@ #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/drawing/XControlShape.hpp> @@ -35761,7 +34795,7 @@ index 1409dbb..fa1ee0e 100644 using namespace ::ooo::vba; using namespace ::com::sun::star; -@@ -223,6 +231,28 @@ SwVbaDocument::Sections( const uno::Any& index ) throw (uno::RuntimeException) +@@ -223,6 +231,28 @@ SwVbaDocument::Sections( const uno::Any& } uno::Any SAL_CALL @@ -35790,7 +34824,7 @@ index 1409dbb..fa1ee0e 100644 SwVbaDocument::PageSetup( ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xPageProps( word::getCurrentPageStyle( mxModel ), uno::UNO_QUERY_THROW ); -@@ -242,16 +272,35 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException) +@@ -242,16 +272,35 @@ SwVbaDocument::getAttachedTemplate() thr uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW ); uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW ); uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); @@ -35830,7 +34864,7 @@ index 1409dbb..fa1ee0e 100644 } uno::Any SAL_CALL -@@ -270,6 +319,116 @@ void SAL_CALL SwVbaDocument::Activate() throw (uno::RuntimeException) +@@ -270,6 +319,116 @@ void SAL_CALL SwVbaDocument::Activate() VbaDocumentBase::Activate(); } @@ -35947,10 +34981,8 @@ index 1409dbb..fa1ee0e 100644 uno::Any SwVbaDocument::getControlShape( const ::rtl::OUString& sName ) { -diff --git sw/source/ui/vba/vbadocument.hxx sw/source/ui/vba/vbadocument.hxx -index 651b06c..020ab2b 100644 ---- sw/source/ui/vba/vbadocument.hxx -+++ sw/source/ui/vba/vbadocument.hxx +--- sw/source/ui/vba/vbadocument.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbadocument.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -68,6 +68,25 @@ public: virtual css::uno::Any SAL_CALL Sections( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual void SAL_CALL Activate() throw (css::uno::RuntimeException); @@ -35977,10 +35009,8 @@ index 651b06c..020ab2b 100644 // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); -diff --git sw/source/ui/vba/vbadocumentproperties.cxx sw/source/ui/vba/vbadocumentproperties.cxx -index f07b978..dfea425 100644 ---- sw/source/ui/vba/vbadocumentproperties.cxx -+++ sw/source/ui/vba/vbadocumentproperties.cxx +--- sw/source/ui/vba/vbadocumentproperties.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbadocumentproperties.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -206,16 +206,16 @@ public: static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper ) @@ -36004,11 +35034,8 @@ index f07b978..dfea425 100644 } uno::Any getValue() { -diff --git sw/source/ui/vba/vbaeventshelper.cxx sw/source/ui/vba/vbaeventshelper.cxx -new file mode 100644 -index 0000000..384a81f ---- /dev/null -+++ sw/source/ui/vba/vbaeventshelper.cxx +--- sw/source/ui/vba/vbaeventshelper.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaeventshelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,169 @@ +/************************************************************************* + * @@ -36179,11 +35206,8 @@ index 0000000..384a81f + "SwVbaEventsHelper", + "com.sun.star.text.TextDocumentVbaEventsHelper" ); +} -diff --git sw/source/ui/vba/vbaeventshelper.hxx sw/source/ui/vba/vbaeventshelper.hxx -new file mode 100644 -index 0000000..02dd648 ---- /dev/null -+++ sw/source/ui/vba/vbaeventshelper.hxx +--- sw/source/ui/vba/vbaeventshelper.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaeventshelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,67 @@ +/************************************************************************* + * @@ -36252,10 +35276,8 @@ index 0000000..02dd648 + +#endif + -diff --git sw/source/ui/vba/vbafield.cxx sw/source/ui/vba/vbafield.cxx -index 6effe4d..849f59e 100644 ---- sw/source/ui/vba/vbafield.cxx -+++ sw/source/ui/vba/vbafield.cxx +--- sw/source/ui/vba/vbafield.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbafield.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -36,6 +36,7 @@ #include <ooo/vba/word/WdFieldType.hpp> #include <com/sun/star/text/FilenameDisplayFormat.hpp> @@ -36264,7 +35286,7 @@ index 6effe4d..849f59e 100644 #include <swtypes.hxx> using namespace ::ooo::vba; -@@ -48,6 +49,17 @@ SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rPa +@@ -48,6 +49,17 @@ SwVbaField::SwVbaField( const uno::Refe mxTextField.set( xTextField, uno::UNO_QUERY_THROW ); } @@ -36282,7 +35304,7 @@ index 6effe4d..849f59e 100644 // XHelperInterface rtl::OUString& SwVbaField::getServiceImplName() -@@ -371,6 +383,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, +@@ -371,6 +383,7 @@ SwVbaFields::Add( const css::uno::Refere { _ReadFieldParams aReadParam(sText); sFieldName = aReadParam.GetFieldName(); @@ -36290,7 +35312,7 @@ index 6effe4d..849f59e 100644 } uno::Reference< text::XTextContent > xTextField; -@@ -378,6 +391,10 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, +@@ -378,6 +391,10 @@ SwVbaFields::Add( const css::uno::Refere { xTextField.set( Create_Field_FileName( sText ), uno::UNO_QUERY_THROW ); } @@ -36301,7 +35323,7 @@ index 6effe4d..849f59e 100644 else { throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); -@@ -422,6 +439,104 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl +@@ -422,6 +439,104 @@ uno::Reference< text::XTextField > SwVba return xTextField; } @@ -36406,11 +35428,9 @@ index 6effe4d..849f59e 100644 uno::Reference< container::XEnumeration > SAL_CALL SwVbaFields::createEnumeration() throw (uno::RuntimeException) { -diff --git sw/source/ui/vba/vbafield.hxx sw/source/ui/vba/vbafield.hxx -index ab28416..9ec21b3 100644 ---- sw/source/ui/vba/vbafield.hxx -+++ sw/source/ui/vba/vbafield.hxx -@@ -44,7 +44,8 @@ class SwVbaField : public SwVbaField_BASE +--- sw/source/ui/vba/vbafield.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbafield.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -44,7 +44,8 @@ class SwVbaField : public SwVbaField_BAS css::uno::Reference< css::text::XTextField > mxTextField; public: SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); @@ -36420,7 +35440,7 @@ index ab28416..9ec21b3 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -@@ -60,6 +61,7 @@ class SwVbaFields : public SwVbaFields_BASE +@@ -60,6 +61,7 @@ class SwVbaFields : public SwVbaFields_B css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF; private: css::uno::Reference< css::text::XTextField > Create_Field_FileName( const rtl::OUString _text ) throw (css::uno::RuntimeException); @@ -36428,11 +35448,8 @@ index ab28416..9ec21b3 100644 public: SwVbaFields( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); -diff --git sw/source/ui/vba/vbaformfield.cxx sw/source/ui/vba/vbaformfield.cxx -new file mode 100644 -index 0000000..944ffbb ---- /dev/null -+++ sw/source/ui/vba/vbaformfield.cxx +--- sw/source/ui/vba/vbaformfield.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaformfield.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,139 @@ +/************************************************************************* + * @@ -36573,11 +35590,8 @@ index 0000000..944ffbb + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbaformfield.hxx sw/source/ui/vba/vbaformfield.hxx -new file mode 100644 -index 0000000..e3a2d7f ---- /dev/null -+++ sw/source/ui/vba/vbaformfield.hxx +--- sw/source/ui/vba/vbaformfield.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaformfield.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,61 @@ +/************************************************************************* + * @@ -36640,11 +35654,8 @@ index 0000000..e3a2d7f + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_FORMFIELD_HXX */ -diff --git sw/source/ui/vba/vbaformfields.cxx sw/source/ui/vba/vbaformfields.cxx -new file mode 100644 -index 0000000..b56cff8 ---- /dev/null -+++ sw/source/ui/vba/vbaformfields.cxx +--- sw/source/ui/vba/vbaformfields.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaformfields.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,205 @@ +/************************************************************************* + * @@ -36851,11 +35862,8 @@ index 0000000..b56cff8 + } + return sNames; +} -diff --git sw/source/ui/vba/vbaformfields.hxx sw/source/ui/vba/vbaformfields.hxx -new file mode 100644 -index 0000000..76ef6bb ---- /dev/null -+++ sw/source/ui/vba/vbaformfields.hxx +--- sw/source/ui/vba/vbaformfields.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaformfields.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -36917,11 +35925,8 @@ index 0000000..76ef6bb +}; + +#endif /* SW_VBA_FORMFIELDS_HXX */ -diff --git sw/source/ui/vba/vbaframe.cxx sw/source/ui/vba/vbaframe.cxx -new file mode 100644 -index 0000000..bec1aa6 ---- /dev/null -+++ sw/source/ui/vba/vbaframe.cxx +--- sw/source/ui/vba/vbaframe.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaframe.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,75 @@ +/************************************************************************* + * @@ -36998,11 +36003,8 @@ index 0000000..bec1aa6 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbaframe.hxx sw/source/ui/vba/vbaframe.hxx -new file mode 100644 -index 0000000..a36ebf8 ---- /dev/null -+++ sw/source/ui/vba/vbaframe.hxx +--- sw/source/ui/vba/vbaframe.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaframe.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,57 @@ +/************************************************************************* + * @@ -37061,11 +36063,8 @@ index 0000000..a36ebf8 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_FRAME_HXX */ -diff --git sw/source/ui/vba/vbaframes.cxx sw/source/ui/vba/vbaframes.cxx -new file mode 100644 -index 0000000..2c9fa92 ---- /dev/null -+++ sw/source/ui/vba/vbaframes.cxx +--- sw/source/ui/vba/vbaframes.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaframes.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,109 @@ +/************************************************************************* + * @@ -37176,11 +36175,8 @@ index 0000000..2c9fa92 + } + return sNames; +} -diff --git sw/source/ui/vba/vbaframes.hxx sw/source/ui/vba/vbaframes.hxx -new file mode 100644 -index 0000000..0957820 ---- /dev/null -+++ sw/source/ui/vba/vbaframes.hxx +--- sw/source/ui/vba/vbaframes.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaframes.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,61 @@ +/************************************************************************* + * @@ -37243,11 +36239,9 @@ index 0000000..0957820 +}; + +#endif /* SW_VBA_FRAMES_HXX */ -diff --git sw/source/ui/vba/vbaglobals.cxx sw/source/ui/vba/vbaglobals.cxx -index 935a95c..ff56a9b 100644 ---- sw/source/ui/vba/vbaglobals.cxx -+++ sw/source/ui/vba/vbaglobals.cxx -@@ -132,6 +132,12 @@ SwVbaGlobals::Dialogs( const uno::Any& index ) throw (uno::RuntimeException) +--- sw/source/ui/vba/vbaglobals.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaglobals.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -132,6 +132,12 @@ SwVbaGlobals::Dialogs( const uno::Any& i return getApplication()->Dialogs( index ); } @@ -37260,10 +36254,8 @@ index 935a95c..ff56a9b 100644 uno::Reference<word::XSelection > SAL_CALL SwVbaGlobals::getSelection() throw (uno::RuntimeException) { -diff --git sw/source/ui/vba/vbaglobals.hxx sw/source/ui/vba/vbaglobals.hxx -index 066282e..2a2e328 100644 ---- sw/source/ui/vba/vbaglobals.hxx -+++ sw/source/ui/vba/vbaglobals.hxx +--- sw/source/ui/vba/vbaglobals.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaglobals.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -72,6 +72,7 @@ public: virtual css::uno::Any SAL_CALL Documents( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -37272,11 +36264,9 @@ index 066282e..2a2e328 100644 virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException); // XMultiServiceFactory virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); -diff --git sw/source/ui/vba/vbaheaderfooter.cxx sw/source/ui/vba/vbaheaderfooter.cxx -index 0176edf..138e90d 100644 ---- sw/source/ui/vba/vbaheaderfooter.cxx -+++ sw/source/ui/vba/vbaheaderfooter.cxx -@@ -84,6 +84,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaHeaderFooter::getRange() throw (uno +--- sw/source/ui/vba/vbaheaderfooter.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaheaderfooter.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -84,6 +84,7 @@ uno::Reference< word::XRange > SAL_CALL uno::Any SAL_CALL SwVbaHeaderFooter::Shapes( const uno::Any& index ) throw (uno::RuntimeException) { @@ -37284,10 +36274,8 @@ index 0176edf..138e90d 100644 uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW ); //uno::Reference< drawing::XShapes > xShapes( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); uno::Reference< container::XIndexAccess > xIndexAccess( xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); -diff --git sw/source/ui/vba/vbaheaderfooterhelper.cxx sw/source/ui/vba/vbaheaderfooterhelper.cxx -index 4069b85..0f8f194 100644 ---- sw/source/ui/vba/vbaheaderfooterhelper.cxx -+++ sw/source/ui/vba/vbaheaderfooterhelper.cxx +--- sw/source/ui/vba/vbaheaderfooterhelper.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaheaderfooterhelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,8 +32,12 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/XController.hpp> @@ -37383,7 +36371,7 @@ index 4069b85..0f8f194 100644 { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); // FIXME: getPage allways returns 1 -@@ -85,9 +109,9 @@ sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XMo +@@ -85,9 +109,9 @@ sal_Bool HeaderFooterHelper::isFirstPage return sal_False; } @@ -37395,7 +36383,7 @@ index 4069b85..0f8f194 100644 { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; -@@ -101,40 +125,47 @@ sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XMo +@@ -101,40 +125,47 @@ sal_Bool HeaderFooterHelper::isEvenPages return sal_False; } @@ -37462,7 +36450,7 @@ index 4069b85..0f8f194 100644 { uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); sal_Int32 nPage = xPageCursor->getPage(); -@@ -143,9 +174,9 @@ sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XMo +@@ -143,9 +174,9 @@ sal_Bool HeaderFooterHelper::isFirstPage return sal_False; } @@ -37474,7 +36462,7 @@ index 4069b85..0f8f194 100644 { uno::Reference< beans::XPropertySet > xStyleProps( word::getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW ); sal_Bool isShared = sal_False; -@@ -159,20 +190,20 @@ sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XMo +@@ -159,20 +190,20 @@ sal_Bool HeaderFooterHelper::isEvenPages return sal_False; } @@ -37501,10 +36489,8 @@ index 4069b85..0f8f194 100644 } return sal_False; } -diff --git sw/source/ui/vba/vbaheaderfooterhelper.hxx sw/source/ui/vba/vbaheaderfooterhelper.hxx -index 2dffc59..e95aaa3 100644 ---- sw/source/ui/vba/vbaheaderfooterhelper.hxx -+++ sw/source/ui/vba/vbaheaderfooterhelper.hxx +--- sw/source/ui/vba/vbaheaderfooterhelper.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaheaderfooterhelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -39,14 +39,16 @@ class HeaderFooterHelper { @@ -37530,11 +36516,8 @@ index 2dffc59..e95aaa3 100644 }; #endif -diff --git sw/source/ui/vba/vbaheadersfooters.cxx sw/source/ui/vba/vbaheadersfooters.cxx -new file mode 100644 -index 0000000..295314a ---- /dev/null -+++ sw/source/ui/vba/vbaheadersfooters.cxx +--- sw/source/ui/vba/vbaheadersfooters.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaheadersfooters.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,150 @@ +/************************************************************************* + * @@ -37686,11 +36669,8 @@ index 0000000..295314a + } + return sNames; +} -diff --git sw/source/ui/vba/vbaheadersfooters.hxx sw/source/ui/vba/vbaheadersfooters.hxx -new file mode 100644 -index 0000000..9bd7683 ---- /dev/null -+++ sw/source/ui/vba/vbaheadersfooters.hxx +--- sw/source/ui/vba/vbaheadersfooters.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbaheadersfooters.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -37754,11 +36734,8 @@ index 0000000..9bd7683 +}; + +#endif /* SW_VBA_HEADERSFOOTERS_HXX */ -diff --git sw/source/ui/vba/vbalistformat.cxx sw/source/ui/vba/vbalistformat.cxx -new file mode 100644 -index 0000000..05d9380 ---- /dev/null -+++ sw/source/ui/vba/vbalistformat.cxx +--- sw/source/ui/vba/vbalistformat.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistformat.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,121 @@ +/************************************************************************* + * @@ -37881,11 +36858,8 @@ index 0000000..05d9380 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbalistformat.hxx sw/source/ui/vba/vbalistformat.hxx -new file mode 100644 -index 0000000..184312a ---- /dev/null -+++ sw/source/ui/vba/vbalistformat.hxx +--- sw/source/ui/vba/vbalistformat.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistformat.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -37947,11 +36921,8 @@ index 0000000..184312a + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_LISTFORMAT_HXX */ -diff --git sw/source/ui/vba/vbalistgalleries.cxx sw/source/ui/vba/vbalistgalleries.cxx -new file mode 100644 -index 0000000..ff09ae2 ---- /dev/null -+++ sw/source/ui/vba/vbalistgalleries.cxx +--- sw/source/ui/vba/vbalistgalleries.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistgalleries.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,115 @@ +/************************************************************************* + * @@ -38068,11 +37039,8 @@ index 0000000..ff09ae2 + } + return sNames; +} -diff --git sw/source/ui/vba/vbalistgalleries.hxx sw/source/ui/vba/vbalistgalleries.hxx -new file mode 100644 -index 0000000..36cd0ba ---- /dev/null -+++ sw/source/ui/vba/vbalistgalleries.hxx +--- sw/source/ui/vba/vbalistgalleries.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistgalleries.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,61 @@ +/************************************************************************* + * @@ -38135,11 +37103,8 @@ index 0000000..36cd0ba +}; + +#endif /* SW_VBA_LISTGALLERIES_HXX */ -diff --git sw/source/ui/vba/vbalistgallery.cxx sw/source/ui/vba/vbalistgallery.cxx -new file mode 100644 -index 0000000..6ac7e7c ---- /dev/null -+++ sw/source/ui/vba/vbalistgallery.cxx +--- sw/source/ui/vba/vbalistgallery.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistgallery.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,73 @@ +/************************************************************************* + * @@ -38214,11 +37179,8 @@ index 0000000..6ac7e7c + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbalistgallery.hxx sw/source/ui/vba/vbalistgallery.hxx -new file mode 100644 -index 0000000..0ece178 ---- /dev/null -+++ sw/source/ui/vba/vbalistgallery.hxx +--- sw/source/ui/vba/vbalistgallery.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistgallery.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -38278,11 +37240,8 @@ index 0000000..0ece178 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_LISTGALLERY_HXX */ -diff --git sw/source/ui/vba/vbalisthelper.cxx sw/source/ui/vba/vbalisthelper.cxx -new file mode 100644 -index 0000000..34cd6be ---- /dev/null -+++ sw/source/ui/vba/vbalisthelper.cxx +--- sw/source/ui/vba/vbalisthelper.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalisthelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,707 @@ +/************************************************************************* + * @@ -38991,11 +37950,8 @@ index 0000000..34cd6be + mxStyleProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingRules") ) , uno::makeAny( mxNumberingRules ) ); +} + -diff --git sw/source/ui/vba/vbalisthelper.hxx sw/source/ui/vba/vbalisthelper.hxx -new file mode 100644 -index 0000000..0f5fa26 ---- /dev/null -+++ sw/source/ui/vba/vbalisthelper.hxx +--- sw/source/ui/vba/vbalisthelper.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalisthelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,82 @@ +/************************************************************************* + * @@ -39079,11 +38035,8 @@ index 0000000..0f5fa26 +}; + +#endif//SW_VBA_LISTHELPER_HXX -diff --git sw/source/ui/vba/vbalistlevel.cxx sw/source/ui/vba/vbalistlevel.cxx -new file mode 100644 -index 0000000..4dc0951 ---- /dev/null -+++ sw/source/ui/vba/vbalistlevel.cxx +--- sw/source/ui/vba/vbalistlevel.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistlevel.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,401 @@ +/************************************************************************* + * @@ -39486,11 +38439,8 @@ index 0000000..4dc0951 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbalistlevel.hxx sw/source/ui/vba/vbalistlevel.hxx -new file mode 100644 -index 0000000..4bcb147 ---- /dev/null -+++ sw/source/ui/vba/vbalistlevel.hxx +--- sw/source/ui/vba/vbalistlevel.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistlevel.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,81 @@ +/************************************************************************* + * @@ -39573,11 +38523,8 @@ index 0000000..4bcb147 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_LISTLEVEL_HXX */ -diff --git sw/source/ui/vba/vbalistlevels.cxx sw/source/ui/vba/vbalistlevels.cxx -new file mode 100644 -index 0000000..019b6f5 ---- /dev/null -+++ sw/source/ui/vba/vbalistlevels.cxx +--- sw/source/ui/vba/vbalistlevels.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistlevels.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,118 @@ +/************************************************************************* + * @@ -39697,11 +38644,8 @@ index 0000000..019b6f5 + } + return sNames; +} -diff --git sw/source/ui/vba/vbalistlevels.hxx sw/source/ui/vba/vbalistlevels.hxx -new file mode 100644 -index 0000000..c57da55 ---- /dev/null -+++ sw/source/ui/vba/vbalistlevels.hxx +--- sw/source/ui/vba/vbalistlevels.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalistlevels.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -39765,11 +38709,8 @@ index 0000000..c57da55 +}; + +#endif /* SW_VBA_LISTLEVELS_HXX */ -diff --git sw/source/ui/vba/vbalisttemplate.cxx sw/source/ui/vba/vbalisttemplate.cxx -new file mode 100644 -index 0000000..1ad091e ---- /dev/null -+++ sw/source/ui/vba/vbalisttemplate.cxx +--- sw/source/ui/vba/vbalisttemplate.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalisttemplate.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,80 @@ +/************************************************************************* + * @@ -39851,11 +38792,8 @@ index 0000000..1ad091e + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbalisttemplate.hxx sw/source/ui/vba/vbalisttemplate.hxx -new file mode 100644 -index 0000000..733ef76 ---- /dev/null -+++ sw/source/ui/vba/vbalisttemplate.hxx +--- sw/source/ui/vba/vbalisttemplate.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalisttemplate.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -39917,11 +38855,8 @@ index 0000000..733ef76 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_LISTTEMPLATE_HXX */ -diff --git sw/source/ui/vba/vbalisttemplates.cxx sw/source/ui/vba/vbalisttemplates.cxx -new file mode 100644 -index 0000000..ba560d3 ---- /dev/null -+++ sw/source/ui/vba/vbalisttemplates.cxx +--- sw/source/ui/vba/vbalisttemplates.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalisttemplates.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,112 @@ +/************************************************************************* + * @@ -40035,11 +38970,8 @@ index 0000000..ba560d3 + } + return sNames; +} -diff --git sw/source/ui/vba/vbalisttemplates.hxx sw/source/ui/vba/vbalisttemplates.hxx -new file mode 100644 -index 0000000..214d01b ---- /dev/null -+++ sw/source/ui/vba/vbalisttemplates.hxx +--- sw/source/ui/vba/vbalisttemplates.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbalisttemplates.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,62 @@ +/************************************************************************* + * @@ -40103,11 +39035,9 @@ index 0000000..214d01b +}; + +#endif /* SW_VBA_LISTTEMPLATES_HXX */ -diff --git sw/source/ui/vba/vbaparagraph.cxx sw/source/ui/vba/vbaparagraph.cxx -index 107ff33..56db358 100644 ---- sw/source/ui/vba/vbaparagraph.cxx -+++ sw/source/ui/vba/vbaparagraph.cxx -@@ -51,6 +51,20 @@ SwVbaParagraph::getRange( ) throw ( uno::RuntimeException ) +--- sw/source/ui/vba/vbaparagraph.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaparagraph.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -51,6 +51,20 @@ SwVbaParagraph::getRange( ) throw ( uno: return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), sal_True ) ); } @@ -40128,10 +39058,8 @@ index 107ff33..56db358 100644 rtl::OUString& SwVbaParagraph::getServiceImplName() { -diff --git sw/source/ui/vba/vbaparagraph.hxx sw/source/ui/vba/vbaparagraph.hxx -index 979116d..bebafe0 100644 ---- sw/source/ui/vba/vbaparagraph.hxx -+++ sw/source/ui/vba/vbaparagraph.hxx +--- sw/source/ui/vba/vbaparagraph.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaparagraph.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -53,6 +53,8 @@ public: // XParagraph @@ -40141,10 +39069,8 @@ index 979116d..bebafe0 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); -diff --git sw/source/ui/vba/vbaparagraphformat.cxx sw/source/ui/vba/vbaparagraphformat.cxx -index 2959a23..6639ceb 100644 ---- sw/source/ui/vba/vbaparagraphformat.cxx -+++ sw/source/ui/vba/vbaparagraphformat.cxx +--- sw/source/ui/vba/vbaparagraphformat.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaparagraphformat.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -37,6 +37,7 @@ #include <ooo/vba/word/WdOutlineLevel.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> @@ -40153,7 +39079,7 @@ index 2959a23..6639ceb 100644 using namespace ::ooo::vba; -@@ -203,9 +204,12 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat::getOutlineLevel() throw (uno::RuntimeEx +@@ -203,9 +204,12 @@ sal_Int32 SAL_CALL SwVbaParagraphFormat: return nLevel; } @@ -40168,7 +39094,7 @@ index 2959a23..6639ceb 100644 } uno::Any SAL_CALL SwVbaParagraphFormat::getPageBreakBefore() throw (uno::RuntimeException) -@@ -299,7 +303,7 @@ void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) throw ( +@@ -299,7 +303,7 @@ void SAL_CALL SwVbaParagraphFormat::setR uno::Any SAL_CALL SwVbaParagraphFormat::getTabStops() throw (uno::RuntimeException) { @@ -40177,10 +39103,8 @@ index 2959a23..6639ceb 100644 } void SAL_CALL SwVbaParagraphFormat::setTabStops( const uno::Any& /*_tabstops*/ ) throw (uno::RuntimeException) -diff --git sw/source/ui/vba/vbarange.cxx sw/source/ui/vba/vbarange.cxx -index 7f166e9..057330b 100644 ---- sw/source/ui/vba/vbarange.cxx -+++ sw/source/ui/vba/vbarange.cxx +--- sw/source/ui/vba/vbarange.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbarange.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -35,12 +35,21 @@ #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/text/ControlCharacter.hpp> @@ -40204,7 +39128,7 @@ index 7f166e9..057330b 100644 using namespace ::ooo::vba; using namespace ::com::sun::star; -@@ -73,6 +82,8 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c +@@ -73,6 +82,8 @@ void SwVbaRange::initialize( const uno:: } mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText ); @@ -40213,7 +39137,7 @@ index 7f166e9..057330b 100644 mxTextCursor->collapseToStart(); if( rEnd.is() ) -@@ -94,6 +105,67 @@ void SwVbaRange::setXTextRange( const uno::Reference< text::XTextRange >& xRange +@@ -94,6 +105,67 @@ void SwVbaRange::setXTextRange( const un mxTextCursor->gotoRange( xRange->getEnd(), sal_True ); } @@ -40281,7 +39205,7 @@ index 7f166e9..057330b 100644 /** * The complexity in this method is because we need to workaround * an issue that the last paragraph in a document does not have a trailing CRLF. -@@ -131,17 +203,46 @@ SwVbaRange::getText() throw ( uno::RuntimeException ) +@@ -131,17 +203,46 @@ SwVbaRange::getText() throw ( uno::Runti void SAL_CALL SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException ) { @@ -40329,7 +39253,7 @@ index 7f166e9..057330b 100644 } // FIXME: test is not pass -@@ -232,11 +333,8 @@ SwVbaRange::setParagraphFormat( const uno::Reference< word::XParagraphFormat >& +@@ -232,11 +333,8 @@ SwVbaRange::setParagraphFormat( const un throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); } @@ -40342,7 +39266,7 @@ index 7f166e9..057330b 100644 uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW ); if( ( xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") ) ) >>= aStyleName ) && aStyleName.getLength() ) { -@@ -250,14 +348,23 @@ SwVbaRange::getStyle() throw ( uno::RuntimeException ) +@@ -250,14 +348,23 @@ SwVbaRange::getStyle() throw ( uno::Runt { DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); } @@ -40368,7 +39292,7 @@ index 7f166e9..057330b 100644 { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); SwVbaStyle::setStyle( xParaProps, rStyle ); -@@ -270,6 +377,12 @@ SwVbaRange::getFont() throw ( uno::RuntimeException ) +@@ -270,6 +377,12 @@ SwVbaRange::getFont() throw ( uno::Runti return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), uno::Reference< beans::XPropertySet >( getXTextRange(), uno::UNO_QUERY_THROW ) ); } @@ -40381,7 +39305,7 @@ index 7f166e9..057330b 100644 ::sal_Int32 SAL_CALL SwVbaRange::getLanguageID() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); -@@ -327,6 +440,50 @@ void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeExceptio +@@ -327,6 +440,50 @@ void SAL_CALL SwVbaRange::setEnd( ::sal_ mxTextCursor->gotoRange( xEnd, sal_True ); } @@ -40432,10 +39356,8 @@ index 7f166e9..057330b 100644 rtl::OUString& SwVbaRange::getServiceImplName() { -diff --git sw/source/ui/vba/vbarange.hxx sw/source/ui/vba/vbarange.hxx -index abce5b7..030007e 100644 ---- sw/source/ui/vba/vbarange.hxx -+++ sw/source/ui/vba/vbarange.hxx +--- sw/source/ui/vba/vbarange.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbarange.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -38,6 +38,8 @@ #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/text/XTextDocument.hpp> @@ -40485,10 +39407,8 @@ index abce5b7..030007e 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); -diff --git sw/source/ui/vba/vbarangehelper.cxx sw/source/ui/vba/vbarangehelper.cxx -index 5df01b8..12aa933 100644 ---- sw/source/ui/vba/vbarangehelper.cxx -+++ sw/source/ui/vba/vbarangehelper.cxx +--- sw/source/ui/vba/vbarangehelper.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbarangehelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -30,6 +30,7 @@ #include "vbarangehelper.hxx" #include <com/sun/star/text/ControlCharacter.hpp> @@ -40497,7 +39417,7 @@ index 5df01b8..12aa933 100644 using namespace ::ooo::vba; using namespace ::com::sun::star; -@@ -114,7 +115,7 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref +@@ -114,7 +115,7 @@ uno::Reference< text::XTextCursor > SwVb DebugHelper::exception(e); } @@ -40506,7 +39426,7 @@ index 5df01b8..12aa933 100644 { try { -@@ -128,7 +129,7 @@ uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Ref +@@ -128,7 +129,7 @@ uno::Reference< text::XTextCursor > SwVb } } @@ -40515,7 +39435,7 @@ index 5df01b8..12aa933 100644 { try { -@@ -172,3 +173,29 @@ sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rT +@@ -172,3 +173,29 @@ sal_Int32 SwVbaRangeHelper::getPosition( return nPosition; } @@ -40545,10 +39465,8 @@ index 5df01b8..12aa933 100644 + return uno::Reference< text::XTextContent >(); +} + -diff --git sw/source/ui/vba/vbarangehelper.hxx sw/source/ui/vba/vbarangehelper.hxx -index 5e47899..e17eb72 100644 ---- sw/source/ui/vba/vbarangehelper.hxx -+++ sw/source/ui/vba/vbarangehelper.hxx +--- sw/source/ui/vba/vbarangehelper.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbarangehelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -33,6 +33,8 @@ #include <vbahelper/vbahelperinterface.hxx> #include <com/sun/star/text/XTextViewCursor.hpp> @@ -40566,11 +39484,9 @@ index 5e47899..e17eb72 100644 }; #endif /* SW_VBA_RANGEHELPER_HXX */ -diff --git sw/source/ui/vba/vbareplacement.cxx sw/source/ui/vba/vbareplacement.cxx -index abf85f3..7a46f83 100644 ---- sw/source/ui/vba/vbareplacement.cxx -+++ sw/source/ui/vba/vbareplacement.cxx -@@ -53,6 +53,12 @@ void SAL_CALL SwVbaReplacement::setText( const ::rtl::OUString& _text ) throw (u +--- sw/source/ui/vba/vbareplacement.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbareplacement.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -53,6 +53,12 @@ void SAL_CALL SwVbaReplacement::setText( mxPropertyReplace->setReplaceString( _text ); } @@ -40583,10 +39499,8 @@ index abf85f3..7a46f83 100644 rtl::OUString& SwVbaReplacement::getServiceImplName() { -diff --git sw/source/ui/vba/vbareplacement.hxx sw/source/ui/vba/vbareplacement.hxx -index d590a1d..8d0ef8d 100644 ---- sw/source/ui/vba/vbareplacement.hxx -+++ sw/source/ui/vba/vbareplacement.hxx +--- sw/source/ui/vba/vbareplacement.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbareplacement.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -50,6 +50,9 @@ public: virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); @@ -40597,11 +39511,8 @@ index d590a1d..8d0ef8d 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -diff --git sw/source/ui/vba/vbarevision.cxx sw/source/ui/vba/vbarevision.cxx -new file mode 100644 -index 0000000..0c48b1d ---- /dev/null -+++ sw/source/ui/vba/vbarevision.cxx +--- sw/source/ui/vba/vbarevision.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarevision.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,105 @@ +/************************************************************************* + * @@ -40708,11 +39619,8 @@ index 0000000..0c48b1d + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbarevision.hxx sw/source/ui/vba/vbarevision.hxx -new file mode 100644 -index 0000000..0384370 ---- /dev/null -+++ sw/source/ui/vba/vbarevision.hxx +--- sw/source/ui/vba/vbarevision.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarevision.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -40774,11 +39682,8 @@ index 0000000..0384370 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_REVISION_HXX */ -diff --git sw/source/ui/vba/vbarevisions.cxx sw/source/ui/vba/vbarevisions.cxx -new file mode 100644 -index 0000000..9d3e921 ---- /dev/null -+++ sw/source/ui/vba/vbarevisions.cxx +--- sw/source/ui/vba/vbarevisions.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarevisions.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,189 @@ +/************************************************************************* + * @@ -40969,11 +39874,8 @@ index 0000000..9d3e921 + } + return sNames; +} -diff --git sw/source/ui/vba/vbarevisions.hxx sw/source/ui/vba/vbarevisions.hxx -new file mode 100644 -index 0000000..88db794 ---- /dev/null -+++ sw/source/ui/vba/vbarevisions.hxx +--- sw/source/ui/vba/vbarevisions.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarevisions.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,66 @@ +/************************************************************************* + * @@ -41041,11 +39943,8 @@ index 0000000..88db794 +}; + +#endif /* SW_VBA_PANES_HXX */ -diff --git sw/source/ui/vba/vbarow.cxx sw/source/ui/vba/vbarow.cxx -new file mode 100644 -index 0000000..2f4132b ---- /dev/null -+++ sw/source/ui/vba/vbarow.cxx +--- sw/source/ui/vba/vbarow.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarow.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,136 @@ +/************************************************************************* + * @@ -41183,11 +40082,8 @@ index 0000000..2f4132b + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbarow.hxx sw/source/ui/vba/vbarow.hxx -new file mode 100644 -index 0000000..cfbfb4d ---- /dev/null -+++ sw/source/ui/vba/vbarow.hxx +--- sw/source/ui/vba/vbarow.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarow.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,69 @@ +/************************************************************************* + * @@ -41258,11 +40154,8 @@ index 0000000..cfbfb4d + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_ROW_HXX */ -diff --git sw/source/ui/vba/vbarows.cxx sw/source/ui/vba/vbarows.cxx -new file mode 100644 -index 0000000..875e024 ---- /dev/null -+++ sw/source/ui/vba/vbarows.cxx +--- sw/source/ui/vba/vbarows.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarows.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,368 @@ +/************************************************************************* + * @@ -41632,11 +40525,8 @@ index 0000000..875e024 + } + return sNames; +} -diff --git sw/source/ui/vba/vbarows.hxx sw/source/ui/vba/vbarows.hxx -new file mode 100644 -index 0000000..ccff1ef ---- /dev/null -+++ sw/source/ui/vba/vbarows.hxx +--- sw/source/ui/vba/vbarows.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbarows.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,87 @@ +/************************************************************************* + * @@ -41725,10 +40615,8 @@ index 0000000..ccff1ef +}; + +#endif /* SW_VBA_ROWS_HXX */ -diff --git sw/source/ui/vba/vbasection.cxx sw/source/ui/vba/vbasection.cxx -index c30058a..1a61e10 100644 ---- sw/source/ui/vba/vbasection.cxx -+++ sw/source/ui/vba/vbasection.cxx +--- sw/source/ui/vba/vbasection.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbasection.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -31,6 +31,7 @@ #include <vbahelper/vbahelper.hxx> #include <tools/diagnose_ex.h> @@ -41737,7 +40625,7 @@ index c30058a..1a61e10 100644 using namespace ::ooo::vba; using namespace ::com::sun::star; -@@ -53,14 +54,20 @@ void SAL_CALL SwVbaSection::setProtectedForForms( ::sal_Bool /*_protectedforform +@@ -53,14 +54,20 @@ void SAL_CALL SwVbaSection::setProtected { } @@ -41762,10 +40650,8 @@ index c30058a..1a61e10 100644 } uno::Any SAL_CALL -diff --git sw/source/ui/vba/vbasection.hxx sw/source/ui/vba/vbasection.hxx -index 92a65f3..f30f5ad 100644 ---- sw/source/ui/vba/vbasection.hxx -+++ sw/source/ui/vba/vbasection.hxx +--- sw/source/ui/vba/vbasection.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbasection.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -51,8 +51,8 @@ public: virtual void SAL_CALL setProtectedForForms( ::sal_Bool _protectedforforms ) throw (css::uno::RuntimeException); @@ -41777,10 +40663,8 @@ index 92a65f3..f30f5ad 100644 virtual css::uno::Any SAL_CALL PageSetup( ) throw (css::uno::RuntimeException); // XHelperInterface -diff --git sw/source/ui/vba/vbasections.cxx sw/source/ui/vba/vbasections.cxx -index 8fca880..0223efe 100644 ---- sw/source/ui/vba/vbasections.cxx -+++ sw/source/ui/vba/vbasections.cxx +--- sw/source/ui/vba/vbasections.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbasections.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -90,6 +90,15 @@ public: } } @@ -41797,7 +40681,7 @@ index 8fca880..0223efe 100644 ~SectionCollectionHelper(){} // XIndexAccess -@@ -138,6 +147,10 @@ SwVbaSections::SwVbaSections( const uno::Reference< XHelperInterface >& xParent, +@@ -138,6 +147,10 @@ SwVbaSections::SwVbaSections( const uno: { } @@ -41808,10 +40692,8 @@ index 8fca880..0223efe 100644 uno::Any SAL_CALL SwVbaSections::PageSetup( ) throw (uno::RuntimeException) { -diff --git sw/source/ui/vba/vbasections.hxx sw/source/ui/vba/vbasections.hxx -index 1ff9e9e..29e8ce4 100644 ---- sw/source/ui/vba/vbasections.hxx -+++ sw/source/ui/vba/vbasections.hxx +--- sw/source/ui/vba/vbasections.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbasections.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -34,6 +34,7 @@ #include <ooo/vba/word/XSections.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -41828,10 +40710,8 @@ index 1ff9e9e..29e8ce4 100644 virtual ~SwVbaSections() {} // XEnumerationAccess -diff --git sw/source/ui/vba/vbaselection.cxx sw/source/ui/vba/vbaselection.cxx -index 3f5d607..7f124e1 100644 ---- sw/source/ui/vba/vbaselection.cxx -+++ sw/source/ui/vba/vbaselection.cxx +--- sw/source/ui/vba/vbaselection.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaselection.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,7 +32,6 @@ #include <tools/diagnose_ex.h> #include "vbarange.hxx" @@ -41878,7 +40758,7 @@ index 3f5d607..7f124e1 100644 using namespace ::ooo::vba; using namespace ::com::sun::star; -@@ -126,23 +141,25 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw +@@ -126,23 +141,25 @@ SwVbaSelection::HomeKey( const uno::Any& sal_Int32 nExtend = word::WdMovementType::wdMove; _unit >>= nUnit; _extend >>= nExtend; @@ -41910,7 +40790,7 @@ index 3f5d607..7f124e1 100644 break; } default: -@@ -160,23 +177,25 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( +@@ -160,23 +177,25 @@ SwVbaSelection::EndKey( const uno::Any& sal_Int32 nExtend = word::WdMovementType::wdMove; _unit >>= nUnit; _extend >>= nExtend; @@ -41943,7 +40823,7 @@ index 3f5d607..7f124e1 100644 break; } default: -@@ -188,14 +207,161 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( +@@ -188,14 +207,161 @@ SwVbaSelection::EndKey( const uno::Any& } void SAL_CALL @@ -42108,7 +40988,7 @@ index 3f5d607..7f124e1 100644 { uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextTable > xTextTable; -@@ -214,22 +380,22 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, E_DIRECTION eDirection ) throw +@@ -214,22 +380,22 @@ void SwVbaSelection::NextCell( sal_Int32 // move the table cursor switch( eDirection ) { @@ -42135,7 +41015,7 @@ index 3f5d607..7f124e1 100644 { xTextTableCursor->goDown( nCount, sal_False ); break; -@@ -248,61 +414,29 @@ void SwVbaSelection::NextCell( sal_Int32 nCount, E_DIRECTION eDirection ) throw +@@ -248,61 +414,29 @@ void SwVbaSelection::NextCell( sal_Int32 void SAL_CALL SwVbaSelection::MoveRight( const uno::Any& _unit, const uno::Any& _count, const uno::Any& _extend ) throw ( uno::RuntimeException ) { @@ -42198,7 +41078,7 @@ index 3f5d607..7f124e1 100644 if( nCount == 0 ) return; -@@ -313,67 +447,47 @@ SwVbaSelection::MoveLeft( const uno::Any& _unit, const uno::Any& _count, const u +@@ -313,67 +447,47 @@ SwVbaSelection::MoveLeft( const uno::Any return; } @@ -42287,7 +41167,7 @@ index 3f5d607..7f124e1 100644 } void SAL_CALL -@@ -425,16 +539,17 @@ SwVbaSelection::getFind() throw ( uno::RuntimeException ) +@@ -425,16 +539,17 @@ SwVbaSelection::getFind() throw ( uno::R return uno::Reference< word::XFind >( new SwVbaFind( this, mxContext, mxModel, xTextRange ) ); } @@ -42308,7 +41188,7 @@ index 3f5d607..7f124e1 100644 } uno::Reference< word::XFont > SAL_CALL -@@ -477,39 +592,79 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w +@@ -477,39 +592,79 @@ uno::Reference< word::XRange > SAL_CALL sal_Int32 nWhich = 0; if( _which.hasValue() ) _which >>= nWhich; @@ -42418,7 +41298,7 @@ index 3f5d607..7f124e1 100644 } default: throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); -@@ -549,6 +704,82 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run +@@ -549,6 +704,82 @@ uno::Any SAL_CALL SwVbaSelection::Inform result = uno::makeAny( SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( mxModel, mxTextViewCursor ) ); break; } @@ -42501,7 +41381,7 @@ index 3f5d607..7f124e1 100644 default: throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); } -@@ -569,11 +800,6 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) +@@ -569,11 +800,6 @@ SwVbaSelection::Tables( const uno::Any& // we can only support a selection that is a single table if ( !aIndex.hasValue() ) // currently we can't support multiple tables in a selection throw uno::RuntimeException(); @@ -42513,7 +41393,7 @@ index 3f5d607..7f124e1 100644 sal_Int32 nIndex = 0; aIndex >>= nIndex; -@@ -582,6 +808,24 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException) +@@ -582,6 +808,24 @@ SwVbaSelection::Tables( const uno::Any& if ( nIndex != 1 ) throw uno::RuntimeException(); @@ -42538,7 +41418,7 @@ index 3f5d607..7f124e1 100644 SwXTextTableCursor* pTTCursor = dynamic_cast< SwXTextTableCursor* >( xTextTableCursor.get() ); if ( pTTCursor ) { -@@ -611,15 +855,14 @@ SwVbaSelection::Fields( const uno::Any& index ) throw (uno::RuntimeException) +@@ -611,15 +855,14 @@ SwVbaSelection::Fields( const uno::Any& uno::Reference< word::XHeaderFooter > SAL_CALL SwVbaSelection::getHeaderFooter() throw ( uno::RuntimeException ) { @@ -42574,7 +41454,7 @@ index 3f5d607..7f124e1 100644 uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< drawing::XDrawPage > xDrawPage = xDrawPageSupplier->getDrawPage(); -@@ -661,6 +908,281 @@ void SAL_CALL SwVbaSelection::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeExce +@@ -661,6 +908,281 @@ void SAL_CALL SwVbaSelection::setEnd( :: getRange()->setEnd( _end ); } @@ -42856,10 +41736,8 @@ index 3f5d607..7f124e1 100644 rtl::OUString& SwVbaSelection::getServiceImplName() { -diff --git sw/source/ui/vba/vbaselection.hxx sw/source/ui/vba/vbaselection.hxx -index 83994f6..c10bf2c 100644 ---- sw/source/ui/vba/vbaselection.hxx -+++ sw/source/ui/vba/vbaselection.hxx +--- sw/source/ui/vba/vbaselection.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaselection.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -34,11 +34,13 @@ #include <ooo/vba/word/XRange.hpp> #include <vbahelper/vbahelperinterface.hxx> @@ -42937,10 +41815,8 @@ index 83994f6..c10bf2c 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); -diff --git sw/source/ui/vba/vbastyle.cxx sw/source/ui/vba/vbastyle.cxx -index 0fe8875..03b27ff 100644 ---- sw/source/ui/vba/vbastyle.cxx -+++ sw/source/ui/vba/vbastyle.cxx +--- sw/source/ui/vba/vbastyle.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbastyle.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -31,15 +31,18 @@ #include "vbastyle.hxx" #include <ooo/vba/word/WdStyleType.hpp> @@ -42961,7 +41837,7 @@ index 0fe8875..03b27ff 100644 { mxStyle.set( _xPropertySet, uno::UNO_QUERY_THROW ); } -@@ -87,7 +90,7 @@ void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) throw (uno::R +@@ -87,7 +90,7 @@ void SAL_CALL SwVbaStyle::setLanguageID( nType = word::WdStyleType::wdStyleTypeParagraph; else if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.CharacterStyle") ) ) ) nType = word::WdStyleType::wdStyleTypeCharacter; @@ -42970,7 +41846,7 @@ index 0fe8875..03b27ff 100644 nType = word::WdStyleType::wdStyleTypeList; return nType; } -@@ -99,10 +102,31 @@ SwVbaStyle::getFont() throw ( uno::RuntimeException ) +@@ -99,10 +102,31 @@ SwVbaStyle::getFont() throw ( uno::Runti return new SwVbaFont( mxParent, mxContext, aColors.getPalette(), mxStyleProps ); } @@ -43005,7 +41881,7 @@ index 0fe8875..03b27ff 100644 } rtl::OUString SwVbaStyle::getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType ) -@@ -132,6 +156,115 @@ rtl::OUString SwVbaStyle::getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType ) +@@ -132,6 +156,115 @@ rtl::OUString SwVbaStyle::getOOoStyleTyp return aStyleType; } @@ -43121,10 +41997,8 @@ index 0fe8875..03b27ff 100644 rtl::OUString& SwVbaStyle::getServiceImplName() { -diff --git sw/source/ui/vba/vbastyle.hxx sw/source/ui/vba/vbastyle.hxx -index 9a7f349..49eb7e2 100644 ---- sw/source/ui/vba/vbastyle.hxx -+++ sw/source/ui/vba/vbastyle.hxx +--- sw/source/ui/vba/vbastyle.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbastyle.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -36,6 +36,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -43133,7 +42007,7 @@ index 9a7f349..49eb7e2 100644 typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE; -@@ -43,13 +44,14 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE; +@@ -43,13 +44,14 @@ typedef InheritedHelperInterfaceImpl1< o class SwVbaStyle : public SwVbaStyle_BASE { private: @@ -43171,10 +42045,8 @@ index 9a7f349..49eb7e2 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); -diff --git sw/source/ui/vba/vbastyles.cxx sw/source/ui/vba/vbastyles.cxx -index c13ba74..3ca80e8 100644 ---- sw/source/ui/vba/vbastyles.cxx -+++ sw/source/ui/vba/vbastyles.cxx +--- sw/source/ui/vba/vbastyles.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbastyles.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -47,7 +47,7 @@ struct BuiltinStyleTable sal_Int32 wdStyleType; }; @@ -43184,7 +42056,7 @@ index c13ba74..3ca80e8 100644 { { word::WdBuiltinStyle::wdStyleBlockQuotation, "", word::WdStyleType::wdStyleTypeParagraph }, { word::WdBuiltinStyle::wdStyleBodyText, "Text body", word::WdStyleType::wdStyleTypeParagraph }, -@@ -155,6 +155,18 @@ const BuiltinStyleTable aBuiltinStyleTable[] = +@@ -155,6 +155,18 @@ const BuiltinStyleTable aBuiltinStyleTab { 0, 0, 0 } }; @@ -43203,7 +42075,7 @@ index c13ba74..3ca80e8 100644 static uno::Sequence< rtl::OUString > getStyleTypes() { -@@ -168,38 +180,21 @@ static uno::Sequence< rtl::OUString > getStyleTypes() +@@ -168,38 +180,21 @@ static uno::Sequence< rtl::OUString > ge typedef ::cppu::WeakImplHelper1< container::XEnumeration > StyleEnumeration_BASE; typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE; @@ -43387,7 +42259,7 @@ index c13ba74..3ca80e8 100644 } uno::Type SAL_CALL -@@ -305,7 +309,7 @@ SwVbaStyles::getElementType() throw (uno::RuntimeException) +@@ -305,7 +309,7 @@ SwVbaStyles::getElementType() throw (uno uno::Reference< container::XEnumeration > SAL_CALL SwVbaStyles::createEnumeration() throw (uno::RuntimeException) { @@ -43396,7 +42268,7 @@ index c13ba74..3ca80e8 100644 } uno::Any SAL_CALL -@@ -322,7 +326,8 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: +@@ -322,7 +326,8 @@ SwVbaStyles::Item( const uno::Any& Index rtl::OUString aStyleName = rtl::OUString::createFromAscii( pTable->pOOoStyleName ); if( aStyleName.getLength() > 0 ) { @@ -43406,7 +42278,7 @@ index c13ba74..3ca80e8 100644 switch( pTable->wdStyleType ) { case word::WdStyleType::wdStyleTypeParagraph: -@@ -338,7 +343,8 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: +@@ -338,7 +343,8 @@ SwVbaStyles::Item( const uno::Any& Index } case word::WdStyleType::wdStyleTypeList: { @@ -43416,7 +42288,7 @@ index c13ba74..3ca80e8 100644 break; } default: -@@ -347,7 +353,12 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 ) throw (uno:: +@@ -347,7 +353,12 @@ SwVbaStyles::Item( const uno::Any& Index uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxModel, uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW ); @@ -43430,10 +42302,8 @@ index c13ba74..3ca80e8 100644 } else { -diff --git sw/source/ui/vba/vbasystem.cxx sw/source/ui/vba/vbasystem.cxx -index 3a16e23..7466894 100644 ---- sw/source/ui/vba/vbasystem.cxx -+++ sw/source/ui/vba/vbasystem.cxx +--- sw/source/ui/vba/vbasystem.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbasystem.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -37,6 +37,13 @@ #include <tools/urlobj.hxx> #include <tools/string.hxx> @@ -43448,7 +42318,7 @@ index 3a16e23..7466894 100644 using namespace ::ooo::vba; using namespace ::com::sun::star; -@@ -55,13 +62,79 @@ void PrivateProfileStringListener::Initialize( const rtl::OUString& rFileName, c +@@ -55,13 +62,79 @@ void PrivateProfileStringListener::Initi maGroupName = rGroupName; maKey = rKey; } @@ -43531,7 +42401,7 @@ index 3a16e23..7466894 100644 return uno::makeAny( sValue ); } -@@ -69,12 +142,44 @@ uno::Any PrivateProfileStringListener::getValueEvent() +@@ -69,12 +142,44 @@ uno::Any PrivateProfileStringListener::g void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value ) { // set the private profile string @@ -43580,7 +42450,7 @@ index 3a16e23..7466894 100644 } SwVbaSystem::SwVbaSystem( uno::Reference<uno::XComponentContext >& xContext ): SwVbaSystem_BASE( uno::Reference< XHelperInterface >(), xContext ) -@@ -154,19 +259,19 @@ SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) +@@ -154,19 +259,19 @@ SwVbaSystem::setCursor( sal_Int32 _curso uno::Any SAL_CALL SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException ) { @@ -43610,10 +42480,8 @@ index 3a16e23..7466894 100644 ByteString aGroupName = ByteString( rSection.getStr(), RTL_TEXTENCODING_DONTKNOW); ByteString aKey = ByteString( rKey.getStr(), RTL_TEXTENCODING_DONTKNOW); -diff --git sw/source/ui/vba/vbatable.cxx sw/source/ui/vba/vbatable.cxx -index 7598dfc..1ff9294 100644 ---- sw/source/ui/vba/vbatable.cxx -+++ sw/source/ui/vba/vbatable.cxx +--- sw/source/ui/vba/vbatable.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbatable.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -9,11 +9,13 @@ #include <com/sun/star/container/XNamed.hpp> #include "vbaborders.hxx" @@ -43629,10 +42497,12 @@ index 7598dfc..1ff9294 100644 { mxTextTable.set( xTextTable, uno::UNO_QUERY_THROW ); } -@@ -75,6 +77,26 @@ SwVbaTable::Borders( const uno::Any& index ) throw (uno::RuntimeException) +@@ -73,6 +75,26 @@ SwVbaTable::Borders( const uno::Any& ind + if ( index.hasValue() ) + return xCol->Item( index, uno::Any() ); return uno::makeAny( xCol ); - } - ++} ++ +uno::Any SAL_CALL +SwVbaTable::Rows( const uno::Any& index ) throw (uno::RuntimeException) +{ @@ -43651,15 +42521,11 @@ index 7598dfc..1ff9294 100644 + if ( index.hasValue() ) + return xCol->Item( index, uno::Any() ); + return uno::makeAny( xCol ); -+} -+ + } + // XHelperInterface - rtl::OUString& - SwVbaTable::getServiceImplName() -diff --git sw/source/ui/vba/vbatable.hxx sw/source/ui/vba/vbatable.hxx -index c28a3cd..1348c60 100644 ---- sw/source/ui/vba/vbatable.hxx -+++ sw/source/ui/vba/vbatable.hxx +--- sw/source/ui/vba/vbatable.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbatable.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -21,6 +21,9 @@ public: virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL ConvertToText( const css::uno::Any& Separator, const css::uno::Any& NestedTables ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual rtl::OUString SAL_CALL getName( ) throw (css::uno::RuntimeException); @@ -43670,11 +42536,8 @@ index c28a3cd..1348c60 100644 // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -diff --git sw/source/ui/vba/vbatablehelper.cxx sw/source/ui/vba/vbatablehelper.cxx -new file mode 100644 -index 0000000..2c7aecf ---- /dev/null -+++ sw/source/ui/vba/vbatablehelper.cxx +--- sw/source/ui/vba/vbatablehelper.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatablehelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,306 @@ +/************************************************************************* + * @@ -43982,11 +42845,8 @@ index 0000000..2c7aecf + //pDoc->SetTabCols(*pTable, aCols, aOldCols, pStartBox, bCurRowOnly ); + pTable->SetTabCols(aCols, aOldCols, pStart, bCurRowOnly ); +} -diff --git sw/source/ui/vba/vbatablehelper.hxx sw/source/ui/vba/vbatablehelper.hxx -new file mode 100644 -index 0000000..73425d4 ---- /dev/null -+++ sw/source/ui/vba/vbatablehelper.hxx +--- sw/source/ui/vba/vbatablehelper.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatablehelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,70 @@ +/************************************************************************* + * @@ -44058,11 +42918,8 @@ index 0000000..73425d4 +}; + +#endif -diff --git sw/source/ui/vba/vbatableofcontents.cxx sw/source/ui/vba/vbatableofcontents.cxx -new file mode 100644 -index 0000000..1c37e96 ---- /dev/null -+++ sw/source/ui/vba/vbatableofcontents.cxx +--- sw/source/ui/vba/vbatableofcontents.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatableofcontents.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,125 @@ +/************************************************************************* + * @@ -44189,11 +43046,8 @@ index 0000000..1c37e96 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbatableofcontents.hxx sw/source/ui/vba/vbatableofcontents.hxx -new file mode 100644 -index 0000000..8e9394a ---- /dev/null -+++ sw/source/ui/vba/vbatableofcontents.hxx +--- sw/source/ui/vba/vbatableofcontents.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatableofcontents.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,70 @@ +/************************************************************************* + * @@ -44265,10 +43119,8 @@ index 0000000..8e9394a + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_TABLEOFCONTENTS_HXX */ -diff --git sw/source/ui/vba/vbatables.cxx sw/source/ui/vba/vbatables.cxx -index 53178d1..7423216 100644 ---- sw/source/ui/vba/vbatables.cxx -+++ sw/source/ui/vba/vbatables.cxx +--- sw/source/ui/vba/vbatables.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbatables.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -4,6 +4,9 @@ #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> @@ -44279,7 +43131,7 @@ index 53178d1..7423216 100644 #include <comphelper/componentcontext.hxx> using namespace ::ooo::vba; -@@ -26,7 +29,89 @@ uno::Any lcl_createTable( const uno::Reference< XHelperInterface >& xParent, con +@@ -26,7 +29,89 @@ uno::Any lcl_createTable( const uno::Ref return uno::makeAny( xTable ); } @@ -44378,7 +43230,7 @@ index 53178d1..7423216 100644 { } -@@ -85,6 +170,12 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N +@@ -85,6 +170,12 @@ SwVbaTables::Add( const uno::Reference< uno::Reference< text::XTextContent > xContext( xTable, uno::UNO_QUERY_THROW ); xText->insertTextContent( xTextRange, xContext, true ); @@ -44391,11 +43243,8 @@ index 53178d1..7423216 100644 uno::Reference< word::XTable > xVBATable( new SwVbaTable( mxParent, mxContext, pVbaRange->getDocument(), xTable ) ); return xVBATable; } -diff --git sw/source/ui/vba/vbatablesofcontents.cxx sw/source/ui/vba/vbatablesofcontents.cxx -new file mode 100644 -index 0000000..fd81978 ---- /dev/null -+++ sw/source/ui/vba/vbatablesofcontents.cxx +--- sw/source/ui/vba/vbatablesofcontents.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatablesofcontents.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,197 @@ +/************************************************************************* + * @@ -44594,11 +43443,8 @@ index 0000000..fd81978 + } + return sNames; +} -diff --git sw/source/ui/vba/vbatablesofcontents.hxx sw/source/ui/vba/vbatablesofcontents.hxx -new file mode 100644 -index 0000000..e193df7 ---- /dev/null -+++ sw/source/ui/vba/vbatablesofcontents.hxx +--- sw/source/ui/vba/vbatablesofcontents.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatablesofcontents.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,64 @@ +/************************************************************************* + * @@ -44664,11 +43510,8 @@ index 0000000..e193df7 +}; + +#endif /* SW_VBA_TABLESOFCONTENTS_HXX */ -diff --git sw/source/ui/vba/vbatabstop.cxx sw/source/ui/vba/vbatabstop.cxx -new file mode 100644 -index 0000000..259c508 ---- /dev/null -+++ sw/source/ui/vba/vbatabstop.cxx +--- sw/source/ui/vba/vbatabstop.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatabstop.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,63 @@ +/************************************************************************* + * @@ -44733,11 +43576,8 @@ index 0000000..259c508 + return aServiceNames; +} + -diff --git sw/source/ui/vba/vbatabstop.hxx sw/source/ui/vba/vbatabstop.hxx -new file mode 100644 -index 0000000..77780c7 ---- /dev/null -+++ sw/source/ui/vba/vbatabstop.hxx +--- sw/source/ui/vba/vbatabstop.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatabstop.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,54 @@ +/************************************************************************* + * @@ -44793,11 +43633,8 @@ index 0000000..77780c7 + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); +}; +#endif /* SW_VBA_TABSTOP_HXX */ -diff --git sw/source/ui/vba/vbatabstops.cxx sw/source/ui/vba/vbatabstops.cxx -new file mode 100644 -index 0000000..8d19875 ---- /dev/null -+++ sw/source/ui/vba/vbatabstops.cxx +--- sw/source/ui/vba/vbatabstops.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatabstops.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,280 @@ +/************************************************************************* + * @@ -45079,11 +43916,8 @@ index 0000000..8d19875 + } + return sNames; +} -diff --git sw/source/ui/vba/vbatabstops.hxx sw/source/ui/vba/vbatabstops.hxx -new file mode 100644 -index 0000000..913e12b ---- /dev/null -+++ sw/source/ui/vba/vbatabstops.hxx +--- sw/source/ui/vba/vbatabstops.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ sw/source/ui/vba/vbatabstops.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,65 @@ +/************************************************************************* + * @@ -45150,10 +43984,8 @@ index 0000000..913e12b +}; + +#endif /* SW_VBA_TABSTOPS_HXX */ -diff --git sw/source/ui/vba/vbatemplate.cxx sw/source/ui/vba/vbatemplate.cxx -index 136a9ec..a7a1a6c 100644 ---- sw/source/ui/vba/vbatemplate.cxx -+++ sw/source/ui/vba/vbatemplate.cxx +--- sw/source/ui/vba/vbatemplate.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbatemplate.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -33,12 +33,35 @@ #include "vbaautotextentry.hxx" #include <comphelper/processfactory.hxx> @@ -45221,7 +44053,7 @@ index 136a9ec..a7a1a6c 100644 } uno::Any SAL_CALL -@@ -61,17 +104,18 @@ SwVbaTemplate::AutoTextEntries( const uno::Any& index ) throw (uno::RuntimeExcep +@@ -61,17 +104,18 @@ SwVbaTemplate::AutoTextEntries( const un // the default template is "Normal.dot" in Word. rtl::OUString sGroup( RTL_CONSTASCII_USTRINGPARAM("Normal") ); @@ -45246,11 +44078,9 @@ index 136a9ec..a7a1a6c 100644 } else { -diff --git sw/source/ui/vba/vbatemplate.hxx sw/source/ui/vba/vbatemplate.hxx -index df8848b..502e9be 100644 ---- sw/source/ui/vba/vbatemplate.hxx -+++ sw/source/ui/vba/vbatemplate.hxx -@@ -39,7 +39,7 @@ class SwVbaTemplate : public SwVbaTemplate_BASE +--- sw/source/ui/vba/vbatemplate.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbatemplate.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -39,7 +39,7 @@ class SwVbaTemplate : public SwVbaTempla { private: css::uno::Reference< css::frame::XModel > mxModel; @@ -45267,11 +44097,9 @@ index df8848b..502e9be 100644 virtual css::uno::Any SAL_CALL AutoTextEntries( const css::uno::Any& index ) throw (css::uno::RuntimeException); // XHelperInterface virtual rtl::OUString& getServiceImplName(); -diff --git sw/source/ui/vba/vbaview.cxx sw/source/ui/vba/vbaview.cxx -index bc7b9b4..df9a524 100644 ---- sw/source/ui/vba/vbaview.cxx -+++ sw/source/ui/vba/vbaview.cxx -@@ -95,20 +95,20 @@ SwVbaView::getSeekView() throw (css::uno::RuntimeException) +--- sw/source/ui/vba/vbaview.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbaview.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -95,20 +95,20 @@ SwVbaView::getSeekView() throw (css::uno } else if( aImplName.equalsAscii("SwXHeadFootText") ) { @@ -45297,7 +44125,7 @@ index bc7b9b4..df9a524 100644 return word::WdSeekView::wdSeekEvenPagesFooter; else return word::WdSeekView::wdSeekPrimaryFooter; -@@ -135,6 +135,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio +@@ -135,6 +135,7 @@ SwVbaView::setSeekView( ::sal_Int32 _see // if( _seekview == getSeekView() ) // return; @@ -45305,7 +44133,7 @@ index bc7b9b4..df9a524 100644 switch( _seekview ) { case word::WdSeekView::wdSeekFirstPageFooter: -@@ -184,7 +185,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio +@@ -184,7 +185,7 @@ SwVbaView::setSeekView( ::sal_Int32 _see { uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< text::XText > xText = xTextDocument->getText(); @@ -45314,7 +44142,7 @@ index bc7b9b4..df9a524 100644 break; } } -@@ -379,28 +380,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) +@@ -379,28 +380,7 @@ uno::Reference< text::XTextRange > SwVba { DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() ); } @@ -45344,10 +44172,8 @@ index bc7b9b4..df9a524 100644 return xTextRange; } -diff --git sw/source/ui/vba/vbawindow.cxx sw/source/ui/vba/vbawindow.cxx -index abdf3d5..a0ac99d 100644 ---- sw/source/ui/vba/vbawindow.cxx -+++ sw/source/ui/vba/vbawindow.cxx +--- sw/source/ui/vba/vbawindow.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbawindow.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -28,12 +28,16 @@ * ************************************************************************/ @@ -45365,7 +44191,7 @@ index abdf3d5..a0ac99d 100644 using namespace ::com::sun::star; using namespace ::ooo::vba; -@@ -81,6 +85,52 @@ void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeE +@@ -81,6 +85,52 @@ void SAL_CALL SwVbaWindow::setView( cons } uno::Any SAL_CALL @@ -45418,10 +44244,8 @@ index abdf3d5..a0ac99d 100644 SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< XCollection > xPanes( new SwVbaPanes( this, mxContext, m_xModel ) ); -diff --git sw/source/ui/vba/vbawindow.hxx sw/source/ui/vba/vbawindow.hxx -index 11a1a36..7e30d2c 100644 ---- sw/source/ui/vba/vbawindow.hxx -+++ sw/source/ui/vba/vbawindow.hxx +--- sw/source/ui/vba/vbawindow.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/vbawindow.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -48,6 +48,8 @@ public: // Attributes virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException); @@ -45431,10 +44255,8 @@ index 11a1a36..7e30d2c 100644 // Methods virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException); -diff --git sw/source/ui/vba/wordvbahelper.cxx sw/source/ui/vba/wordvbahelper.cxx -index 409b8bd..0772d07 100644 ---- sw/source/ui/vba/wordvbahelper.cxx -+++ sw/source/ui/vba/wordvbahelper.cxx +--- sw/source/ui/vba/wordvbahelper.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/wordvbahelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,11 +32,16 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/XController.hpp> @@ -45452,7 +44274,7 @@ index 409b8bd..0772d07 100644 using namespace ::com::sun::star; using namespace ::ooo::vba; -@@ -74,8 +79,13 @@ uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference +@@ -74,8 +79,13 @@ uno::Reference< text::XTextViewCursor > uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xCursorProps( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW ); @@ -45467,7 +44289,7 @@ index 409b8bd..0772d07 100644 uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW ); -@@ -90,6 +100,92 @@ sal_Int32 getPageCount( const uno::Reference< frame::XModel>& xModel ) throw (un +@@ -90,6 +100,92 @@ sal_Int32 getPageCount( const uno::Refer return pDocShell ? pDocShell->GetDoc()->GetPageCount() : 0; } @@ -45560,10 +44382,8 @@ index 409b8bd..0772d07 100644 } // word } // } // -diff --git sw/source/ui/vba/wordvbahelper.hxx sw/source/ui/vba/wordvbahelper.hxx -index 88aa3c1..1f9835b 100644 ---- sw/source/ui/vba/wordvbahelper.hxx -+++ sw/source/ui/vba/wordvbahelper.hxx +--- sw/source/ui/vba/wordvbahelper.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/source/ui/vba/wordvbahelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -35,6 +35,8 @@ #include <com/sun/star/text/XTextViewCursor.hpp> #include <com/sun/star/text/XPageCursor.hpp> @@ -45594,10 +44414,8 @@ index 88aa3c1..1f9835b 100644 } // word } // vba -diff --git sw/util/makefile.mk sw/util/makefile.mk -index c89f6c9..0396bd1 100644 ---- sw/util/makefile.mk -+++ sw/util/makefile.mk +--- sw/util/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ sw/util/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -373,6 +373,10 @@ SHL5STDLIBS= \ $(SVXCORELIB) \ $(SVXMSFILTERLIB) \ @@ -45609,10 +44427,8 @@ index c89f6c9..0396bd1 100644 SHL5DEPN=$(SHL1TARGETN) SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib -diff --git toolkit/inc/toolkit/awt/vclxmenu.hxx toolkit/inc/toolkit/awt/vclxmenu.hxx -index a6e5264..2222da9 100644 ---- toolkit/inc/toolkit/awt/vclxmenu.hxx -+++ toolkit/inc/toolkit/awt/vclxmenu.hxx +--- toolkit/inc/toolkit/awt/vclxmenu.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ toolkit/inc/toolkit/awt/vclxmenu.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -48,6 +48,7 @@ class Menu; class MenuBar; @@ -45621,7 +44437,7 @@ index a6e5264..2222da9 100644 DECLARE_LIST( PopupMenuRefList, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >* ) -@@ -184,6 +185,7 @@ class TOOLKIT_DLLPUBLIC VCLXPopupMenu : public VCLXMenu +@@ -184,6 +185,7 @@ class TOOLKIT_DLLPUBLIC VCLXPopupMenu : { public: VCLXPopupMenu(); @@ -45629,10 +44445,8 @@ index a6e5264..2222da9 100644 }; #endif // _TOOLKIT_AWT_VCLXMENU_HXX_ -diff --git toolkit/inc/toolkit/awt/vclxwindows.hxx toolkit/inc/toolkit/awt/vclxwindows.hxx -index 0573296..df266de 100644 ---- toolkit/inc/toolkit/awt/vclxwindows.hxx -+++ toolkit/inc/toolkit/awt/vclxwindows.hxx +--- toolkit/inc/toolkit/awt/vclxwindows.hxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/inc/toolkit/awt/vclxwindows.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -96,6 +96,7 @@ #include <vcl/imgcons.hxx> #include <vcl/image.hxx> @@ -45660,10 +44474,8 @@ index 0573296..df266de 100644 }; // ---------------------------------------------------- -diff --git toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx -index ebc7942..b031e13 100644 ---- toolkit/inc/toolkit/controls/dialogcontrol.hxx -+++ toolkit/inc/toolkit/controls/dialogcontrol.hxx +--- toolkit/inc/toolkit/controls/dialogcontrol.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ toolkit/inc/toolkit/controls/dialogcontrol.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -51,6 +51,8 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/basemutex.hxx> @@ -45705,10 +44517,8 @@ index ebc7942..b031e13 100644 }; // ---------------------------------------------------- -diff --git toolkit/inc/toolkit/controls/unocontrols.hxx toolkit/inc/toolkit/controls/unocontrols.hxx -index c4c3ea1..55c70b2 100644 ---- toolkit/inc/toolkit/controls/unocontrols.hxx -+++ toolkit/inc/toolkit/controls/unocontrols.hxx +--- toolkit/inc/toolkit/controls/unocontrols.hxx.old 2009-10-07 15:06:52.000000000 +0200 ++++ toolkit/inc/toolkit/controls/unocontrols.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -225,7 +225,6 @@ private: bool mbAdjustingGraphic; @@ -45762,10 +44572,8 @@ index c4c3ea1..55c70b2 100644 // ---------------------------------------------------- // class UnoFixedTextControl // ---------------------------------------------------- -diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx -index 920272b..4aee234 100644 ---- toolkit/inc/toolkit/helper/property.hxx -+++ toolkit/inc/toolkit/helper/property.hxx +--- toolkit/inc/toolkit/helper/property.hxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/inc/toolkit/helper/property.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -197,6 +197,8 @@ namespace rtl { #define BASEPROPERTY_GRID_COLUMNMODEL 143 #define BASEPROPERTY_GRID_SELECTIONMODE 144 @@ -45775,11 +44583,9 @@ index 920272b..4aee234 100644 // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen. -diff --git toolkit/inc/toolkit/helper/servicenames.hxx toolkit/inc/toolkit/helper/servicenames.hxx -index c989ce6..8ba2af3 100644 ---- toolkit/inc/toolkit/helper/servicenames.hxx -+++ toolkit/inc/toolkit/helper/servicenames.hxx -@@ -40,6 +40,8 @@ extern const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_Popup +--- toolkit/inc/toolkit/helper/servicenames.hxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/inc/toolkit/helper/servicenames.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -40,6 +40,8 @@ extern const sal_Char __FAR_DATA szServi extern const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[]; extern const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[]; extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[]; @@ -45788,11 +44594,9 @@ index c989ce6..8ba2af3 100644 extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[]; extern const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[]; extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[]; -diff --git toolkit/source/awt/vclxmenu.cxx toolkit/source/awt/vclxmenu.cxx -index 9a68e74..a5ae296 100644 ---- toolkit/source/awt/vclxmenu.cxx -+++ toolkit/source/awt/vclxmenu.cxx -@@ -529,6 +529,14 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref +--- toolkit/source/awt/vclxmenu.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/awt/vclxmenu.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -529,6 +529,14 @@ void VCLXMenu::setPopupMenu( sal_Int16 n break; } } @@ -45816,11 +44620,9 @@ index 9a68e74..a5ae296 100644 +{ + DBG_CTOR( VCLXPopupMenu, 0 ); +} -diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx -index 0c78ffc..4890b63 100644 ---- toolkit/source/awt/vclxwindows.cxx -+++ toolkit/source/awt/vclxwindows.cxx -@@ -680,6 +680,7 @@ void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +--- toolkit/source/awt/vclxwindows.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/awt/vclxwindows.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -680,6 +680,7 @@ void VCLXImageControl::ImplGetPropertyId BASEPROPERTY_TABSTOP, BASEPROPERTY_WRITING_MODE, BASEPROPERTY_CONTEXT_WRITING_MODE, @@ -45828,7 +44630,7 @@ index 0c78ffc..4890b63 100644 0); VCLXImageConsumer::ImplGetPropertyIds( rIds ); } -@@ -1116,6 +1117,7 @@ void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +@@ -1116,6 +1117,7 @@ void VCLXRadioButton::ImplGetPropertyIds BASEPROPERTY_VERTICALALIGN, BASEPROPERTY_WRITING_MODE, BASEPROPERTY_CONTEXT_WRITING_MODE, @@ -45836,7 +44638,7 @@ index 0c78ffc..4890b63 100644 0); VCLXImageConsumer::ImplGetPropertyIds( rIds ); } -@@ -1180,6 +1182,16 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const :: +@@ -1180,6 +1182,16 @@ void VCLXRadioButton::setProperty( const pButton->Check( b ); else pButton->SetState( b ); @@ -45853,7 +44655,7 @@ index 0c78ffc..4890b63 100644 } } break; -@@ -1942,8 +1954,11 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: +@@ -1942,8 +1954,11 @@ void VCLXListBox::setProperty( const ::r ::com::sun::star::uno::Sequence< ::rtl::OUString> aItems; if ( Value >>= aItems ) { @@ -45865,7 +44667,7 @@ index 0c78ffc..4890b63 100644 } } break; -@@ -1956,7 +1971,11 @@ void VCLXListBox::setProperty( const ::rtl::OUString& PropertyName, const ::com: +@@ -1956,7 +1971,11 @@ void VCLXListBox::setProperty( const ::r pListBox->SelectEntryPos( --n, sal_False ); if ( aItems.getLength() ) @@ -45892,7 +44694,7 @@ index 0c78ffc..4890b63 100644 getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDialog>* ) NULL ), VCLXTopWindow::getTypes() IMPL_XTYPEPROVIDER_END -@@ -2300,6 +2321,40 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::s +@@ -2300,6 +2321,40 @@ void SAL_CALL VCLXDialog::draw( sal_Int3 return aInfo; } @@ -45933,10 +44735,8 @@ index 0c78ffc..4890b63 100644 void SAL_CALL VCLXDialog::setProperty( const ::rtl::OUString& PropertyName, -diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx -index f78e5e1..b977909 100644 ---- toolkit/source/controls/dialogcontrol.cxx -+++ toolkit/source/controls/dialogcontrol.cxx +--- toolkit/source/controls/dialogcontrol.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/controls/dialogcontrol.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -81,6 +81,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; @@ -45982,7 +44782,7 @@ index f78e5e1..b977909 100644 } // ---------------------------------------------------------------------------- -@@ -254,7 +269,7 @@ static const ::rtl::OUString& getStepPropertyName( ) +@@ -254,7 +269,7 @@ static const ::rtl::OUString& getStepPro UnoControlDialogModel::UnoControlDialogModel() :maContainerListeners( *this ) ,maChangeListeners ( GetMutex() ) @@ -45991,7 +44791,7 @@ index f78e5e1..b977909 100644 { ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR ); // ImplRegisterProperty( BASEPROPERTY_BORDER ); -@@ -276,6 +291,8 @@ UnoControlDialogModel::UnoControlDialogModel() +@@ -276,6 +291,8 @@ UnoControlDialogModel::UnoControlDialogM aBool <<= (sal_Bool) sal_True; ImplRegisterProperty( BASEPROPERTY_MOVEABLE, aBool ); ImplRegisterProperty( BASEPROPERTY_CLOSEABLE, aBool ); @@ -46000,7 +44800,7 @@ index f78e5e1..b977909 100644 } UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rModel ) -@@ -283,7 +300,7 @@ UnoControlDialogModel::UnoControlDialogModel( const UnoControlDialogModel& rMode +@@ -283,7 +300,7 @@ UnoControlDialogModel::UnoControlDialogM , UnoControlDialogModel_Base( rModel ) , maContainerListeners( *this ) , maChangeListeners ( GetMutex() ) @@ -46009,7 +44809,7 @@ index f78e5e1..b977909 100644 { } -@@ -314,6 +331,40 @@ Sequence< Type > UnoControlDialogModel::getTypes() throw(RuntimeException) +@@ -314,6 +331,40 @@ Sequence< Type > UnoControlDialogModel:: return ::rtl::OUString::createFromAscii( szServiceName_UnoControlDialogModel ); } @@ -46050,7 +44850,7 @@ index f78e5e1..b977909 100644 Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { Any aAny; -@@ -901,6 +952,63 @@ void UnoControlDialogModel::implNotifyTabModelChange( const ::rtl::OUString& _rA +@@ -901,6 +952,63 @@ void UnoControlDialogModel::implNotifyTa } } @@ -46114,7 +44914,7 @@ index f78e5e1..b977909 100644 // ---------------------------------------------------------------------------- void UnoControlDialogModel::implUpdateGroupStructure() -@@ -925,10 +1033,13 @@ void UnoControlDialogModel::implUpdateGroupStructure() +@@ -925,10 +1033,13 @@ void UnoControlDialogModel::implUpdateGr GroupingMachineState eState = eLookingForGroup; // the current state of our machine Reference< XServiceInfo > xModelSI; // for checking for a radion button @@ -46130,7 +44930,7 @@ index f78e5e1..b977909 100644 #if OSL_DEBUG_LEVEL > 1 ::std::vector< ::rtl::OUString > aCurrentGroupLabels; #endif -@@ -949,14 +1060,8 @@ void UnoControlDialogModel::implUpdateGroupStructure() +@@ -949,14 +1060,8 @@ void UnoControlDialogModel::implUpdateGr // the current model is a radio button // -> we found the beginning of a new group // create the place for this group @@ -46139,15 +44939,14 @@ index f78e5e1..b977909 100644 - aCurrentGroup = maGroups.begin() + nGroups; - // and add the (only, til now) member - aCurrentGroup->push_back( *pControlModels ); -- ++ AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup ); + - // get the step which all controls of this group now have to belong to - nCurrentGroupStep = lcl_getDialogStep( *pControlModels ); -+ AddRadioButtonToGroup( *pControlModels, GROUP_NAME, aNamedGroups, aCurrentGroup ); -+ // new state: looking for further members eState = eExpandingGroup; -@@ -974,7 +1079,7 @@ void UnoControlDialogModel::implUpdateGroupStructure() +@@ -974,7 +1079,7 @@ void UnoControlDialogModel::implUpdateGr { if ( !bIsRadioButton ) { // no radio button -> the group is done @@ -46156,7 +44955,7 @@ index f78e5e1..b977909 100644 eState = eLookingForGroup; #if OSL_DEBUG_LEVEL > 1 aCurrentGroupLabels.clear(); -@@ -982,47 +1087,8 @@ void UnoControlDialogModel::implUpdateGroupStructure() +@@ -982,47 +1087,8 @@ void UnoControlDialogModel::implUpdateGr continue; } @@ -46205,7 +45004,7 @@ index f78e5e1..b977909 100644 #if OSL_DEBUG_LEVEL > 1 Reference< XPropertySet > xModelProps( *pControlModels, UNO_QUERY ); ::rtl::OUString sLabel; -@@ -1035,6 +1101,7 @@ void UnoControlDialogModel::implUpdateGroupStructure() +@@ -1035,6 +1101,7 @@ void UnoControlDialogModel::implUpdateGr } } @@ -46213,7 +45012,7 @@ index f78e5e1..b977909 100644 mbGroupsUpToDate = sal_True; } -@@ -1415,17 +1482,32 @@ void UnoDialogControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) +@@ -1415,17 +1482,32 @@ void UnoDialogControl::ImplSetPosSize( R xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) >>= nWidth; xP->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) >>= nHeight; @@ -46250,7 +45049,7 @@ index f78e5e1..b977909 100644 nWidth = aTmp.Width(); nHeight = aTmp.Height(); } -@@ -1644,17 +1726,16 @@ void UnoDialogControl::PrepareWindowDescriptor( ::com::sun::star::awt::WindowDes +@@ -1644,17 +1726,16 @@ void UnoDialogControl::PrepareWindowDesc // can lead to overwrites we have to set the graphic property // before the propertiesChangeEvents are sent! ::rtl::OUString aImageURL; @@ -46271,7 +45070,7 @@ index f78e5e1..b977909 100644 } void UnoDialogControl::elementInserted( const ContainerEvent& Event ) throw(RuntimeException) -@@ -1886,18 +1967,16 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang +@@ -1886,18 +1967,16 @@ void UnoDialogControl::ImplModelProperti if ( bOwnModel && rEvt.PropertyName.equalsAsciiL( "ImageURL", 8 )) { ::rtl::OUString aImageURL; @@ -46314,11 +45113,9 @@ index f78e5e1..b977909 100644 } return ret; -diff --git toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx -index c61aa2d..782e5c3 100644 ---- toolkit/source/controls/unocontrolmodel.cxx -+++ toolkit/source/controls/unocontrolmodel.cxx -@@ -349,6 +349,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 ) +--- toolkit/source/controls/unocontrolmodel.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/controls/unocontrolmodel.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -349,6 +349,7 @@ void UnoControlModel::ImplPropertyChange case BASEPROPERTY_ENABLEVISIBLE: case BASEPROPERTY_DECORATION: aDefault <<= (sal_Bool) sal_True; break; @@ -46326,11 +45123,9 @@ index c61aa2d..782e5c3 100644 case BASEPROPERTY_HELPTEXT: case BASEPROPERTY_HELPURL: case BASEPROPERTY_IMAGEURL: -diff --git toolkit/source/controls/unocontrols.cxx toolkit/source/controls/unocontrols.cxx -index 2ba1553..87981f9 100644 ---- toolkit/source/controls/unocontrols.cxx -+++ toolkit/source/controls/unocontrols.cxx -@@ -571,7 +571,7 @@ uno::Any ImageProducerControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) co +--- toolkit/source/controls/unocontrols.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/controls/unocontrols.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -571,7 +571,7 @@ uno::Any ImageProducerControlModel::Impl return UnoControlModel::ImplGetDefaultValue( nPropId ); } @@ -46339,7 +45134,7 @@ index 2ba1553..87981f9 100644 { uno::Reference< graphic::XGraphic > xGraphic; -@@ -581,10 +581,10 @@ uno::Any ImageProducerControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) co +@@ -581,10 +581,10 @@ uno::Any ImageProducerControlModel::Impl rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ); // get the DefaultContext ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() ); @@ -46352,7 +45147,7 @@ index 2ba1553..87981f9 100644 if ( !_rURL.getLength() ) return xGraphic; -@@ -625,7 +625,7 @@ void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_I +@@ -625,7 +625,7 @@ void SAL_CALL ImageProducerControlModel: mbAdjustingGraphic = true; ::rtl::OUString sImageURL; OSL_VERIFY( rValue >>= sImageURL ); @@ -46361,7 +45156,7 @@ index 2ba1553..87981f9 100644 mbAdjustingGraphic = false; } break; -@@ -1842,6 +1842,77 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException) +@@ -1842,6 +1842,77 @@ sal_Bool UnoGroupBoxControl::isTranspare return sal_True; } @@ -46439,11 +45234,9 @@ index 2ba1553..87981f9 100644 // ---------------------------------------------------- // class UnoControlListBoxModel // ---------------------------------------------------- -diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx -index 9ab0a3c..a01046f 100644 ---- toolkit/source/helper/property.cxx -+++ toolkit/source/helper/property.cxx -@@ -183,6 +183,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) +--- toolkit/source/helper/property.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/helper/property.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -183,6 +183,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( DECL_PROP_3 ( "FormatsSupplier", FORMATSSUPPLIER, Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ), DECL_PROP_2 ( "Graphic", GRAPHIC, Reference< ::com::sun::star::graphic::XGraphic >, BOUND, TRANSIENT ), @@ -46451,7 +45244,7 @@ index 9ab0a3c..a01046f 100644 DECL_PROP_2 ( "HelpText", HELPTEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "HelpURL", HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "HideInactiveSelection", HIDEINACTIVESELECTION, bool, BOUND, MAYBEDEFAULT ), -@@ -280,7 +281,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) +@@ -280,7 +281,8 @@ ImplPropertyInfo* ImplGetPropertyInfos( DECL_PROP_3 ( "GridDataModel", GRID_DATAMODEL, Reference< ::com::sun::star::awt::grid::XGridDataModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "ColumnModel", GRID_COLUMNMODEL, Reference< ::com::sun::star::awt::grid::XGridColumnModel >, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_3 ( "SelectionModel", GRID_SELECTIONMODE, ::com::sun::star::view::SelectionType, BOUND, MAYBEDEFAULT, MAYBEVOID ), @@ -46461,11 +45254,9 @@ index 9ab0a3c..a01046f 100644 }; pPropertyInfos = aImplPropertyInfos; nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo ); -diff --git toolkit/source/helper/registerservices.cxx toolkit/source/helper/registerservices.cxx -index daf4128..d59200f 100644 ---- toolkit/source/helper/registerservices.cxx -+++ toolkit/source/helper/registerservices.cxx -@@ -168,6 +168,7 @@ IMPL_CREATEINSTANCE( UnoControlTimeFieldModel ) +--- toolkit/source/helper/registerservices.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/helper/registerservices.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -168,6 +168,7 @@ IMPL_CREATEINSTANCE( UnoControlTimeField IMPL_CREATEINSTANCE( UnoControlProgressBarModel ) IMPL_CREATEINSTANCE( UnoControlScrollBarModel ) IMPL_CREATEINSTANCE( UnoSpinButtonModel ) @@ -46473,7 +45264,7 @@ index daf4128..d59200f 100644 IMPL_CREATEINSTANCE( UnoControlFixedLineModel ) IMPL_CREATEINSTANCE( UnoCurrencyFieldControl ) IMPL_CREATEINSTANCE( UnoDateFieldControl ) -@@ -187,6 +188,7 @@ IMPL_CREATEINSTANCE( UnoTimeFieldControl ) +@@ -187,6 +188,7 @@ IMPL_CREATEINSTANCE( UnoTimeFieldControl IMPL_CREATEINSTANCE( UnoProgressBarControl ) IMPL_CREATEINSTANCE( UnoScrollBarControl ) IMPL_CREATEINSTANCE( UnoSpinButtonControl ) @@ -46481,7 +45272,7 @@ index daf4128..d59200f 100644 IMPL_CREATEINSTANCE( UnoFixedLineControl ) IMPL_CREATEINSTANCE( VCLXMenuBar ) IMPL_CREATEINSTANCE( VCLXPointer ) -@@ -279,6 +281,8 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( void* _pServiceManager, +@@ -279,6 +281,8 @@ TOOLKIT_DLLPUBLIC sal_Bool SAL_CALL comp registerServices( xRegistryKey, "UnoControlScrollBarModel", szServiceName_UnoControlScrollBarModel, szServiceName2_UnoControlScrollBarModel ); registerServices( xRegistryKey, "UnoSpinButtonModel", szServiceName_UnoSpinButtonModel ); registerServices( xRegistryKey, "UnoSpinButtonControl", szServiceName_UnoSpinButtonControl ); @@ -46490,7 +45281,7 @@ index daf4128..d59200f 100644 registerServices( xRegistryKey, "UnoFixedLineControl", szServiceName_UnoControlFixedLine, szServiceName2_UnoControlFixedLine ); registerServices( xRegistryKey, "UnoControlFixedLineModel", szServiceName_UnoControlFixedLineModel, szServiceName2_UnoControlFixedLineModel ); registerServices( xRegistryKey, "VCLXPrinterServer", szServiceName_PrinterServer, szServiceName2_PrinterServer ); -@@ -369,6 +373,8 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* sImplemen +@@ -369,6 +373,8 @@ TOOLKIT_DLLPUBLIC void* SAL_CALL compone CHECKANDCREATEFACTORY( VCLXPrinterServer, szServiceName_PrinterServer, szServiceName2_PrinterServer ) CHECKANDCREATEFACTORY( UnoRoadmapControl, szServiceName_UnoControlRoadmap, szServiceName2_UnoControlRoadmap ) CHECKANDCREATEFACTORY( UnoControlRoadmapModel, szServiceName_UnoControlRoadmapModel, szServiceName2_UnoControlRoadmapModel ) @@ -46499,11 +45290,9 @@ index daf4128..d59200f 100644 CHECKANDCREATEFACTORY( UnoSpinButtonModel, szServiceName_UnoSpinButtonModel, NULL ) CHECKANDCREATEFACTORY( UnoSpinButtonControl, szServiceName_UnoSpinButtonControl, NULL ) CHECKANDCREATEFACTORY( TreeControl, szServiceName_TreeControl, NULL ) -diff --git toolkit/source/helper/servicenames.cxx toolkit/source/helper/servicenames.cxx -index e3ccf13..3d531f8 100644 ---- toolkit/source/helper/servicenames.cxx -+++ toolkit/source/helper/servicenames.cxx -@@ -40,6 +40,8 @@ const sal_Char __FAR_DATA szServiceName_PopupMenu[] = "stardiv.vcl.PopupMenu", s +--- toolkit/source/helper/servicenames.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ toolkit/source/helper/servicenames.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -40,6 +40,8 @@ const sal_Char __FAR_DATA szServiceName_ const sal_Char __FAR_DATA szServiceName_MenuBar[] = "stardiv.vcl.MenuBar", szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar"; const sal_Char __FAR_DATA szServiceName_Pointer[] = "stardiv.vcl.Pointer", szServiceName2_Pointer[] = "com.sun.star.awt.Pointer"; const sal_Char __FAR_DATA szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer", szServiceName2_UnoControlContainer[] = "com.sun.star.awt.UnoControlContainer"; @@ -46512,7 +45301,7 @@ index e3ccf13..3d531f8 100644 const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer", szServiceName2_UnoControlContainerModel[] = "com.sun.star.awt.UnoControlContainerModel"; const sal_Char __FAR_DATA szServiceName_TabController[] = "stardiv.vcl.control.TabController", szServiceName2_TabController[] = "com.sun.star.awt.TabController"; const sal_Char __FAR_DATA szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController", szServiceName2_TabControllerModel[] = "com.sun.star.awt.TabControllerModel"; -@@ -92,6 +94,8 @@ const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[] = "stardiv.vcl.contr +@@ -92,6 +94,8 @@ const sal_Char __FAR_DATA szServiceName_ const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap", szServiceName2_UnoControlRoadmapModel[] = "com.sun.star.awt.UnoControlRoadmapModel"; const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton"; const sal_Char __FAR_DATA szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel"; @@ -46521,11 +45310,8 @@ index e3ccf13..3d531f8 100644 const sal_Char __FAR_DATA szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl"; const sal_Char __FAR_DATA szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel"; const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[] = "com.sun.star.awt.tree.MutableTreeDataModel"; -diff --git udkapi/com/sun/star/script/ModuleInfo.idl udkapi/com/sun/star/script/ModuleInfo.idl -new file mode 100644 -index 0000000..00204f9 ---- /dev/null -+++ udkapi/com/sun/star/script/ModuleInfo.idl +--- udkapi/com/sun/star/script/ModuleInfo.idl.old 2010-03-03 16:59:35.000000000 +0100 ++++ udkapi/com/sun/star/script/ModuleInfo.idl 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,57 @@ +/************************************************************************* + * @@ -46584,11 +45370,8 @@ index 0000000..00204f9 +}; }; }; }; + +#endif -diff --git udkapi/com/sun/star/script/ModuleType.idl udkapi/com/sun/star/script/ModuleType.idl -new file mode 100644 -index 0000000..3295c52 ---- /dev/null -+++ udkapi/com/sun/star/script/ModuleType.idl +--- udkapi/com/sun/star/script/ModuleType.idl.old 2010-03-03 16:59:35.000000000 +0100 ++++ udkapi/com/sun/star/script/ModuleType.idl 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,58 @@ +/************************************************************************* + * @@ -46648,11 +45431,8 @@ index 0000000..3295c52 +}; }; }; }; + +#endif -diff --git udkapi/com/sun/star/script/XAutomationInvocation.idl udkapi/com/sun/star/script/XAutomationInvocation.idl -new file mode 100644 -index 0000000..9dcf61b ---- /dev/null -+++ udkapi/com/sun/star/script/XAutomationInvocation.idl +--- udkapi/com/sun/star/script/XAutomationInvocation.idl.old 2010-03-03 16:59:35.000000000 +0100 ++++ udkapi/com/sun/star/script/XAutomationInvocation.idl 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,51 @@ +/************************************************************************* + * @@ -46705,11 +45485,8 @@ index 0000000..9dcf61b +}; }; }; }; + +#endif -diff --git udkapi/com/sun/star/script/XErrorQuery.idl udkapi/com/sun/star/script/XErrorQuery.idl -new file mode 100644 -index 0000000..9a1860e ---- /dev/null -+++ udkapi/com/sun/star/script/XErrorQuery.idl +--- udkapi/com/sun/star/script/XErrorQuery.idl.old 2010-03-03 16:59:35.000000000 +0100 ++++ udkapi/com/sun/star/script/XErrorQuery.idl 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,25 @@ +#ifndef __com_sun_star_script_XErrorQuery_idl__ +#define __com_sun_star_script_XErrorQuery_idl__ @@ -46736,10 +45513,8 @@ index 0000000..9a1860e + +}; }; }; }; +#endif -diff --git udkapi/com/sun/star/script/makefile.mk udkapi/com/sun/star/script/makefile.mk -index 155c602..8b8f53a 100644 ---- udkapi/com/sun/star/script/makefile.mk -+++ udkapi/com/sun/star/script/makefile.mk +--- udkapi/com/sun/star/script/makefile.mk.old 2009-10-07 15:06:10.000000000 +0200 ++++ udkapi/com/sun/star/script/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -85,6 +85,10 @@ IDLFILES=\ XScriptEventsAttacher.idl\ XDefaultMethod.idl\ @@ -46751,11 +45526,9 @@ index 155c602..8b8f53a 100644 # ------------------------------------------------------------------ -diff --git vbahelper/inc/vbahelper/vbacollectionimpl.hxx vbahelper/inc/vbahelper/vbacollectionimpl.hxx -index bc60cf1..9dbd9f7 100644 ---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx -+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx -@@ -161,12 +161,25 @@ typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; +--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2010-03-03 16:59:35.000000000 +0100 +@@ -161,12 +161,25 @@ typedef InheritedHelperInterfaceImpl< If protected: css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess; css::uno::Reference< css::container::XNameAccess > m_xNameAccess; @@ -46790,7 +45563,7 @@ index bc60cf1..9dbd9f7 100644 //XCollection virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException) { -@@ -250,7 +263,7 @@ class VBAHELPER_DLLPUBLIC CollTestImplHelper : public ScVbaCollectionBase< ::cp +@@ -250,7 +263,7 @@ class VBAHELPER_DLLPUBLIC CollTestImplHe typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > > ImplBase1; public: @@ -46799,10 +45572,8 @@ index bc60cf1..9dbd9f7 100644 }; -diff --git vbahelper/inc/vbahelper/vbadocumentbase.hxx vbahelper/inc/vbahelper/vbadocumentbase.hxx -index 9576510..3880a46 100644 ---- vbahelper/inc/vbahelper/vbadocumentbase.hxx -+++ vbahelper/inc/vbahelper/vbadocumentbase.hxx +--- vbahelper/inc/vbahelper/vbadocumentbase.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/inc/vbahelper/vbadocumentbase.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -60,7 +60,7 @@ public: virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges, const css::uno::Any &aFileName, @@ -46812,11 +45583,8 @@ index 9576510..3880a46 100644 virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException); virtual void SAL_CALL Save() throw (css::uno::RuntimeException); virtual void SAL_CALL Activate() throw (css::uno::RuntimeException); -diff --git vbahelper/inc/vbahelper/vbaeventshelperbase.hxx vbahelper/inc/vbahelper/vbaeventshelperbase.hxx -new file mode 100644 -index 0000000..461cfbc ---- /dev/null -+++ vbahelper/inc/vbahelper/vbaeventshelperbase.hxx +--- vbahelper/inc/vbahelper/vbaeventshelperbase.hxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ vbahelper/inc/vbahelper/vbaeventshelperbase.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,54 @@ +/************************************************************************* + * @@ -46872,10 +45640,8 @@ index 0000000..461cfbc +}; + +#endif /* VBAEVENTS_HELPER_BASE_HXX */ -diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx -index 5d97b81..54ab0ad 100644 ---- vbahelper/inc/vbahelper/vbahelper.hxx -+++ vbahelper/inc/vbahelper/vbahelper.hxx +--- vbahelper/inc/vbahelper/vbahelper.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/inc/vbahelper/vbahelper.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -97,6 +97,7 @@ namespace ooo VBAHELPER_DLLPUBLIC void setDefaultPropByIntrospection( const css::uno::Any& aObj, const css::uno::Any& aValue ) throw ( css::uno::RuntimeException ); VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName ); @@ -46884,10 +45650,8 @@ index 5d97b81..54ab0ad 100644 class VBAHELPER_DLLPUBLIC Millimeter { -diff --git vbahelper/inc/vbahelper/vbashaperange.hxx vbahelper/inc/vbahelper/vbashaperange.hxx -index 0d29c3a..8f79b10 100644 ---- vbahelper/inc/vbahelper/vbashaperange.hxx -+++ vbahelper/inc/vbahelper/vbashaperange.hxx +--- vbahelper/inc/vbahelper/vbashaperange.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/inc/vbahelper/vbashaperange.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -59,6 +59,8 @@ public: virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException); virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException) ; @@ -46905,19 +45669,15 @@ index 0d29c3a..8f79b10 100644 //XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); -diff --git vbahelper/prj/d.lst vbahelper/prj/d.lst -index d7b61d1..db11559 100644 ---- vbahelper/prj/d.lst -+++ vbahelper/prj/d.lst +--- vbahelper/prj/d.lst.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/prj/d.lst 2010-03-03 16:59:35.000000000 +0100 @@ -25,3 +25,4 @@ mkdir: %_DEST%\inc%_EXT%\basic ..\inc\vbahelper\vbatextframe.hxx %_DEST%\inc%_EXT%\vbahelper\vbatextframe.hxx ..\inc\vbahelper\vbashaperange.hxx %_DEST%\inc%_EXT%\vbahelper\vbashaperange.hxx ..\inc\vbahelper\vbapagesetupbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbapagesetupbase.hxx +..\inc\vbahelper\vbaeventshelperbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaeventshelperbase.hxx -diff --git vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/makefile.mk -index 1d550c8..e92dc3a 100644 ---- vbahelper/source/msforms/makefile.mk -+++ vbahelper/source/msforms/makefile.mk +--- vbahelper/source/msforms/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -40,6 +40,8 @@ VISIBILITY_HIDDEN=TRUE .INCLUDE : settings.mk @@ -46927,10 +45687,8 @@ index 1d550c8..e92dc3a 100644 SLOFILES=\ $(SLO)$/vbacontrol.obj \ $(SLO)$/vbacontrols.obj \ -diff --git vbahelper/source/msforms/vbacheckbox.hxx vbahelper/source/msforms/vbacheckbox.hxx -index f3374db..71d45ae 100644 ---- vbahelper/source/msforms/vbacheckbox.hxx -+++ vbahelper/source/msforms/vbacheckbox.hxx +--- vbahelper/source/msforms/vbacheckbox.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbacheckbox.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -35,12 +35,12 @@ #ifndef SC_VBA_CHECKBOX_HXX #define SC_VBA_CHECKBOX_HXX @@ -46946,10 +45704,8 @@ index f3374db..71d45ae 100644 class ScVbaCheckbox : public CheckBoxImpl_BASE { -diff --git vbahelper/source/msforms/vbacombobox.cxx vbahelper/source/msforms/vbacombobox.cxx -index 7c27734..c4146f7 100644 ---- vbahelper/source/msforms/vbacombobox.cxx -+++ vbahelper/source/msforms/vbacombobox.cxx +--- vbahelper/source/msforms/vbacombobox.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbacombobox.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -29,6 +29,9 @@ ************************************************************************/ #include "vbacombobox.hxx" @@ -46960,7 +45716,7 @@ index 7c27734..c4146f7 100644 using namespace com::sun::star; using namespace ooo::vba; -@@ -66,12 +69,41 @@ ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExcepti +@@ -66,12 +69,41 @@ ScVbaComboBox::setListIndex( const uno:: sal_Int16 nIndex = 0; if( _value >>= nIndex ) { @@ -47002,11 +45758,9 @@ index 7c27734..c4146f7 100644 } } } -diff --git vbahelper/source/msforms/vbacontrol.cxx vbahelper/source/msforms/vbacontrol.cxx -index 2a82626..284bf99 100644 ---- vbahelper/source/msforms/vbacontrol.cxx -+++ vbahelper/source/msforms/vbacontrol.cxx -@@ -371,6 +371,18 @@ ScVbaControl::setControlTipText( const rtl::OUString& rsToolTip ) throw (css::un +--- vbahelper/source/msforms/vbacontrol.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbacontrol.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -371,6 +371,18 @@ ScVbaControl::setControlTipText( const r m_xProps->setPropertyValue (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) ), uno::makeAny( rsToolTip ) ); } @@ -47025,7 +45779,7 @@ index 2a82626..284bf99 100644 //ScVbaControlFactory ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel ) -@@ -400,16 +412,25 @@ ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing:: +@@ -400,16 +412,25 @@ ScVbaControl* ScVbaControlFactory::creat const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") ); xProps->getPropertyValue( sClassId ) >>= nClassId; uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess @@ -47054,10 +45808,8 @@ index 2a82626..284bf99 100644 case form::FormComponentType::RADIOBUTTON: return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) ); case form::FormComponentType::LISTBOX: -diff --git vbahelper/source/msforms/vbacontrol.hxx vbahelper/source/msforms/vbacontrol.hxx -index 3c9a128..3d7f67f 100644 ---- vbahelper/source/msforms/vbacontrol.hxx -+++ vbahelper/source/msforms/vbacontrol.hxx +--- vbahelper/source/msforms/vbacontrol.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbacontrol.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -90,6 +90,8 @@ public: virtual void SAL_CALL setControlTipText( const rtl::OUString& ) throw (css::uno::RuntimeException); //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape @@ -47067,11 +45819,9 @@ index 3c9a128..3d7f67f 100644 //XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -diff --git vbahelper/source/msforms/vbaframe.cxx vbahelper/source/msforms/vbaframe.cxx -index b2827d0..e3a586e 100644 ---- vbahelper/source/msforms/vbaframe.cxx -+++ vbahelper/source/msforms/vbaframe.cxx -@@ -72,6 +72,30 @@ ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::Run +--- vbahelper/source/msforms/vbaframe.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbaframe.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -72,6 +72,30 @@ ScVbaFrame::setValue( const uno::Any& _v _value >>= sCaption; setCaption( sCaption ); } @@ -47102,10 +45852,8 @@ index b2827d0..e3a586e 100644 rtl::OUString& ScVbaFrame::getServiceImplName() -diff --git vbahelper/source/msforms/vbaframe.hxx vbahelper/source/msforms/vbaframe.hxx -index 071b5b0..a9346a0 100644 ---- vbahelper/source/msforms/vbaframe.hxx -+++ vbahelper/source/msforms/vbaframe.hxx +--- vbahelper/source/msforms/vbaframe.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbaframe.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -51,6 +51,12 @@ public: virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); @@ -47119,11 +45867,9 @@ index 071b5b0..a9346a0 100644 //XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -diff --git vbahelper/source/msforms/vbalabel.cxx vbahelper/source/msforms/vbalabel.cxx -index a5fa3c1..93fb8c8 100644 ---- vbahelper/source/msforms/vbalabel.cxx -+++ vbahelper/source/msforms/vbalabel.cxx -@@ -67,6 +67,18 @@ ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::Run +--- vbahelper/source/msforms/vbalabel.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbalabel.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -67,6 +67,18 @@ ScVbaLabel::setValue( const uno::Any& _v setCaption( sCaption ); } @@ -47142,10 +45888,8 @@ index a5fa3c1..93fb8c8 100644 rtl::OUString& ScVbaLabel::getServiceImplName() -diff --git vbahelper/source/msforms/vbalabel.hxx vbahelper/source/msforms/vbalabel.hxx -index 3afd652..01f4d9b 100644 ---- vbahelper/source/msforms/vbalabel.hxx -+++ vbahelper/source/msforms/vbalabel.hxx +--- vbahelper/source/msforms/vbalabel.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbalabel.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -47,6 +47,8 @@ public: virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); @@ -47155,11 +45899,9 @@ index 3afd652..01f4d9b 100644 //XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); -diff --git vbahelper/source/msforms/vbalistbox.cxx vbahelper/source/msforms/vbalistbox.cxx -index 47f9847..175328f 100644 ---- vbahelper/source/msforms/vbalistbox.cxx -+++ vbahelper/source/msforms/vbalistbox.cxx -@@ -113,7 +113,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) +--- vbahelper/source/msforms/vbalistbox.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbalistbox.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -113,7 +113,7 @@ ScVbaListBox::setValue( const uno::Any& uno::Sequence< sal_Int16 > nSelectedIndices(1); nSelectedIndices[ 0 ] = nValue; m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) ); @@ -47168,7 +45910,7 @@ index 47f9847..175328f 100644 } ::rtl::OUString SAL_CALL -@@ -130,20 +130,22 @@ ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeExcepti +@@ -130,20 +130,22 @@ ScVbaListBox::setText( const ::rtl::OUSt setValue( uno::makeAny( _text ) ); // seems the same } @@ -47195,10 +45937,8 @@ index 47f9847..175328f 100644 css::uno::Any SAL_CALL ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException) { -diff --git vbahelper/source/msforms/vbalistbox.hxx vbahelper/source/msforms/vbalistbox.hxx -index 93e80a3..009ee4f 100644 ---- vbahelper/source/msforms/vbalistbox.hxx -+++ vbahelper/source/msforms/vbalistbox.hxx +--- vbahelper/source/msforms/vbalistbox.hxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbalistbox.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -61,8 +61,8 @@ public: virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); @@ -47210,10 +45950,8 @@ index 93e80a3..009ee4f 100644 virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException); // Methods -diff --git vbahelper/source/msforms/vbalistcontrolhelper.cxx vbahelper/source/msforms/vbalistcontrolhelper.cxx -index 8582821..2aed7f1 100644 ---- vbahelper/source/msforms/vbalistcontrolhelper.cxx -+++ vbahelper/source/msforms/vbalistcontrolhelper.cxx +--- vbahelper/source/msforms/vbalistcontrolhelper.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbalistcontrolhelper.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -1,11 +1,69 @@ #include <vbalistcontrolhelper.hxx> #include <vector> @@ -47284,7 +46022,7 @@ index 8582821..2aed7f1 100644 void SAL_CALL ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException) { -@@ -116,31 +174,5 @@ ListControlHelper::getListCount() throw (uno::RuntimeException) +@@ -116,31 +174,5 @@ ListControlHelper::getListCount() throw uno::Any SAL_CALL ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException) { @@ -47317,11 +46055,9 @@ index 8582821..2aed7f1 100644 - return aRet; + return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( new ListPropListener( m_xProps, pvargIndex, pvarColumn ) ) ) ); } -diff --git vbahelper/source/msforms/vbatextbox.cxx vbahelper/source/msforms/vbatextbox.cxx -index d246970..eb1b393 100644 ---- vbahelper/source/msforms/vbatextbox.cxx -+++ vbahelper/source/msforms/vbatextbox.cxx -@@ -93,7 +93,8 @@ ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException) +--- vbahelper/source/msforms/vbatextbox.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbatextbox.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -93,7 +93,8 @@ ScVbaTextBox::getMaxLength() throw (css: void SAL_CALL ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException) { @@ -47331,11 +46067,9 @@ index d246970..eb1b393 100644 m_xProps->setPropertyValue (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue); } -diff --git vbahelper/source/msforms/vbatogglebutton.cxx vbahelper/source/msforms/vbatogglebutton.cxx -index f938ad1..0d7cfaf 100644 ---- vbahelper/source/msforms/vbatogglebutton.cxx -+++ vbahelper/source/msforms/vbatogglebutton.cxx -@@ -76,16 +76,33 @@ ScVbaToggleButton::getValue() throw (uno::RuntimeException) +--- vbahelper/source/msforms/vbatogglebutton.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/msforms/vbatogglebutton.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -76,16 +76,33 @@ ScVbaToggleButton::getValue() throw (uno return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) ); } @@ -47371,10 +46105,8 @@ index f938ad1..0d7cfaf 100644 rtl::OUString& ScVbaToggleButton::getServiceImplName() -diff --git vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/makefile.mk -index a8a4167..a9578a0 100644 ---- vbahelper/source/vbahelper/makefile.mk -+++ vbahelper/source/vbahelper/makefile.mk +--- vbahelper/source/vbahelper/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -64,6 +64,7 @@ SLOFILES=\ $(SLO)$/vbashaperange.obj \ $(SLO)$/vbatextframe.obj \ @@ -47383,10 +46115,8 @@ index a8a4167..a9578a0 100644 # --- Targets ------------------------------------------------------- -diff --git vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbaapplicationbase.cxx -index 81ff270..5468339 100644 ---- vbahelper/source/vbahelper/vbaapplicationbase.cxx -+++ vbahelper/source/vbahelper/vbaapplicationbase.cxx +--- vbahelper/source/vbahelper/vbaapplicationbase.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbaapplicationbase.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -76,6 +76,8 @@ void SAL_CALL VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException) { @@ -47396,7 +46126,7 @@ index 81ff270..5468339 100644 if (bUpdate) xModel->unlockControllers(); else -@@ -141,7 +143,8 @@ VbaApplicationBase::getVersion() throw (uno::RuntimeException) +@@ -141,7 +143,8 @@ VbaApplicationBase::getVersion() throw ( void SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, const uno::Any& varg1, const uno::Any& varg2, const uno::Any& varg3, const uno::Any& varg4, const uno::Any& varg5, const uno::Any& varg6, const uno::Any& varg7, const uno::Any& varg8, const uno::Any& varg9, const uno::Any& varg10, const uno::Any& varg11, const uno::Any& varg12, const uno::Any& varg13, const uno::Any& varg14, const uno::Any& varg15, const uno::Any& varg16, const uno::Any& varg17, const uno::Any& varg18, const uno::Any& varg19, const uno::Any& varg20, const uno::Any& varg21, const uno::Any& varg22, const uno::Any& varg23, const uno::Any& varg24, const uno::Any& varg25, const uno::Any& varg26, const uno::Any& varg27, const uno::Any& varg28, const uno::Any& varg29, const uno::Any& varg30 ) throw (uno::RuntimeException) { @@ -47406,10 +46136,8 @@ index 81ff270..5468339 100644 if( aMacroInfo.IsResolved() ) { // handle the arguments -diff --git vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx -index 3830fe9..b6ab5e7 100644 ---- vbahelper/source/vbahelper/vbadocumentbase.cxx -+++ vbahelper/source/vbahelper/vbadocumentbase.cxx +--- vbahelper/source/vbahelper/vbadocumentbase.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbadocumentbase.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -36,6 +36,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -47418,7 +46146,7 @@ index 3830fe9..b6ab5e7 100644 #include <com/sun/star/beans/XPropertySet.hpp> #include <tools/urlobj.hxx> -@@ -69,13 +70,8 @@ VbaDocumentBase::getName() throw (uno::RuntimeException) +@@ -69,13 +70,8 @@ VbaDocumentBase::getName() throw (uno::R } else { @@ -47434,7 +46162,7 @@ index 3830fe9..b6ab5e7 100644 } return sName; } -@@ -131,12 +127,20 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg, +@@ -131,12 +127,20 @@ VbaDocumentBase::Close( const uno::Any & uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY ); if( xCloseable.is() ) @@ -47456,7 +46184,7 @@ index 3830fe9..b6ab5e7 100644 // If close is not supported by this model - try to dispose it. // But if the model disagree with a reset request for the modify state // we shouldn't do so. Otherwhise some strange things can happen. -@@ -144,7 +148,16 @@ VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg, +@@ -144,7 +148,16 @@ VbaDocumentBase::Close( const uno::Any & { uno::Reference< lang::XComponent > xDisposable ( getModel(), uno::UNO_QUERY ); if ( xDisposable.is() ) @@ -47474,10 +46202,8 @@ index 3830fe9..b6ab5e7 100644 } } -diff --git vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx -index e7907b7..d8a9df7 100644 ---- vbahelper/source/vbahelper/vbadocumentsbase.cxx -+++ vbahelper/source/vbahelper/vbadocumentsbase.cxx +--- vbahelper/source/vbahelper/vbadocumentsbase.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbadocumentsbase.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -47507,11 +46233,8 @@ index e7907b7..d8a9df7 100644 } } -diff --git vbahelper/source/vbahelper/vbaeventshelperbase.cxx vbahelper/source/vbahelper/vbaeventshelperbase.cxx -new file mode 100644 -index 0000000..52aba1f ---- /dev/null -+++ vbahelper/source/vbahelper/vbaeventshelperbase.cxx +--- vbahelper/source/vbahelper/vbaeventshelperbase.cxx.old 2010-03-03 16:59:35.000000000 +0100 ++++ vbahelper/source/vbahelper/vbaeventshelperbase.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -0,0 +1,60 @@ +/************************************************************************* + * @@ -47573,11 +46296,9 @@ index 0000000..52aba1f + return mbIgnoreEvents; +} + -diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx -index 901cc71..1290b25 100644 ---- vbahelper/source/vbahelper/vbahelper.cxx -+++ vbahelper/source/vbahelper/vbahelper.cxx -@@ -970,6 +970,18 @@ sal_Bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const r +--- vbahelper/source/vbahelper/vbahelper.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbahelper.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -970,6 +970,18 @@ sal_Bool setPropertyValue( uno::Sequence return sal_False; } @@ -47596,11 +46317,9 @@ index 901cc71..1290b25 100644 #define VBA_LEFT "PositionX" #define VBA_TOP "PositionY" UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl ) -diff --git vbahelper/source/vbahelper/vbapictureformat.cxx vbahelper/source/vbahelper/vbapictureformat.cxx -index 2663682..3f4793a 100644 ---- vbahelper/source/vbahelper/vbapictureformat.cxx -+++ vbahelper/source/vbahelper/vbapictureformat.cxx -@@ -115,13 +115,14 @@ ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeExc +--- vbahelper/source/vbahelper/vbapictureformat.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbapictureformat.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -115,13 +115,14 @@ ScVbaPictureFormat::IncrementContrast( d { double nContrast = getContrast(); nContrast += increment; @@ -47619,10 +46338,8 @@ index 2663682..3f4793a 100644 } setContrast( nContrast ); } -diff --git vbahelper/source/vbahelper/vbashape.cxx vbahelper/source/vbahelper/vbashape.cxx -index c35745b..c0c6ba3 100644 ---- vbahelper/source/vbahelper/vbashape.cxx -+++ vbahelper/source/vbahelper/vbashape.cxx +--- vbahelper/source/vbahelper/vbashape.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbashape.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -38,6 +38,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -47631,7 +46348,7 @@ index c35745b..c0c6ba3 100644 #include <ooo/vba/word/WdRelativeHorizontalPosition.hpp> #include <ooo/vba/word/WdRelativeVerticalPosition.hpp> -@@ -222,25 +223,66 @@ ScVbaShape::setWidth( double _width ) throw (uno::RuntimeException) +@@ -222,25 +223,66 @@ ScVbaShape::setWidth( double _width ) th double SAL_CALL ScVbaShape::getLeft() throw (uno::RuntimeException) { @@ -47746,7 +46463,7 @@ index c35745b..c0c6ba3 100644 } } return nRelativeHorizontalPosition; -@@ -544,23 +585,27 @@ ScVbaShape::getRelativeHorizontalPosition() throw (uno::RuntimeException) +@@ -544,23 +585,27 @@ ScVbaShape::getRelativeHorizontalPositio void SAL_CALL ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (uno::RuntimeException) { @@ -47778,7 +46495,7 @@ index c35745b..c0c6ba3 100644 break; } default: -@@ -568,42 +613,41 @@ ScVbaShape::setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalpositi +@@ -568,42 +613,41 @@ ScVbaShape::setRelativeHorizontalPositio DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); } } @@ -47830,7 +46547,7 @@ index c35745b..c0c6ba3 100644 } } return nRelativeVerticalPosition; -@@ -612,23 +656,27 @@ ScVbaShape::getRelativeVerticalPosition() throw (uno::RuntimeException) +@@ -612,23 +656,27 @@ ScVbaShape::getRelativeVerticalPosition( void SAL_CALL ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (uno::RuntimeException) { @@ -47862,7 +46579,7 @@ index c35745b..c0c6ba3 100644 break; } default: -@@ -636,7 +684,7 @@ ScVbaShape::setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) +@@ -636,7 +684,7 @@ ScVbaShape::setRelativeVerticalPosition( DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); } } @@ -47871,11 +46588,9 @@ index c35745b..c0c6ba3 100644 } uno::Any SAL_CALL -diff --git vbahelper/source/vbahelper/vbashaperange.cxx vbahelper/source/vbahelper/vbashaperange.cxx -index 0c3535b..b088adf 100644 ---- vbahelper/source/vbahelper/vbashaperange.cxx -+++ vbahelper/source/vbahelper/vbashaperange.cxx -@@ -128,6 +128,27 @@ ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException) +--- vbahelper/source/vbahelper/vbashaperange.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbashaperange.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -128,6 +128,27 @@ ScVbaShapeRange::IncrementTop( double In } } @@ -47903,7 +46618,7 @@ index 0c3535b..b088adf 100644 double SAL_CALL ScVbaShapeRange::getHeight() throw (uno::RuntimeException) { sal_Int32 nLen = getCount(); -@@ -340,6 +361,16 @@ uno::Any SAL_CALL ScVbaShapeRange::WrapFormat( ) throw (css::uno::RuntimeExcept +@@ -340,6 +361,16 @@ uno::Any SAL_CALL ScVbaShapeRange::WrapF throw uno::RuntimeException(); } @@ -47920,10 +46635,8 @@ index 0c3535b..b088adf 100644 uno::Type SAL_CALL ScVbaShapeRange::getElementType() throw (uno::RuntimeException) { -diff --git vbahelper/source/vbahelper/vbashapes.cxx vbahelper/source/vbahelper/vbashapes.cxx -index 5302f92..0b09fcc 100644 ---- vbahelper/source/vbahelper/vbashapes.cxx -+++ vbahelper/source/vbahelper/vbashapes.cxx +--- vbahelper/source/vbahelper/vbashapes.cxx.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/source/vbahelper/vbashapes.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -89,7 +89,7 @@ void ScVbaShapes::initBaseCollection() m_xNameAccess.set( xShapes, uno::UNO_QUERY ); } @@ -47933,10 +46646,8 @@ index 5302f92..0b09fcc 100644 { m_xShapes.set( xShapes, uno::UNO_QUERY_THROW ); m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); -diff --git vbahelper/util/makefile.mk vbahelper/util/makefile.mk -index 796af0a..a7fe40f 100644 ---- vbahelper/util/makefile.mk -+++ vbahelper/util/makefile.mk +--- vbahelper/util/makefile.mk.old 2010-03-03 16:59:33.000000000 +0100 ++++ vbahelper/util/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -95,6 +95,7 @@ SHL2STDLIBS= \ $(VCLLIB) \ $(TKLIB) \ @@ -47945,10 +46656,8 @@ index 796af0a..a7fe40f 100644 SHL2DEPN=$(SHL1TARGETN) SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib -diff --git vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/bitmap.hxx -index ff57cdf..964bc9b 100644 ---- vcl/inc/vcl/bitmap.hxx -+++ vcl/inc/vcl/bitmap.hxx +--- vcl/inc/vcl/bitmap.hxx.old 2009-10-07 15:06:53.000000000 +0200 ++++ vcl/inc/vcl/bitmap.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -270,9 +270,9 @@ public: SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp ); SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap ); @@ -47970,10 +46679,8 @@ index ff57cdf..964bc9b 100644 BOOL Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const; friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Bitmap& rBitmap ); -diff --git vcl/inc/vcl/bitmapex.hxx vcl/inc/vcl/bitmapex.hxx -index dc4c3e0..0e14676 100644 ---- vcl/inc/vcl/bitmapex.hxx -+++ vcl/inc/vcl/bitmapex.hxx +--- vcl/inc/vcl/bitmapex.hxx.old 2009-11-20 11:38:57.000000000 +0100 ++++ vcl/inc/vcl/bitmapex.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -398,6 +398,7 @@ public: friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx ); @@ -47982,10 +46689,8 @@ index dc4c3e0..0e14676 100644 }; #endif // _SV_BITMAPEX_HXX -diff --git vcl/inc/vcl/dialog.hxx vcl/inc/vcl/dialog.hxx -index 4ff3a72..1f841f1 100644 ---- vcl/inc/vcl/dialog.hxx -+++ vcl/inc/vcl/dialog.hxx +--- vcl/inc/vcl/dialog.hxx.old 2009-10-07 15:06:53.000000000 +0200 ++++ vcl/inc/vcl/dialog.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -56,6 +56,7 @@ private: BOOL mbOldSaveBack; BOOL mbInClose; @@ -48004,10 +46709,8 @@ index 4ff3a72..1f841f1 100644 //////////////////////////////////////// // Dialog::Execute replacement API public: -diff --git vcl/inc/vcl/menu.hxx vcl/inc/vcl/menu.hxx -index 4f8ad3a..106080c 100644 ---- vcl/inc/vcl/menu.hxx -+++ vcl/inc/vcl/menu.hxx +--- vcl/inc/vcl/menu.hxx.old 2009-10-07 15:06:53.000000000 +0200 ++++ vcl/inc/vcl/menu.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -93,6 +93,8 @@ typedef USHORT MenuItemBits; #define MIB_POPUPSELECT ((MenuItemBits)0x0020) // not in rsc/vclsrc.hxx because only a prelimitary solution @@ -48017,10 +46720,8 @@ index 4f8ad3a..106080c 100644 #define MENU_FLAG_NOAUTOMNEMONICS 0x0001 #define MENU_FLAG_HIDEDISABLEDENTRIES 0x0002 -diff --git vcl/inc/vcl/toolbox.hxx vcl/inc/vcl/toolbox.hxx -index 105f9da..b2b27f0 100644 ---- vcl/inc/vcl/toolbox.hxx -+++ vcl/inc/vcl/toolbox.hxx +--- vcl/inc/vcl/toolbox.hxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/inc/vcl/toolbox.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -124,6 +124,9 @@ typedef USHORT ToolBoxItemBits; #define TIB_DROPDOWN ((ToolBoxItemBits)0x0020) #define TIB_REPEAT ((ToolBoxItemBits)0x0040) @@ -48031,11 +46732,9 @@ index 105f9da..b2b27f0 100644 // ----------------- // - ToolBox-Types - -diff --git vcl/source/control/combobox.cxx vcl/source/control/combobox.cxx -index ab222e5..d41a695 100644 ---- vcl/source/control/combobox.cxx -+++ vcl/source/control/combobox.cxx -@@ -471,8 +471,11 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void*, EMPTYARG ) +--- vcl/source/control/combobox.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/source/control/combobox.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -471,8 +471,11 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void mpSubEdit->SetModifyFlag(); mbSyntheticModify = TRUE; Modify(); @@ -48049,10 +46748,8 @@ index ab222e5..d41a695 100644 } return 0; -diff --git vcl/source/gdi/bitmap2.cxx vcl/source/gdi/bitmap2.cxx -index d3308bd..0ef849d 100644 ---- vcl/source/gdi/bitmap2.cxx -+++ vcl/source/gdi/bitmap2.cxx +--- vcl/source/gdi/bitmap2.cxx.old 2010-03-03 16:59:29.000000000 +0100 ++++ vcl/source/gdi/bitmap2.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -49,6 +49,8 @@ #define DIBCOREHEADERSIZE ( 12UL ) @@ -48062,7 +46759,7 @@ index d3308bd..0ef849d 100644 #define SETPIXEL4( pBuf, nX, cChar )( (pBuf)[ (nX) >> 1 ] |= ( (nX) & 1 ) ? ( cChar ): (cChar) << 4 ); // ---------------------- -@@ -132,7 +134,7 @@ SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap ) +@@ -132,7 +134,7 @@ SvStream& operator<<( SvStream& rOStm, c // ------------------------------------------------------------------ @@ -48071,7 +46768,7 @@ index d3308bd..0ef849d 100644 { const USHORT nOldFormat = rIStm.GetNumberFormatInt(); const ULONG nOldPos = rIStm.Tell(); -@@ -147,7 +149,7 @@ BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader ) +@@ -147,7 +149,7 @@ BOOL Bitmap::Read( SvStream& rIStm, BOOL bRet = ImplReadDIB( rIStm, *this, nOffset ); } else @@ -48080,7 +46777,7 @@ index d3308bd..0ef849d 100644 if( !bRet ) { -@@ -164,14 +166,14 @@ BOOL Bitmap::Read( SvStream& rIStm, BOOL bFileHeader ) +@@ -164,14 +166,14 @@ BOOL Bitmap::Read( SvStream& rIStm, BOOL // ------------------------------------------------------------------ @@ -48097,7 +46794,7 @@ index d3308bd..0ef849d 100644 { const USHORT nBitCount( discretizeBitcount(aHeader.nBitCount) ); -@@ -302,20 +304,36 @@ BOOL Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, ULONG& rOffset ) +@@ -302,20 +304,36 @@ BOOL Bitmap::ImplReadDIBFileHeader( SvSt // ------------------------------------------------------------------ @@ -48136,10 +46833,8 @@ index d3308bd..0ef849d 100644 } else { -diff --git vcl/source/gdi/bitmapex.cxx vcl/source/gdi/bitmapex.cxx -index 83e1780..c7cbffa 100644 ---- vcl/source/gdi/bitmapex.cxx -+++ vcl/source/gdi/bitmapex.cxx +--- vcl/source/gdi/bitmapex.cxx.old 2009-11-20 11:38:57.000000000 +0100 ++++ vcl/source/gdi/bitmapex.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -48,6 +48,7 @@ #endif #include <vcl/svapp.hxx> @@ -48148,7 +46843,7 @@ index 83e1780..c7cbffa 100644 // ------------ // - BitmapEx - -@@ -760,6 +761,61 @@ void BitmapEx::Draw( OutputDevice* pOutDev, +@@ -760,6 +761,61 @@ void BitmapEx::Draw( OutputDevice* pOutD pOutDev->DrawBitmapEx( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, *this ); } @@ -48210,10 +46905,8 @@ index 83e1780..c7cbffa 100644 // ------------------------------------------------------------------ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, sal_Int32 nY) const -diff --git vcl/source/window/dialog.cxx vcl/source/window/dialog.cxx -index c0702a7..eeab586 100644 ---- vcl/source/window/dialog.cxx -+++ vcl/source/window/dialog.cxx +--- vcl/source/window/dialog.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/source/window/dialog.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -550,7 +550,14 @@ BOOL Dialog::Close() { ImplDelData aDelData; @@ -48230,11 +46923,9 @@ index c0702a7..eeab586 100644 if ( aDelData.IsDelete() ) return FALSE; ImplRemoveDel( &aDelData ); -diff --git vcl/source/window/toolbox.cxx vcl/source/window/toolbox.cxx -index 5f36ab1..48b7baa 100644 ---- vcl/source/window/toolbox.cxx -+++ vcl/source/window/toolbox.cxx -@@ -229,6 +229,22 @@ int ToolBox::ImplGetDragWidth( ToolBox* pThis ) +--- vcl/source/window/toolbox.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/source/window/toolbox.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -229,6 +229,22 @@ int ToolBox::ImplGetDragWidth( ToolBox* } return width; } @@ -48282,7 +46973,7 @@ index 5f36ab1..48b7baa 100644 { // we're drawing text only if ( bText || !bImage ) -@@ -3625,7 +3642,8 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHighlight, BOOL bPaint, BOOL bLay +@@ -3625,7 +3642,8 @@ void ToolBox::ImplDrawItem( USHORT nPos, // determine what has to be drawn on the button: image, text or both BOOL bImage; BOOL bText; @@ -48292,10 +46983,8 @@ index 5f36ab1..48b7baa 100644 // compute output values long nBtnWidth = aBtnSize.Width()-SMALLBUTTON_HSIZE; -diff --git vcl/source/window/toolbox2.cxx vcl/source/window/toolbox2.cxx -index 23e0fa7..72f388c 100644 ---- vcl/source/window/toolbox2.cxx -+++ vcl/source/window/toolbox2.cxx +--- vcl/source/window/toolbox2.cxx.old 2009-10-08 16:17:47.000000000 +0200 ++++ vcl/source/window/toolbox2.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -59,6 +59,8 @@ using namespace rtl; #define TB_SEP_SIZE 8 @@ -48305,10 +46994,8 @@ index 23e0fa7..72f388c 100644 // ----------------------------------------------------------------------- ImplToolBoxPrivateData::ImplToolBoxPrivateData() : -diff --git xmloff/inc/xmlnmspe.hxx xmloff/inc/xmlnmspe.hxx -index 2a1c9f4..4717911 100644 ---- xmloff/inc/xmlnmspe.hxx -+++ xmloff/inc/xmlnmspe.hxx +--- xmloff/inc/xmlnmspe.hxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ xmloff/inc/xmlnmspe.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -105,6 +105,7 @@ XML_OLD_NAMESPACE( META, 6U ) // experimental namespaces @@ -48317,10 +47004,8 @@ index 2a1c9f4..4717911 100644 #endif // _XMLOFF_XMLNMSPE_HXX -diff --git xmloff/inc/xmloff/shapeexport.hxx xmloff/inc/xmloff/shapeexport.hxx -index f4f79c1..25e57fe 100644 ---- xmloff/inc/xmloff/shapeexport.hxx -+++ xmloff/inc/xmloff/shapeexport.hxx +--- xmloff/inc/xmloff/shapeexport.hxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ xmloff/inc/xmloff/shapeexport.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -197,11 +197,6 @@ private: const rtl::OUString msStartShape; const rtl::OUString msEndShape; @@ -48333,10 +47018,8 @@ index f4f79c1..25e57fe 100644 const rtl::OUString msEventType; const rtl::OUString msPresentation; const rtl::OUString msMacroName; -diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx -index 5f90249..e3a00e2 100644 ---- xmloff/inc/xmloff/xmltoken.hxx -+++ xmloff/inc/xmloff/xmltoken.hxx +--- xmloff/inc/xmloff/xmltoken.hxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ xmloff/inc/xmloff/xmltoken.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -151,6 +151,10 @@ namespace xmloff { namespace token { XML_NP_TABLE_EXT, XML_N_TABLE_EXT, @@ -48348,10 +47031,8 @@ index 5f90249..e3a00e2 100644 // units XML_UNIT_MM, XML_UNIT_M, -diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx -index 842ea86..59b68ca 100644 ---- xmloff/source/core/xmlexp.cxx -+++ xmloff/source/core/xmlexp.cxx +--- xmloff/source/core/xmlexp.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ xmloff/source/core/xmlexp.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -345,6 +345,7 @@ void SvXMLExport::_InitCtor() mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD ); mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI ); @@ -48360,11 +47041,9 @@ index 842ea86..59b68ca 100644 } // RDFa: needed for content and header/footer styles if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) -diff --git xmloff/source/core/xmlimp.cxx xmloff/source/core/xmlimp.cxx -index 3ecc7f2..cae09c6 100644 ---- xmloff/source/core/xmlimp.cxx -+++ xmloff/source/core/xmlimp.cxx -@@ -117,6 +117,7 @@ sal_Char __READONLY_DATA sXML_np__script[] = "_script"; +--- xmloff/source/core/xmlimp.cxx.old 2010-03-03 16:44:01.000000000 +0100 ++++ xmloff/source/core/xmlimp.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -117,6 +117,7 @@ sal_Char __READONLY_DATA sXML_np__script sal_Char __READONLY_DATA sXML_np__config[] = "_config"; sal_Char __READONLY_DATA sXML_np__db[] = "_db"; sal_Char __READONLY_DATA sXML_np__xforms[] = "_xforms"; @@ -48382,10 +47061,8 @@ index 3ecc7f2..cae09c6 100644 mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xsd) ), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD ); -diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx -index b2a1ddb..3200d40 100644 ---- xmloff/source/core/xmltoken.cxx -+++ xmloff/source/core/xmltoken.cxx +--- xmloff/source/core/xmltoken.cxx.old 2010-03-03 16:59:15.000000000 +0100 ++++ xmloff/source/core/xmltoken.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -156,6 +156,10 @@ namespace xmloff { namespace token { TOKEN( "officeooo", XML_NP_OFFICE_EXT ), TOKEN( "http://openoffice.org/2009/office", XML_N_OFFICE_EXT ), @@ -48397,10 +47074,8 @@ index b2a1ddb..3200d40 100644 TOKEN( "tableooo", XML_NP_TABLE_EXT ), TOKEN( "http://openoffice.org/2009/table", XML_N_TABLE_EXT ), -diff --git xmloff/source/draw/eventimp.cxx xmloff/source/draw/eventimp.cxx -index 5efceb5..737fbcd 100644 ---- xmloff/source/draw/eventimp.cxx -+++ xmloff/source/draw/eventimp.cxx +--- xmloff/source/draw/eventimp.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ xmloff/source/draw/eventimp.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -104,9 +104,6 @@ public: sal_Bool mbValid; @@ -48421,7 +47096,7 @@ index 5efceb5..737fbcd 100644 }; /////////////////////////////////////////////////////////////////////// -@@ -179,18 +173,11 @@ TYPEINIT1( SdXMLEventContext, SvXMLImportContext ); +@@ -179,18 +173,11 @@ TYPEINIT1( SdXMLEventContext, SvXMLImpor SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape ) : SvXMLImportContext(rImp, nPrfx, rLocalName), @@ -48440,7 +47115,7 @@ index 5efceb5..737fbcd 100644 if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) ) { -@@ -261,12 +248,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons +@@ -261,12 +248,7 @@ SdXMLEventContext::SdXMLEventContext( Sv sEventName = sValue; sal_uInt16 nScriptPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sValue, &sEventName ); @@ -48453,7 +47128,7 @@ index 5efceb5..737fbcd 100644 } else if( IsXMLToken( aAttrLocalName, XML_LANGUAGE ) ) { -@@ -295,12 +277,6 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons +@@ -295,12 +277,6 @@ SdXMLEventContext::SdXMLEventContext( Sv { msMacroName = sValue; } @@ -48502,11 +47177,9 @@ index 5efceb5..737fbcd 100644 xEvents->replaceByName( sAPIEventName, uno::Any( aProperties ) ); } while(0); -diff --git xmloff/source/draw/shapeexport.cxx xmloff/source/draw/shapeexport.cxx -index b39d29e..75298f8 100644 ---- xmloff/source/draw/shapeexport.cxx -+++ xmloff/source/draw/shapeexport.cxx -@@ -87,11 +87,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, +--- xmloff/source/draw/shapeexport.cxx.old 2009-10-07 15:07:04.000000000 +0200 ++++ xmloff/source/draw/shapeexport.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -87,11 +87,6 @@ XMLShapeExport::XMLShapeExport(SvXMLExpo msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ), msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ), msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ), @@ -48518,11 +47191,9 @@ index b39d29e..75298f8 100644 msEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ), msPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ), msMacroName( RTL_CONSTASCII_USTRINGPARAM("MacroName") ), -diff --git xmloff/source/draw/shapeexport2.cxx xmloff/source/draw/shapeexport2.cxx -index af04a6e..2a10dc2 100644 ---- xmloff/source/draw/shapeexport2.cxx -+++ xmloff/source/draw/shapeexport2.cxx -@@ -297,9 +297,6 @@ const sal_Int32 FOUND_CLICKEVENTTYPE = 0x00000080; +--- xmloff/source/draw/shapeexport2.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/draw/shapeexport2.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -297,9 +297,6 @@ const sal_Int32 FOUND_CLICKEVENTTYPE const sal_Int32 FOUND_MACRO = 0x00000100; const sal_Int32 FOUND_LIBRARY = 0x00000200; const sal_Int32 FOUND_ACTIONEVENTTYPE = 0x00000400; @@ -48532,7 +47203,7 @@ index af04a6e..2a10dc2 100644 } // namespace -@@ -389,33 +386,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x +@@ -389,33 +386,6 @@ void XMLShapeExport::ImpExportEvents( co } } @@ -48566,7 +47237,7 @@ index af04a6e..2a10dc2 100644 // create the XML elements if( aClickEventType == msPresentation ) -@@ -567,15 +537,9 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x +@@ -567,15 +537,9 @@ void XMLShapeExport::ImpExportEvents( co SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True); } } @@ -48582,7 +47253,7 @@ index af04a6e..2a10dc2 100644 { SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True); if ( nFound & FOUND_MACRO ) -@@ -590,18 +554,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x +@@ -590,18 +554,6 @@ void XMLShapeExport::ImpExportEvents( co SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True); } @@ -48601,10 +47272,8 @@ index af04a6e..2a10dc2 100644 } } } -diff --git xmloff/source/draw/ximpshap.cxx xmloff/source/draw/ximpshap.cxx -index 6b6aedb..fd64df6 100644 ---- xmloff/source/draw/ximpshap.cxx -+++ xmloff/source/draw/ximpshap.cxx +--- xmloff/source/draw/ximpshap.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/draw/ximpshap.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -375,6 +375,11 @@ void SdXMLShapeContext::EndElement() if( msHyperlink.getLength() != 0 ) try @@ -48617,7 +47286,7 @@ index 6b6aedb..fd64df6 100644 Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW ); Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); -@@ -3230,9 +3235,16 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix, +@@ -3230,9 +3235,16 @@ SvXMLImportContext *SdXMLFrameShapeConte if( !mxImplContext.Is() ) { @@ -48635,10 +47304,8 @@ index 6b6aedb..fd64df6 100644 mxImplContext = pContext; mbSupportsReplacement = IsXMLToken( rLocalName, XML_OBJECT ) || IsXMLToken( rLocalName, XML_OBJECT_OLE ); -diff --git xmloff/source/forms/elementexport.cxx xmloff/source/forms/elementexport.cxx -index 8b6abaf..7d887de 100644 ---- xmloff/source/forms/elementexport.cxx -+++ xmloff/source/forms/elementexport.cxx +--- xmloff/source/forms/elementexport.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/forms/elementexport.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -1113,6 +1113,39 @@ namespace xmloff } @@ -48688,10 +47355,8 @@ index 8b6abaf..7d887de 100644 m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED; m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE; break; -diff --git xmloff/source/forms/formattributes.cxx xmloff/source/forms/formattributes.cxx -index 75a44b1..795cf4a 100644 ---- xmloff/source/forms/formattributes.cxx -+++ xmloff/source/forms/formattributes.cxx +--- xmloff/source/forms/formattributes.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/forms/formattributes.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -195,6 +195,7 @@ namespace xmloff case SCA_MAX_VALUE: return "max-value"; case SCA_MIN_VALUE: return "min-value"; @@ -48715,10 +47380,8 @@ index 75a44b1..795cf4a 100644 return XML_NAMESPACE_FORM; } -diff --git xmloff/source/forms/formattributes.hxx xmloff/source/forms/formattributes.hxx -index fcadbec..0a2be39 100644 ---- xmloff/source/forms/formattributes.hxx -+++ xmloff/source/forms/formattributes.hxx +--- xmloff/source/forms/formattributes.hxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/forms/formattributes.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -126,6 +126,7 @@ namespace xmloff #define SCA_MAX_VALUE 0x00000002 #define SCA_MIN_VALUE 0x00000004 @@ -48727,11 +47390,9 @@ index fcadbec..0a2be39 100644 #define SCA_MULTI_LINE 0x00000020 #define SCA_AUTOMATIC_COMPLETION 0x00000080 #define SCA_MULTIPLE 0x00000100 -diff --git xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.cxx -index 7c8a715..642244e 100644 ---- xmloff/source/forms/layerimport.cxx -+++ xmloff/source/forms/layerimport.cxx -@@ -98,6 +98,8 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) +--- xmloff/source/forms/layerimport.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/forms/layerimport.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -98,6 +98,8 @@ OFormLayerXMLImport_Impl::OFormLayerXMLI m_aAttributeMetaData.addStringProperty( OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), PROPERTY_NAME); m_aAttributeMetaData.addStringProperty( @@ -48740,10 +47401,8 @@ index 7c8a715..642244e 100644 OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), PROPERTY_IMAGEURL); m_aAttributeMetaData.addStringProperty( OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL); -diff --git xmloff/source/forms/strings.hxx xmloff/source/forms/strings.hxx -index 57bf81f..8c78b45 100644 ---- xmloff/source/forms/strings.hxx -+++ xmloff/source/forms/strings.hxx +--- xmloff/source/forms/strings.hxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmloff/source/forms/strings.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -208,6 +208,7 @@ namespace xmloff XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION, "ImagePosition"); XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN, "ImageAlign"); @@ -48752,10 +47411,8 @@ index 57bf81f..8c78b45 100644 XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL, "BoundCell"); XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE, "CellRange"); -diff --git xmlscript/inc/xmlscript/xmldlg_imexp.hxx xmlscript/inc/xmlscript/xmldlg_imexp.hxx -index 9e5d443..341134c 100644 ---- xmlscript/inc/xmlscript/xmldlg_imexp.hxx -+++ xmlscript/inc/xmlscript/xmldlg_imexp.hxx +--- xmlscript/inc/xmlscript/xmldlg_imexp.hxx.old 2009-10-07 15:07:05.000000000 +0200 ++++ xmlscript/inc/xmlscript/xmldlg_imexp.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -30,6 +30,8 @@ #ifndef _XMLSCRIPT_XMLDLG_IMEXP_HXX_ #define _XMLSCRIPT_XMLDLG_IMEXP_HXX_ @@ -48809,10 +47466,8 @@ index 9e5d443..341134c 100644 SAL_THROW( (::com::sun::star::uno::Exception) ); } -diff --git xmlscript/source/xmldlg_imexp/exp_share.hxx xmlscript/source/xmldlg_imexp/exp_share.hxx -index 9d5ab99..c8e8d94 100644 ---- xmlscript/source/xmldlg_imexp/exp_share.hxx -+++ xmlscript/source/xmldlg_imexp/exp_share.hxx +--- xmlscript/source/xmldlg_imexp/exp_share.hxx.old 2009-10-07 15:07:05.000000000 +0200 ++++ xmlscript/source/xmldlg_imexp/exp_share.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -174,15 +174,17 @@ public: // void readDialogModel( StyleBag * all_styles ) @@ -48856,10 +47511,8 @@ index 9d5ab99..c8e8d94 100644 SAL_THROW( (css::uno::Exception) ); void readFixedHyperLinkModel( StyleBag * all_styles ) SAL_THROW( (css::uno::Exception) ); -diff --git xmlscript/source/xmldlg_imexp/imp_share.hxx xmlscript/source/xmldlg_imexp/imp_share.hxx -index 8c56453..ca0c179 100644 ---- xmlscript/source/xmldlg_imexp/imp_share.hxx -+++ xmlscript/source/xmldlg_imexp/imp_share.hxx +--- xmlscript/source/xmldlg_imexp/imp_share.hxx.old 2009-10-07 15:07:05.000000000 +0200 ++++ xmlscript/source/xmldlg_imexp/imp_share.hxx 2010-03-03 16:59:35.000000000 +0100 @@ -45,6 +45,7 @@ #include <com/sun/star/awt/FontEmphasisMark.hpp> #include <com/sun/star/awt/FontRelief.hpp> @@ -48950,10 +47603,8 @@ index 8c56453..ca0c179 100644 class ProgressBarElement : public ControlElement { -diff --git xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx -index af119ec..b790817 100644 ---- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx -+++ xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +--- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx.old 2009-10-07 15:07:05.000000000 +0200 ++++ xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -44,6 +44,7 @@ using namespace ::rtl; using namespace ::com::sun::star; @@ -48962,7 +47613,7 @@ index af119ec..b790817 100644 namespace xmlscript { -@@ -73,7 +74,8 @@ Reference< io::XInputStream > InputStreamProvider::createInputStream() +@@ -73,7 +74,8 @@ Reference< io::XInputStream > InputStrea //================================================================================================== Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( Reference< container::XNameContainer > const & xDialogModel, @@ -48972,7 +47623,7 @@ index af119ec..b790817 100644 SAL_THROW( (Exception) ) { Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() ); -@@ -98,7 +100,7 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( +@@ -98,7 +100,7 @@ Reference< io::XInputStreamProvider > SA Reference< io::XActiveDataSource > xSource( xHandler, UNO_QUERY ); xSource->setOutputStream( createOutputStream( &aBytes ) ); @@ -48981,7 +47632,7 @@ index af119ec..b790817 100644 return new InputStreamProvider( aBytes ); } -@@ -107,7 +109,8 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel( +@@ -107,7 +109,8 @@ Reference< io::XInputStreamProvider > SA void SAL_CALL importDialogModel( Reference< io::XInputStream > xInput, Reference< container::XNameContainer > const & xDialogModel, @@ -49000,10 +47651,8 @@ index af119ec..b790817 100644 xml::sax::InputSource source; source.aInputStream = xInput; -diff --git xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx -index ef8f852..ba28702 100644 ---- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx -+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +--- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx.old 2009-10-07 15:07:05.000000000 +0200 ++++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -32,7 +32,16 @@ #include "precompiled_xmlscript.hxx" #include "exp_share.hxx" @@ -49088,7 +47737,7 @@ index ef8f852..ba28702 100644 static inline bool readBorderProps( ElementDescriptor * element, Style & style ) { -@@ -68,6 +137,42 @@ static inline bool readFontProps( ElementDescriptor * element, Style & style ) +@@ -68,6 +137,42 @@ static inline bool readFontProps( Elemen } //__________________________________________________________________________________________________ @@ -49131,7 +47780,7 @@ index ef8f852..ba28702 100644 void ElementDescriptor::readButtonModel( StyleBag * all_styles ) SAL_THROW( (Exception) ) { -@@ -209,7 +314,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles ) +@@ -209,7 +314,7 @@ void ElementDescriptor::readCheckBoxMode readEvents(); } //__________________________________________________________________________________________________ @@ -49140,7 +47789,7 @@ index ef8f852..ba28702 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -250,7 +355,8 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles ) +@@ -250,7 +355,8 @@ void ElementDescriptor::readComboBoxMode OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxlength") ) ); readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) ); @@ -49150,7 +47799,7 @@ index ef8f852..ba28702 100644 // string item list Sequence< OUString > itemValues; if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) && -@@ -276,7 +382,7 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles ) +@@ -276,7 +382,7 @@ void ElementDescriptor::readComboBoxMode readEvents(); } //__________________________________________________________________________________________________ @@ -49159,7 +47808,7 @@ index ef8f852..ba28702 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -311,7 +417,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles ) +@@ -311,7 +417,7 @@ void ElementDescriptor::readListBoxModel OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) ); readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) ); @@ -49168,7 +47817,7 @@ index ef8f852..ba28702 100644 // string item list Sequence< OUString > itemValues; if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) && -@@ -351,7 +457,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles ) +@@ -351,7 +457,7 @@ void ElementDescriptor::readListBoxModel readEvents(); } //__________________________________________________________________________________________________ @@ -49177,7 +47826,7 @@ index ef8f852..ba28702 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -388,6 +494,8 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles ) +@@ -388,6 +494,8 @@ void ElementDescriptor::readRadioButtonM OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) ); readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) ); @@ -49186,7 +47835,7 @@ index ef8f852..ba28702 100644 sal_Int16 nState = 0; if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState) -@@ -407,6 +515,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles ) +@@ -407,6 +515,7 @@ void ElementDescriptor::readRadioButtonM break; } } @@ -49194,7 +47843,7 @@ index ef8f852..ba28702 100644 readEvents(); } //__________________________________________________________________________________________________ -@@ -579,7 +688,7 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles ) +@@ -579,7 +688,7 @@ void ElementDescriptor::readEditModel( S readEvents(); } //__________________________________________________________________________________________________ @@ -49203,7 +47852,7 @@ index ef8f852..ba28702 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -598,8 +707,31 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles ) +@@ -598,8 +707,31 @@ void ElementDescriptor::readImageControl readDefaults(); readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-image") ) ); @@ -49237,7 +47886,7 @@ index ef8f852..ba28702 100644 readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) ); readEvents(); -@@ -1074,7 +1206,7 @@ void ElementDescriptor::readProgressBarModel( StyleBag * all_styles ) +@@ -1074,7 +1206,7 @@ void ElementDescriptor::readProgressBarM readEvents(); } //__________________________________________________________________________________________________ @@ -49246,7 +47895,7 @@ index ef8f852..ba28702 100644 SAL_THROW( (Exception) ) { // collect styles -@@ -1112,6 +1244,47 @@ void ElementDescriptor::readScrollBarModel( StyleBag * all_styles ) +@@ -1112,6 +1244,47 @@ void ElementDescriptor::readScrollBarMod OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":live-scroll") ) ); readHexLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SymbolColor") ), OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":symbol-color") ) ); @@ -49294,11 +47943,9 @@ index ef8f852..ba28702 100644 readEvents(); } //__________________________________________________________________________________________________ -diff --git xmlscript/source/xmldlg_imexp/xmldlg_export.cxx xmlscript/source/xmldlg_imexp/xmldlg_export.cxx -index f5c660c..656ead7 100644 ---- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx -+++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx -@@ -1328,7 +1328,8 @@ void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOu +--- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx 2010-03-03 16:59:35.000000000 +0100 +@@ -1328,7 +1328,8 @@ void StyleBag::dump( Reference< xml::sax //================================================================================================== void SAL_CALL exportDialogModel( Reference< xml::sax::XExtendedDocumentHandler > const & xOut, @@ -49376,10 +48023,8 @@ index f5c660c..656ead7 100644 } else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) ) { -diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx -index 47a79a5..956ec15 100644 ---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx -+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +--- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx.old 2009-10-07 15:07:05.000000000 +0200 ++++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -31,17 +31,195 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmlscript.hxx" @@ -49578,7 +48223,7 @@ index 47a79a5..956ec15 100644 // progessmeter //__________________________________________________________________________________________________ -@@ -122,10 +300,24 @@ Reference< xml::input::XElement > ScrollBarElement::startChildElement( +@@ -122,10 +300,24 @@ Reference< xml::input::XElement > Scroll void ScrollBarElement::endElement() throw (xml::sax::SAXException, RuntimeException) { @@ -49827,7 +48472,7 @@ index 47a79a5..956ec15 100644 ::std::vector< Reference< xml::input::XElement > > * radioEvents = static_cast< RadioElement * >( xRadio.get() )->getEvents(); ctx.importEvents( *radioEvents ); -@@ -1638,9 +1978,26 @@ Reference< xml::input::XElement > MenuListElement::startChildElement( +@@ -1638,9 +1978,26 @@ Reference< xml::input::XElement > MenuLi void MenuListElement::endElement() throw (xml::sax::SAXException, RuntimeException) { @@ -49875,7 +48520,7 @@ index 47a79a5..956ec15 100644 makeAny( p->getSelectedItems() ) ); } ctx.importEvents( _events ); -@@ -1725,9 +2085,26 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement( +@@ -1725,9 +2085,26 @@ Reference< xml::input::XElement > ComboB void ComboBoxElement::endElement() throw (xml::sax::SAXException, RuntimeException) { @@ -49915,7 +48560,7 @@ index 47a79a5..956ec15 100644 { MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() ); xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ), -@@ -2096,10 +2475,19 @@ Reference< xml::input::XElement > BulletinBoardElement::startChildElement( +@@ -2096,10 +2475,19 @@ Reference< xml::input::XElement > Bullet { return new ScrollBarElement( rLocalName, xAttributes, this, _pImport ); } @@ -49935,10 +48580,8 @@ index 47a79a5..956ec15 100644 } // bulletinboard else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("bulletinboard") )) -diff --git xmlscript/source/xmldlg_imexp/xmldlg_import.cxx xmlscript/source/xmldlg_imexp/xmldlg_import.cxx -index 99a8361..f895d66 100644 ---- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx -+++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +--- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx 2010-03-03 16:59:35.000000000 +0100 @@ -60,9 +60,13 @@ #include <com/sun/star/script/ScriptEventDescriptor.hpp> @@ -49953,7 +48596,7 @@ index 99a8361..f895d66 100644 using ::rtl::OUString; namespace xmlscript -@@ -1891,18 +1895,44 @@ Reference< xml::input::XElement > DialogImport::getStyle( +@@ -1891,18 +1895,44 @@ Reference< xml::input::XElement > Dialog } return 0; } @@ -50001,10 +48644,8 @@ index 99a8361..f895d66 100644 } } -diff --git xmlscript/util/makefile.mk xmlscript/util/makefile.mk -index ae1479c..a0b300e 100644 ---- xmlscript/util/makefile.mk -+++ xmlscript/util/makefile.mk +--- xmlscript/util/makefile.mk.old 2009-10-08 16:17:57.000000000 +0200 ++++ xmlscript/util/makefile.mk 2010-03-03 16:59:35.000000000 +0100 @@ -58,6 +58,7 @@ SHL1LIBS= \ $(LIB1TARGET) |