[ooo-build-commit] .: configure.in patches/dev300 patches/vba
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Jul 30 06:55:33 PDT 2010
configure.in | 2
patches/dev300/always-save-option-sfx2.diff | 28
patches/dev300/apply | 97
patches/dev300/build-ant-1.6.diff | 25
patches/dev300/build-enable-boost-1.36.diff | 20
patches/dev300/build-prebuilt-stax.diff | 73
patches/dev300/buildfix-filter-system-saxon.diff | 12
patches/dev300/calc-distributed-cell-text-sc.diff | 2
patches/dev300/calc-distributed-cell-text-xmloff.diff | 11
patches/dev300/calc-formula-variable-sep-config-check-sc.diff | 28
patches/dev300/calc-increase-row-limit.diff | 20
patches/dev300/calc-insert-current-time-sc.diff | 56
patches/dev300/calc-insert-new-sheet-tab-svtools.diff | 6
patches/dev300/calc-ods-sheet-protection-sc.diff | 183
patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff | 19
patches/dev300/calc-perf-adjust-slot-machine.diff | 6
patches/dev300/calc-perf-import-dbf-sc.diff | 53
patches/dev300/calc-perf-xls-import-cellstyles.diff | 34
patches/dev300/corporate-dictionary.diff | 8
patches/dev300/crash-startup.diff | 4
patches/dev300/cws-calctabcolor-accessibility.diff | 34
patches/dev300/cws-calctabcolor-filter.diff | 479
patches/dev300/cws-calctabcolor-offapi.diff | 30
patches/dev300/cws-calctabcolor-officecfg.diff | 31
patches/dev300/cws-calctabcolor-sc.diff | 3677
patches/dev300/cws-calctabcolor-svtools.diff | 469
patches/dev300/cws-calctabcolor-tools.diff | 20
patches/dev300/cws-calctabcolor-xmloff.diff | 32
patches/dev300/cws-cbosdo03.diff | 4189 -
patches/dev300/cws-koheirowlimitperf-mdds.diff | 108
patches/dev300/cws-koheirowlimitperf-sc.diff | 8982 --
patches/dev300/cws-systemlibc.diff | 526
patches/dev300/desktop-disable-startup-registration.diff | 2
patches/dev300/desktop-infilter-option.diff | 30
patches/dev300/desktop-quickstart-option-enable-unx.diff | 28
patches/dev300/dlopen-global-symbols.diff | 19
patches/dev300/docx-vml-import.diff | 141
patches/dev300/fix-system-mythes-for-mythes-1.2.diff | 76
patches/dev300/g++44-debug.diff | 43
patches/dev300/link-as-needed.diff | 113
patches/dev300/ooo83878.unopkg.enablelinking.diff | 383
patches/dev300/oox-fix-list-style-apply.diff | 15
patches/dev300/oox-xlsx-import-fix-connector-shape.diff | 24
patches/dev300/pptx-gfx-layout-fix.diff | 44
patches/dev300/redirect-extensions.diff | 94
patches/dev300/reportdesigner-no-license.diff | 19
patches/dev300/sc-sheet-gridline-toggle.diff | 5
patches/dev300/sd-bitmapex-static-pointer.diff | 146
patches/dev300/speed-hash-style.diff | 48
patches/dev300/svtools-unsort-template-dialogentries.diff | 55
patches/dev300/sw-collapse-empty-table-par-like-html.diff | 12
patches/dev300/sw-invert-border-spacing.diff | 14
patches/dev300/system-mdds.diff | 74
patches/dev300/unxsplash-rework.diff | 6
patches/dev300/writer-doc-comparison.diff | 47
patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff | 12
patches/dev300/xlsx-shared-xlsx-snapshot.diff | 34
patches/vba/cws-vbasupportdev300.diff |40473 ++++------
58 files changed, 20604 insertions(+), 40617 deletions(-)
New commits:
commit 2c49084afa8fc77fb8d09ef7a1b6b97155afb190
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Fri Jul 30 15:45:41 2010 +0200
update for ooo330-m2, remove support for older milestones
* configure.in: set ooo330-m2; does not build now!!!
* patches/dev300/apply: update to follow the below changes
* updated for ooo320-m2:
* patches/dev300/always-save-option-sfx2.diff
* patches/dev300/build-ant-1.6.diff
* patches/dev300/calc-distributed-cell-text-sc.diff
* patches/dev300/calc-distributed-cell-text-xmloff.diff
* patches/dev300/calc-formula-variable-sep-config-check-sc.diff
* patches/dev300/calc-insert-current-time-sc.diff
* patches/dev300/calc-insert-new-sheet-tab-svtools.diff
* patches/dev300/calc-ods-sheet-protection-sc.diff
* patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff
* patches/dev300/calc-perf-adjust-slot-machine.diff
* patches/dev300/calc-perf-import-dbf-sc.diff
* patches/dev300/calc-perf-xls-import-cellstyles.diff
* patches/dev300/corporate-dictionary.diff
* patches/dev300/crash-startup.diff
* patches/dev300/desktop-disable-startup-registration.diff
* patches/dev300/desktop-infilter-option.diff
* patches/dev300/desktop-quickstart-option-enable-unx.diff
* patches/dev300/dlopen-global-symbols.diff
* patches/dev300/docx-vml-import.diff
* patches/dev300/g++44-debug.diff
* patches/dev300/link-as-needed.diff
* patches/dev300/oox-fix-list-style-apply.diff
* patches/dev300/oox-xlsx-import-fix-connector-shape.diff
* patches/dev300/pptx-gfx-layout-fix.diff
* patches/dev300/redirect-extensions.diff
* patches/dev300/reportdesigner-no-license.diff
* patches/dev300/sc-sheet-gridline-toggle.diff
* patches/dev300/speed-hash-style.diff
* patches/dev300/svtools-unsort-template-dialogentries.diff
* patches/dev300/sw-collapse-empty-table-par-like-html.diff
* patches/dev300/sw-invert-border-spacing.diff
* patches/dev300/unxsplash-rework.diff
* patches/dev300/writer-doc-comparison.diff
* patches/dev300/xlsx-shared-xlsx-shared-import-and-export.diff
* patches/dev300/xlsx-shared-xlsx-snapshot.diff
* patches/vba/cws-vbasupportdev300.diff
* removed obsolete:
* patches/dev300/build-enable-boost-1.36.diff
* patches/dev300/build-prebuilt-stax.diff
* patches/dev300/buildfix-filter-system-saxon.diff
* patches/dev300/calc-increase-row-limit.diff
* patches/dev300/cws-calctabcolor-accessibility.diff
* patches/dev300/cws-calctabcolor-filter.diff
* patches/dev300/cws-calctabcolor-offapi.diff
* patches/dev300/cws-calctabcolor-officecfg.diff
* patches/dev300/cws-calctabcolor-sc.diff
* patches/dev300/cws-calctabcolor-svtools.diff
* patches/dev300/cws-calctabcolor-tools.diff
* patches/dev300/cws-calctabcolor-xmloff.diff
* patches/dev300/cws-cbosdo03.diff
* patches/dev300/cws-koheirowlimitperf-mdds.diff
* patches/dev300/cws-koheirowlimitperf-sc.diff
* patches/dev300/cws-systemlibc.diff
* patches/dev300/fix-system-mythes-for-mythes-1.2.diff
* patches/dev300/ooo83878.unopkg.enablelinking.diff
* patches/dev300/sd-bitmapex-static-pointer.diff
* patches/dev300/system-mdds.diff
* FIXME: temporary disabled:
* buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
* cws-vbasupportdev300.diff, partly updated
* cws-vbasupportdev300_m83-fix.diff, cbosdo
* vba-enable-fieldrelatedbits.diff
* vba-container-controls.diff
* oox-projectname-oobuild-specifix.diff
* vba-oox-autocodename.diff, n#507768
* vba-oox-olenameoverride.diff, n#359933, n#403974
* fix-name-range-separator.diff, n#597351
* vbahelper-no-oox.diff
* pptx-autoplay-fix.diff, n#485645, thorsten
* ooxml-filters.diff, cbosdo
* ooxml-autoplay-fix.diff, tml
diff --git a/configure.in b/configure.in
index ba3f347..ba581a4 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=dev300-m83
+DEFAULT_TAG=ooo330-m2
# For the upstream packages it is like:
# DEFAULT_TAG=OOO320_m1
diff --git a/patches/dev300/always-save-option-sfx2.diff b/patches/dev300/always-save-option-sfx2.diff
index 30f51db..f0abf83 100644
--- a/patches/dev300/always-save-option-sfx2.diff
+++ b/patches/dev300/always-save-option-sfx2.diff
@@ -1,21 +1,14 @@
----
- sfx2/source/doc/guisaveas.cxx | 12 +++++++++---
- sfx2/source/doc/objserv.cxx | 10 +++++++---
- 2 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git sfx2/source/doc/guisaveas.cxx sfx2/source/doc/guisaveas.cxx
-index 1f0e56c..32b3418 100644
---- sfx2/source/doc/guisaveas.cxx
-+++ sfx2/source/doc/guisaveas.cxx
-@@ -64,6 +64,7 @@
- #include <svl/itemset.hxx>
+--- sfx2/source/doc/guisaveas.cxx.old 2010-07-26 15:06:38.000000000 +0200
++++ sfx2/source/doc/guisaveas.cxx 2010-07-30 13:34:56.000000000 +0200
+@@ -67,6 +67,7 @@
+ #include <svl/intitem.hxx>
#include <unotools/useroptions.hxx>
#include <unotools/saveopt.hxx>
+#include <svtools/miscopt.hxx>
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
-@@ -623,9 +624,14 @@ sal_Int8 ModelData_Impl::CheckStateForSave()
+@@ -696,9 +697,14 @@ sal_Int8 ModelData_Impl::CheckStateForSa
if ( GetMediaDescr().size() != aAcceptedArgs.size() )
GetMediaDescr() = aAcceptedArgs;
@@ -33,10 +26,8 @@ index 1f0e56c..32b3418 100644
// if the document is readonly or a new one a SaveAs operation must be used
if ( !GetStorable()->hasLocation() || GetStorable()->isReadonly() )
-diff --git sfx2/source/doc/objserv.cxx sfx2/source/doc/objserv.cxx
-index 7f784db..85cb86f 100644
---- sfx2/source/doc/objserv.cxx
-+++ sfx2/source/doc/objserv.cxx
+--- sfx2/source/doc/objserv.cxx.old 2010-07-29 21:20:54.000000000 +0200
++++ sfx2/source/doc/objserv.cxx 2010-07-30 13:34:56.000000000 +0200
@@ -63,8 +63,9 @@
#include <basic/sbx.hxx>
#include <unotools/pathoptions.hxx>
@@ -48,7 +39,7 @@ index 7f784db..85cb86f 100644
#include <comphelper/documentconstants.hxx>
#include <sfx2/app.hxx>
-@@ -936,8 +937,11 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
+@@ -936,8 +937,11 @@ void SfxObjectShell::GetState_Impl(SfxIt
}
case SID_SAVEDOC:
{
@@ -62,6 +53,3 @@ index 7f784db..85cb86f 100644
rSet.Put(SfxStringItem(
nWhich, String(SfxResId(STR_SAVEDOC))));
else
---
-1.7.0.1
-
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2893c8b..8f3497e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -7,7 +7,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp
# might be space separated list to support more MWS
-OLDEST_SUPPORTED=dev300-m83
+OLDEST_SUPPORTED=ooo330-m2
# -------- Functional sub-sets --------
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -178,22 +178,6 @@ helpcontent-scalc-01.diff, kohei
[ LocalizeFixes ]
# FIXME dev300-m77 helpcontent-scalc-01-localize.diff, kohei
-[ CWSBackports < dev300-m84 ]
-# calctabcolor cws (tab color feature by Daniel Watson)
-cws-calctabcolor-accessibility.diff, kohei
-cws-calctabcolor-filter.diff, kohei
-cws-calctabcolor-offapi.diff, kohei
-cws-calctabcolor-officecfg.diff, kohei
-# FIXME dev300-m83 cws-calctabcolor-oox.diff, kohei
-cws-calctabcolor-sc.diff, kohei
-cws-calctabcolor-svtools.diff, kohei
-cws-calctabcolor-tools.diff, kohei
-cws-calctabcolor-xmloff.diff, kohei
-
-# row limit increase perf cws
-cws-koheirowlimitperf-mdds.diff, kohei
-cws-koheirowlimitperf-sc.diff, kohei
-
[ CWSBackports ]
# koheichart02 cws (supported mixed chart types in single diagram).
cws-koheichart02-chart2.diff, kohei
@@ -268,12 +252,14 @@ sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
# don't let HelpLinker be miscompiled with g++ 4.3
gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
-[ TemporaryHacks < dev300-m84 ]
+[ TemporaryHacks ]
+# included in dev300 for OOo-3.4
# add the .archive flag to some instsetoo_native/util/makefile.mk rules
buildfix-instsetoo_native-archive.diff, i#111617
-[ TemporaryHacks >= dev300-m83 < ooo330-m1 ]
-buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
+# FIXME ooo330-m2 bugzilla says that it was included for OOo-3.4, so???
+# FIXME ooo330-m2 [ TemporaryHacks >= dev300-m83 < ooo330-m1 ]
+# FIXME ooo330-m2 buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
[ TemporaryHacks and not MacOSXOnly ]
@@ -837,10 +823,6 @@ sc-uninitialized-var-fix.diff, kohei
# The work to increase Calc's row size limit, and any work associated with it.
SectionOwner => kohei
-# increase the row limit and make the row header a little wider.
-# Note: When up-streamed, remove evaluation-row-limit.diff
-calc-increase-row-limit.diff, n#443634, i#30215, kohei
-
# don't show progress bar during row height adjustment if the row count is
# less than 1000.
calc-perf-rowheight-no-progress-bar.diff, n#514156, kohei
@@ -1060,18 +1042,12 @@ solenv-dummy-localize-sdf.diff, i#113389, pmladek
# even worse, the direcotry had the rights 444
installer-get-path-correctly.diff, pmladek
-# allow to use the prebuilt jsr173_1.0_api.jar
-build-prebuilt-stax.diff, i#93116, pmladek
-
# 1.12.1 was allowed before; we have 1.12.0 on older SUSE distros
build-allow-system-cppunit-1.12.0.diff, pmladek
# fix build with neon-0.24
ucb-neon-0.24.diff, pmladek
-# it builds fine with boost-1,36 here
-build-enable-boost-1.36.diff, i#105772, pmladek
-
# don't break dmake with environment variables containing space in the name
# [which is a broken setup, but apparently most apps don't break with that ;-)]
dmake-space-in-envvar-name.diff, i#101786, jholesov
@@ -1083,10 +1059,6 @@ dmake-space-in-envvar-name.diff, i#101786, jholesov
# return 0 with -h option
# FIXME dev300-m77 transex3-localize.pl-ooo-build.diff, i#107386, pmladek # RENAMED transex3 -> l10ntools
-[ BuildBits < dev300-m83 ]
-# fix XCLASSPATH setting for system-saxon
-buildfix-filter-system-saxon.diff. i#112741
-
[ Gcc44 ]
oox-tokenmap.string.h.diff, i#105219
@@ -1367,13 +1339,6 @@ psprint-postscript-page-setup.diff, i#65491, n#80448, jholesov
# enable vcl to load bitmaps when height it negative
vcl-bitmap2-negative-height.diff
-[ SystemBits < dev300-m84 ]
-fix-system-mythes-for-mythes-1.2.diff
-
-# use getopt() and readdir_r() from system glibc
-cws-systemlibc.diff, i#69033, rengelha
-
-
[ TangoIcons ]
# default to large icons in the toolbar
gui-toolbox-large-icons.diff, jholesov
@@ -1584,25 +1549,32 @@ mono-climaker-bridgetest.diff
[ VBAObjects ]
SectionOwner => noelpwer
-cws-vbasupportdev300_m83.diff, noelpwer
+# FIXME: half of the diff is somehow fixed to apply by pmladek
+# few things need double checking
+# !!!!!IMPORTANT!!!!: enable two hunks in xlsx-shared-xlsx-snapshot.diff again
+# enable the right hunks in writer-doc-comparison.diff again
+# FIXME ooo330-m2 partly updated for m2 cws-vbasupportdev300.diff
+# FIXME ooo330-m2 old version (m83) of the diff cws-vbasupportdev300_m83.diff, noelpwer
# fix vbasupport for field related changes ( note this code
# is disabled in vbasupportdev300 upstream )
-cws-vbasupportdev300_m83-fix.diff, cbosdo
-vba-enable-fieldrelatedbits.diff
-vba-container-controls.diff
+# FIXME ooo330-m2 cws-vbasupportdev300_m83-fix.diff, cbosdo
+# FIXME ooo330-m2 vba-enable-fieldrelatedbits.diff
+# FIXME ooo330-m2 vba-container-controls.diff
# need to adapt ooo-build wrt the changes intorduced into container_controls
-oox-projectname-oobuild-specifix.diff
+# FIXME ooo330-m2 oox-projectname-oobuild-specifix.diff
# tweak oox filter to handle any passed generated code names
# there is a strange scenario with one cust doc where a code module is missing
-vba-oox-autocodename.diff, n#507768
+# FIXME ooo330-m2 vba-oox-autocodename.diff, n#507768
# tweak oox filter to handle strange scenario where there might be some
# missing codenmames in excel
-vba-oox-olenameoverride.diff, n#359933, n#403974
+# FIXME ooo330-m2: need to uncomment the right hunk in xlsx-shared-xlsx-shared-import-and-export.diff that
+# depends on this changes in oox/source/xls/excelfilter.cxx
+# FIXME ooo330-m2 vba-oox-olenameoverride.diff, n#359933, n#403974
# fix strange ranges seperator regression problem
-fix-name-range-separator.diff, n#597351
+# FIXME ooo330-m2 fix-name-range-separator.diff, n#597351
# remove dependency of vbahelper on oox ( added by container_controls.diff )
-vbahelper-no-oox.diff
+# FIXME ooo330-m2 vbahelper-no-oox.diff
[ VBAUntested ]
SectionOwner => noelpwer
# KEEP - unfinished autotext stuff
@@ -2033,10 +2005,8 @@ win32-installer-register-moox-types.diff
writerfilter-module-writer.diff #disabled
writerfilter-source-dmapper-domainmapper-debug.diff
-cws-cbosdo03.diff, cbosdo
docx-vml-import.diff, cbosdo
-
# Ugly temporary fix
docx-ugly-fix.diff, n#548701, cbosdo
@@ -2222,9 +2192,6 @@ ooo86080.unopkg.bodge.diff
oooXXXX.partial-revert-ooo95118.diff
-# add unopkg add --link option to register uncompressed extensions
-# it helps to get automatic depencies when packaging extensions in RPMs
-ooo83878.unopkg.enablelinking.diff, i#83878, bnc#493994, caolan
[ CairoFonts ]
# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
@@ -2986,10 +2953,14 @@ pptx-fix-connector-crash.diff, n#499129, thorsten
# Snapshot of the xlsx export filter at the time of creation of ooxml03
# This is until 0453-Fix-formatted-text-change-tracking.patch, inluding, and
# should contain all the available changes.
+# FIXME ooo330-m2 disabled two hunks in sc/source/filter/excel/xeescher.cxx
+# they depend on cws-vbasupportdev300.diff
xlsx-shared-xlsx-snapshot.diff
# Make the xlsx export and import work at the same time
# (converts the xlsx export to a UNO filter)
+# FIXME ooo330-m2: commented out hunk for oox/source/xls/excelfilter.cxx
+# need to use it after vba-oox-olenameoverride.diff is applied again
xlsx-shared-xlsx-shared-import-and-export.diff
xlsx-shared-xlsx-arabic-export-crash.diff, n#497419, janneke
@@ -3030,8 +3001,8 @@ wmf-mm-text-1.diff, n#417818, rodo
# FIXME dev300-m83 sd-create-table-height-fix.diff, i#100275, thorsten
[ OOXML ]
-pptx-autoplay-fix.diff, n#485645, thorsten
-ooxml-filters.diff, cbosdo
+# FIXME ooo330-m2 pptx-autoplay-fix.diff, n#485645, thorsten
+# FIXME ooo330-m2 ooxml-filters.diff, cbosdo
[ OOXMLExportDevel ]
ooxml-filters-calc.diff, muthusuba
@@ -3048,7 +3019,7 @@ ooxml-sc-brk.diff, muthusuba
ooxml-sw-fix-2010-import-crash.diff, bubli
# depends on pptx-autoplay-fix.diff
-ooxml-autoplay-fix.diff, tml
+# FIXME ooo330-m2 ooxml-autoplay-fix.diff, tml
[ UbuntuHardyOnly ]
@@ -3131,6 +3102,7 @@ SectionOwner => jholesov
# http://gsoc-tzvetelina.blogspot.com/
# Improved document comparison
+# FIXME ooo330-m2 use the right hunks with cws-vbasupportdev300.diff
writer-doc-comparison.diff, tzvetelina
# Help files for the document comparison
#writer-doc-comparison-help.diff, tzvetelina
@@ -3417,10 +3389,12 @@ svtools-wmf-clean-warnings.diff, rodo
# Improve import performance of dbf files by ~80%.
calc-perf-import-dbf-connectivity.diff, n#558505, kohei
calc-perf-import-dbf-dbaccess.diff, n#558505, kohei
+# FIXME ooo330-m2: enable the right hunks together with vba diffs
calc-perf-import-dbf-sc.diff, n#558505, kohei
# Speed up row height data import from ods documents.
calc-perf-ods-import-cellstyles.diff, n#582693, kohei
+# FIXME ooo330-m2: enable the right hunks together with vba diffs
calc-perf-xls-import-cellstyles.diff, n#582693, kohei
calc-perf-xls-import-cellstyles-fix.diff, n#594266, kohei
calc-perf-xls-import-cellstyles-fix2.diff, n#594235, kohei
@@ -3493,9 +3467,6 @@ calc-formula-r1c1-parser-fix.diff, n#604903, kohei
# Fix poor performance on saving document with hidden rows.
calc-perf-ods-export-hidden-rows.diff, deb#582785, kohei
-[ CalcFixes < dev300-m84 ]
-system-mdds.diff, rengelha
-
[ GentooExperimental ]
SectionOwner => hmth
# jemalloc allocator
@@ -3514,10 +3485,6 @@ evaluation-row-limit.diff
valgrind-fixes.diff, thorsten
framework-menubar-fix.diff, thorsten
-[ Fixes < dev300-m84 ]
-# fix smoketest after m81
-sd-bitmapex-static-pointer.diff, i#112758
-
[ BuildBits ]
# Allow oowintool to detect java sdk 1.6.x
oowintool-java6.diff, fridrich
diff --git a/patches/dev300/build-ant-1.6.diff b/patches/dev300/build-ant-1.6.diff
index a1f9b5b..0970203 100644
--- a/patches/dev300/build-ant-1.6.diff
+++ b/patches/dev300/build-ant-1.6.diff
@@ -1,22 +1,13 @@
----
- configure.in | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git configure.in configure.in
-index a92e359..105bb0d 100644
--- configure.in
+++ configure.in
@@ -6612,10 +6612,6 @@ else
- fi
+ fi
- ant_minver=1.6.0
-- # update for more extensions...
-- if test "$ENABLE_MEDIAWIKI" = "YES"; then
-- ant_minver=1.7.0
-- fi
- ant_minminor1=`echo $ant_minver | cut -d"." -f2`
+ ant_minver=1.6.0
+-# update for more extensions...
+-if test "$ENABLE_MEDIAWIKI" = "YES"; then
+- ant_minver=1.7.0
+-fi
+ ant_minminor1=`echo $ant_minver | cut -d"." -f2`
- AC_MSG_CHECKING([whether ant is >= $ant_minver])
---
-1.7.0.1
-
+ AC_MSG_CHECKING([whether ant is >= $ant_minver])
diff --git a/patches/dev300/build-enable-boost-1.36.diff b/patches/dev300/build-enable-boost-1.36.diff
deleted file mode 100644
index 67bb545..0000000
--- a/patches/dev300/build-enable-boost-1.36.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- configure.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git configure.in configure.in
-index 31628e5..7e303cf 100644
---- configure.in
-+++ configure.in
-@@ -4322,7 +4322,7 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \
- AC_CHECK_HEADER(boost/shared_ptr.hpp, [],
- [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
- AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
-- [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.38)], [])
-+ [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
- AC_CHECK_HEADER(boost/function.hpp, [],
- [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
-
---
-1.7.0.1
-
diff --git a/patches/dev300/build-prebuilt-stax.diff b/patches/dev300/build-prebuilt-stax.diff
deleted file mode 100644
index d86c2a2..0000000
--- a/patches/dev300/build-prebuilt-stax.diff
+++ /dev/null
@@ -1,73 +0,0 @@
----
- configure.in | 13 +++++++++++++
- set_soenv.in | 1 +
- stax/makefile.mk | 10 ++++++++++
- 3 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git configure.in configure.in
-index 99cf64f..31628e5 100644
---- configure.in
-+++ configure.in
-@@ -3482,6 +3482,19 @@ else
- fi
-
- dnl ===================================================================
-+dnl Check for building stax
-+dnl ===================================================================
-+AC_MSG_CHECKING([whether to build the stax])
-+if test -f "external/StAX/jsr173_1.0_api.jar"; then
-+ BUILD_STAX=NO
-+ AC_MSG_RESULT([no, will use the prebuilt external/StAX/jsr173_1.0_api.jar])
-+else
-+ BUILD_STAX=YES
-+ AC_MSG_RESULT([yes])
-+fi
-+AC_SUBST(BUILD_STAX)
-+
-+dnl ===================================================================
- dnl Check for building ODK
- dnl ===================================================================
- AC_MSG_CHECKING([whether to build the ODK])
-diff --git set_soenv.in set_soenv.in
-index 2aceb1f..b72a43e 100644
---- set_soenv.in
-+++ set_soenv.in
-@@ -1919,6 +1919,7 @@ ToFile( "ENABLE_AGG", "@ENABLE_AGG@", "e" );
- ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );
- ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" );
- ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
-+ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
- ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );
- ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
- ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
-diff --git stax/makefile.mk stax/makefile.mk
-index 6dbe81e..d6792c5 100644
---- stax/makefile.mk
-+++ stax/makefile.mk
-@@ -47,6 +47,15 @@ all:
- @echo "Therefore the files provided here does not need to be built in addition."
- .ENDIF
-
-+EXTERNAL_DIR=$(PRJ)$/..$/external/StAX
-+
-+.IF "$(BUILD_STAX)" != "YES"
-+
-+$(OUT)$/class$/jsr173_1.0_api.jar : $(EXTERNAL_DIR)$/jsr173_1.0_api.jar
-+ +$(COPY) $< $@
-+
-+.ELSE # "$(BUILD_STAX)" != "YES"
-+
- # --- Files --------------------------------------------------------
- TARFILE_NAME=stax-api-1.0-2-sources
- TARFILE_MD5=8294d6c42e3553229af9934c5c0ed997
-@@ -56,6 +65,7 @@ BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf jsr173_1.0_api.jar j
-
- OUT2CLASS=jsr173_1.0_api.jar
-
-+.ENDIF # "$(BUILD_STAX)" != "YES"
- .ELSE # $(SOLAR_JAVA)!= ""
- nojava:
- @echo "Not building $(PRJNAME) because Java is disabled"
---
-1.7.0.1
-
diff --git a/patches/dev300/buildfix-filter-system-saxon.diff b/patches/dev300/buildfix-filter-system-saxon.diff
deleted file mode 100644
index 8fc4c44..0000000
--- a/patches/dev300/buildfix-filter-system-saxon.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk
---- filter/source/xsltfilter/makefile.mk
-+++ filter/source/xsltfilter/makefile.mk
-@@ -66,7 +66,7 @@
- JARTARGET = $(TARGET).jar
-
- .IF "$(SYSTEM_SAXON)" == "YES"
--XCLASSPATH+=$(SAXON_JAR)
-+XCLASSPATH:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR)
- .ELSE
- JARFILES += saxon9.jar
- .ENDIF
diff --git a/patches/dev300/calc-distributed-cell-text-sc.diff b/patches/dev300/calc-distributed-cell-text-sc.diff
index ff85816..d943234 100644
--- a/patches/dev300/calc-distributed-cell-text-sc.diff
+++ b/patches/dev300/calc-distributed-cell-text-sc.diff
@@ -1270,8 +1270,8 @@ index 82b91c5..0f1e8c3 100644
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRITING), ATTR_WRITINGDIR, &getCppuType((sal_Int16*)0), 0, 0 },
- {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0},
{MAP_CHAR_LEN(SC_UNONAME_TABCOLOR), SC_WID_UNO_TABCOLOR, &getCppuType((sal_Int32*)0), 0, 0 },
+ {MAP_CHAR_LEN(SC_UNO_CODENAME), SC_WID_UNO_CODENAME, &getCppuType(static_cast< const rtl::OUString * >(0)), 0, 0},
diff --git sc/source/ui/unoobj/styleuno.cxx sc/source/ui/unoobj/styleuno.cxx
index 3ddccdb..f62f17c 100644
--- sc/source/ui/unoobj/styleuno.cxx
diff --git a/patches/dev300/calc-distributed-cell-text-xmloff.diff b/patches/dev300/calc-distributed-cell-text-xmloff.diff
index 7690dc1..7de8d83 100644
--- a/patches/dev300/calc-distributed-cell-text-xmloff.diff
+++ b/patches/dev300/calc-distributed-cell-text-xmloff.diff
@@ -9,14 +9,23 @@ diff --git xmloff/inc/xmlnmspe.hxx xmloff/inc/xmlnmspe.hxx
index 33de6ea..79197cf 100644
--- xmloff/inc/xmlnmspe.hxx
+++ xmloff/inc/xmlnmspe.hxx
+# FIXME ooo330-m2: this version of the hunk depends on the vba diffs
+#@@ -104,6 +104,7 @@ XML_OLD_NAMESPACE( META, 6U )
+#
+# // experimental namespaces
+# XML_NAMESPACE( FIELD, 100U )
+#+XML_NAMESPACE( CSS3TEXT, 103U ) // CSS Text Level 3
+# XML_NAMESPACE( FORMX, 101U ) // form interop extensions
+#
+#
@@ -104,6 +104,7 @@ XML_OLD_NAMESPACE( META, 6U )
// experimental namespaces
XML_NAMESPACE( FIELD, 100U )
+XML_NAMESPACE( CSS3TEXT, 103U ) // CSS Text Level 3
- XML_NAMESPACE( FORMX, 101U ) // form interop extensions
+ #endif // _XMLOFF_XMLNMSPE_HXX
diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
index c61eac4..212a4c3 100644
--- xmloff/inc/xmloff/xmltoken.hxx
diff --git a/patches/dev300/calc-formula-variable-sep-config-check-sc.diff b/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
index 6cda23f..83a0988 100644
--- a/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
+++ b/patches/dev300/calc-formula-variable-sep-config-check-sc.diff
@@ -26,15 +26,27 @@ diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
index 7503ce2..629cbb4 100644
--- sc/inc/globstr.hrc
+++ sc/inc/globstr.hrc
-@@ -592,8 +592,10 @@
- #define STR_FORM_DROPDOWN 451
- #define STR_FORM_SPINNER 452
- #define STR_FORM_SCROLLBAR 453
+# FIXME ooo330-m2: this version of the hunk depends on the vba stuff
+#@@ -592,8 +592,10 @@
+# #define STR_FORM_DROPDOWN 451
+# #define STR_FORM_SPINNER 452
+# #define STR_FORM_SCROLLBAR 453
+#+
+#+#define STR_OPTIONS_WARN_SEPARATORS 454
+#
+#-#define STR_COUNT 454
+#+#define STR_COUNT 455
+#
+# #endif
+#
+@@ -577,7 +577,9 @@
+ #define STR_UNDO_SET_TAB_BG_COLOR 438
+ #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439
+
+-#define STR_COUNT 440
++#define STR_OPTIONS_WARN_SEPARATORS 440
+
-+#define STR_OPTIONS_WARN_SEPARATORS 454
-
--#define STR_COUNT 454
-+#define STR_COUNT 455
++#define STR_COUNT 441
#endif
diff --git a/patches/dev300/calc-increase-row-limit.diff b/patches/dev300/calc-increase-row-limit.diff
deleted file mode 100644
index bdb68a2..0000000
--- a/patches/dev300/calc-increase-row-limit.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sc/inc/address.hxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sc/inc/address.hxx sc/inc/address.hxx
-index 67cb480..6bd785e 100644
---- sc/inc/address.hxx
-+++ sc/inc/address.hxx
-@@ -84,7 +84,7 @@ const SCSIZE SCSIZE_MAX = ::std::numeric_limits<SCSIZE>::max();
-
- // The maximum values. Defines are needed for preprocessor checks in
- // bcaslot.cxx, otherwise type safe constants are preferred.
--#define MAXROWCOUNT_DEFINE 65536
-+#define MAXROWCOUNT_DEFINE 1048576
- #define MAXCOLCOUNT_DEFINE 1024
-
- // Count values
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-insert-current-time-sc.diff b/patches/dev300/calc-insert-current-time-sc.diff
index e0726b3..a0864c2 100644
--- a/patches/dev300/calc-insert-current-time-sc.diff
+++ b/patches/dev300/calc-insert-current-time-sc.diff
@@ -12,15 +12,28 @@ diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
index 629cbb4..6a62736 100644
--- sc/inc/globstr.hrc
+++ sc/inc/globstr.hrc
-@@ -594,8 +594,10 @@
- #define STR_FORM_SCROLLBAR 453
-
- #define STR_OPTIONS_WARN_SEPARATORS 454
-+#define STR_UNDO_INSERT_CURRENT_DATE 455
-+#define STR_UNDO_INSERT_CURRENT_TIME 456
-
--#define STR_COUNT 455
-+#define STR_COUNT 457
+# FIXME ooo330-m2: this version of the hunk depends on the vba diffs
+#@@ -594,8 +594,10 @@
+# #define STR_FORM_SCROLLBAR 453
+#
+# #define STR_OPTIONS_WARN_SEPARATORS 454
+#+#define STR_UNDO_INSERT_CURRENT_DATE 455
+#+#define STR_UNDO_INSERT_CURRENT_TIME 456
+#
+#-#define STR_COUNT 455
+#+#define STR_COUNT 457
+#
+# #endif
+#
+@@ -578,8 +578,10 @@
+ #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439
+
+ #define STR_OPTIONS_WARN_SEPARATORS 440
++#define STR_UNDO_INSERT_CURRENT_DATE 441
++#define STR_UNDO_INSERT_CURRENT_TIME 442
+
+-#define STR_COUNT 441
++#define STR_COUNT 443
#endif
@@ -28,12 +41,25 @@ diff --git sc/inc/sc.hrc sc/inc/sc.hrc
index 5547bb4..9341e0d 100644
--- sc/inc/sc.hrc
+++ sc/inc/sc.hrc
-@@ -1676,6 +1676,9 @@
- #define SID_DATA_FORM (SC_OOO_BUILD_START + 2) // menu (in Data menu)
- #define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 3) // dialog
-
-+#define SID_INSERT_CURRENT_DATE (SC_OOO_BUILD_START + 5)
-+#define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 6)
+# FIXME ooo330-m2: this version of the hunk depends on the vba stuff
+#@@ -1676,6 +1676,9 @@
+# #define SID_DATA_FORM (SC_OOO_BUILD_START + 2) // menu (in Data menu)
+# #define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 3) // dialog
+#
+#+#define SID_INSERT_CURRENT_DATE (SC_OOO_BUILD_START + 5)
+#+#define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 6)
+#+
+# #endif
+#
+#
+@@ -1672,6 +1672,11 @@
+ #define RID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 3)
+ #define HID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 4)
+
++#define SC_OOO_BUILD_START (SC_DIALOGS_END)
++
++#define SID_INSERT_CURRENT_DATE (SC_OOO_BUILD_START + 1)
++#define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 2)
+
#endif
diff --git a/patches/dev300/calc-insert-new-sheet-tab-svtools.diff b/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
index a137a7d..b6c33c5 100644
--- a/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
+++ b/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
@@ -395,7 +395,7 @@ index 36dccc3..d1578d9 100644
- }
- else
- {
-- if ( !pItem->IsDefaultTabBgColor() )
+- if ( !pItem->IsDefaultTabBgColor() && !rStyleSettings.GetHighContrastMode() )
- {
- SetFillColor( pItem->maTabBgColor );
- SetTextColor( pItem->maTabTextColor );
@@ -456,7 +456,7 @@ index 36dccc3..d1578d9 100644
- if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
- SetLineColor( rStyleSettings.GetLightColor() );
- } else {
-- if ( !pItem->IsDefaultTabBgColor() )
+- if ( !pItem->IsDefaultTabBgColor() && ! rStyleSettings.GetHighContrastMode() )
- {
- SetLineColor( pItem->maTabBgColor );
- } else {
@@ -517,7 +517,7 @@ index 36dccc3..d1578d9 100644
-
- if ( !pItem->IsDefaultTabBgColor() )
- {
-- if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
+- if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) || rStyleSettings.GetHighContrastMode() ) {
- SetLineColor( pItem->maTabBgColor );
- DrawLine( Point(aPos1.X()-1, aPos1.Y()-1), Point(aPos2.X(), aPos2.Y()-1) );
- if ( !pItem->mbEnable )
diff --git a/patches/dev300/calc-ods-sheet-protection-sc.diff b/patches/dev300/calc-ods-sheet-protection-sc.diff
index a6c9d0e..634fba3 100644
--- a/patches/dev300/calc-ods-sheet-protection-sc.diff
+++ b/patches/dev300/calc-ods-sheet-protection-sc.diff
@@ -1,23 +1,5 @@
----
- sc/inc/tabprotection.hxx | 42 +++++---
- sc/source/core/data/tabprotection.cxx | 169 ++++++++++++++++++++++++-------
- sc/source/filter/xml/xmlbodyi.cxx | 8 ++-
- sc/source/filter/xml/xmlbodyi.hxx | 4 +
- sc/source/filter/xml/xmlexprt.cxx | 78 +++++++++++++-
- sc/source/filter/xml/xmlimprt.cxx | 23 ++++-
- sc/source/filter/xml/xmlimprt.hxx | 13 ++-
- sc/source/filter/xml/xmlsubti.cxx | 27 ++++--
- sc/source/filter/xml/xmlsubti.hxx | 19 +++-
- sc/source/filter/xml/xmltabi.cxx | 85 ++++++++++++++--
- sc/source/filter/xml/xmltabi.hxx | 22 ++++
- sc/source/ui/docshell/docsh.cxx | 9 ++-
- sc/source/ui/miscdlgs/retypepassdlg.cxx | 2 +-
- 13 files changed, 417 insertions(+), 84 deletions(-)
-
-diff --git sc/inc/tabprotection.hxx sc/inc/tabprotection.hxx
-index 965ea30..4c87b6d 100644
---- sc/inc/tabprotection.hxx
-+++ sc/inc/tabprotection.hxx
+--- sc/inc/tabprotection.hxx.old 2010-07-29 16:15:34.000000000 +0200
++++ sc/inc/tabprotection.hxx 2010-07-29 16:20:18.000000000 +0200
@@ -32,7 +32,6 @@
#include <com/sun/star/uno/Sequence.hxx>
@@ -105,12 +87,10 @@ index 965ea30..4c87b6d 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 fe63d16..67a2b52 100644
---- sc/source/core/data/tabprotection.cxx
-+++ sc/source/core/data/tabprotection.cxx
-@@ -35,20 +35,27 @@
- #include "svl/PasswordHelper.hxx"
+--- sc/source/core/data/tabprotection.cxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/core/data/tabprotection.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -36,20 +36,27 @@
+ #include <comphelper/docpasswordhelper.hxx>
#include "document.hxx"
+#include <vector>
@@ -139,7 +119,7 @@ index fe63d16..67a2b52 100644
return true;
}
-@@ -60,13 +67,37 @@ bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash
+@@ -61,13 +68,37 @@ bool ScPassHashHelper::needsPassHashRege
// Sheet not protected. Skip it.
continue;
@@ -178,7 +158,7 @@ index fe63d16..67a2b52 100644
// ============================================================================
ScPassHashProtectable::~ScPassHashProtectable()
-@@ -112,7 +143,8 @@ static Sequence<sal_Int8> lcl_getXLHash(const String& aPassText)
+@@ -79,7 +110,8 @@ ScPassHashProtectable::~ScPassHashProtec
class ScTableProtectionImpl
{
public:
@@ -188,7 +168,7 @@ index fe63d16..67a2b52 100644
explicit ScTableProtectionImpl(SCSIZE nOptSize);
explicit ScTableProtectionImpl(const ScTableProtectionImpl& r);
-@@ -122,10 +154,13 @@ public:
+@@ -89,10 +121,13 @@ public:
void setProtected(bool bProtected);
bool isPasswordEmpty() const;
@@ -205,7 +185,7 @@ index fe63d16..67a2b52 100644
bool verifyPassword(const String& aPassText) const;
bool isOptionEnabled(SCSIZE nOptId) const;
-@@ -137,7 +172,8 @@ private:
+@@ -104,7 +139,8 @@ private:
::std::vector<bool> maOptions;
bool mbEmptyPass;
bool mbProtected;
@@ -215,9 +195,9 @@ index fe63d16..67a2b52 100644
};
Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText, ScPasswordHash eHash)
-@@ -148,19 +184,44 @@ Sequence<sal_Int8> ScTableProtectionImpl::hashPassword(const String& aPassText,
+@@ -115,19 +151,44 @@ Sequence<sal_Int8> ScTableProtectionImpl
case PASSHASH_XL:
- aHash = lcl_getXLHash(aPassText);
+ aHash = ::comphelper::DocPasswordHelper::GetXLHashAsSequence( aPassText, RTL_TEXTENCODING_UTF8 );
break;
- case PASSHASH_OOO:
- default:
@@ -263,7 +243,7 @@ index fe63d16..67a2b52 100644
{
}
-@@ -170,7 +231,8 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) :
+@@ -137,7 +198,8 @@ ScTableProtectionImpl::ScTableProtection
maOptions(r.maOptions),
mbEmptyPass(r.mbEmptyPass),
mbProtected(r.mbProtected),
@@ -273,7 +253,7 @@ index fe63d16..67a2b52 100644
{
}
-@@ -214,7 +276,7 @@ bool ScTableProtectionImpl::isPasswordEmpty() const
+@@ -181,7 +243,7 @@ bool ScTableProtectionImpl::isPasswordEm
return mbEmptyPass;
}
@@ -282,7 +262,7 @@ index fe63d16..67a2b52 100644
{
if (mbEmptyPass)
return true;
-@@ -222,35 +284,65 @@ bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash) const
+@@ -189,35 +251,65 @@ bool ScTableProtectionImpl::hasPasswordH
if (maPassText.Len())
return true;
@@ -359,7 +339,7 @@ index fe63d16..67a2b52 100644
maPassHash = aPassword;
#if DEBUG_TAB_PROTECTION
-@@ -274,7 +366,8 @@ bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const
+@@ -241,7 +333,8 @@ bool ScTableProtectionImpl::verifyPasswo
// Clear text password exists, and this one takes precedence.
return aPassText.Equals(maPassText);
@@ -369,7 +349,7 @@ index fe63d16..67a2b52 100644
#if DEBUG_TAB_PROTECTION
fprintf(stdout, "ScTableProtectionImpl::verifyPassword: hash = ");
-@@ -350,9 +443,9 @@ bool ScDocProtection::isPasswordEmpty() const
+@@ -317,9 +410,9 @@ bool ScDocProtection::isPasswordEmpty()
return mpImpl->isPasswordEmpty();
}
@@ -381,7 +361,7 @@ index fe63d16..67a2b52 100644
}
void ScDocProtection::setPassword(const String& aPassText)
-@@ -360,14 +453,15 @@ void ScDocProtection::setPassword(const String& aPassText)
+@@ -327,14 +420,15 @@ void ScDocProtection::setPassword(const
mpImpl->setPassword(aPassText);
}
@@ -401,7 +381,7 @@ index fe63d16..67a2b52 100644
}
bool ScDocProtection::verifyPassword(const String& aPassText) const
-@@ -425,9 +519,9 @@ bool ScTableProtection::isPasswordEmpty() const
+@@ -392,9 +486,9 @@ bool ScTableProtection::isPasswordEmpty(
return mpImpl->isPasswordEmpty();
}
@@ -413,7 +393,7 @@ index fe63d16..67a2b52 100644
}
void ScTableProtection::setPassword(const String& aPassText)
-@@ -435,14 +529,15 @@ void ScTableProtection::setPassword(const String& aPassText)
+@@ -402,14 +496,15 @@ void ScTableProtection::setPassword(cons
mpImpl->setPassword(aPassText);
}
@@ -433,11 +413,9 @@ index fe63d16..67a2b52 100644
}
bool ScTableProtection::verifyPassword(const String& aPassText) const
-diff --git sc/source/filter/xml/xmlbodyi.cxx sc/source/filter/xml/xmlbodyi.cxx
-index 29775de..f0165aa 100644
---- sc/source/filter/xml/xmlbodyi.cxx
-+++ sc/source/filter/xml/xmlbodyi.cxx
-@@ -77,6 +77,8 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
+--- sc/source/filter/xml/xmlbodyi.cxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/filter/xml/xmlbodyi.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -77,6 +77,8 @@ ScXMLBodyContext::ScXMLBodyContext( ScXM
const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
sPassword(),
@@ -446,7 +424,7 @@ index 29775de..f0165aa 100644
bProtected(sal_False),
bHadCalculationSettings(sal_False),
pChangeTrackingImportHelper(NULL)
-@@ -122,6 +124,10 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
+@@ -122,6 +124,10 @@ ScXMLBodyContext::ScXMLBodyContext( ScXM
bProtected = IsXMLToken(sValue, XML_TRUE);
else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY))
sPassword = sValue;
@@ -466,10 +444,8 @@ index 29775de..f0165aa 100644
}
pDoc->SetDocProtection(pProtection.get());
-diff --git sc/source/filter/xml/xmlbodyi.hxx sc/source/filter/xml/xmlbodyi.hxx
-index e279431..fa3c29b 100644
---- sc/source/filter/xml/xmlbodyi.hxx
-+++ sc/source/filter/xml/xmlbodyi.hxx
+--- sc/source/filter/xml/xmlbodyi.hxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/filter/xml/xmlbodyi.hxx 2010-07-29 16:20:18.000000000 +0200
@@ -31,12 +31,16 @@
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlimp.hxx>
@@ -487,11 +463,9 @@ index e279431..fa3c29b 100644
sal_Bool bProtected;
sal_Bool bHadCalculationSettings;
-diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 42d07cc..4572ba5 100644
---- sc/source/filter/xml/xmlexprt.cxx
-+++ sc/source/filter/xml/xmlexprt.cxx
-@@ -1517,12 +1517,36 @@ void ScXMLExport::SetBodyAttributes()
+--- sc/source/filter/xml/xmlexprt.cxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/filter/xml/xmlexprt.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -1520,12 +1520,36 @@ void ScXMLExport::SetBodyAttributes()
AddAttribute(XML_NAMESPACE_TABLE, XML_STRUCTURE_PROTECTED, XML_TRUE);
rtl::OUStringBuffer aBuffer;
uno::Sequence<sal_Int8> aPassHash;
@@ -529,7 +503,7 @@ index 42d07cc..4572ba5 100644
}
}
-@@ -1722,18 +1746,46 @@ void ScXMLExport::_ExportContent()
+@@ -1725,18 +1749,46 @@ void ScXMLExport::_ExportContent()
AddAttribute(sAttrStyleName, aTableStyles[nTable]);
uno::Reference<util::XProtectable> xProtectable (xTable, uno::UNO_QUERY);
@@ -581,7 +555,7 @@ index 42d07cc..4572ba5 100644
}
rtl::OUString sPrintRanges;
table::CellRangeAddress aColumnHeaderRange;
-@@ -1744,6 +1796,20 @@ void ScXMLExport::_ExportContent()
+@@ -1747,6 +1799,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);
@@ -600,13 +574,11 @@ index 42d07cc..4572ba5 100644
+ }
+
CheckAttrList();
- WriteTableSource();
- WriteScenario();
-diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index 091777e..d67b6b2 100644
---- sc/source/filter/xml/xmlimprt.cxx
-+++ sc/source/filter/xml/xmlimprt.cxx
-@@ -637,6 +637,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
+
+ if ( pDoc && pDoc->GetSheetEvents( static_cast<SCTAB>(nTable) ) &&
+--- sc/source/filter/xml/xmlimprt.cxx.old 2010-07-29 16:15:34.000000000 +0200
++++ sc/source/filter/xml/xmlimprt.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -637,6 +637,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 },
@@ -614,7 +586,7 @@ index 091777e..d67b6b2 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()
+@@ -656,6 +657,22 @@ const SvXMLTokenMap& ScXMLImport::GetTab
return *pTableElemTokenMap;
}
@@ -637,7 +609,7 @@ index 091777e..d67b6b2 100644
const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap()
{
if( !pTableRowsElemTokenMap )
-@@ -700,9 +717,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap()
+@@ -702,9 +719,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 },
@@ -650,7 +622,7 @@ index 091777e..d67b6b2 100644
{ XML_NAMESPACE_TABLE, XML_PRINT, XML_TOK_TABLE_PRINT },
XML_TOKEN_MAP_END
};
-@@ -1662,6 +1681,7 @@ ScXMLImport::ScXMLImport(
+@@ -1664,6 +1683,7 @@ ScXMLImport::ScXMLImport(
pLabelRangesElemTokenMap( 0 ),
pLabelRangeAttrTokenMap( 0 ),
pTableElemTokenMap( 0 ),
@@ -658,7 +630,7 @@ index 091777e..d67b6b2 100644
pTableRowsElemTokenMap( 0 ),
pTableColsElemTokenMap( 0 ),
pTableScenarioAttrTokenMap( 0 ),
-@@ -1786,6 +1806,7 @@ ScXMLImport::~ScXMLImport() throw()
+@@ -1788,6 +1808,7 @@ ScXMLImport::~ScXMLImport() throw()
delete pLabelRangesElemTokenMap;
delete pLabelRangeAttrTokenMap;
delete pTableElemTokenMap;
@@ -666,10 +638,8 @@ index 091777e..d67b6b2 100644
delete pTableRowsElemTokenMap;
delete pTableColsElemTokenMap;
delete pTableAttrTokenMap;
-diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
-index 5137975..9871238 100644
---- sc/source/filter/xml/xmlimprt.hxx
-+++ sc/source/filter/xml/xmlimprt.hxx
+--- sc/source/filter/xml/xmlimprt.hxx.old 2010-07-29 16:15:34.000000000 +0200
++++ sc/source/filter/xml/xmlimprt.hxx 2010-07-29 16:20:18.000000000 +0200
@@ -169,6 +169,7 @@ enum ScXMLTableTokens
XML_TOK_TABLE_COL,
XML_TOK_TABLE_ROW_GROUP,
@@ -678,8 +648,8 @@ index 5137975..9871238 100644
XML_TOK_TABLE_ROWS,
XML_TOK_TABLE_ROW,
XML_TOK_TABLE_SOURCE,
-@@ -177,6 +178,12 @@ enum ScXMLTableTokens
- XML_TOK_TABLE_FORMS
+@@ -179,6 +180,12 @@ enum ScXMLTableTokens
+ XML_TOK_TABLE_EVENT_LISTENERS_EXT
};
+enum ScXMLTokenProtectionTokens
@@ -691,7 +661,7 @@ index 5137975..9871238 100644
enum ScXMLTableRowsTokens
{
XML_TOK_TABLE_ROWS_ROW_GROUP,
-@@ -197,9 +204,11 @@ enum ScXMLTableAttrTokens
+@@ -199,9 +206,11 @@ enum ScXMLTableAttrTokens
{
XML_TOK_TABLE_NAME,
XML_TOK_TABLE_STYLE_NAME,
@@ -704,7 +674,7 @@ index 5137975..9871238 100644
XML_TOK_TABLE_PRINT
};
-@@ -697,6 +706,7 @@ class ScXMLImport: public SvXMLImport
+@@ -699,6 +708,7 @@ class ScXMLImport: public SvXMLImport
SvXMLTokenMap *pLabelRangesElemTokenMap;
SvXMLTokenMap *pLabelRangeAttrTokenMap;
SvXMLTokenMap *pTableElemTokenMap;
@@ -712,7 +682,7 @@ index 5137975..9871238 100644
SvXMLTokenMap *pTableRowsElemTokenMap;
SvXMLTokenMap *pTableColsElemTokenMap;
SvXMLTokenMap *pTableScenarioAttrTokenMap;
-@@ -861,6 +871,7 @@ public:
+@@ -863,6 +873,7 @@ public:
const SvXMLTokenMap& GetLabelRangesElemTokenMap();
const SvXMLTokenMap& GetLabelRangeAttrTokenMap();
const SvXMLTokenMap& GetTableElemTokenMap();
@@ -720,11 +690,9 @@ index 5137975..9871238 100644
const SvXMLTokenMap& GetTableRowsElemTokenMap();
const SvXMLTokenMap& GetTableColsElemTokenMap();
const SvXMLTokenMap& GetTableAttrTokenMap();
-diff --git sc/source/filter/xml/xmlsubti.cxx sc/source/filter/xml/xmlsubti.cxx
-index bde6633..6eb7861 100644
---- sc/source/filter/xml/xmlsubti.cxx
-+++ sc/source/filter/xml/xmlsubti.cxx
-@@ -148,6 +148,15 @@ void ScMyTableData::SetChangedCols(const sal_Int32 nValue)
+--- sc/source/filter/xml/xmlsubti.cxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/filter/xml/xmlsubti.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -148,6 +148,15 @@ void ScMyTableData::SetChangedCols(const
/*******************************************************************************************************************************/
@@ -749,7 +717,7 @@ index bde6633..6eb7861 100644
{
if (rImport.GetModel().is())
{
-@@ -189,8 +198,7 @@ void ScMyTables::NewSheet(const rtl::OUString& sTableName, const rtl::OUString&
+@@ -189,8 +198,7 @@ void ScMyTables::NewSheet(const rtl::OUS
}
++nCurrentSheet;
@@ -781,10 +749,8 @@ index bde6633..6eb7861 100644
rImport.GetDocument()->SetTabProtection(static_cast<SCTAB>(nCurrentSheet), pProtect.get());
}
-diff --git sc/source/filter/xml/xmlsubti.hxx sc/source/filter/xml/xmlsubti.hxx
-index 3abb885..19623ef 100644
---- sc/source/filter/xml/xmlsubti.hxx
-+++ sc/source/filter/xml/xmlsubti.hxx
+--- sc/source/filter/xml/xmlsubti.hxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/filter/xml/xmlsubti.hxx 2010-07-29 16:20:18.000000000 +0200
@@ -40,6 +40,7 @@
#include <list>
#include "XMLTableShapeResizer.hxx"
@@ -847,11 +813,9 @@ index 3abb885..19623ef 100644
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 f9123a3..cf5c38b 100644
---- sc/source/filter/xml/xmltabi.cxx
-+++ sc/source/filter/xml/xmltabi.cxx
-@@ -62,6 +62,9 @@
+--- sc/source/filter/xml/xmltabi.cxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/filter/xml/xmltabi.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -63,6 +63,9 @@
using namespace com::sun::star;
using namespace xmloff::token;
@@ -861,7 +825,7 @@ index f9123a3..cf5c38b 100644
/**
* Determine whether this table is an external reference cache from its
-@@ -160,10 +163,9 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
+@@ -161,10 +164,9 @@ ScXMLTableContext::ScXMLTableContext( Sc
if (!bTempIsSubTable)
{
@@ -873,7 +837,7 @@ index f9123a3..cf5c38b 100644
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableAttrTokenMap();
for( sal_Int16 i=0; i < nAttrCount; ++i )
-@@ -182,15 +184,21 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
+@@ -183,15 +185,21 @@ ScXMLTableContext::ScXMLTableContext( Sc
case XML_TOK_TABLE_STYLE_NAME:
sStyleName = sValue;
break;
@@ -900,7 +864,7 @@ index f9123a3..cf5c38b 100644
case XML_TOK_TABLE_PRINT:
{
if (IsXMLToken(sValue, XML_FALSE))
-@@ -218,7 +226,7 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
+@@ -219,7 +227,7 @@ ScXMLTableContext::ScXMLTableContext( Sc
else
{
// This is a regular table.
@@ -909,7 +873,7 @@ index f9123a3..cf5c38b 100644
}
}
else
-@@ -286,6 +294,9 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix,
+@@ -287,6 +295,9 @@ SvXMLImportContext *ScXMLTableContext::C
pContext = new ScXMLTableColContext( GetScImport(), nPrefix,
rLName, xAttrList );
break;
@@ -919,7 +883,7 @@ index f9123a3..cf5c38b 100644
case XML_TOK_TABLE_ROW_GROUP:
pContext = new ScXMLTableRowsContext( GetScImport(), nPrefix,
rLName, xAttrList,
-@@ -411,3 +422,61 @@ void ScXMLTableContext::EndElement()
+@@ -420,3 +431,61 @@ void ScXMLTableContext::EndElement()
GetScImport().UnlockSolarMutex();
}
@@ -981,10 +945,8 @@ index f9123a3..cf5c38b 100644
+void ScXMLTableProtectionContext::EndElement()
+{
+}
-diff --git sc/source/filter/xml/xmltabi.hxx sc/source/filter/xml/xmltabi.hxx
-index 8dd3b3e..411ce7c 100644
---- sc/source/filter/xml/xmltabi.hxx
-+++ sc/source/filter/xml/xmltabi.hxx
+--- sc/source/filter/xml/xmltabi.hxx.old 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/filter/xml/xmltabi.hxx 2010-07-29 16:20:18.000000000 +0200
@@ -75,4 +75,26 @@ public:
virtual void EndElement();
};
@@ -1012,11 +974,9 @@ index 8dd3b3e..411ce7c 100644
+};
+
#endif
-diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index f0bab17..8d49218 100644
---- sc/source/ui/docshell/docsh.cxx
-+++ sc/source/ui/docshell/docsh.cxx
-@@ -1431,9 +1431,14 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMedium& rMedium )
+--- sc/source/ui/docshell/docsh.cxx.old 2010-07-29 16:15:34.000000000 +0200
++++ sc/source/ui/docshell/docsh.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -1489,9 +1489,14 @@ BOOL __EXPORT ScDocShell::SaveAs( SfxMed
#if ENABLE_SHEET_PROTECTION
ScTabViewShell* pViewShell = GetBestViewShell();
@@ -1033,11 +993,9 @@ index f0bab17..8d49218 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 02a7c01..0f237de 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 2010-07-21 15:32:50.000000000 +0200
++++ sc/source/ui/miscdlgs/retypepassdlg.cxx 2010-07-29 16:20:18.000000000 +0200
+@@ -77,7 +77,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window*
mpDocItem(static_cast<ScDocProtection*>(NULL)),
mnCurScrollPos(0),
@@ -1046,6 +1004,3 @@ index 02a7c01..0f237de 100644
{
Init();
}
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff b/patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff
index 759c561..6127461 100644
--- a/patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff
+++ b/patches/dev300/calc-pdf-export-allow-filtered-range-sc.diff
@@ -13,16 +13,27 @@ index fd60fdf..35092fd 100644
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/sheet/XNamedRanges.hpp>
#include <com/sun/star/sheet/XLabelRanges.hpp>
+# FIXME ooo330-m2: this version of the hunk depends on the vba stuff
+#@@ -106,6 +107,9 @@
+# #include <com/sun/star/document/XVbaEventsHelper.hpp>
+# #include <com/sun/star/document/VbaEventId.hpp>
+# using namespace com::sun::star;
+#+using ::rtl::OUString;
+#+using ::com::sun::star::uno::Reference;
+#+
+# using namespace com::sun::star::document::VbaEventId;
+#
+# #define SC_UNO_VBADOCOBJ "ThisVBADocObj" // perhaps we want to actually make this ThisWorkbook ?
@@ -106,6 +107,9 @@
- #include <com/sun/star/document/XVbaEventsHelper.hpp>
- #include <com/sun/star/document/VbaEventId.hpp>
+ #endif
+
using namespace com::sun::star;
+using ::rtl::OUString;
+using ::com::sun::star::uno::Reference;
+
- using namespace com::sun::star::document::VbaEventId;
- #define SC_UNO_VBADOCOBJ "ThisVBADocObj" // perhaps we want to actually make this ThisWorkbook ?
+ //------------------------------------------------------------------------
+
@@ -929,7 +933,13 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount( const uno::Any& aSelection,
ScPrintSelectionStatus aStatus;
String aPagesStr;
diff --git a/patches/dev300/calc-perf-adjust-slot-machine.diff b/patches/dev300/calc-perf-adjust-slot-machine.diff
index f798dc5..a9f5e1d 100644
--- a/patches/dev300/calc-perf-adjust-slot-machine.diff
+++ b/patches/dev300/calc-perf-adjust-slot-machine.diff
@@ -6,14 +6,16 @@ diff --git sc/source/core/data/bcaslot.cxx sc/source/core/data/bcaslot.cxx
index a917383..cf004e5 100644
--- sc/source/core/data/bcaslot.cxx
+++ sc/source/core/data/bcaslot.cxx
-@@ -45,11 +45,7 @@
+@@ -45,13 +45,7 @@
// Number of slots per dimension
// must be integer divisors of MAXCOLCOUNT respectively MAXROWCOUNT
#define BCA_SLOTS_COL ((MAXCOLCOUNT_DEFINE) / 16)
-#if MAXROWCOUNT_DEFINE == 32000
-#define BCA_SLOTS_ROW 256
+-#define BCA_SLICE 125
-#else
--#define BCA_SLOTS_ROW ((MAXROWCOUNT_DEFINE) / 128)
+-#define BCA_SLICE 128
+-#define BCA_SLOTS_ROW ((MAXROWCOUNT_DEFINE) / BCA_SLICE)
-#endif
+#define BCA_SLOTS_ROW 2048
#define BCA_SLOT_COLS ((MAXCOLCOUNT_DEFINE) / BCA_SLOTS_COL)
diff --git a/patches/dev300/calc-perf-import-dbf-sc.diff b/patches/dev300/calc-perf-import-dbf-sc.diff
index 7295545..f84166c 100644
--- a/patches/dev300/calc-perf-import-dbf-sc.diff
+++ b/patches/dev300/calc-perf-import-dbf-sc.diff
@@ -237,6 +237,16 @@ diff --git sc/inc/table.hxx sc/inc/table.hxx
index abd0a88..709000e 100644
--- sc/inc/table.hxx
+++ sc/inc/table.hxx
+# FIXME: this version of the hunk depends on cws-vbasupportdev300.diff
+#@@ -85,6 +85,8 @@ class ScFlatUInt16RowSegments;
+# class ScFlatBoolRowSegments;
+# class ScFlatBoolColSegments;
+# struct ScSetStringParam;
+#+struct ScColWidthParam;
+#+struct ScColWidthParam;
+#
+# typedef std::hash_map< ::rtl::OUString, rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameToNameMap;
+#
@@ -85,6 +85,8 @@ class ScFlatUInt16RowSegments;
class ScFlatBoolRowSegments;
class ScFlatBoolColSegments;
@@ -244,8 +254,8 @@ index abd0a88..709000e 100644
+struct ScColWidthParam;
+struct ScColWidthParam;
- typedef std::hash_map< ::rtl::OUString, rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameToNameMap;
-
+ class ScTable
+ {
@@ -596,7 +598,7 @@ public:
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
@@ -681,22 +691,35 @@ index ef33f94..7249979 100644
#include <rtl/logfile.hxx>
#include <comphelper/processfactory.hxx>
-@@ -129,12 +131,18 @@
- #include <com/sun/star/document/VbaEventId.hpp>
- #include <basic/sbstar.hxx>
- #include <basic/basmgr.hxx>
-+
-+#include <vector>
-+#include <boost/shared_ptr.hpp>
-+
- using namespace com::sun::star;
- using namespace com::sun::star::document::VbaEventId;
-
+# FIXME ooo330-m2: this version of the hunk depends on the vba diffs
+#@@ -129,12 +131,18 @@
+# #include <com/sun/star/document/VbaEventId.hpp>
+# #include <basic/sbstar.hxx>
+# #include <basic/basmgr.hxx>
+#+
+#+#include <vector>
+#+#include <boost/shared_ptr.hpp>
+#+
+# using namespace com::sun::star;
+# using namespace com::sun::star::document::VbaEventId;
+#
+# using namespace com::sun::star;
+# using ::rtl::OUString;
+# using ::rtl::OUStringBuffer;
+#+using ::boost::shared_ptr;
+#+using ::std::vector;
+#
+# // STATIC DATA -----------------------------------------------------------
+#
+@@ -132,6 +134,11 @@
using namespace com::sun::star;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-+using ::boost::shared_ptr;
-+using ::std::vector;
++#include <vector>
++#include <boost/shared_ptr.hpp>
++using ::boost::shared_ptr;
++using ::std::vector;
++
// STATIC DATA -----------------------------------------------------------
diff --git a/patches/dev300/calc-perf-xls-import-cellstyles.diff b/patches/dev300/calc-perf-xls-import-cellstyles.diff
index 9a39546..364a61f 100644
--- a/patches/dev300/calc-perf-xls-import-cellstyles.diff
+++ b/patches/dev300/calc-perf-xls-import-cellstyles.diff
@@ -160,6 +160,26 @@ diff --git sc/source/filter/excel/xistyle.cxx sc/source/filter/excel/xistyle.cxx
index fdd537a..6e6ee3e 100644
--- sc/source/filter/excel/xistyle.cxx
+++ sc/source/filter/excel/xistyle.cxx
+# FIXME ooo330-m2: this version of the hunk depends on the vba diffs
+#@@ -58,12 +58,18 @@
+# #include "stlsheet.hxx"
+# #include "cell.hxx"
+# #include "globstr.hrc"
+#+#include "attarray.hxx"
+# #include "xltracer.hxx"
+# #include "xistream.hxx"
+# #include "xicontent.hxx"
+#
+# #include "root.hxx"
+# #include "colrowst.hxx"
+#+#include "svl/poolcach.hxx"
+#+
+#+#include <list>
+#+
+#+using ::std::list;
+#
+# #include <cppuhelper/implbase1.hxx>
+# #include <com/sun/star/container/XIndexAccess.hpp>
@@ -58,12 +58,18 @@
#include "stlsheet.hxx"
#include "cell.hxx"
@@ -171,14 +191,14 @@ index fdd537a..6e6ee3e 100644
#include "root.hxx"
#include "colrowst.hxx"
-+#include "svl/poolcach.hxx"
-+
-+#include <list>
-+
-+using ::std::list;
++#include "svl/poolcach.hxx"
++
++#include <list>
++
++using ::std::list;
+
+ // PALETTE record - color information =========================================
- #include <cppuhelper/implbase1.hxx>
- #include <com/sun/star/container/XIndexAccess.hpp>
@@ -1242,26 +1248,60 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs )
return *mpPattern;
}
diff --git a/patches/dev300/corporate-dictionary.diff b/patches/dev300/corporate-dictionary.diff
index 7b83da9..740806c 100644
--- a/patches/dev300/corporate-dictionary.diff
+++ b/patches/dev300/corporate-dictionary.diff
@@ -11,8 +11,8 @@ index 7d4e618..62f8318 100644
ZIP1TARGET = $(WORDBOOK_ALL_TARGET)
--ZIP1LIST = sun.dic
-+ZIP1LIST = sun.dic Novell.dic
+-ZIP1LIST = oracle.dic
++ZIP1LIST = oracle.dic Novell.dic
ZIP2TARGET = $(WORDBOOK_USER_TARGET)
@@ -24,8 +24,8 @@ index 7cb13b7..e0828fa 100644
<desc>Specifies the custom dictionaries to be used. The Ignore list (IgnoreAllList (All)) is administered in the RAM only for the current spellcheck.</desc>
<label>Custom dictionaries</label>
</info>
-- <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;sun.dic</value>
-+ <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;Novell.dic;sun.dic;corporate.dic</value>
+- <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;oracle.dic</value>
++ <value oor:separator=";">IgnoreAllList;soffice.dic;standard.dic;Novell.dic;oracle.dic;corporate.dic</value>
</prop>
<prop oor:name="IsUseDictionaryList" oor:type="xs:boolean">
<!-- OldLocation: NEW -->
diff --git a/patches/dev300/crash-startup.diff b/patches/dev300/crash-startup.diff
index ec01851..31188ee 100644
--- a/patches/dev300/crash-startup.diff
+++ b/patches/dev300/crash-startup.diff
@@ -14,15 +14,15 @@ index f069828..72bbbe3 100644
+ $(SLO)$/bitmapex.obj \
$(SLO)$/outdev.obj \
$(SLO)$/outdev3.obj \
- $(SLO)$/gfxlink.obj \
+ $(SLO)$/outdevnative.obj \
@@ -83,7 +84,6 @@ SLOFILES= $(EXCEPTIONSFILES) \
$(SLO)$/bitmap3.obj \
$(SLO)$/bitmap4.obj \
$(SLO)$/alpha.obj \
- $(SLO)$/bitmapex.obj \
- $(SLO)$/imgcons.obj \
$(SLO)$/bmpacc.obj \
$(SLO)$/bmpacc2.obj \
+ $(SLO)$/bmpacc3.obj \
diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
index 5748c43..df15dd7 100644
--- vcl/unx/gtk/window/gtkframe.cxx
diff --git a/patches/dev300/cws-calctabcolor-accessibility.diff b/patches/dev300/cws-calctabcolor-accessibility.diff
deleted file mode 100644
index e184900..0000000
--- a/patches/dev300/cws-calctabcolor-accessibility.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- .../source/extended/accessibletabbarbase.cxx | 2 +-
- .../source/extended/accessibletabbarpagelist.cxx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git accessibility/source/extended/accessibletabbarbase.cxx accessibility/source/extended/accessibletabbarbase.cxx
-index 36e3378..c908508 100644
---- accessibility/source/extended/accessibletabbarbase.cxx
-+++ accessibility/source/extended/accessibletabbarbase.cxx
-@@ -63,7 +63,7 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent )
- DBG_ASSERT( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );
-
- if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
-- ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TABBAR_PAGE_NOTFOUND ) &&
-+ ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TabBar::PAGE_NOT_FOUND ) &&
- ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) )
- {
- return 0;
-diff --git accessibility/source/extended/accessibletabbarpagelist.cxx accessibility/source/extended/accessibletabbarpagelist.cxx
-index 50c6359..6f5c447 100644
---- accessibility/source/extended/accessibletabbarpagelist.cxx
-+++ accessibility/source/extended/accessibletabbarpagelist.cxx
-@@ -313,7 +313,7 @@ namespace accessibility
- {
- sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
-
-- if ( nPageId == TABBAR_PAGE_NOTFOUND )
-+ if ( nPageId == TabBar::PAGE_NOT_FOUND )
- {
- for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
- RemoveChild( i );
---
-1.7.0.1
-
diff --git a/patches/dev300/cws-calctabcolor-filter.diff b/patches/dev300/cws-calctabcolor-filter.diff
deleted file mode 100644
index df0a5cf..0000000
--- a/patches/dev300/cws-calctabcolor-filter.diff
+++ /dev/null
@@ -1,479 +0,0 @@
----
- .../source/xslt/export/spreadsheetml/formular.xsl | 6 +-
- .../export/spreadsheetml/ooo2spreadsheetml.xsl | 180 ++++++++++++++++-
- .../import/spreadsheetml/spreadsheetml2ooo.xsl | 215 ++++++++++++++++++++
- 3 files changed, 397 insertions(+), 4 deletions(-)
-
-diff --git filter/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
-index 3acb4f3..8134412 100644
---- filter/source/xslt/export/spreadsheetml/formular.xsl
-+++ filter/source/xslt/export/spreadsheetml/formular.xsl
-@@ -377,7 +377,7 @@
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$earlierCandidate" />
-- <xsl:variable name="parameterCandidate">
-+ <xsl:variable name="parameterCandidate2">
- <xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
- <xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
- <xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
-@@ -401,8 +401,8 @@
- <xsl:call-template name="getParameter">
- <xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
- <xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
-- <xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
-- <xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
-+ <xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
-+ <xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
- <xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
- </xsl:call-template>
- </xsl:otherwise>
-diff --git filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
-index 027f732..420d064 100644
---- filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
-+++ filter/source/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl
-@@ -141,6 +141,17 @@
- <RGB><xsl:value-of select="." /></RGB>
- </Color>
- </xsl:for-each>
-+ <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]">
-+ <xsl:sort select="." />
-+ <Color>
-+ <Index><xsl:value-of select="56 - position()" /></Index>
-+ <RGB>
-+ <xsl:call-template name="colordecimal2rgb">
-+ <xsl:with-param name="colordecimal" select="."/>
-+ </xsl:call-template>
-+ </RGB>
-+ </Color>
-+ </xsl:for-each>
- </Colors>
- </OfficeDocumentSettings>
- <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
-@@ -171,6 +182,160 @@
- </Workbook>
- </xsl:template>
-
-+ <xsl:template name="colordecimal2rgb">
-+ <xsl:param name="colordecimal"/>
-+ <xsl:choose>
-+ <xsl:when test="$colordecimal <= 16777215 and $colordecimal >= 65536">
-+ <xsl:variable name="redValue" select="floor(($colordecimal) div 65536)"/>
-+ <xsl:variable name="greenValue" select="floor(($colordecimal - ($redValue*65536)) div 256)"/>
-+ <xsl:variable name="blueValue" select="$colordecimal - ($redValue*65536) - ($greenValue*256)"/>
-+ <xsl:call-template name="dec_rgb2Hex">
-+ <xsl:with-param name="decRedValue" select="$redValue"/>
-+ <xsl:with-param name="decGreenValue" select="$greenValue"/>
-+ <xsl:with-param name="decBlueValue" select="$blueValue"/>
-+ </xsl:call-template>
-+ </xsl:when>
-+ <xsl:when test="$colordecimal <= 65535 and $colordecimal >= 256">
-+ <xsl:variable name="redValue" select="0"/>
-+ <xsl:variable name="greenValue" select="$colordecimal div 256"/>
-+ <xsl:variable name="blueValue" select="$colordecimal - ($greenValue*256)"/>
-+ <xsl:call-template name="dec_rgb2Hex">
-+ <xsl:with-param name="decRedValue" select="$redValue"/>
-+ <xsl:with-param name="decGreenValue" select="$greenValue"/>
-+ <xsl:with-param name="decBlueValue" select="$blueValue"/>
-+ </xsl:call-template>
-+ </xsl:when>
-+ <xsl:when test="$colordecimal <= 255 and $colordecimal >= 0">
-+ <xsl:variable name="redValue" select="0"/>
-+ <xsl:variable name="greenValue" select="0"/>
-+ <xsl:variable name="blueValue" select="$colordecimal"/>
-+ <xsl:call-template name="dec_rgb2Hex">
-+ <xsl:with-param name="decRedValue" select="$redValue"/>
-+ <xsl:with-param name="decGreenValue" select="$greenValue"/>
-+ <xsl:with-param name="decBlueValue" select="$blueValue"/>
-+ </xsl:call-template>
-+ </xsl:when>
-+ <xsl:otherwise/>
-+ </xsl:choose>
-+ </xsl:template>
-+ <xsl:template name="dec_rgb2Hex">
-+ <xsl:param name="decRedValue"/>
-+ <xsl:param name="decGreenValue"/>
-+ <xsl:param name="decBlueValue"/>
-+ <xsl:variable name="hexRedValue">
-+ <xsl:variable name="tmpHexRedValue">
-+ <xsl:call-template name="decimal2hex">
-+ <xsl:with-param name="dec-number" select="$decRedValue"/>
-+ <xsl:with-param name="last-value" select="'H'"/>
-+ </xsl:call-template>
-+ </xsl:variable>
-+ <xsl:choose>
-+ <xsl:when test="string-length($tmpHexRedValue) = 1">
-+ <xsl:value-of select="concat('0',$tmpHexRedValue)"/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:value-of select="$tmpHexRedValue"/>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:variable>
-+ <xsl:variable name="hexGreenValue">
-+ <xsl:variable name="tmpHexGreenValue">
-+ <xsl:call-template name="decimal2hex">
-+ <xsl:with-param name="dec-number" select="$decGreenValue"/>
-+ <xsl:with-param name="last-value" select="'H'"/>
-+ </xsl:call-template>
-+ </xsl:variable>
-+ <xsl:choose>
-+ <xsl:when test="string-length($tmpHexGreenValue) = 1">
-+ <xsl:value-of select="concat('0',$tmpHexGreenValue)"/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:value-of select="$tmpHexGreenValue"/>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:variable>
-+ <xsl:variable name="hexBlueValue">
-+ <xsl:variable name="tmpHexBlueValue">
-+ <xsl:call-template name="decimal2hex">
-+ <xsl:with-param name="dec-number" select="$decBlueValue"/>
-+ <xsl:with-param name="last-value" select="'H'"/>
-+ </xsl:call-template>
-+ </xsl:variable>
-+ <xsl:choose>
-+ <xsl:when test="string-length($tmpHexBlueValue) = 1">
-+ <xsl:value-of select="concat('0',$tmpHexBlueValue)"/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:value-of select="$tmpHexBlueValue"/>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:variable>
-+ <xsl:value-of select="concat('#',$hexRedValue,$hexGreenValue,$hexBlueValue)"/>
-+ </xsl:template>
-+ <xsl:template name="decimal2hex">
-+ <!-- transforms a decimal number to a hex number,only for two-bit hex(less than 256 in decimal) currently -->
-+ <xsl:param name="dec-number"/>
-+ <xsl:param name="last-value"/>
-+ <xsl:variable name="current-value">
-+ <xsl:call-template name="decNumber2hex">
-+ <xsl:with-param name="dec-value">
-+ <xsl:if test="$dec-number > 15">
-+ <xsl:value-of select="floor($dec-number div 16)"/>
-+ </xsl:if>
-+ <xsl:if test="$dec-number < 16">
-+ <xsl:value-of select="$dec-number"/>
-+ </xsl:if>
-+ </xsl:with-param>
-+ </xsl:call-template>
-+ </xsl:variable>
-+ <xsl:if test="$dec-number > 15">
-+ <xsl:call-template name="decimal2hex">
-+ <xsl:with-param name="dec-number" select="$dec-number mod 16"/>
-+ <xsl:with-param name="last-value" select="concat($last-value,$current-value)"/>
-+ </xsl:call-template>
-+ </xsl:if>
-+ <xsl:if test="$dec-number < 16">
-+ <xsl:value-of select="substring-after(concat($last-value,$current-value),'H')"/>
-+ </xsl:if>
-+ </xsl:template>
-+
-+ <xsl:template name="decNumber2hex">
-+ <!-- return a hex number for a decimal character -->
-+ <xsl:param name="dec-value"/>
-+ <xsl:choose>
-+ <xsl:when test="$dec-value = 10">
-+ <xsl:value-of select="'A'"/>
-+ </xsl:when>
-+ <xsl:when test="$dec-value = 11">
-+ <xsl:value-of select="'B'"/>
-+ </xsl:when>
-+ <xsl:when test="$dec-value = 12">
-+ <xsl:value-of select="'C'"/>
-+ </xsl:when>
-+ <xsl:when test="$dec-value = 13">
-+ <xsl:value-of select="'D'"/>
-+ </xsl:when>
-+ <xsl:when test="$dec-value = 14">
-+ <xsl:value-of select="'E'"/>
-+ </xsl:when>
-+ <xsl:when test="$dec-value = 15">
-+ <xsl:value-of select="'F'"/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:value-of select="$dec-value"/>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:template>
-+ <xsl:template name="GetTabColorIndex">
-+ <xsl:param name="SheetColor"/>
-+ <xsl:for-each select="key('config', 'TabColor')[not(.=preceding::config:config-item)]">
-+ <xsl:sort select="." />
-+ <xsl:variable name="tmpColor" select="."/>
-+ <xsl:if test=". = $SheetColor" >
-+ <xsl:value-of select="56 - position()"/>
-+ </xsl:if>
-+ </xsl:for-each>
-+ </xsl:template>
- <xsl:template match="office:body">
- <!-- office:body table:table children are spreadsheets -->
- <xsl:apply-templates />
-@@ -183,8 +348,11 @@
- <!-- office:body table:table children are spreadsheets -->
- <xsl:template match="office:spreadsheet/table:table">
- <xsl:element name="ss:Worksheet">
-- <xsl:attribute name="ss:Name">
-+ <xsl:variable name="TableName">
- <xsl:value-of select="@table:name" />
-+ </xsl:variable>
-+ <xsl:attribute name="ss:Name">
-+ <xsl:value-of select="$TableName" />
- </xsl:attribute>
- <xsl:call-template name="table:table" />
- <xsl:element name="x:WorksheetOptions">
-@@ -200,6 +368,16 @@
- <xsl:if test="key('config', 'ShowZeroValues') = 'false'">
- <xsl:element name="x:DoNotDisplayZeros" />
- </xsl:if>
-+ <xsl:if test="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']">
-+ <xsl:element name="x:TabColorIndex">
-+ <xsl:variable name="TabColorIndex">
-+ <xsl:call-template name="GetTabColorIndex">
-+ <xsl:with-param name="SheetColor" select="/*/office:settings/config:config-item-set/config:config-item-map-indexed/config:config-item-map-entry/config:config-item-map-named/config:config-item-map-entry[@config:name=$TableName]/config:config-item[@config:name='TabColor']"/>
-+ </xsl:call-template>
-+ </xsl:variable>
-+ <xsl:value-of select="$TabColorIndex"/>
-+ </xsl:element>
-+ </xsl:if>
- </xsl:element>
- </xsl:element>
- </xsl:template>
-diff --git filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
-index 64ac130..71f1baa 100644
---- filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
-+++ filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl
-@@ -381,6 +381,16 @@
- </xsl:otherwise>
- </xsl:choose>
- <xsl:copy-of select="$sharedConfiguration"/>
-+ <xsl:if test="x:WorksheetOptions/x:TabColorIndex">
-+ <config:config-item config:name="TabColor" config:type="int">
-+ <xsl:variable name="temp-value">
-+ <xsl:call-template name="colorindex2decimal">
-+ <xsl:with-param name="colorindex" select="x:WorksheetOptions/x:TabColorIndex"/>
-+ </xsl:call-template>
-+ </xsl:variable>
-+ <xsl:value-of select="$temp-value"/>
-+ </config:config-item>
-+ </xsl:if>
- </config:config-item-map-entry>
- </xsl:for-each>
- </config:config-item-map-named>
-@@ -4637,6 +4647,211 @@
- </xsl:variable>
- <xsl:value-of select="concat('#',$R-value,$G-value,$B-value)"/>
- </xsl:template>
-+ <xsl:template name="colorindex2decimal">
-+ <xsl:param name="colorindex"/>
-+ <xsl:variable name="colorIndexLookup">
-+ <xsl:value-of select="$colorindex - 8"/>
-+ </xsl:variable>
-+ <xsl:variable name="tempColorValue">
-+ <xsl:choose>
-+ <!-- Grab the color from the custom color index if it exists... -->
-+ <xsl:when test="/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup">
-+ <xsl:value-of select="substring-after(normalize-space(/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:RGB[/ss:Workbook/o:OfficeDocumentSettings/o:Colors/o:Color/o:Index=$colorIndexLookup]), '#')"/>
-+ </xsl:when >
-+ <xsl:otherwise>
-+ <xsl:choose>
-+ <xsl:when test="$colorindex=8">
-+ <xsl:value-of select="'000000'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=9">
-+ <xsl:value-of select="'FFFFFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=10">
-+ <xsl:value-of select="'FF0000'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=11">
-+ <xsl:value-of select="'00FF00'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=12">
-+ <xsl:value-of select="'0000FF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=13">
-+ <xsl:value-of select="'FFFF00'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=14">
-+ <xsl:value-of select="'FF00FF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=15">
-+ <xsl:value-of select="'00FFFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=16">
-+ <xsl:value-of select="'800000'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=17">
-+ <xsl:value-of select="'008000'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=18">
-+ <xsl:value-of select="'000080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=19">
-+ <xsl:value-of select="'808000'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=20">
-+ <xsl:value-of select="'800080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=21">
-+ <xsl:value-of select="'008080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=22">
-+ <xsl:value-of select="'C0C0C0'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=23">
-+ <xsl:value-of select="'808080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=24">
-+ <xsl:value-of select="'9999FF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=25">
-+ <xsl:value-of select="'993366'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=26">
-+ <xsl:value-of select="'FFFFCC'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=27">
-+ <xsl:value-of select="'CCFFFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=28">
-+ <xsl:value-of select="'660066'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=29">
-+ <xsl:value-of select="'FF8080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=30">
-+ <xsl:value-of select="'0066CC'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=31">
-+ <xsl:value-of select="'CCCCFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=32">
-+ <xsl:value-of select="'000080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=33">
-+ <xsl:value-of select="'FF00FF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=34">
-+ <xsl:value-of select="'FFFF00'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=35">
-+ <xsl:value-of select="'00FFFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=36">
-+ <xsl:value-of select="'800080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=37">
-+ <xsl:value-of select="'800000'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=38">
-+ <xsl:value-of select="'008080'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=39">
-+ <xsl:value-of select="'0000FF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=40">
-+ <xsl:value-of select="'00CCFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=41">
-+ <xsl:value-of select="'CCFFFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=42">
-+ <xsl:value-of select="'CCFFCC'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=43">
-+ <xsl:value-of select="'FFFF99'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=44">
-+ <xsl:value-of select="'99CCFF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=45">
-+ <xsl:value-of select="'FF99CC'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=46">
-+ <xsl:value-of select="'CC99FF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=47">
-+ <xsl:value-of select="'FFCC99'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=48">
-+ <xsl:value-of select="'3366FF'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=49">
-+ <xsl:value-of select="'33CCCC'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=50">
-+ <xsl:value-of select="'99CC00'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=51">
-+ <xsl:value-of select="'FFCC00'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=52">
-+ <xsl:value-of select="'FF9900'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=53">
-+ <xsl:value-of select="'FF6600'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=54">
-+ <xsl:value-of select="'666699'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=55">
-+ <xsl:value-of select="'969696'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=56">
-+ <xsl:value-of select="'003366'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=57">
-+ <xsl:value-of select="'339966'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=58">
-+ <xsl:value-of select="'003300'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=59">
-+ <xsl:value-of select="'333300'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=60">
-+ <xsl:value-of select="'993300'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=61">
-+ <xsl:value-of select="'993366'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=62">
-+ <xsl:value-of select="'333399'"/>
-+ </xsl:when>
-+ <xsl:when test="$colorindex=63">
-+ <xsl:value-of select="'333333'"/>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:value-of select="'NOTFOUND'"/>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:variable>
-+ <xsl:variable name="tempColorDecimal">
-+ <xsl:choose>
-+ <xsl:when test="not($tempColorValue = 'NOTFOUND')">
-+ <xsl:call-template name="hex2decimal">
-+ <xsl:with-param name="hex-number" select="$tempColorValue"/>
-+ <xsl:with-param name="index" select="1"/>
-+ <xsl:with-param name="str-length" select="6"/>
-+ <xsl:with-param name="last-value" select="0"/>
-+ </xsl:call-template>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:value-of select="4294967295"/>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:variable>
-+ <xsl:value-of select="$tempColorDecimal"/>
-+ </xsl:template>
- <xsl:template name="hex2decimal">
- <!-- transforms a hex number to a decimal number.parses the string from left to right -->
- <xsl:param name="hex-number"/>
---
-1.7.0.1
-
diff --git a/patches/dev300/cws-calctabcolor-offapi.diff b/patches/dev300/cws-calctabcolor-offapi.diff
deleted file mode 100644
index e8922cc..0000000
--- a/patches/dev300/cws-calctabcolor-offapi.diff
+++ /dev/null
@@ -1,30 +0,0 @@
----
- offapi/com/sun/star/sheet/Spreadsheet.idl | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git offapi/com/sun/star/sheet/Spreadsheet.idl offapi/com/sun/star/sheet/Spreadsheet.idl
-index 670a05c..5ba0e53 100644
---- offapi/com/sun/star/sheet/Spreadsheet.idl
-+++ offapi/com/sun/star/sheet/Spreadsheet.idl
-@@ -96,6 +96,8 @@
- #include <com/sun/star/sheet/XExternalSheetName.idl>
- #endif
-
-+#include <com/sun/star/util/Color.idl>
-+
- //=============================================================================
-
- module com { module sun { module star { module sheet {
-@@ -264,6 +266,9 @@ service Spreadsheet
- */
- [optional, property] boolean AutomaticPrintArea;
-
-+ /** specifies the color of the sheet tab, if any.
-+ */
-+ [optional, property] com::sun::star::util::Color TabColor;
- };
-
- //=============================================================================
---
-1.7.0.1
-
diff --git a/patches/dev300/cws-calctabcolor-officecfg.diff b/patches/dev300/cws-calctabcolor-officecfg.diff
deleted file mode 100644
index 45eb4d2..0000000
--- a/patches/dev300/cws-calctabcolor-officecfg.diff
+++ /dev/null
@@ -1,31 +0,0 @@
----
- .../data/org/openoffice/Office/UI/CalcCommands.xcu | 13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-index d3db052..33e5109 100644
---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-@@ -1254,6 +1254,19 @@
- <value xml:lang="en-US">Rename Sheet</value>
- </prop>
- </node>
-+ <node oor:name=".uno:SetTabBgColor" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="en-US">~Tab Color...</value>
-+ </prop>
-+ <prop oor:name="ContextLabel" oor:type="xs:string">
-+ <value xml:lang="en-US">~Tab Color...</value>
-+ </prop>
-+ </node>
-+ <node oor:name=".uno:TabBgColor" oor:op="replace">
-+ <prop oor:name="Label" oor:type="xs:string">
-+ <value xml:lang="en-US">Tab Color</value>
-+ </prop>
-+ </node>
- <node oor:name=".uno:Move" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Move/Copy Sheet...</value>
---
-1.7.0.1
-
diff --git a/patches/dev300/cws-calctabcolor-sc.diff b/patches/dev300/cws-calctabcolor-sc.diff
deleted file mode 100644
index fc0435e..0000000
--- a/patches/dev300/cws-calctabcolor-sc.diff
+++ /dev/null
@@ -1,3677 +0,0 @@
----
- sc/inc/AccessibleFilterTopWindow.hxx | 3 -
- sc/inc/ViewSettingsSequenceDefines.hxx | 3 +-
- sc/inc/dociter.hxx | 3 -
- sc/inc/document.hxx | 3 +
- sc/inc/globstr.hrc | 8 +-
- sc/inc/sc.hrc | 12 +-
- sc/inc/scabstdlg.hxx | 14 +
- sc/inc/scmod.hxx | 8 +-
- sc/inc/tabbgcolor.hxx | 54 +
- sc/inc/table.hxx | 3 +
- sc/inc/unonames.hxx | 2 +
- sc/inc/unowids.hxx | 3 +-
- sc/sdi/docsh.sdi | 1 +
- sc/sdi/scalc.sdi | 53 +
- sc/sdi/tabvwsh.sdi | 1 +
- sc/source/core/data/dociter.cxx | 13 -
- sc/source/core/data/documen3.cxx | 20 +
- sc/source/core/data/makefile.mk | 2 +
- sc/source/core/data/tabbgcolor.cxx | 62 ++
- sc/source/core/data/table1.cxx | 17 +
- sc/source/core/inc/doubleref.hxx | 3 +-
- sc/source/core/tool/doubleref.cxx | 5 -
- sc/source/filter/excel/read.cxx | 1 +
- sc/source/filter/excel/xestyle.cxx | 1 +
- sc/source/filter/excel/xeview.cxx | 43 +
- sc/source/filter/excel/xichart.cxx | 6 +
- sc/source/filter/excel/xiview.cxx | 22 +
- sc/source/filter/excel/xlview.cxx | 1 +
- sc/source/filter/inc/xestyle.hxx | 3 +-
- sc/source/filter/inc/xeview.hxx | 15 +
- sc/source/filter/inc/xiview.hxx | 3 +-
- sc/source/filter/inc/xlview.hxx | 8 +
- sc/source/filter/xml/xmlexprt.cxx | 1079 ++++++++++----------
- sc/source/filter/xml/xmlimprt.cxx | 12 +-
- sc/source/filter/xml/xmlstyle.cxx | 3 +
- .../ui/Accessibility/AccessibleContextBase.cxx | 4 -
- .../ui/Accessibility/AccessibleFilterTopWindow.cxx | 7 -
- sc/source/ui/app/scmod.cxx | 13 +-
- sc/source/ui/attrdlg/scdlgfact.cxx | 35 +
- sc/source/ui/attrdlg/scdlgfact.hxx | 15 +
- sc/source/ui/cctrl/dpcontrol.cxx | 26 -
- sc/source/ui/docshell/docfunc.cxx | 98 ++
- sc/source/ui/inc/AccessibleContextBase.hxx | 2 -
- sc/source/ui/inc/docfunc.hxx | 4 +
- sc/source/ui/inc/dpcontrol.hxx | 4 -
- sc/source/ui/inc/miscdlgs.hrc | 6 +
- sc/source/ui/inc/tabbgcolordlg.hxx | 80 ++
- sc/source/ui/inc/undotab.hxx | 28 +
- sc/source/ui/inc/viewfunc.hxx | 5 +
- sc/source/ui/miscdlgs/makefile.mk | 1 +
- sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 199 ++++
- sc/source/ui/src/globstr.src | 8 +
- sc/source/ui/src/miscdlgs.src | 90 ++
- sc/source/ui/src/popup.src | 9 +
- sc/source/ui/src/scstring.src | 8 +
- sc/source/ui/undo/undotab.cxx | 74 ++
- sc/source/ui/unoobj/cellsuno.cxx | 34 +-
- sc/source/ui/view/tabcont.cxx | 38 +-
- sc/source/ui/view/tabvwshf.cxx | 136 +++
- sc/source/ui/view/viewdata.cxx | 14 +-
- sc/source/ui/view/viewfun2.cxx | 23 +
- sc/uiconfig/scalc/menubar/menubar.xml | 2 +
- sc/util/makefile.mk | 1 +
- 63 files changed, 1800 insertions(+), 654 deletions(-)
- create mode 100644 sc/inc/tabbgcolor.hxx
- create mode 100644 sc/source/core/data/tabbgcolor.cxx
- create mode 100644 sc/source/ui/inc/tabbgcolordlg.hxx
- create mode 100644 sc/source/ui/miscdlgs/tabbgcolordlg.cxx
-
-diff --git sc/inc/AccessibleFilterTopWindow.hxx sc/inc/AccessibleFilterTopWindow.hxx
-index 727bef6..be508e5 100644
---- sc/inc/AccessibleFilterTopWindow.hxx
-+++ sc/inc/AccessibleFilterTopWindow.hxx
-@@ -58,9 +58,6 @@ public:
-
- // Non-UNO Methods
-
-- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-- getAccessibleChildMenu();
--
- enum ChildControlType {
- LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN
- };
-diff --git sc/inc/ViewSettingsSequenceDefines.hxx sc/inc/ViewSettingsSequenceDefines.hxx
-index 4bc0793..a729620 100644
---- sc/inc/ViewSettingsSequenceDefines.hxx
-+++ sc/inc/ViewSettingsSequenceDefines.hxx
-@@ -61,7 +61,7 @@
- // this are the defines for the position of the settings in the
- // TableViewSettingsSequence
-
--#define SC_TABLE_VIEWSETTINGS_COUNT 14
-+#define SC_TABLE_VIEWSETTINGS_COUNT 15
-
- #define SC_CURSOR_X 0
- #define SC_CURSOR_Y 1
-@@ -77,6 +77,7 @@
- #define SC_TABLE_ZOOM_TYPE 11
- #define SC_TABLE_ZOOM_VALUE 12
- #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE 13
-+#define SC_TABLE_TAB_BG_COLOR 14
-
- #define SC_CURSORPOSITIONX "CursorPositionX"
- #define SC_CURSORPOSITIONY "CursorPositionY"
-diff --git sc/inc/dociter.hxx sc/inc/dociter.hxx
-index 749e674..66274aa 100644
---- sc/inc/dociter.hxx
-+++ sc/inc/dociter.hxx
-@@ -206,8 +206,6 @@ private:
- ::std::auto_ptr<ScDBQueryParamBase> mpParam;
- ::std::auto_ptr<DataAccess> mpData;
-
-- bool GetThis(Value& rValue);
--
- public:
- ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam);
- /// Does NOT reset rValue if no value found!
-@@ -305,7 +303,6 @@ public:
- ScBaseCell* GetNext();
- SCCOL GetCol() { return nCol; }
- SCROW GetRow() { return nRow; }
-- ULONG GetNumberFormat();
-
- // setzt alle Entry.nField einen weiter, wenn Spalte
- // wechselt, fuer ScInterpreter ScHLookup()
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 372527f..3502362 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -616,6 +616,9 @@ public:
- Color& rColor, USHORT& rFlags ) const;
- SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const String& rComment,
- const Color& rColor, USHORT nFlags );
-+ SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const;
-+ SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor );
-+ SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const;
- void GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const;
- SC_DLLPUBLIC BOOL IsActiveScenario( SCTAB nTab ) const;
- SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc.
-diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
-index 2a78b15..a783120 100644
---- sc/inc/globstr.hrc
-+++ sc/inc/globstr.hrc
-@@ -571,9 +571,13 @@
- #define STR_STYLE_FAMILY_PAGE 434
-
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list