ooo-build r14610 - in trunk: . patches/dev300 patches/gstreamer patches/unittesting patches/vba
- From: tml svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14610 - in trunk: . patches/dev300 patches/gstreamer patches/unittesting patches/vba
- Date: Wed, 26 Nov 2008 16:04:03 +0000 (UTC)
Author: tml
Date: Wed Nov 26 16:04:03 2008
New Revision: 14610
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14610&view=rev
Log:
2008-11-26 Tor Lillqvist <tml novell com>
* patches/dev300/apply: Make dev300-m35 the oldest supported
milestone. Drop conditional sections that would select patches for
dev300 milestones earlier than dev300-m35. Drop conditional
sections that would select patches for ooo300 milestones
only. Drop patches that have been integrated in dev300-m35.
For many diff files I was not able to make them apply to
dev300-m35. These have been commented out with a comment "FIXME
2008-11-26". I had to bypass the VBAObjects and SVGImport patch
sets completely, unfortunately.
The owners of the affected patches need to fix them up. It is
possible that later milestones in the dev300 series will be more
similar to ooo300-m9 and that if you just wait a bit, the patches
will apply easier. In fact dev300-m36 is already out.
* patches/dev300/autocorrect-accidental-caps-lock-vcl.diff
* patches/dev300/build-java-target.diff
* patches/dev300/build-prebuilt-stax.diff
* patches/dev300/buildfix-enable-reportdesign-check.diff
* patches/dev300/calc-dp-drilldown-hidden-items.diff
* patches/dev300/calc-multiline-formula-ref.diff
* patches/dev300/chart-skip-hidden-cells-xmloff.diff
* patches/dev300/chart-subtitle-xls-export.diff
* patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff
* patches/dev300/default-ms-filter-convert.diff
* patches/dev300/extensions_configure.diff
* patches/dev300/extensions_deliver.diff
* patches/dev300/forms-radio-button-group-names.diff
* patches/dev300/gnome-vfs-locking-config_office.diff
* patches/dev300/layout-disable-experimental.diff
* patches/dev300/localize-pl-cygwin-paths.diff
* patches/dev300/novell-win32-agfa-monotype-fonts.diff
* patches/dev300/novell-win32-msi-patchability.diff
* patches/dev300/odf-converter-ignore-writerfilter.diff
* patches/dev300/pyuno-rpath-ooodir.diff
* patches/dev300/redirect-extensions.diff
* patches/dev300/reportdesign-useless-jfreereport-dep.diff
* patches/dev300/reportdesigner-no-license-m3.diff
* patches/dev300/reportdesigner-no-license.diff
* patches/dev300/sc-overwrite-char-font-attrs.diff
* patches/dev300/sc-paste-on-enter.diff
* patches/dev300/soffice-detect-mozilla-certificates.diff
* patches/dev300/speed-configmgr-misc.diff
* patches/dev300/store-install.diff
* patches/dev300/svg-import-filter.diff
* patches/dev300/svx-hatched-textmove.diff
* patches/dev300/vba-get-nonfiltered-range-selection.diff
* patches/dev300/win32-prebuilt-writingaids-zip.diff
* patches/dev300/zoom-combobox.diff
* patches/gstreamer/gstreamer-config-office.diff
* patches/unittesting/unittesting-basegfx.diff
* patches/unittesting/unittesting-configmgr.diff
* patches/unittesting/unittesting-stoc.diff
* patches/vba/basic-ide-module-object-name-combile.diff
* patches/vba/vba-support-export-palette.diff
* patches/vba/vba-userform-geometry-tweak.diff
* patches/vba/vba-workbook-worksheet-events.diff: Minor fixes to
make these diffs apply and compile with dev300-m35.
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff
trunk/patches/dev300/build-java-target.diff
trunk/patches/dev300/build-prebuilt-stax.diff
trunk/patches/dev300/buildfix-enable-reportdesign-check.diff
trunk/patches/dev300/calc-dp-drilldown-hidden-items.diff
trunk/patches/dev300/calc-multiline-formula-ref.diff
trunk/patches/dev300/chart-skip-hidden-cells-xmloff.diff
trunk/patches/dev300/chart-subtitle-xls-export.diff
trunk/patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff
trunk/patches/dev300/default-ms-filter-convert.diff
trunk/patches/dev300/extensions_configure.diff
trunk/patches/dev300/extensions_deliver.diff
trunk/patches/dev300/forms-radio-button-group-names.diff
trunk/patches/dev300/gnome-vfs-locking-config_office.diff
trunk/patches/dev300/layout-disable-experimental.diff
trunk/patches/dev300/localize-pl-cygwin-paths.diff
trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
trunk/patches/dev300/novell-win32-msi-patchability.diff
trunk/patches/dev300/odf-converter-ignore-writerfilter.diff
trunk/patches/dev300/pyuno-rpath-ooodir.diff
trunk/patches/dev300/redirect-extensions.diff
trunk/patches/dev300/reportdesign-useless-jfreereport-dep.diff
trunk/patches/dev300/reportdesigner-no-license-m3.diff
trunk/patches/dev300/reportdesigner-no-license.diff
trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
trunk/patches/dev300/sc-paste-on-enter.diff
trunk/patches/dev300/soffice-detect-mozilla-certificates.diff
trunk/patches/dev300/speed-configmgr-misc.diff
trunk/patches/dev300/store-install.diff
trunk/patches/dev300/svg-import-filter.diff
trunk/patches/dev300/svx-hatched-textmove.diff
trunk/patches/dev300/vba-get-nonfiltered-range-selection.diff
trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff
trunk/patches/dev300/zoom-combobox.diff
trunk/patches/gstreamer/gstreamer-config-office.diff
trunk/patches/unittesting/unittesting-basegfx.diff
trunk/patches/unittesting/unittesting-configmgr.diff
trunk/patches/unittesting/unittesting-stoc.diff
trunk/patches/vba/basic-ide-module-object-name-combile.diff
trunk/patches/vba/vba-support-export-palette.diff
trunk/patches/vba/vba-userform-geometry-tweak.diff
trunk/patches/vba/vba-workbook-worksheet-events.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Wed Nov 26 16:04:03 2008
@@ -7,7 +7,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../scsolver:../lwp
-OLDEST_SUPPORTED=dev300-m28 ooo300-m0
+OLDEST_SUPPORTED=dev300-m35
# -------- Functional sub-sets --------
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -168,16 +168,6 @@
# add accelerator to the OK and Cancel buttons.
ok-cancel-btn-add-accel.diff, kohei
-[ TemporaryHacks < dev300-m29 < ooo300-m1 ]
-
-# Detect MSVS9 if available
-msvs9-temporary-fix-m28.diff, i#88945, tml
-
-[ TemporaryHacks >= dev300-m29 >= ooo300-m1 ]
-
-# Detect MSVS9 if available
-msvs9-temporary-fix.diff, i#88945, i#93332, tml
-
[ TemporaryHacks ]
# fix the smoketest
@@ -253,8 +243,10 @@
# Make the historically very verbose build quieter, helps us see warnings.
quiet-build.diff, i#84497, michael
+[ TemporaryHacks ]
# further performance tweaks to configmgr
-speed-configmgr-misc.diff, i#84751, michael
+# FIXME 2008-11-26: doesn't compile in dev300-m35
+#speed-configmgr-misc.diff, i#84751, michael
# gcc OOMs here otherwise (x86_64)
writerfilter-qnametostr-NOOPTFILES.diff
@@ -270,10 +262,6 @@
# don't lstat() that much while creating absolute URLs
speed-sal-fewer-lstats.diff, i#89730, jholesov
-# fix build when PATH is set to something like /bin:"C:\blah\bleh":/ugh
-# (happened to me with DirectX SDK)
-buildfix-directx-path.diff, i#93333, jholesov
-
[ CJK ]
#set default CJK font fontsize as 10.5pt
@@ -290,6 +278,7 @@
# insert Chinese forbidden characters at start or end of line into i18npool module
cjk-insert-forbidden-characters-into-i18npool.diff, Amelia Wang
+[ CJK < dev300-m36 ]
i92072-textgrid-fix.diff, i#92072, Fong
#[ CJKTemporaryHacks ]
@@ -312,11 +301,9 @@
wpsimport-writerperfect.diff
libwps.diff
-[ CWSBackports ]
#basic runtime fixes
basic-add-missing-includes-after-cws-npower10.diff
-cws-pflin10.diff
#api changes
cws-npower11.diff
@@ -337,10 +324,6 @@
# JDKs too
buildfix-qadevOOo-java-encoding.diff, brosenk
-[ GCJ < ooo300-m2 < dev300-m30 ]
-# Seems that bug #69026 is back
-gcj-workaround-serializer.diff
-
# Fixes that were not accepted up-stream, but are still useful
[ FixesNotForUpstream ]
# Make debugging nicer under unix
@@ -351,26 +334,13 @@
# make menu layout prettier
vcl-menu-fixes.diff, i#67123, michael
-[ FixesNotForUpstream < dev300-m31 < ooo300-m5 ]
-# Tell the desktop we support the VFS
-uses-vfs-m30.diff, i#43504, michael
-[ FixesNotForUpstream >= dev300-m31 >= ooo300-m5 ]
# Tell the desktop we support the VFS
uses-vfs.diff, i#43504, michael
-[ FixesNotForUpstream < dev300-m30 ]
-# add mozilla certificate dir detection to soffice
-soffice-detect-mozilla-certificates.diff
-
-[ FixesNotForUpstream <= dev300-m30 <= ooo300-m3 ]
-redirect-extensions-m30.diff
-[ FixesNotForUpstream > dev300-m30 > ooo300-m3 <= dev300-m31 <= ooo300-m8 ]
-redirect-extensions-m8.diff
-[ FixesNotForUpstream > dev300-m31 > ooo300-m8 ]
# re-direct to plugins via http://extensions.go-oo.org/
redirect-extensions.diff
-[ BuildBits >= ooo300-m4 < ooo300-m7 ]
+[ BuildBits ]
reportdesign-useless-jfreereport-dep.diff
[ FixesNotForUpstream ]
@@ -390,28 +360,18 @@
# no bogus license question when registering these extensions
#solenv-no-extension-license.diff
-[ FixesNotForUpstream < ooo300-m4 ]
-reportdesigner-no-license-m3.diff
-[ FixesNotForUpstream < ooo300-m6 ]
-reportdesigner-no-license-m5.diff
-
-[ ExtensionFixes >= ooo300-m6 ]
-reportdesigner-no-license.diff
[ ExtensionFixes ]
+reportdesigner-no-license.diff
+
presentation-minimizer-no-license.diff
presenterscreen-no-license.diff
# extensions: fix & unbundle system java
-extensions-system-java.diff, hmth
+# FIXME 2008-11-26: huh?
+#extensions-system-java.diff, hmth
# Fixing build breake in apache-common module when you use UTF-8 based locale in the build system
apache-commons-build-fix-invalid-chars.diff, kami
-[ FixesNotForUpstream < ooo300-m3 ]
-pdfimport-no-license-m2.diff
-
-[ FixesNotForUpstream >= ooo300-m3 < ooo300-m6 ]
-pdfimport-no-license-m5.diff
-
-[ ExtensionFixes >= ooo300-m6 ]
+[ FixesNotForUpstream ]
pdfimport-no-license.diff
[ ExtensionFixes ]
@@ -431,20 +391,11 @@
# IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
build-ant-1.6.diff, i#90830, pmladek
+[ Fixes ]
# FIXME: Was fixed in m1 as masterfix. I'd bet it will be in m30, too, but...
-[ Fixes >= dev300-m30 >= ooo300-m1 ]
# more intelligent nsplugin seeking
nsplugin-path.diff, i#49590, michael
-[ Fixes < dev300-m30 < ooo300-m1 ]
-# more intelligent nsplugin seeking
-nsplugin-path-m28.diff, i#49590, michael
-[ Fixes < dev300-m31 < ooo300-m4 ]
-sd-builddep.diff, i#92662, michael
-# fix parallel build in desktop
-desktop-builddep.diff, i#92818, michael
-
-[ Fixes ]
# sd printing fixes
printing-bugfix-254573.diff, n#254573, rodo
@@ -462,10 +413,6 @@
# Fix for n#113235
wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
-# do not shrink a string in some localizations;
-# the width was too small without any reason
-wizards-form-fit-french-localization.diff, n#340679, i#89475, pmladek
-
# testtool doesn't like oobuild basic compatability defaults
# ooo-build only fix n#145906#
automation-testtool-oobuildfix.diff, n#145906, noelpwer
@@ -492,10 +439,12 @@
# fix that allows OOo to work with a standard (unpatched) libjpeg,
jpegc.c.diff, i#80674, n#272574, flr
-[ Fixes ]
+
+[ Fixes < dev300-m36 ]
# handle hyperlinks to files better
sw-hyperlinks-relative.diff, n#405712, i#91522, jholesov
+[ Fixes ]
# process relative SMB paths (in hyperlinks) correctly
tools-urlobj-smb-scheme-patch.diff, n#261623, flr
samba-hyperlinks-sc-sd.diff, n#382718, jholesov
@@ -514,16 +463,16 @@
#document ( containing macros ) crashing
save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
+[ Fixes < dev300-m36 ]
# prevent some array out of bounds in ww8 exporter
sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff, n#391197, i#91396, fridrich
-# adds fixes for printing transparent content
-vcl-transparent-printing.diff, i#88536, thorsten
-
+[ Fixes ]
localize-pl-cygwin-paths.diff, tml
# import/export form control's visibility
-form-control-visibility.diff, i#88878, jianhua
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#form-control-visibility.diff, i#88878, jianhua
# import tooltip for userforms
import-controls-tooltip.diff, i#90124, noelpwer
@@ -534,7 +483,8 @@
# fix path to the python binary in the mailmerge.py script
# /bin/python does not exists and breaks the automatic rpm dependencies
-scripting-mailmerge-python-binary.diff, pmladek
+# FIXME 2008-11-26: the mailmerge.py in dev300-m35 doesn't have any #! line at all!?
+#scripting-mailmerge-python-binary.diff, pmladek
# initialize the default locale in the resource manager
# for example, it fixes unopkg to do not show random localization
@@ -568,14 +518,12 @@
pythonloader-no-DEBUG.diff, i#90653
-[ Fixes < dev300-m31 < ooo300-m5 ]
-# fixes the realpath buffer size to avoid crash when detecting soffice path
-cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
-
[ TemporaryHacks ]
-xmloff-field-patch.diff, flr, n#248354
+# FIXME 2008-11-26: partly applies to dev300-m35 with several "fuzz 2", partly not at all
+#xmloff-field-patch.diff, flr, n#248354
-[ RadioButtons ]
+[ RadioButtons > dev300-m99 ]
+# FIXME 2008-11-26: these don't apply in dev300-m35
# Add a GroupName property to RadioButtons so that RadioButtons don't need to
# share the same name to be part of the same group.
forms-radio-button-group-names.diff, n#310052, i#30823, jonp
@@ -630,12 +578,9 @@
gnome-vfs-late-init.diff, i#84137, jholesov
-[ QuickStarter <= dev300-m30 <= ooo300-m3 ]
-unxsplash-rework-m30.diff, i#60696, michael/jholesov
-[ QuickStarter > dev300-m30 > ooo300-m3 ]
+[ QuickStarter ]
unxsplash-rework.diff, i#60696, michael/jholesov
-[ QuickStarter ]
# fix the systray quickstarter
sfx2-quickstarter-fix.diff, i#88382, michael
@@ -768,7 +713,10 @@
sc-excel-chart-default-xlabels.diff, n#257079, i#83679, kohei
# Fix autoshape excel hyperlink import OOo ( depends on vba-sc-handleautoshapemacro-import.diff )
-vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
+# FIXME 2008-11-26: doesn't apply to dev300-m35, maybe because of lack of diffs
+# above that has also been bypassed
+# vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
+
# Delete Rows/Delete Columns should remember the content so that the user is
# able to paste it elsewhere (similar to Insert Cut Cells in Excel)
sc-delete-rows-columns-remembers-content.diff, i#71921, jholesov
@@ -776,9 +724,10 @@
# load, store and save the sheet protection options from and to an Excel file,
# and use that information to constrain cell cursor movement when the sheet is
# protected. Also to support encryption on Excel file export.
-cws-scsheetprotection02-sc.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-svx.diff, i#60305, i#71468, i#84766, kohei
+# FIXME 2008-11-26: don't apply to dev300-m35
+#cws-scsheetprotection02-sc.diff, i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
+#cws-scsheetprotection02-svx.diff, i#60305, i#71468, i#84766, kohei
# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets.diff, n#335684, i#45497, jonp
@@ -869,9 +818,10 @@
# Pivot cache field import fix.
calc-dp-pivotcache-fix.diff, n#433658, i#96326, kohei
-[ CalcFixes < ooo300-m3 ]
+[ CalcFixes ]
# Fix a regression on filtering by page field.
-calc-fix-datapilot-date-filter.diff, i#90022, kohei
+# FIXME 2008-11-26: lots of failed chunks for dev300-m35
+#calc-fix-datapilot-date-filter.diff, i#90022, kohei
[ LinuxOnly ]
# accelerate linking, by extreme cunning i#63927
@@ -910,16 +860,6 @@
scroll-accel-sc.diff, n#375909, i#71362, kohei
scroll-accel-vcl.diff, n#375909, i#71362, kohei
-# Clean up code by removing the obsolete SFX_NOTIFY.
-sfxnotify-removal-automation.diff, i#89804, kohei
-sfxnotify-removal-basic.diff, i#89805, kohei
-sfxnotify-removal-chart2.diff, i#89806, kohei
-sfxnotify-removal-sc.diff, i#89807, kohei
-sfxnotify-removal-sd.diff, i#89809, kohei
-sfxnotify-removal-sfx2.diff, i#89810, kohei
-sfxnotify-removal-svx.diff, i#89811, kohei
-sfxnotify-removal-svtools.diff, kohei
-
# reduce mininum password length from 5 to 1.
min-password-length-sfx2.diff, i#85453, kohei
@@ -957,8 +897,6 @@
# Fix the system default fpicker
default-system-fpicker.diff, michael
-[ NotDebian ]
-
# Disable the printer properties which are unused#583
# related issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=353595
# also last comment in: https://bugzilla.novell.com/show_bug.cgi?id=83925
@@ -981,18 +919,9 @@
# Swap the delete and backspace key bindings but leave the menus alone.
sc-default-delete-backspace-key.diff, i#17965, kohei
-[ CustomUserConfig < dev300-m29 < ooo300-m1 ]
-
-# migrate keyboard shortcuts & reset character set for CSV import dialog.
-desktop-config-migration-m28.diff n#367160, n#376473, kohei
-
-[ CustomUserConfig >= dev300-m29 >= ooo300-m1 ]
-
# migrate keyboard shortcuts & reset character set for CSV import dialog.
desktop-config-migration.diff n#367160, n#376473, n#421070, kohei/jholesov
-[ CustomUserConfig ]
-
# To make CSV Text Import settings persistent.
sc-preserve-imp-opts.diff, i#3687, muthusub
@@ -1019,15 +948,8 @@
# to download it from elsewhere
reportdesign-mention-package.diff, rengelha
-
-[ DebianOnly >= dev300-m20 >= ooo300-m1]
-SectionOwner => rengelha
# fix the splash progressbar colors
debian-splash.diff
-[ DebianOnly < dev300-m30 < ooo300-m1 ]
-SectionOwner => rengelha
-# fix the splash progressbar colors
-debian-splash-m29.diff
[ DroplineGNOMEOnly ]
SectionOwner => DropLine
@@ -1087,19 +1009,9 @@
libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
-[ BuildBits < dev300-m39 < ooo300-m1 ]
-# fix the --enable-reportdesign configure check to work
-buildfix-enable-reportdesign-check.diff, i#87518, pmladek
-
-# fix evo2 driver build
-buildfix-connectivity-evoab2.diff, i#91025, pmladek
-
-[ BuildBits <= dev300-m30 <= ooo300-m3 ]
-novell-win32-agfa-monotype-fonts-m30.diff, tml
-[ BuildBits > dev300-m30 > ooo300-m3 ]
+[ BuildBits ]
novell-win32-agfa-monotype-fonts.diff, tml
-[ BuildBits ]
# allow to define java target, so the build is usable with the JVM 1.5
# even when it is built with JDK 1.6
build-java-target.diff, i#93115, pmladek
@@ -1122,9 +1034,6 @@
# enable build with IBM Java 1.6.0
build-ibm-java-enable.diff, i#93114, pmladek
-# fixed build with IBM Java 1.6.0
-bean-ibm-java.diff, i#93113, pmladek
-
# allow to use the prebuilt jsr173_1.0_api.jar
build-prebuilt-stax.diff, i#93116, pmladek
@@ -1144,9 +1053,6 @@
[ Gcc43 ]
# gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
buildfix-bridges-strdup-header.diff, i#89762, kohei
-[ Gcc43 < dev300-m30 < ooo300-m3 ]
-buildfix-filter-memcmp-header.diff, i#89803, kohei
-[ Gcc43 >= dev300-m30 >= ooo300-m3 ]
buildfix-sdext-memcmp-header.diff, i#89803, kohei
[ Java14 ]
@@ -1171,18 +1077,6 @@
novell-win32-vrb-branding.diff, n#191913, i#68817
novell-win32-registry-branding.diff, n#191913
-[ NovellOnlyWin32 < dev300m30 < ooo300-m2 ]
-SectionOwner => tml
-
-win32-prebuilt-writingaids-zip-m1.diff
-win32-prebuilt-writingaids-zip-scp2-m1.diff
-
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m2 < ooo300-m3]
-SectionOwner => tml
-
-win32-prebuilt-writingaids-zip-m2.diff
-win32-prebuilt-writingaids-zip-scp2-m2.diff
-
[ NovellOnlyWin32 >= dev300m30 >= ooo300-m3 ]
SectionOwner => tml
@@ -1297,9 +1191,6 @@
# do not pack any potential .orig files with ppds
psprint_config-no-orig.diff, jholesov
-[ BuildBits < ooo300-m7 ]
-lucene-no-java.diff
-
[ DebianOnly ]
seamonkey-is-iceape.diff
@@ -1308,10 +1199,6 @@
# FIXME: is anybody using this feature?
#FIXME src680: separate-helpcontent.diff, jholesov
-# use --hash-style=gnu linking when supported
-# disabled for Debian as Debian policy (for now) is to use=both
-speed-hash-style.diff, pmladek
-
# bind all those function / named relocations locally
speed-symbolic-functions.diff, i#85679, pmladek
@@ -1329,7 +1216,7 @@
system-db-4.3-use-lpthread.diff, i#58474, rengelha
-[PLDOnly]
+[ PLDOnly ]
SectionOwner => arekm
# fix build of sal project
@@ -1338,11 +1225,6 @@
sfx2-badscript.diff, i#67976
-[ BuildBits < ooo300-m2 < dev300-m30 ]
-# add automatical detection of serializer.jar into the configure
-# add it to classpath on one more place
-xalan-serializer-jar-more.diff, pmladek
-
[ BuildBits ]
# work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
svx-customshapes-NOOPTFILES.diff, martink
@@ -1404,11 +1286,6 @@
# enable vcl to load bitmaps when height it negative
vcl-bitmap2-negative-height.diff
-# Make sure that the colors between selected and unselected tabs can be
-# distinguished by using appropriate theme colors.
-native-theme-tab-colors-svtools.diff, n#396386, i#94452, kohei
-native-theme-tab-colors-vcl.diff, n#396386, i#94452, kohei
-
# There's no reason to arbitrary use smaller icons - it looks ugly in the
# modern desktop environments
vcl-bigger-icons-kde-gnome.diff, i#95220, jholesov
@@ -1520,19 +1397,8 @@
mozilla-buildlibs-win32.diff, i#58741, davidf
# This enables building scsolver on Win32
boost-patch.diff, tml
-
-[ Win32Only < dev300-m29 < ooo300-m1 ]
-
-# Multi-language installer stuff
-win32-multi-lang-installer-m28.diff, i#66062, i#88638, i#88639, tml
-
-[ Win32Only >= dev300-m29 >= ooo300-m1 ]
-
# Multi-language installer stuff
win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
-
-[ Win32Only ]
-
# fixes for visual studio express 2005 ( ooo-build only )
2005-express-stl-remove.diff, noelpwer, i#71404
@@ -1632,7 +1498,8 @@
mono-climaker-config.diff
mono-climaker-bridgetest.diff
-[ VBAObjects ]
+# FIXME 2008-11-26: easiest to skip all this...
+[ VBAObjects > dev300-m99 ]
SectionOwner => noelpwer
@@ -1658,7 +1525,8 @@
# address.
vba-get-nonfiltered-range-selection.diff, n#415002, kohei
-[ VBAObjects ]
+# FIXME 2008-11-26: easiest to skip all this...
+[ VBAObjects > dev300-m99 ]
#associating sheet and codename when insert a sheet
# sc-insert-sheet-codename.diff, i#80869, jianhua
@@ -1684,18 +1552,22 @@
sc-source-ui-vba-makefile-mk.diff
# export of macro bindings for shapes
-sc-export-shape-macro-bindings.diff, n#304739, noelpwer
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#sc-export-shape-macro-bindings.diff, n#304739, noelpwer
# export of hlink bindings for shapes
-sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
# attributes present in the vba streams can override the default shape name
# used for the control in the binary format
-sc-vbaimport-override-controlname.diff, n#359933, noelpwer
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#sc-vbaimport-override-controlname.diff, n#359933, noelpwer
# Application.Caller
api-application-caller.diff, n#339941, noelpwer
-default-autotext-and-form-name.diff, n#353687
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#default-autotext-and-form-name.diff, n#353687
# fix --disable-vba build
oovbaapi-disable-vba.diff
@@ -1711,21 +1583,28 @@
vba-support-properties-inmodules.diff
controls-with-images-in-document.diff, i#38215, noelpwer
# import graphic for image control
-controls-with-images-import.diff, Fong
+# FIXME 2008-11-26: causes compilation error in dev300-m35
+#controls-with-images-import.diff, Fong
#use of form control models in userforms/dialogs, additionally
#enables use of document embedded images in image control for
#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
-enhanced-form-userform-controls.diff, noelpwer
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#enhanced-form-userform-controls.diff, noelpwer
# object module support... getting there
-ObjectModule.diff
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#ObjectModule.diff
# userform ( depends on ObjectModule.diff )
-vba-userform.diff
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#vba-userform.diff
# fix userform activate event re-compute; extracted from vcl92
-vba-userform-activate-fix.diff, i#91038
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#vba-userform-activate-fix.diff, i#91038
# uno interface for vba mode
-vba-compatible-mode-uno.diff, Fong
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#vba-compatible-mode-uno.diff, Fong
# support to display spinbutton in userform
-vba-spinbutton-in-userform.diff, Fong
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#vba-spinbutton-in-userform.diff, Fong
vbaevents-services-sources.diff, i#68893
@@ -1740,7 +1619,8 @@
# comparison of tow empty type fix in vba mode
vba-empty-comparison-fix.diff, n#397438, Fong
# Add Worksheet.EnableSelection ( depends on cws-scsheetprotection02-sc.diff )
-vba-worksheet-enableselection.diff, n#405312, Fong
+# FIXME 2008-11-26: dependency on commented out diff
+#vba-worksheet-enableselection.diff, n#405312, Fong
# keywords (including NAME, LINE, TEXT) can be used as variable
vba-keyword-fix.diff, n#403586, Fong
@@ -1753,19 +1633,23 @@
#the other ( no idea )
userform-possible-groupingtweak.diff
#disable to delete or rename objectmodule name in basic ide
-basic-ide-objectmodule.diff, Fong
+# FIXME 2008-11-26: doesn't compile on dev300-m35
+#basic-ide-objectmodule.diff, Fong
# display a friendly name for objectmodule tab
-basic-ide-module-object-name-combile.diff, Fong
-vba-fix-ide-friendly-modulename.diff, n#439971, Fong
+# FIXME 2008-11-26: doesn't compile on dev300-m35
+#basic-ide-module-object-name-combile.diff, Fong
+#vba-fix-ide-friendly-modulename.diff, n#439971, Fong
# display a friendly basic macro tree in macrochoose dialog
-vba-basic-macrochoose-dialog.diff, Fong
-vba-fix-basic-macro-organizer.diff, n#439972, Fong
+# FIXME 2008-11-26: doesn't compile on dev300-m35
+#vba-basic-macrochoose-dialog.diff, Fong
+#vba-fix-basic-macro-organizer.diff, n#439972, Fong
# fix bug accessing default member of userform control
range-listBox-compare.diff, n#421939
# fix bug comparing string that can't be converted to number
stringnumbercompare.diff, n#422559
# fix import sizes and geometry of userforms
-vba-userform-geometry-tweak.diff
+# FIXME 2008-11-26: doesn't apply because some diff above is skipped because of a FIXME
+#vba-userform-geometry-tweak.diff
# n#426415
vba-allow-forms-resetvalue-binding.diff
# n#426415
@@ -1820,10 +1704,6 @@
vba-fix-docmodule-import-crash.diff, n#447560
-[ VBAObjects < ooo300-m3 ]
-bytearray-string-fix.diff, i#91911, Fong
-
-
[ Features ]
# Pre- and postprocessing capabilities for loading and saving.
sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
@@ -1899,20 +1779,23 @@
calc-formula-datevalue-strip-time.diff, i#94765, kohei
# Implement external range names.
-calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
-calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
+#calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
# Additional fix for the external range name implementation.
-calc-external-defined-names-sc-fixes.diff, i#3740, i#4385, n#355685, kohei
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#calc-external-defined-names-sc-fixes.diff, i#3740, i#4385, n#355685, kohei
# Don't adjust row height on xls load for better layout preservation and
# faster file load.
calc-xls-disable-adjust-row-height.diff, kohei
# Support PHONETIC function to display asian phonetic guide.
-calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
[ CalcSolver ]
SectionOwner => kohei
@@ -2096,11 +1979,7 @@
gstreamer-sd.diff
gstreamer-scp2.diff
gstreamer-config-office.diff
-[ GStreamer < ooo300-m7 ]
-gstreamer-slideshow-m6.diff
-[ GStreamer >= ooo300-m7 ]
gstreamer-slideshow.diff
-[ GStreamer ]
gstreamer-solenv.diff
gstreamer-svtools-content-types.diff
gstreamer-avmedia-file-types.diff
@@ -2131,8 +2010,6 @@
# warning: comparison with string literal results in unspecified results
warning-string-comparsion-sw.diff, i#86880, i#86772, pmladek
-[ Shrink ]
-
# don't export trivial strings in svtools, increases linking time, bloats size
svtools-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
@@ -2147,7 +2024,8 @@
jvmfwk-gij32.diff, n#222708, pmladek
-[ SVGImport ]
+# FIXME 2008-11-26: doesn't compile
+[ SVGImport > dev300-m99 ]
# A bit less partial implementation of SVG import
# Work in progress, but fairly usable already
svg-import-filter.diff, thorsten
@@ -2164,10 +2042,7 @@
# much improved text import
svg-import-textimport.diff, thorsten
-[ NovellOnlyWin32 < dev300m30 < ooo300-m2 ]
-novell-win32-msi-patchability-m1.diff, tml
-
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m2 ]
+[ NovellOnlyWin32 ]
novell-win32-msi-patchability.diff, tml
[ MacOSXOnly ]
@@ -2195,7 +2070,6 @@
store-registry.diff
-[ Store ]
# don't burn 3% of startup doing CRC's we don't need
speed-store.diff, i#78495, michael
# don't do a load of locking we don't need to 1% of startup
@@ -2207,57 +2081,44 @@
wmf-pattern-brush.diff, n#232232, rodo
-[ LayoutDialogs < dev300-m29 >= ooo300-m0 ]
-SectionOwner => jannieuw
-
-cws-layoutdialogs-offapi.diff
-cws-layoutdialogs-scp2.diff
-cws-layoutdialogs-svx.diff
-cws-layoutdialogs-sw.diff
-cws-layoutdialogs-toolkit.diff
-cws-layoutdialogs-toolkit-remove-paragraph.diff
-
-[ LayoutDialogs < dev300-m29 < ooo300-m0 ]
-cws-layoutdialogs-transex3.diff
-[ LayoutDialogs < dev300-m0 >= ooo300-m1 ]
-cws-layoutdialogs-transex3-ooo300.diff
-
[ LayoutDialogs ]
# make it build with dev300-m19 - Janneke, please check :-)
#buildfix-layoutdialogs-transex3.diff
# use old style widgets as plugin in a layout dialog
-layout-plugin-toolkit.diff
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#layout-plugin-toolkit.diff
# use one or more layout tabpages in old .src tabbed dialog
-layout-tab-toolkit.diff
-layout-tab-sfx2.diff
-layout-tab-sc.diff
-layout-tab-scp2.diff
-layout-tab-svx.diff
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#layout-tab-toolkit.diff
+#layout-tab-sfx2.diff
+#layout-tab-sc.diff
+#layout-tab-scp2.diff
+#layout-tab-svx.diff
# convert some simple dialogs to layout engine
-layout-simple-dialogs-offapi.diff
-layout-simple-dialogs-sc.diff
-layout-simple-dialogs-scp2.diff
-layout-simple-dialogs-scripting.diff
-layout-simple-dialogs-sd.diff
-layout-simple-dialogs-sfx2.diff
-layout-simple-dialogs-solenv.diff
-layout-simple-dialogs-starmath.diff
-layout-simple-dialogs-svx.diff
-layout-simple-dialogs-sw.diff
-layout-simple-dialogs-toolkit.diff
-layout-simple-dialogs-vcl.diff
-layout-tab-sfx2-fix.diff, thorsten
+#layout-simple-dialogs-offapi.diff
+#layout-simple-dialogs-sc.diff
+#layout-simple-dialogs-scp2.diff
+#layout-simple-dialogs-scripting.diff
+#layout-simple-dialogs-sd.diff
+#layout-simple-dialogs-sfx2.diff
+#layout-simple-dialogs-solenv.diff
+#layout-simple-dialogs-starmath.diff
+#layout-simple-dialogs-svx.diff
+#layout-simple-dialogs-sw.diff
+#layout-simple-dialogs-toolkit.diff
+#layout-simple-dialogs-vcl.diff
+#layout-tab-sfx2-fix.diff, thorsten
# FIXME: hack to avoid internal copiler error with gcc (SUSE Linux) 4.3.2 20080613 (prerelease)
# on openSUSE-11.1-alpha0; pmladek is discussing it with the gcc team
-toolkit-layout-gcc-4.3.2-hack.diff, pmladek
+#toolkit-layout-gcc-4.3.2-hack.diff, pmladek
# These merge with the layoutdialogs2 cws
-layout-disable-experimental.diff
-layoutdialogs2-development.diff
+#layout-disable-experimental.diff
+#layoutdialogs2-development.diff
[ AutoCorrectCapsLock ]
SectionOwner => kohei
@@ -2430,22 +2291,20 @@
[ DebianBaseSystemJFreeReport ]
debian-system-jfreereport.diff
+
[ DebianBaseSystemApacheCommons ]
debian-system-apache-commons.diff
-[ DebianBaseSystemLucene >= dev300-m30 >= ooo300-m1 ]
+
+[ DebianBaseSystemLucene ]
debian-system-lucene.diff
-[ DebianBaseSystemLucene < dev300-m30 < ooo300-m1 ]
-debian-system-lucene-m29.diff
-[ DebianBaseOnly >= dev300-m30 >= ooo300-m1 ]
+[ DebianBaseOnly ]
configures-explicit-arch.diff
-[ DebianBaseOnly < dev300-m30 < ooo300-m1 ]
-configures-explicit-arch-m29.diff
+
[ Fixes ]
svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
goodies-eps-filter-unix.diff, n#200053, rodo
-xmloff-import-crash-fix-for-i90562.diff, i#90562, flr
[ EMFPlus ]
SectionOwner => rodo
@@ -2470,7 +2329,6 @@
linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
-[ LinkWarningDlg ]
linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
linkwarn-svx-warning-dlg.diff, n#348149, thorsten
linkwarn-sd-no-dnd-links.diff, n#348149, thorsten
@@ -2482,10 +2340,7 @@
extensions_configure.diff
extensions_packinfo.diff
-[ IntegrateExtensions < ooo300-m2 ]
-extensions_deliver-m2.diff
-
-[ IntegrateExtensions >= ooo300-m2 ]
+[ IntegrateExtensions ]
extensions_deliver.diff
@@ -2558,15 +2413,8 @@
[ TemporaryHacks ]
# First work on field enhancements...
-offapi-field-patch.diff, flr, n#248354
-svtools-field-patch.diff, flr, n#248354
-sw-field-patch.diff, flr, n#248354
-sw-field-patch-fix-competing-protection.diff, flr, n#400884
-
-[ NovellOnly ]
-#only enable enhanced field work in Novell OOo by default
-officecfg-field-patch.diff, flr, n#248354
-
+# FIXME 2008-11-26: check this
+#sw-field-patch-fix-competing-protection.diff, flr, n#400884
[ Fixes ]
#sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
@@ -2594,9 +2442,10 @@
# have Impress outline text boxes shrink font automatically when text
# starts to overflow
-fit-list-to-size.diff, i#94086, thorsten
-fit-list-to-size-ui.diff, i#94086, thorsten
-fit-list-to-size-style-defaults.diff, i#94086, thorsten
+# FIXME 2008-11-26: doesn't apply to dev300-m35
+#fit-list-to-size.diff, i#94086, thorsten
+#fit-list-to-size-ui.diff, i#94086, thorsten
+#fit-list-to-size-style-defaults.diff, i#94086, thorsten
# apply this patch if you need to disable vcl grabbing your mouse -
# after applying the patch, set SAL_NO_MOUSEGRABS in your env
@@ -2653,31 +2502,12 @@
cppcanvas-fix-roundcorners.diff, rodo
slideshow-media-control.diff, i#91250, thorsten
-[ Fixes < dev300-m29 < ooo300-m1 ]
-vcl-linking-randr.diff, i#90809, n#398244, thorsten
-vcl-gtk-slideshow-crash.diff, i#91496, thorsten
-
-[ Fixes ]
sd-macro-nudges.diff, i#91249, n#188199, thorsten
sd-more-title-styles.diff, i#23221, thorsten
officecfg-bighandles-default.diff, thorsten
-[ Fixes < dev300-m29 < ooo300-m1 ]
-config_office-msvc-compat-m28.diff, i#93332, thorsten
-
-[ Fixes >= dev300-m29 >= ooo300-m1]
-config_office-msvc-compat.diff, i#93332, thorsten
-
-# support msvc 2008 express in oowintool
-buildfix-msvc2008-express.diff, i#93332, jholesov
-
-[ Fixes < dev300-m29 < ooo300-m1 ]
-config_office-disable-atl.diff, thorsten
-
-[ Fixes ]
xmlsecurity-disable-moz.diff, thorsten
-solenv-paths.diff, caolan
cairocanvas-colorspace-fix.diff, thorsten
slideshow-colorspace-fix.diff, thorsten
slideshow-cutblack.diff, thorsten
@@ -2692,7 +2522,8 @@
sw-source-filter-xml-xmltbli-uninitializedvalue.diff, fridrich
-vcl-salnativewidgets-uninitializedvalues.diff, fridrich
+# FIXME 2008-11-26: fails for dev300-m35
+#vcl-salnativewidgets-uninitializedvalues.diff, fridrich
[ LocalizeFixes ]
# it is Y axis, not X one [in Spanish]
@@ -2723,10 +2554,7 @@
libwps-testing.diff
writerperfect-testing.diff
-[ PieceBits <= dev300-m30 <= ooo300-m3 ]
-# zipintro is not kind to us ...
-piece-desktop-m30.diff
-[ PieceBits > dev300-m30 > ooo300-m3 ]
+[ PieceBits ]
# zipintro is not kind to us ...
piece-desktop.diff
@@ -2784,7 +2612,8 @@
piece-desktop-avoid-user-conf-symlinks.diff, pmladek
[ BFFixes ]
-fit-list-to-size-binfilter.diff, i#94086, thorsten
+# FIXME 2008-11-26: compilation error in dev300-m35
+#fit-list-to-size-binfilter.diff, i#94086, thorsten
[ ArkOnly ]
SectionOwner => brosenk
@@ -2792,24 +2621,11 @@
# See what breaks if we build with more optimizations
testing-more-optimizations-ark.diff
-[ Fixes <= dev300-m30 <= ooo300-m3 ]
-win32-mergemodule-pm-m30.diff, i#93065, tml
-[ Fixes > dev300-m30 > ooo300-m3 < ooo300-m6 ]
-win32-mergemodule-pm.diff, tml
-
-
[ Fixes ]
svtools-update-ole.diff, n#411855, thorsten
vcl-logical-bmp-size.diff, i#92902, thorsten
-[ Fixes < dev300-m30 < ooo300-m3 ]
-pdfimport-system-poppler-m29.diff, i#92920, cmc
-pdfimport-lax-restrictions-m29.diff, i#90468, thorsten
-[ Fixes == dev300-m30 == ooo300-m3 ]
-pdfimport-system-poppler-m30.diff, i#92920, cmc
-pdfimport-lax-restrictions.diff, i#90468, thorsten
-[ ExtensionFixes >= dev300-m31 >= ooo300-m4 ]
-pdfimport-system-poppler.diff, i#92920, cmc
+[ ExtensionFixes ]
pdfimport-lax-restrictions.diff, i#90468, thorsten
[ NovellOnlyWin32 ]
@@ -2820,15 +2636,12 @@
[ Fixes ]
#sw-import-TOC.diff ,n#404254, Amelia Wang
-gnome-fpicker-transient-win.diff, i#92878, cmc
gnome-fpicker-main-thread.diff, i#93366, cmc
jurt-jnilib-deliver.diff, i#93516, thorsten
solenv-silent-mac-build.diff, thorsten
-ppt-continuous-numbering-fix.diff, n#411565, thorsten
-o3tl-fix-warnings.diff, i#92941, cmc
+# FIXME 2008-11-26: doesn't apply to dev300-m35, fix for the problem already there?
+#ppt-continuous-numbering-fix.diff, n#411565, thorsten
sdext-presenterview-thread-suicide.diff, n#425072, thorsten
-vcl-fix-screen-number.diff, n#426521, i#93986, thorsten
-vcl-fix-gtk-fullscreen-crash.diff, i#93805, dtardon
timely-canvas-disposing.diff, i#94007, thorsten
# only build full package for en_US, use langpacks for the rest
instset-prefer-langpacks.diff, thorsten
@@ -2840,9 +2653,11 @@
sal-disable-backtrace.diff, thorsten
valgrind-fix-warnings.diff, i#95197, thorsten
cws-impress163-sd.diff, thorsten
-cws-impress163-svx.diff, thorsten
+# FIXME 2008-11-26:
+#cws-impress163-svx.diff, thorsten
cws-impress163-slideshow.diff, thorsten
-sw-invert-border-spacing.diff, n#391591, flr
+# FIXME 2008-11-26:
+#sw-invert-border-spacing.diff, n#391591, flr
cppcanvas-axial-gradient-fix.diff, i#95341, thorsten
cws-impress162-sd.diff, i#94193, thorsten
cws-impress162-canvas.diff, i#94193, thorsten
@@ -2888,27 +2703,17 @@
# Fuzzing work n#228555
crash-sot.diff, i#94845, michael
-[ ImpressFontSize ]
-[ Fixes <= dev300-m30 <= ooo300-m3 ]
-cws-impressfontsize-m30.diff, i#8824, cl
-[ Fixes > dev300-m30 > ooo300-m3 ]
+[ Fixes ]
cws-impressfontsize.diff, i#8824, cl
-[ UnusedMethodsRemoval < dev300-m33 ]
-# Patches in this section remove unused methods identified by callcatcher.
-# This section should always be at the bottom so that no other patches would
-# depend on it.
-
-unused-methods-removal-sc.diff, i#85185, kohei
-
-
[ Fixes ]
# Drop the lame and misleading tooltips for the icon on the desktop
# and in the Start Menu on Windows
win32-tooltips.diff, tml
# avoid annoying warning
-warning-spin-button.diff, i#95554, michael
+# FIXME 2008-11-26: already in?
+#warning-spin-button.diff, i#95554, michael
# disable gnome-vfs bits if we are not building with it enabled
crash-gvfs.diff, i#95689, michael
@@ -2919,16 +2724,15 @@
# fix problem with calling private and protected members in layout code
sfx2-privateprotectedpublic.diff
-# stop font updatess crashing OO.o - to be merged up-stream
-# soon, hence < m28
-[ CairoFonts < dev300-m28 >= ooo300-m9 ]
-psprint.defconfig_changes.diff, n#436441, flr
-[ CairoFonts < dev300-m28 < ooo300-m9 ]
-psprint.defconfig_changes-m7.diff, n#436441, flr
-
[ NestedTables ]
SectionOwner => jholesov
# implementation of nested tables
cws-hb10.diff
cws-hb11.diff
+
+[ UnusedMethodsRemoval ]
+# Patches in this section remove unused methods identified by callcatcher.
+
+# NOTE! This section should always be at the bottom so that no other patches would
+# depend on it.
Modified: trunk/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff
==============================================================================
--- trunk/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff (original)
+++ trunk/patches/dev300/autocorrect-accidental-caps-lock-vcl.diff Wed Nov 26 16:04:03 2008
@@ -101,9 +101,9 @@
+ USHORT GetIndicatorState() const;
+
+ void SimulateKeyPress( USHORT nKeyCode ) const;
- };
-
+ virtual XubString GetSurroundingText() const;
+ virtual Selection GetSurroundingTextSelection() const;
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/os2/inc/salframe.h vcl/os2/inc/salframe.h
--- vcl.clean/os2/inc/salframe.h 2007-11-02 08:44:25.000000000 -0400
+++ vcl/os2/inc/salframe.h 2008-02-28 13:00:17.000000000 -0500
Modified: trunk/patches/dev300/build-java-target.diff
==============================================================================
--- trunk/patches/dev300/build-java-target.diff (original)
+++ trunk/patches/dev300/build-java-target.diff Wed Nov 26 16:04:03 2008
@@ -101,7 +101,6 @@
else {
ToFile( "JAVACISGCJ", '@JAVACISGCJ@', "e" );
@@ -1852,6 +1853,8 @@ if ( $GUI eq "UNX" ) {
- if ( '@JDK@' ne '' )
{
ToFile( "JDK", "@JDK@", "e" );
ToFile( "JAVAFLAGS", "@JAVAFLAGS@", "e" );
@@ -109,6 +108,7 @@
+ ToFile( "JAVA_TARGET_VER", "@JAVA_TARGET_VER@","e" );
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)
@@ -130,7 +130,7 @@
.IF "$(ANT_DEBUG)"==""
.IF "$(debug)"==""
ANT_DEBUG=off
-@@ -65,24 +77,14 @@ JAVA_HOME=
+@@ -65,21 +77,12 @@ JAVA_HOME=
.EXPORT : JAVA_HOME
.ENDIF
@@ -153,13 +153,9 @@
- -Dsolar.sourceversion=$(SOURCEVERSION) -Dsolar.lastminor=$(LAST_MINOR) \
- -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
-.ENDIF
-+
.ELSE # No java
ANT=
ANT_FLAGS=
- .ENDIF
--
--
--- 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)
Modified: trunk/patches/dev300/build-prebuilt-stax.diff
==============================================================================
--- trunk/patches/dev300/build-prebuilt-stax.diff (original)
+++ trunk/patches/dev300/build-prebuilt-stax.diff Wed Nov 26 16:04:03 2008
@@ -48,8 +48,11 @@
# --- Files --------------------------------------------------------
TARFILE_NAME=stax-api-1.0-2-sources
TARFILE_ROOTDIR=src
-@@ -66,3 +75,4 @@ OUT2CLASS=jsr173_1.0_api.jar
- .INCLUDE : target.mk
- .INCLUDE : tg_ext.mk
+@@ -66,6 +75,7 @@ OUT2CLASS=jsr173_1.0_api.jar
+
+ OUT2CLASS=jsr173_1.0_api.jar
+.ENDIF # "$(BUILD_STAX)" != "YES"
+ .ELSE # $(SOLAR_JAVA)!= ""
+ nojava:
+ @echo "Not building $(PRJNAME) because Java is disabled"
Modified: trunk/patches/dev300/buildfix-enable-reportdesign-check.diff
==============================================================================
--- trunk/patches/dev300/buildfix-enable-reportdesign-check.diff (original)
+++ trunk/patches/dev300/buildfix-enable-reportdesign-check.diff Wed Nov 26 16:04:03 2008
@@ -1,7 +1,7 @@
--- config_office/configure.in.old 2008-03-20 21:10:37.000000000 +0100
+++ config_office/configure.in 2008-03-27 17:40:30.000000000 +0100
@@ -5380,7 +5380,7 @@ else
- fi
+ AC_SUBST(SERVLETAPI_JAR)
AC_MSG_CHECKING([whether to build the Report Builder extension])
-if test -z "$enable_reportdesign" -a "$enable_reportdesign" != "no" && test "$WITH_JAVA" != "no"; then
Modified: trunk/patches/dev300/calc-dp-drilldown-hidden-items.diff
==============================================================================
--- trunk/patches/dev300/calc-dp-drilldown-hidden-items.diff (original)
+++ trunk/patches/dev300/calc-dp-drilldown-hidden-items.diff Wed Nov 26 16:04:03 2008
@@ -237,12 +237,10 @@
public:
ScDPCollection(ScDocument* pDocument);
-@@ -279,7 +307,12 @@ public:
- void WriteRefsTo( ScDPCollection& r ) const;
+@@ -279,6 +307,11 @@ public:
String CreateNewName( USHORT nMin = 1 ) const;
-- void EnsureNames();
-+ void EnsureNames();
+ //UNUSED2008-05 void EnsureNames();
+
+ ScSimpleSharedString& GetSharedString();
+
@@ -1034,9 +1032,9 @@
}
DataObject* ScDPCollection::Clone() const
-@@ -2716,9 +2761,66 @@ void ScDPCollection::EnsureNames()
- ((ScDPObject*)At(i))->SetName( CreateNewName() );
- }
+@@ -2716,6 +2761,62 @@ void ScDPCollection::EnsureNames()
+ //UNUSED2008-05 ((ScDPObject*)At(i))->SetName( CreateNewName() );
+ //UNUSED2008-05 }
+ScSimpleSharedString& ScDPCollection::GetSharedString()
+{
@@ -1097,10 +1095,6 @@
//------------------------------------------------------------------------
// convert old pivot tables into new datapilot tables
-+#if OLD_PIVOT_IMPLEMENTATION
- void ScDPCollection::ConvertOldTables( ScPivotCollection& rOldColl )
- {
- // convert old pivot tables into new datapilot tables
diff --git sc/source/core/data/dpsdbtab.cxx sc/source/core/data/dpsdbtab.cxx
index 5ac8d6d..e8d0509 100644
--- sc/source/core/data/dpsdbtab.cxx
Modified: trunk/patches/dev300/calc-multiline-formula-ref.diff
==============================================================================
--- trunk/patches/dev300/calc-multiline-formula-ref.diff (original)
+++ trunk/patches/dev300/calc-multiline-formula-ref.diff Wed Nov 26 16:04:03 2008
@@ -447,9 +447,9 @@
+ return static_cast<ScFormulaCell*>(rCell.pBaseCell)->IsMultilineResult();
+}
+
- sal_Bool ScXMLExport::IsAnnotationEqual(const uno::Reference<table::XCell>& /* xCell1 */,
- const uno::Reference<table::XCell>& /* xCell2 */)
- {
+ //UNUSED2008-05 sal_Bool ScXMLExport::IsAnnotationEqual(const uno::Reference<table::XCell>& /* xCell1 */,
+ //UNUSED2008-05 const uno::Reference<table::XCell>& /* xCell2 */)
+ //UNUSED2008-05 {
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 779f94e..e4fcc10 100644
--- sc/source/filter/xml/xmlexprt.hxx
@@ -468,10 +468,10 @@
sal_Bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const;
- sal_Bool IsEditCell(const com::sun::star::table::CellAddress& aAddress) const;
+ sal_Bool IsEditCell(const com::sun::star::table::CellAddress& aAddress, ScMyCell* pMyCell = NULL) const;
- sal_Bool IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const;
+ //UNUSED2008-05 sal_Bool IsEditCell(const com::sun::star::uno::Reference <com::sun::star::table::XCell>& xCell) const;
sal_Bool IsEditCell(ScMyCell& rCell) const;
+ sal_Bool IsMultiLineFormulaCell(ScMyCell& rCell);
- sal_Bool IsAnnotationEqual(const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell1,
+ //UNUSED2008-05 sal_Bool IsAnnotationEqual(const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell1,
const com::sun::star::uno::Reference<com::sun::star::table::XCell>& xCell2);
sal_Bool IsCellEqual (ScMyCell& aCell1, ScMyCell& aCell2);
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
Modified: trunk/patches/dev300/chart-skip-hidden-cells-xmloff.diff
==============================================================================
--- trunk/patches/dev300/chart-skip-hidden-cells-xmloff.diff (original)
+++ trunk/patches/dev300/chart-skip-hidden-cells-xmloff.diff Wed Nov 26 16:04:03 2008
@@ -7,9 +7,9 @@
XML_VALUE_AND_PERCENTAGE,
XML_GROUP_BARS_PER_AXIS,
+ XML_INCLUDE_HIDEEN_CELLS,
+ XML_AUTOMATIC_POSITION,
+ XML_AUTOMATIC_SIZE,
XML_REVERSE_DIRECTION,
- XML_LABEL_SEPARATOR,
- XML_LABEL_POSITION,
diff --git xmloff/source/chart/PropertyMap.hxx xmloff/source/chart/PropertyMap.hxx
index c745746..37d9663 100644
--- xmloff/source/chart/PropertyMap.hxx
@@ -19,9 +19,9 @@
MAP_ENTRY( "StackedBarsConnected", CHART, XML_CONNECT_BARS, XML_TYPE_BOOL ),
MAP_ENTRY_ODF12( "GroupBarsPerAxis", CHART, XML_GROUP_BARS_PER_AXIS, XML_TYPE_BOOL ),
+ MAP_ENTRY_ODF12( "IncludeHiddenCells", CHART, XML_INCLUDE_HIDEEN_CELLS, XML_TYPE_BOOL ),
+ MAP_ENTRY_ODF12( "AutomaticPosition", CHART, XML_AUTOMATIC_POSITION, XML_TYPE_BOOL ),
+ MAP_ENTRY_ODF12( "AutomaticSize", CHART, XML_AUTOMATIC_SIZE, XML_TYPE_BOOL ),
MAP_ENTRY_ODF12( "StartingAngle", CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER ),
- // spline settings
- MAP_ENTRY( "SplineOrder", CHART, XML_SPLINE_ORDER, XML_TYPE_NUMBER ),
diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
index 651a3d4..e7b035a 100644
--- xmloff/source/core/xmltoken.cxx
@@ -31,6 +31,6 @@
TOKEN( "value-and-percentage", XML_VALUE_AND_PERCENTAGE ),
TOKEN( "group-bars-per-axis", XML_GROUP_BARS_PER_AXIS ),
+ TOKEN( "include-hidden-cells", XML_INCLUDE_HIDEEN_CELLS ),
+ TOKEN( "auto-position", XML_AUTOMATIC_POSITION ),
+ TOKEN( "auto-size", XML_AUTOMATIC_SIZE ),
TOKEN( "reverse-direction", XML_REVERSE_DIRECTION ),
- TOKEN( "label-separator", XML_LABEL_SEPARATOR ),
- TOKEN( "label-position", XML_LABEL_POSITION ),
Modified: trunk/patches/dev300/chart-subtitle-xls-export.diff
==============================================================================
--- trunk/patches/dev300/chart-subtitle-xls-export.diff (original)
+++ trunk/patches/dev300/chart-subtitle-xls-export.diff Wed Nov 26 16:04:03 2008
@@ -3,9 +3,9 @@
--- sc/source/filter/excel/xechart.cxx
+++ sc/source/filter/excel/xechart.cxx
@@ -35,6 +35,7 @@
-
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
+ #include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/chart/XChartDocument.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
Modified: trunk/patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff
==============================================================================
--- trunk/patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff (original)
+++ trunk/patches/dev300/cjk-insert-forbidden-characters-into-i18npool.diff Wed Nov 26 16:04:03 2008
@@ -1,6 +1,6 @@
--- i18npool/source/localedata/data/zh_CN.xml-orig 2008-05-26 17:43:55.000000000 +0800
+++ i18npool/source/localedata/data/zh_CN.xml 2008-05-27 11:05:35.000000000 +0800
-@@ -428,8 +428,8 @@
+@@ -428,9 +428,9 @@
</LC_TRANSLITERATION>
<LC_MISC>
<ForbiddenCharacters>
@@ -8,6 +8,6 @@
-<ForbiddenLineEndCharacters>([{ÂÂ'"âãããããããïïïïïãïïïïïïïïïïïïï</ForbiddenLineEndCharacters>
+<ForbiddenLineBeginCharacters>:!),.:;?]}Â'"ããããããããããïïïïïïïïïïïïïïïïïïïïïïïïïïïïïïïïïïïãââÂËËâ--âââ</ForbiddenLineBeginCharacters>
+<ForbiddenLineEndCharacters>([{ÂÂ'"âãããããããïïïïïãïïïïïïïïïïïïïââ</ForbiddenLineEndCharacters>
+ <LineBreakHangingCharacters>!,.:;?ããïïïïïï</LineBreakHangingCharacters>
</ForbiddenCharacters>
<ReservedWords>
- <trueWord>ç</trueWord>
Modified: trunk/patches/dev300/default-ms-filter-convert.diff
==============================================================================
--- trunk/patches/dev300/default-ms-filter-convert.diff (original)
+++ trunk/patches/dev300/default-ms-filter-convert.diff Wed Nov 26 16:04:03 2008
@@ -5,7 +5,7 @@
diff -u -p -u -r1.84 Common.xcs
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs 24 Jul 2003 13:12:08 -0000 1.84
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 5 Jan 2004 14:57:29 -0000
-@@ -3795,54 +3795,54 @@
+@@ -3795,60 +3795,60 @@
<info>
<desc>Specifies if convertible MathType OLE objects are converted into Math objects.</desc>
</info>
@@ -33,6 +33,12 @@
- <value>false</value>
+ <value>true</value>
</prop>
+ <prop oor:name="ImportWWFieldsAsEnhancedFields" oor:type="xs:boolean">
+ <info>
+ <desc>Flag to control use of enhanced fields.</desc>
+ </info>
+ <value>true</value>
+ </prop>
</group>
<group oor:name="Export">
<info>
@@ -66,5 +72,5 @@
- <value>false</value>
+ <value>true</value>
</prop>
- </group>
- </group>
+ <prop oor:name="EnablePowerPointPreview" oor:type="xs:boolean">
+ <info>
Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff (original)
+++ trunk/patches/dev300/extensions_configure.diff Wed Nov 26 16:04:03 2008
@@ -54,11 +54,11 @@
@@ -5663,6 +5663,7 @@
else
AC_MSG_RESULT([no])
- ENABLE_REPORTBUILDER=NO
+ ENABLE_REPORTDESIGN=NO
+ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_REPORTDESIGN"
SYSTEM_JFREEREPORT=NO
fi
- AC_SUBST(ENABLE_REPORTBUILDER)
+ AC_SUBST(ENABLE_REPORTDESIGN)
@@ -6055,6 +6068,53 @@
fi
Modified: trunk/patches/dev300/extensions_deliver.diff
==============================================================================
--- trunk/patches/dev300/extensions_deliver.diff (original)
+++ trunk/patches/dev300/extensions_deliver.diff Wed Nov 26 16:04:03 2008
@@ -1,20 +1,23 @@
--- sdext/prj/d.lst.orig 2007-10-11 14:10:27.000000000 +0200
+++ sdext/prj/d.lst 2008-04-01 22:11:56.000000000 +0200
-@@ -1,4 +1,7 @@
+@@ -1,6 +1,9 @@
mkdir: %_DEST%\bin%_EXT%\minimizer
mkdir: %_DEST%\bin%_EXT%\presenter
+ mkdir: %_DEST%\bin%_EXT%\pdfimport
+..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\sun-presentation-minimizer.oxt
+..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter-screen.oxt
+..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport.oxt
- ..\%__SRC%\bin\sun-presentation-minimizer.oxt %_DEST%\bin%_EXT%\minimizer\sun-presentation-minimizer.oxt
- ..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
+ ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
+ ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
+ ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
--- swext/prj/d.lst.orig 2007-10-11 14:10:27.000000000 +0200
+++ swext/prj/d.lst 2008-04-01 22:11:56.000000000 +0200
-@@ -1,3 +1,4 @@
+@@ -1,4 +1,5 @@
mkdir: %_DEST%\bin%_EXT%\swext
..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\swext\wiki-publisher.oxt
+..\%__SRC%\bin\wiki-publisher.oxt %_DEST%\bin%_EXT%\wiki-publisher.oxt
..\%__SRC%\bin\mediawiki_develop.zip %_DEST%\bin%_EXT%\swext\mediawiki_develop.zip
+
--- extras/prj/d.lst.orig 2008-09-25 16:32:31.000000000 +0200
+++ extras/prj/d.lst 2008-09-25 16:34:34.000000000 +0200
@@ -4,6 +4,7 @@
Modified: trunk/patches/dev300/forms-radio-button-group-names.diff
==============================================================================
--- trunk/patches/dev300/forms-radio-button-group-names.diff (original)
+++ trunk/patches/dev300/forms-radio-button-group-names.diff Wed Nov 26 16:04:03 2008
@@ -691,10 +691,10 @@
--- toolkit/inc/toolkit/helper/property.hxx
+++ toolkit/inc/toolkit/helper/property.hxx
@@ -192,6 +192,7 @@ namespace rtl {
+ #define BASEPROPERTY_URL 134 // ::rtl::OUString
#define BASEPROPERTY_UNIT 135 // ::awt::FieldUnit
#define BASEPROPERTY_CUSTOMUNITTEXT 136 // ::rtl::OUString
- #define BASEPROPERTY_ENABLEVISIBLE 137 // sal_Bool
-+#define BASEPROPERTY_GROUPNAME 138 // ::rtl::OUString
++#define BASEPROPERTY_GROUPNAME 137 // ::rtl::OUString
// Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
Modified: trunk/patches/dev300/gnome-vfs-locking-config_office.diff
==============================================================================
--- trunk/patches/dev300/gnome-vfs-locking-config_office.diff (original)
+++ trunk/patches/dev300/gnome-vfs-locking-config_office.diff Wed Nov 26 16:04:03 2008
@@ -6,7 +6,7 @@
diff -u -p -u -p -B -r1.269 -r1.254.6.2
--- config_office/configure.in 28 May 2008 10:42:27 -0000 1.269
+++ config_office/configure.in 2 Jun 2008 13:52:09 -0000 1.254.6.2
-@@ -5155,16 +5155,28 @@ dnl Gnome VFS check
+@@ -5155,18 +5155,30 @@ dnl Gnome VFS check
dnl ===================================================================
ENABLE_GNOMEVFS=""
@@ -16,7 +16,9 @@
ENABLE_GNOMEVFS="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 )
- PKG_CHECK_MODULES( GCONF, gconf-2.0 )
+ if test "$ENABLE_GCONF" != "TRUE"; then
+ PKG_CHECK_MODULES( GCONF, gconf-2.0 )
+ fi
+
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
Modified: trunk/patches/dev300/layout-disable-experimental.diff
==============================================================================
--- trunk/patches/dev300/layout-disable-experimental.diff (original)
+++ trunk/patches/dev300/layout-disable-experimental.diff Wed Nov 26 16:04:03 2008
@@ -43,7 +43,7 @@
#if ENABLE_LAYOUT
@@ -545,6 +546,8 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
- #define SfxTabPage( parent, id, args ) SfxTabPage( parent, "sort-options.xml", id, &args )
+ #define SfxTabPage( parent, id, args ) TabPage( parent, "sort-options.xml", id, 0, &args )
#endif /* ENABLE_LAYOUT */
+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
@@ -51,13 +51,12 @@
ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
const SfxItemSet& rArgSet )
-@@ -571,11 +574,11 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
+@@ -571,10 +574,10 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
// aFtArea ( this, ScResId( FT_AREA ) ),
//
-#if ENABLE_LAYOUT
+#if ENABLE_LAYOUT_EXPERIMENTAL
- #undef this
#undef ScResId
#define ScResId(x) this, #x
-#endif /* ENABLE_LAYOUT */
@@ -65,13 +64,14 @@
aStrRowLabel ( ScResId( STR_ROW_LABEL ) ),
aStrColLabel ( ScResId( STR_COL_LABEL ) ),
aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
-@@ -715,9 +718,9 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
+@@ -715,10 +718,10 @@ USHORT* __EXPORT ScTabPageSortOptions::GetRanges()
// -----------------------------------------------------------------------
-#if ENABLE_LAYOUT
+#if ENABLE_LAYOUT_EXPERIMENTAL
#undef SfxTabPage
+ #define SfxTabPage TabPage
-#endif /* ENABLE_LAYOUT */
+#endif /* ENABLE_LAYOUT_EXPERIMENTAL */
SfxTabPage* __EXPORT ScTabPageSortOptions::Create(
@@ -100,7 +100,7 @@
class CollatorWrapper;
+#if ENABLE_LAYOUT_EXPERIMENTAL
- #include <sfx2/layout.hxx>
+ #include <layout/layout.hxx>
#include <layout/layout-pre.hxx>
+#else /* !ENABLE_LAYOUT_EXPERIMENTAL */
+#define LocalizedString String
Modified: trunk/patches/dev300/localize-pl-cygwin-paths.diff
==============================================================================
--- trunk/patches/dev300/localize-pl-cygwin-paths.diff (original)
+++ trunk/patches/dev300/localize-pl-cygwin-paths.diff Wed Nov 26 16:04:03 2008
@@ -14,7 +14,7 @@
@@ -444,7 +445,7 @@
# if ( -x $command ){
if( $command ){
- if( !$bVerbose ){ $args .= " -QQ -skip_links "; }
+ if( !$bVerbose ){ $args .= " -QQ "; }
- $args .= " -e -f $localizeSDF -l ";
+ $args .= " -e -f ".fix_cygwin_path($localizeSDF)." -l ";
my $bFlag="";
Modified: trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff (original)
+++ trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff Wed Nov 26 16:04:03 2008
@@ -160,8 +160,8 @@
--- postprocess/prj/build.lst 2005-11-23 05:56:34.703125000 +0200
+++ postprocess/prj/build.lst 2005-11-23 05:56:48.812500000 +0200
@@ -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 MSFONTEXTRACT:msfontextract 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 reportdesign SDEXT:sdext SWEXT:swext writerfilter oox REPORTBUILDER:reportbuilder 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 MSFONTEXTRACT:msfontextract 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 reportdesign SDEXT:sdext SWEXT:swext writerfilter oox REPORTBUILDER:reportbuilder 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 MSFONTEXTRACT:msfontextract 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 REPORTDESIGN: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 MSFONTEXTRACT:msfontextract 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 REPORTDESIGN: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\checkdeliver nmake - all po_checkdlv NULL
Modified: trunk/patches/dev300/novell-win32-msi-patchability.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-msi-patchability.diff (original)
+++ trunk/patches/dev300/novell-win32-msi-patchability.diff Wed Nov 26 16:04:03 2008
@@ -1,106 +1,227 @@
--- instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
+++ instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
-@@ -29,6 +29,74 @@
+@@ -1,10 +1,13 @@
+ [PRODUCTCODE]
+ en-US = "{302DAE3A-2CD6-46DF-A25B-ED0B59FBA771}"
++bs = "{9DF5D8E3-239F-4672-8CBB-64F35914D8FC}"
+ pt = "{FC10CE94-41C6-43AE-AC97-4F4AE45B1BCC}"
++pt-PT = "{B4191495-6B61-4C9E-8E64-BD6B10E7F784}"
+ ru = "{C0C43007-C203-4722-916E-7A4E915E4F8D}"
+ el = "{FC4188CE-C087-4109-A904-0687A76ACEDA}"
+ nl = "{1C7DD608-C8AC-4B5B-81BE-E4ED3753541D}"
+ fr = "{D334E645-4240-467E-9049-8EDA0DF62DD8}"
++fr-CA = "{1779C34A-84B1-4D43-B745-067E82A62052}"
+ es = "{28F03675-F28C-460D-8C2E-800EA7A551A0}"
+ fi = "{5FE3A584-4297-4199-BF98-2BD36628B6C7}"
+ hu = "{91F443E7-DE34-46FC-B02E-F5628399603C}"
+@@ -13,55 +13,210 @@
+ cs = "{7C4C496A-2087-4AE3-8620-84FFD736F2BF}"
+ sk = "{73D7DA04-45CD-494E-9B78-1EFDFDBF5600}"
+ en-GB = "{80F13A63-A0C3-4C6D-A0B3-28F106730674}"
++en-ZA = "{36488CF6-0AA7-4106-8ED5-573C15307DDD}"
+ da = "{387DC3B5-4CF9-48A2-8292-3BB725BF654A}"
+ sv = "{72B0A3D4-B9E4-454C-9A45-52D2DC433A58}"
++nb = "{8372057C-007A-4C31-9E63-F62553829587}"
++nn = "{A144BF58-9C8B-44B7-82D4-33A8EA2B5EF1}"
+ no = "{8FDD7F7B-104C-4CB6-B7BD-F67FCF42F3CD}"
+ pl = "{7CA9656A-7DB4-48EB-8E18-456256C05E92}"
+ de = "{300FFDA6-0C64-406D-B09B-CB5C91ABEBBA}"
+ pt-BR = "{E49BD84D-625C-4BEB-AE0E-349D0DD6FFB7}"
+ th = "{B0E54B09-14B1-4440-BCB8-E036CCD332DF}"
+ et = "{0A773C83-9633-4EAD-BE4F-C015568870BD}"
+ ja = "{DAF0244B-3B71-4EC8-8246-C58401AE5E01}"
+ ko = "{AAFFA871-4921-4D14-9767-E302020DD8BE}"
++km = "{6E84D360-B0B6-405E-8134-5737FCAE19C2}"
++cy = "{1B4EE7DB-FA7F-42AC-8695-58A5D358452E}"
+ zh-CN = "{5B52E76A-647C-4F18-BC52-6293FDE98C5D}"
+ zh-TW = "{03293AD0-38E2-4399-BE6E-EC696138E39A}"
+ tr = "{5F926003-A07A-4812-A6AD-6C466C053F53}"
hi = "{264BD610-28F9-42C0-AFBF-60870763B038}"
++hi-IN = "{2ECD0724-FA4C-4C23-93C2-5801E04B9A00}"
++pa-IN = "{490D7BE1-66E2-4FF0-ADBF-560F90066CA9}"
++ta-IN = "{4C52426D-EF4A-449F-B05A-C2B0EFE5C359}"
++ta = "{68B6D35D-2C65-4995-B899-287F8EEBD0FF}"
++as-IN = "{1C234926-2FE1-4223-BB9C-86FB9ACFDC67}"
ar = "{76854B27-9B89-4C7D-AB32-69E1F60CDA6F}"
++ar-SA = "{6171B484-B0C4-403C-A1CA-50B4879DF076}"
he = "{10C228EF-576B-466C-B863-955EC6A9340C}"
+af = "{538C837C-7A6B-4CC4-9FD8-FB99B459B5FD}"
-+as-IN = "{1C234926-2FE1-4223-BB9C-86FB9ACFDC67}"
++sq = "{848F9F66-A02C-4E12-85F2-D13DC02F0942}"
++hy = "{43705B68-3DBD-4013-BE81-EB1D454E851A}"
++eu = "{CD145A56-9FA5-4FD6-8BF3-80551AC7076B}"
+be-BY = "{96527E6D-7840-4175-8BE8-93DA3706E6F1}"
-+bg = "{E72472AF-C781-4F90-BC90-3621D3051416}"
+bn = "{90B27463-E51E-48BB-B21F-D81E0F738FBE}"
+bn-BD = "{6F47AED5-49DE-4D3D-8804-88C33FD41918}"
+bn-IN = "{52649A81-A02C-4E44-A1E1-846FD635D60D}"
-+br = "{84D7B232-2196-4CD0-A36F-949B7DB83AF2}"
-+bs = "{9DF5D8E3-239F-4672-8CBB-64F35914D8FC}"
-+cy = "{1B4EE7DB-FA7F-42AC-8695-58A5D358452E}"
-+eu = "{CD145A56-9FA5-4FD6-8BF3-80551AC7076B}"
-+fa = "{4667356A-537B-4A30-BF99-C1A11EC6093A}"
-+fo = "{372E1C06-9EDE-470E-A154-2C94B1214FF5}"
-+ga = "{499D9641-2B98-4D59-974C-09199761F62C}"
-+gl = "{B4E79B50-ADE3-49EE-AB75-D0B4AD676B3F}"
-+gu = "{280B3D0B-36AD-462A-9C04-3686F183554D}"
-+gu-IN = "{EB5113B8-2AA8-4CE4-B02A-72E33D2E5143}"
-+hi-IN = "{2ECD0724-FA4C-4C23-93C2-5801E04B9A00}"
-+hr = "{7509D7E9-6302-427E-88C0-42E4D81EC389}"
-+hy = "{43705B68-3DBD-4013-BE81-EB1D454E851A}"
-+id = "{F1837E2E-6E6D-41E0-AFB4-519D666E05B1}"
++bg = "{E72472AF-C781-4F90-BC90-3621D3051416}"
+is = "{ED539F5E-63F4-4366-B88C-4B78A1D85102}"
-+km = "{6E84D360-B0B6-405E-8134-5737FCAE19C2}"
-+kn = "{08708716-FFC8-4717-AD92-9B60F4761119}"
-+ku = "{490A29B0-D3F8-4C3F-B6D7-7BF5A791A746}"
++id = "{F1837E2E-6E6D-41E0-AFB4-519D666E05B1}"
+lo = "{9572F7D7-FD00-443F-B77F-F49ABE718488}"
-+lt = "{4BB4B6E7-DD02-4A82-9F10-5D0D305CBE22}"
+lv = "{D6D3626E-DAA7-4735-9B06-BCD3EB39542B}"
-+mk = "{DBA9A11D-F600-42AD-8D99-06061102A517}"
-+ml-IN = "{741168B7-19D4-41D7-9A96-DF725DA44904}"
-+mr = "{9ABBA360-AACA-4F22-AC20-42F1803B163E}"
-+mr-IN = "{C60698D5-76E9-4AA4-92DE-89E38129E06E}"
-+ms = "{459A2CDA-7915-41FB-8965-7CF19A02F186}"
++lt = "{4BB4B6E7-DD02-4A82-9F10-5D0D305CBE22}"
+mt = "{A4686668-EC2F-49C8-ADED-B6BDA2FCFD78}"
-+nb = "{8372057C-007A-4C31-9E63-F62553829587}"
-+ne = "{740B3E9E-7590-4E96-8497-3E231BAFFB7E}"
-+nn = "{A144BF58-9C8B-44B7-82D4-33A8EA2B5EF1}"
-+nr = "{171E9D9F-58F0-49E0-84E4-E76352C2FF0F}"
-+ns = "{80D26526-29C5-4795-8DBE-DFB8F7CCB1E5}"
-+or = "{12E38217-141E-484E-A6C9-47C5850B4903}"
-+or-IN = "{0238EEF6-23ED-4065-989D-C95F1C8DCBEE}"
-+pa-IN = "{490D7BE1-66E2-4FF0-ADBF-560F90066CA9}"
++mr = "{9ABBA360-AACA-4F22-AC20-42F1803B163E}"
+rm = "{B41046A6-CEF6-45FF-A8D7-5CDCE4C2E500}"
+ro = "{09ABF8A7-2A8B-4067-813E-A59F39BF199D}"
+rw = "{E9B6A2E1-DF76-48BA-9A97-398F3CE2EA34}"
+sa = "{E6D25E8C-3594-4EC2-8F26-5E07AEEAD305}"
-+sb = "{23635FCA-F0EF-47F8-97D8-E7D65B834235}"
-+sh = "{1EECD5C1-31E2-4C18-A57E-4FE79FDBE826}"
++sr-SP = "{9359B34C-4153-4D06-B3E3-B66215383E92}"
++tn = "{0B48531D-0704-49F8-81AA-49088E27663B}"
++hr = "{7509D7E9-6302-427E-88C0-42E4D81EC389}"
++fa = "{4667356A-537B-4A30-BF99-C1A11EC6093A}"
++fo = "{372E1C06-9EDE-470E-A154-2C94B1214FF5}"
+sl = "{B1B6F2FF-5074-4D8B-B6E7-758C097E89F3}"
-+sq = "{848F9F66-A02C-4E12-85F2-D13DC02F0942}"
-+sr = "{A7EA8FF4-A2CC-409F-8260-403442365FA8}"
-+ss = "{5E084FCA-3032-4833-B414-2E6777ECCFE9}"
-+st = "{895F4477-4E71-4158-93DC-14CB4114CC9A}"
++sb = "{23635FCA-F0EF-47F8-97D8-E7D65B834235}"
+st = "{9E74E8F6-615E-4B02-8808-041A43D3B6A8}"
++sw = "{EDD3461D-E7FE-4752-BEC8-8161FCA04619}"
+sw-TZ = "{F139048C-2DE1-4889-BF47-B91B5D41E938}"
-+ta = "{68B6D35D-2C65-4995-B899-287F8EEBD0FF}"
-+tg = "{996FB6B4-5532-415F-9622-73E7C867F42D}"
-+ti-ER = "{E4FE8DE0-D5DB-4CA8-8BBD-2771822EFC6A}"
-+tn = "{0B48531D-0704-49F8-81AA-49088E27663B}"
-+ts = "{9DC49678-1C01-487A-A2CA-2A2B8716610B}"
++ta = "{9B6976A0-B9F1-462C-9B34-482D685EF006}"
+tt = "{A5A0A068-3B2F-49B4-8EED-415FF06C4AB0}"
++ts = "{9DC49678-1C01-487A-A2CA-2A2B8716610B}"
+uk = "{22DCDF5F-8D27-42D7-945C-EB1F190E38B1}"
-+ur-IN = "{1DEDD828-FA9B-4B86-8F00-3E90157B76D7}"
-+ve = "{44411748-2FC8-4D70-BF25-AB6ABDE69D3A}"
++ur = "{1DA1B844-1807-43B5-A122-453FF57EE820}"
+vi = "{084244C8-1887-4BC3-8E85-7DAD99D698D4}"
+xh = "{6528B6C0-DD9F-4CB4-AE2D-A14DF74DDE7C}"
++ns = "{80D26526-29C5-4795-8DBE-DFB8F7CCB1E5}"
+yi = "{D340AAF8-8572-4874-A064-9D45DDB871C4}"
+zu = "{ED5667CD-9B2A-401E-8ECA-9560CC475C41}"
++gu-IN = "{EB5113B8-2AA8-4CE4-B02A-72E33D2E5143}"
++gu = "{280B3D0B-36AD-462A-9C04-3686F183554D}"
++br = "{84D7B232-2196-4CD0-A36F-949B7DB83AF2}"
++or = "{12E38217-141E-484E-A6C9-47C5850B4903}"
++ne = "{740B3E9E-7590-4E96-8497-3E231BAFFB7E}"
++sh-YU = "{1EECD5C1-31E2-4C18-A57E-4FE79FDBE826}"
++sr-CS = "{A7EA8FF4-A2CC-409F-8260-403442365FA8}"
++nr = "{171E9D9F-58F0-49E0-84E4-E76352C2FF0F}"
++ss = "{5E084FCA-3032-4833-B414-2E6777ECCFE9}"
++st = "{895F4477-4E71-4158-93DC-14CB4114CC9A}"
++ve = "{44411748-2FC8-4D70-BF25-AB6ABDE69D3A}"
++ga = "{499D9641-2B98-4D59-974C-09199761F62C}"
++mk = "{DBA9A11D-F600-42AD-8D99-06061102A517}"
++te-IN = "{A340DAB6-ACD6-48BB-9F35-B7D087EA7625}"
++ml-IN = "{741168B7-19D4-41D7-9A96-DF725DA44904}"
++mr-IN = "{C60698D5-76E9-4AA4-92DE-89E38129E06E}"
++ur-IN = "{1DEDD828-FA9B-4B86-8F00-3E90157B76D7}"
++or-IN = "{0238EEF6-23ED-4065-989D-C95F1C8DCBEE}"
++ku = "{490A29B0-D3F8-4C3F-B6D7-7BF5A791A746}"
++tg = "{996FB6B4-5532-415F-9622-73E7C867F42D}"
++ti-ER = "{E4FE8DE0-D5DB-4CA8-8BBD-2771822EFC6A}"
++gl = "{B4E79B50-ADE3-49EE-AB75-D0B4AD676B3F}"
++kn = "{08708716-FFC8-4717-AD92-9B60F4761119}"
++ms = "{459A2CDA-7915-41FB-8965-7CF19A02F186}"
++tg = "{707373D8-F32A-4A02-AA04-9D726F90AB41}"
multiwestern = "{D53F8583-419E-440E-AC00-40E9AB31EEBF}"
multiasia = "{C0D08A10-A266-46DC-8EF4-BE0E5928129D}"
-@@ -34,5 +34,28 @@
- vi = "{BFD81BD4-478B-49AA-BE00-93D6C3EAB2EC}"
- xh = "{7B4270C3-E81A-4159-A7DD-F9BFABE7EAB2}"
- zu = "{45BAF56E-7A90-40F4-A627-477DFD99CCF9}"
+ [UPGRADECODE]
+ en-US = "{8B909084-2220-49AC-A421-142180519088}"
++bs = "{997C6313-8DFC-42F5-BA83-7433C46FD10C}"
+ pt = "{CBFA6A61-D310-4A90-8F49-C7BE2735D58D}"
++pt-PT = "{C66D6B75-5808-44E2-AF7A-4023E3847300}"
+ ru = "{DF67ADAA-4755-4184-9E32-1020F40DDA81}"
+ el = "{39772F91-1D37-4866-BBA4-900AB53590B0}"
+ nl = "{7D14314D-DAF7-4A97-A6EE-97C475080A73}"
+ fr = "{B0FDE9B8-D066-4FB2-885D-615A6D58E02F}"
++fr-CA = "{5D4EA72D-E97F-4135-8BEC-ECA8E5A4DA30}"
+ es = "{01588DD5-C6C5-4C9D-A1BD-1A63E779DA1A}"
+ fi = "{481B0FE0-8313-442E-8A53-7C5139ADA3DC}"
+ hu = "{5981EE94-6763-40AD-A8A0-EEB01CCA153C}"
+ ca = "{8EEC9A45-3BD3-431F-81D0-394F41185BD9}"
+ it = "{50087605-A504-441B-B514-67F13A284C10}"
+ cs = "{DBA607B3-0805-4A18-A45D-769C70D90AB7}"
+ sk = "{19B49960-B58C-48A7-9761-F0B325E00C31}"
+ en-GB = "{E60BC5AC-2513-40AF-A41B-64118A287662}"
++en-ZA = "{7BE3ACA1-3791-47A8-96D6-E284D82B07BC}"
+ da = "{4E7025EF-909F-4609-97BA-304684C4833D}"
+ sv = "{5E751B0D-FE96-4D0E-BAC1-5E7501294940}"
++nb = "{A9DAD90A-13F9-40DB-BAF7-039D0192CCBE}"
++nn = "{BF0595DA-9F14-4DEA-A56A-1E5E20641AF3}"
+ no = "{00C1656C-6386-42ED-BE8C-5D6C553EF125}"
+ pl = "{9C92258E-9A41-4A03-AA5C-FD8EF15189BA}"
+ de = "{481E648E-D8AD-478A-A3F6-68FC563FFD8F}"
+ pt-BR = "{7364F154-089D-400B-B275-751AAB9A6122}"
+ th = "{1F9BC074-55AA-496A-9EC5-05E65CF64AE6}"
+ et = "{34FBD5D3-3F88-4C91-8B9B-A10AE833250F}"
+ ja = "{74F683CC-8356-4BF7-9098-B85AAB7C1A0C}"
+ ko = "{1D068BF9-FBCF-4A3B-B9A4-4B2DD3DE8CFB}"
++km = "{D395C065-A13B-4AD1-A283-978E03D56422}"
++cy = "{7417DE83-77C8-41D0-A6DB-D8440BA14BC5}"
+ zh-CN = "{5B45DC72-0755-4EC2-BB12-65A1FEADDDE7}"
+ zh-TW = "{08B2CED3-CFB5-491F-ADC4-FD0CD2366C60}"
+ tr = "{46AB3EE6-FD98-460D-AE0B-6AE68ED6204D}"
+ hi = "{2C70F320-6771-42D6-B3F5-97678C822B20}"
++hi-IN = "{4F098A99-D6A2-4286-9442-9871404D4A46}"
++pa-IN = "{0FDD36BA-D1EE-4F8E-AD8B-BD55459EC790}"
++ta-IN = "{F9817B26-6ED7-452A-8AB8-91341BF1D103}"
++ta = "{130152CC-41E4-4780-8559-21C40587EAFB}"
++as-IN = "{F93D27C8-4A21-4569-AF35-7EC77B70B402}"
+ ar = "{DF297699-3040-48E0-B0E6-B54385D76018}"
++ar-SA = "{6C5D341D-96E3-44FF-961F-9FD50D66AB57}"
+ he = "{13484272-CE60-4867-B494-D56F9049B95A}"
++af = "{FF27D70C-0C5B-4E4E-8883-8F375CA9C468}"
++sq = "{E9B56A18-156C-4936-9CFB-146CA7174B41}"
++hy = "{681C6683-8D75-4284-AE77-DCF3C6E870DE}"
++eu = "{F7141DC1-1538-4FF9-919A-FE1FF0E89503}"
++be-BY = "{CDC2F130-3E02-430F-A5B5-05067BC9336F}"
+bn = "{0B5D5885-3192-48D9-8C8D-706E0DB403DF}"
+bn-BD = "{0535AF67-E56A-4ED8-8A1E-578E549D30AD}"
+bn-IN = "{6F0D3ACA-DCE7-4E0A-87E2-CBD0F8A5B33B}"
-+cy = "{7417DE83-77C8-41D0-A6DB-D8440BA14BC5}"
-+eu = "{F7141DC1-1538-4FF9-919A-FE1FF0E89503}"
-+fa = "{F09DEEB5-1185-4DF2-B9C0-0C295858F966}"
-+fo = "{92F1FA59-3A7D-482D-823A-1A2734FEFB59}"
-+hy = "{681C6683-8D75-4284-AE77-DCF3C6E870DE}"
-+id = "{70886F70-BFB7-4E45-A05D-3294A91FEB3E}"
++bg = "{50E0988D-23C4-44CA-B66A-A4E427A7F038}"
+is = "{6DD324DE-DFA9-41B8-BADF-D037AD3B7A88}"
-+kn = "{0EF96046-D3E4-4ECA-A691-951A90838ACF}"
++id = "{70886F70-BFB7-4E45-A05D-3294A91FEB3E}"
+lo = "{588DACBD-89FA-45EC-B3B5-ACE2759664CC}"
+lv = "{09F6F2FC-F7A3-4C56-B4B6-A1D1483BAF55}"
-+ms = "{0590E9C9-8F5D-446B-883F-7C52963D788B}"
++lt = "{001E86DD-C817-4076-981B-D35253B6910B}"
+mt = "{B07B5F49-C4B6-4A9E-A46F-5565E64C4CC0}"
++mr = "{F2EFAC72-0CFD-4121-A995-1062E6CE4CA0}"
+rm = "{A608FC91-CFD9-44E7-9813-22777911489A}"
+ro = "{6CD33E91-55A4-4A9F-8A27-0069DF389BDC}"
++rw = "{0C88E37B-36CB-4DE0-8332-6A294E342B28}"
+sa = "{6BA9DC90-6F8E-407A-982D-E01A4FF72443}"
-+sb = "{5B574AAD-B8B2-4683-A806-BF92D80F914D}"
-+sq = "{E9B56A18-156C-4936-9CFB-146CA7174B41}"
++sr-SP = "{4FBE4F81-E634-4A58-9B23-598706996376}"
+tn = "{38219093-AB4D-4060-9456-EFB10DADC897}"
++hr = "{E96AE6FB-521A-44A8-AA91-8A7EE15D704B}"
++fa = "{F09DEEB5-1185-4DF2-B9C0-0C295858F966}"
++fo = "{92F1FA59-3A7D-482D-823A-1A2734FEFB59}"
++sl = "{6B1F1226-EBC6-4FED-AD37-E01DA6C5089A}"
++sb = "{5B574AAD-B8B2-4683-A806-BF92D80F914D}"
++st = "{10D5A692-629B-41AB-A74C-2D8E93A8B99A}"
++sw = "{50A48005-42C8-44D8-A12E-936D539E4AB0}"
++sw-TZ = "{53C0207E-0AE7-489F-8B56-DC09E873D3CD}"
++ta = "{538254E7-DCA7-4CD9-8CCE-3E09CD29C508}"
+tt = "{88D194B3-C099-4D80-AD3D-7A26E082D3C8}"
++ts = "{C2A6002F-C719-4E82-BDAD-74313D50442F}"
++uk = "{71F2B27E-DAD2-4B21-9488-8571B7E8C81F}"
++ur = "{A97E507B-875E-465C-933F-A33755EE8898}"
++vi = "{EE359E05-9385-4E70-B63A-39045A7C1285}"
++xh = "{BDBDB347-A3BC-42AB-A315-3AAEF9A533BA}"
++ns = "{875DF331-64DC-4CF1-B835-4D0A7D3D9BB4}"
+yi = "{382C63FC-2CC9-4C7D-877B-AA779CEA0479}"
++zu = "{AAD0E34A-99D5-4C5F-AC7A-5180377E9A60}"
++gu-IN = "{6AD46A4D-CE47-4C88-83CE-C1F475A2E4A3}"
++gu = "{27983EB1-C0D6-43A4-BD3E-E6B6CECAE8D6}"
++br = "{6FE542FD-D054-4F33-BC9C-76E9426240C8}"
++or = "{76B5E11A-3741-46FC-BD84-4673C770755A}"
++ne = "{2AC2E0AD-44DB-482B-B57C-D33B312C556D}"
++sh-YU = "{2C15F81E-ABDC-4036-9C1A-4B1D5F9D2A1B}"
++sr-CS = "{CF7835AD-75B4-4EB2-B0DE-F9E38AB720ED}"
++nr = "{01FC6CDA-80A7-421A-96A7-126DC9416B4C}"
++ss = "{C826B91A-C667-4960-89F1-FDFBC0470FA7}"
++st = "{430448C7-5E21-43A9-87FF-8123C5D31DF7}"
++ve = "{09D0356B-C800-474A-ACFD-A4F3B8C1A20D}"
++ga = "{7605EA0F-8D6C-41DB-8D78-6919C7B07809}"
++mk = "{FF8AC100-490B-4F21-AEEC-51A830D0FF00}"
++te-IN = "{06A44CB4-8BC0-4526-BB93-DB0BE5BF3D57}"
++ml-IN = "{6306670C-8496-43BD-80D8-6840A1B93594}"
++mr-IN = "{89A9DFB9-17C7-4C59-AF7F-620165DE19DD}"
++ur-IN = "{AF887C48-DB5D-4146-9D60-C20BA348D057}"
++or-IN = "{DE221F90-27CB-497C-AE61-F158527C5265}"
++ku = "{325DC0A7-E6CD-40E7-BC9C-EE7D90F0D3DE}"
++tg = "{8E7D7847-D4E3-4709-80EB-345B9F314E98}"
++ti-ER = "{B09DCB13-DBB8-4F6C-8CE5-AE153B8A6699}"
++gl = "{2856F4CC-18CC-492C-AA5B-52C90F2431F1}"
++kn = "{0EF96046-D3E4-4ECA-A691-951A90838ACF}"
++ms = "{0590E9C9-8F5D-446B-883F-7C52963D788B}"
++tg = "{C5C00559-A17F-4ED2-B475-82D94A5BB1B4}"
multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
Modified: trunk/patches/dev300/odf-converter-ignore-writerfilter.diff
==============================================================================
--- trunk/patches/dev300/odf-converter-ignore-writerfilter.diff (original)
+++ trunk/patches/dev300/odf-converter-ignore-writerfilter.diff Wed Nov 26 16:04:03 2008
@@ -2,7 +2,7 @@
index e090c61..b5c97ce 100644
--- oox/source/core/filterdetect.cxx
+++ oox/source/core/filterdetect.cxx
-@@ -41,12 +41,20 @@
+@@ -41,11 +41,19 @@
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <com/sun/star/xml/sax/XFastParser.hpp>
@@ -10,7 +10,6 @@
+#include <ucbhelper/commandenvironment.hxx>
+
- #include <comphelper/processfactory.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
Modified: trunk/patches/dev300/pyuno-rpath-ooodir.diff
==============================================================================
--- trunk/patches/dev300/pyuno-rpath-ooodir.diff (original)
+++ trunk/patches/dev300/pyuno-rpath-ooodir.diff Wed Nov 26 16:04:03 2008
@@ -10,7 +10,7 @@
$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
.IF "$(OS)" == "LINUX"
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
-+ @echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,/usr/lib/openoffice/basis-link/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
++ @echo $(LINK) -Wl,-z,combreloc $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) -Wl,-rpath,${exec_prefix}/lib/ooo-3.0/basis-link/program $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "SOLARIS"
@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "FREEBSD"
Modified: trunk/patches/dev300/redirect-extensions.diff
==============================================================================
--- trunk/patches/dev300/redirect-extensions.diff (original)
+++ trunk/patches/dev300/redirect-extensions.diff Wed Nov 26 16:04:03 2008
@@ -16,11 +16,8 @@
// open such URL in a browser
Index: officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
===================================================================
-RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs,v
-retrieving revision 1.4
-diff -u -p -u -r1.4 ReportDesign.xcs
---- officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs 2 Aug 2007 14:17:57 -0000 1.4
-+++ officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs 27 Feb 2008 12:27:25 -0000
+--- reportdesign/registry/schema/org/openoffice/Office/ReportDesign.xcs
++++ reportdesign/registry/schema/org/openoffice/Office/ReportDesign.xcs
@@ -61,7 +61,7 @@
<author>LLA</author>
<desc>Direct download URL to the Sun(tm) Report Builder extension.</desc>
Modified: trunk/patches/dev300/reportdesign-useless-jfreereport-dep.diff
==============================================================================
--- trunk/patches/dev300/reportdesign-useless-jfreereport-dep.diff (original)
+++ trunk/patches/dev300/reportdesign-useless-jfreereport-dep.diff Wed Nov 26 16:04:03 2008
@@ -7,8 +7,8 @@
--- reportdesign/prj/build.lst 27 Aug 2008 15:44:23 -0000 1.9.10.1
+++ reportdesign/prj/build.lst 18 Sep 2008 09:00:16 -0000 1.9.10.2
@@ -1,4 +1,4 @@
--rd reportdesign : BOOST:boost JFREEREPORT:jfreereport comphelper dbaccess NULL
-+rd reportdesign : BOOST:boost comphelper dbaccess NULL
+-rd reportdesign : BOOST:boost JFREEREPORT:jfreereport comphelper dbaccess readlicense_oo wizards NULL
++rd reportdesign : BOOST:boost comphelper dbaccess readlicense_oo wizards NULL
rd reportdesign usr1 - all rd_mkout NULL
rd reportdesign\inc nmake - all rd_inc NULL
rd reportdesign\registry\data\org\openoffice\Office nmake - all rd_reg_data_ooo NULL
Modified: trunk/patches/dev300/reportdesigner-no-license-m3.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license-m3.diff (original)
+++ trunk/patches/dev300/reportdesigner-no-license-m3.diff Wed Nov 26 16:04:03 2008
@@ -14,6 +14,6 @@
- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
- </simple-license>
- </registration>
- <version value="1.0.5"/>
+ <version value="1.0.6"/>
<identifier value="com.sun.reportdesigner"/>
<dependencies>
Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff (original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff Wed Nov 26 16:04:03 2008
@@ -3,17 +3,17 @@
RCS file: /cvs/dba/reportdesign/util/description.xml,v
retrieving revision 1.4
diff -u -u -r1.4 description.xml
---- reportbuilder/util/description.xml 6 Jun 2008 08:04:51 -0000 1.4
-+++ reportbuilder/util/description.xml 16 Jun 2008 15:02:24 -0000
+--- reportdesign/util/description.xml 6 Jun 2008 08:04:51 -0000 1.4
++++ reportdesign/util/description.xml 16 Jun 2008 15:02:24 -0000
@@ -6,11 +6,6 @@
<name lang="en-US">Sunâ Report Builder</name>
<!-- <name lang="en-US">Sun(TM) Report Builder</name> -->
</display-name>
- <registration>
-- <simple-license accept-by="admin" default-license-id="lic-en-US" >
+- <simple-license accept-by="admin" default-license-id="en-US" >
- <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
- </simple-license>
- </registration>
- <version value="1.0.5"/>
+ <version value="1.0.6"/>
<identifier value="com.sun.reportdesigner"/>
<dependencies>
Modified: trunk/patches/dev300/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/dev300/sc-overwrite-char-font-attrs.diff (original)
+++ trunk/patches/dev300/sc-overwrite-char-font-attrs.diff Wed Nov 26 16:04:03 2008
@@ -57,9 +57,9 @@
class ScMultipleReadHeader;
class ScMultipleWriteHeader;
@@ -217,8 +221,57 @@ public:
- const EditTextObject* GetData() const { return pData; }
+ void GetString( String& rString ) const;
- void Save( SvStream& rStream ) const;
+ const EditTextObject* GetData() const { return pData; }
+
+ /** Removes character attribute based on new pattern attributes. */
+ void RemoveCharAttribs( const ScPatternAttr& rAttr );
Modified: trunk/patches/dev300/sc-paste-on-enter.diff
==============================================================================
--- trunk/patches/dev300/sc-paste-on-enter.diff (original)
+++ trunk/patches/dev300/sc-paste-on-enter.diff Wed Nov 26 16:04:03 2008
@@ -14,9 +14,9 @@
struct CellShell_Impl
{
@@ -102,6 +103,7 @@ public:
+ void ExecutePageSel( SfxRequest& rReq );
void ExecuteMove( SfxRequest& rReq );
void GetStateCursor( SfxItemSet& rSet );
-
+ static void PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, BOOL bShowDialog );
};
@@ -196,13 +196,13 @@
{
@@ -441,6 +450,7 @@ void ScViewData::InitFrom( const ScViewD
- aDefPageZoomX = pRef->aDefPageZoomX;
- aDefPageZoomY = pRef->aDefPageZoomY;
- bPagebreak = pRef->bPagebreak;
-+ nPasteFlags = pRef->nPasteFlags;
- aLogicMode = pRef->aLogicMode;
-
- SetGridMode ( pRef->IsGridMode() );
+ //UNUSED2008-05 aDefPageZoomX = pRef->aDefPageZoomX;
+ //UNUSED2008-05 aDefPageZoomY = pRef->aDefPageZoomY;
+ //UNUSED2008-05 bPagebreak = pRef->bPagebreak;
++//UNUSED2008-05 nPasteFlags = pRef->nPasteFlags;
+ //UNUSED2008-05 aLogicMode = pRef->aLogicMode;
+ //UNUSED2008-05
+ //UNUSED2008-05 SetGridMode ( pRef->IsGridMode() );
Index: sc/source/ui/view/gridwin.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/gridwin.cxx,v
Modified: trunk/patches/dev300/soffice-detect-mozilla-certificates.diff
==============================================================================
--- trunk/patches/dev300/soffice-detect-mozilla-certificates.diff (original)
+++ trunk/patches/dev300/soffice-detect-mozilla-certificates.diff Wed Nov 26 16:04:03 2008
@@ -6,8 +6,8 @@
--- desktop/scripts/soffice.sh 5 Jul 2006 22:33:58 -0000 1.25
+++ desktop/scripts/soffice.sh 9 Sep 2006 11:07:33 -0000
@@ -189,6 +189,29 @@
- OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
- export OPENOFFICE_MOZILLA_FIVE_HOME
+ fi
+ fi
+if [ -z "$MOZILLA_CERTIFICATE_FOLDER" ]; then
+ db=""
Modified: trunk/patches/dev300/speed-configmgr-misc.diff
==============================================================================
--- trunk/patches/dev300/speed-configmgr-misc.diff (original)
+++ trunk/patches/dev300/speed-configmgr-misc.diff Wed Nov 26 16:04:03 2008
@@ -1,21 +1,3 @@
-Index: configmgr/qa/unit/makefile.mk
-===================================================================
-RCS file: /cvs/util/configmgr/qa/unit/makefile.mk,v
-retrieving revision 1.2
-diff -u -p -u -r1.2 makefile.mk
---- configmgr/qa/unit/makefile.mk 23 Nov 2007 13:58:12 -0000 1.2
-+++ configmgr/qa/unit/makefile.mk 19 Dec 2007 11:41:53 -0000
-@@ -59,9 +59,8 @@ ALLTAR: test
- $(MISC)$/$(TARGET).rdb .ERRREMOVE:
- $(COPY) $(SOLARBINDIR)$/types.rdb $@
- regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/configmgr2.uno$(DLLPOST))
-- regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/typeconverter.uno$(DLLPOST))
-+ regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/stocservices.uno$(DLLPOST))
- regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/sax.uno$(DLLPOST))
-- regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/simplereg.uno$(DLLPOST))
- regcomp -register -r $@ -c $(subst,$/,/ $(SOLARLIBDIR)/streams.uno$(DLLPOST))
-
- test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb
Index: configmgr/source/backend/binaryreader.cxx
===================================================================
RCS file: /cvs/util/configmgr/source/backend/binaryreader.cxx,v
@@ -93,21 +75,3 @@
}
struct ltNode
-Index: configmgr/source/tree/subtree.hxx
-===================================================================
-RCS file: /cvs/util/configmgr/source/tree/subtree.hxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 subtree.hxx
---- configmgr/source/tree/subtree.hxx 23 Nov 2007 14:33:13 -0000 1.8
-+++ configmgr/source/tree/subtree.hxx 19 Dec 2007 11:41:54 -0000
-@@ -100,8 +100,8 @@ namespace configmgr
-
- // Iteration support
- virtual void forEachChild(NodeAction& anAction) const;
-- virtual void forEachChild(NodeModification& anAction);
--
-+ virtual void forEachChild(NodeModification& anAction);
-+
- // "rtti"
- RTTI(Subtree, ISubtree);
- };
Modified: trunk/patches/dev300/store-install.diff
==============================================================================
--- trunk/patches/dev300/store-install.diff (original)
+++ trunk/patches/dev300/store-install.diff Wed Nov 26 16:04:03 2008
@@ -48,7 +48,7 @@
+++ solenv/inc/target.mk 2007-03-14 11:54:31.000000000 +0100
@@ -1438,31 +1438,31 @@ makedoc:
$(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
- $(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
+ $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
-$(RM) $@
- $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
+ $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
@@ -56,7 +56,7 @@
.IF "$(LOCALDOCDBTARGET)"!=""
$(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
- $(IDLC) @$(mktmp $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
+ $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
-$(RM) $@
- $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
+ $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
Modified: trunk/patches/dev300/svg-import-filter.diff
==============================================================================
--- trunk/patches/dev300/svg-import-filter.diff (original)
+++ trunk/patches/dev300/svg-import-filter.diff Wed Nov 26 16:04:03 2008
@@ -592,7 +592,7 @@
+ maDashArray(),
+ mnDashOffset(0.0),
+ meLineCap(BUTT),
-+ meLineJoin(basegfx::tools::B2DLINEJOIN_MITER),
++ meLineJoin(basegfx::B2DLINEJOIN_MITER),
+ mnMiterLimit(4.0),
+ mnStrokeWidth(1.0),
+ maViewportFillColor(1.0),
@@ -640,7 +640,7 @@
+ std::vector<double> maDashArray;
+ double mnDashOffset;
+ CapStyle meLineCap;
-+ basegfx::tools::B2DLineJoin meLineJoin;
++ basegfx::B2DLineJoin meLineJoin;
+ double mnMiterLimit;
+ double mnStrokeWidth;
+
@@ -2629,11 +2629,11 @@
+ aVec *= maCurrState.maCTM;
+ xAttrs->AddAttribute( USTR("svg:stroke-width"), rtl::OUString::valueOf( pt2mm(aVec.getLength()) )+USTR("mm"));
+ }
-+ if( maCurrState.meLineJoin == basegfx::tools::B2DLINEJOIN_MITER )
++ if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_MITER )
+ xAttrs->AddAttribute( USTR( "draw:stroke-linejoin"), USTR("miter"));
-+ else if( maCurrState.meLineJoin == basegfx::tools::B2DLINEJOIN_ROUND )
++ else if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_ROUND )
+ xAttrs->AddAttribute( USTR( "draw:stroke-linejoin"), USTR("round"));
-+ else if( maCurrState.meLineJoin == basegfx::tools::B2DLINEJOIN_BEVEL )
++ else if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_BEVEL )
+ xAttrs->AddAttribute( USTR( "draw:stroke-linejoin"), USTR("bevel"));
+ if( maCurrState.mnStrokeOpacity != 1.0 )
+ xAttrs->AddAttribute( USTR("svg:stroke-opacity"),
@@ -2888,11 +2888,11 @@
+ case XML_STROKE_LINEJOIN:
+ {
+ if( aValueUtf8 == "miter" )
-+ maCurrState.meLineJoin = basegfx::tools::B2DLINEJOIN_MITER;
++ maCurrState.meLineJoin = basegfx::B2DLINEJOIN_MITER;
+ else if( aValueUtf8 == "round" )
-+ maCurrState.meLineJoin = basegfx::tools::B2DLINEJOIN_ROUND;
++ maCurrState.meLineJoin = basegfx::B2DLINEJOIN_ROUND;
+ else if( aValueUtf8 == "bevel" )
-+ maCurrState.meLineJoin = basegfx::tools::B2DLINEJOIN_BEVEL;
++ maCurrState.meLineJoin = basegfx::B2DLINEJOIN_BEVEL;
+ else if( aValueUtf8 == "inherit" )
+ maCurrState.meLineJoin = maParentStates.back().meLineJoin;
+ break;
Modified: trunk/patches/dev300/svx-hatched-textmove.diff
==============================================================================
--- trunk/patches/dev300/svx-hatched-textmove.diff (original)
+++ trunk/patches/dev300/svx-hatched-textmove.diff Wed Nov 26 16:04:03 2008
@@ -277,13 +277,14 @@
#include <svx/sdrpagewindow.hxx>
#include <sdrpaintwindow.hxx>
#include <vcl/svapp.hxx>
-@@ -815,45 +816,48 @@
+@@ -815,50 +816,49 @@
Pointer SdrHdl::GetPointer() const
{
PointerStyle ePtr=POINTER_MOVE;
- BOOL bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
- // Fuer Resize von gedrehten Rechtecken die Mauszeiger etwas mitdrehen
-- if (bSize && nDrehWink!=0) {
+- if (bSize && nDrehWink!=0)
+- {
- long nHdlWink=0;
+ const BOOL bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
+ const BOOL bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
@@ -309,22 +310,26 @@
- while (nHdlWink<0) nHdlWink+=18000;
- while (nHdlWink>=18000) nHdlWink-=18000;
- nHdlWink/=4500;
-- switch ((BYTE)nHdlWink) {
+- switch ((BYTE)nHdlWink)
+- {
- case 0: ePtr=POINTER_ESIZE; break;
- case 1: ePtr=POINTER_NESIZE; break;
- case 2: ePtr=POINTER_SSIZE; break;
- case 3: ePtr=POINTER_SESIZE; break;
- } // switch
- }
-- if (ePtr==POINTER_MOVE) {
+- if (ePtr==POINTER_MOVE)
+- {
- BOOL bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
- BOOL bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
-- if (bSize && pHdlList!=NULL && (bRot || bDis)) {
+- if (bSize && pHdlList!=NULL && (bRot || bDis))
+- {
+ } else {
+ // Fuer Resize von gedrehten Rechtecken die Mauszeiger etwas mitdrehen
+ if (bSize && nDrehWink!=0) {
+ long nHdlWink=0;
- switch (eKind) {
+ switch (eKind)
+ {
- case HDL_UPLFT: case HDL_UPRGT:
- case HDL_LWLFT: case HDL_LWRGT: ePtr=bRot ? POINTER_ROTATE : POINTER_REFHAND; break;
- case HDL_LEFT : case HDL_RIGHT: ePtr=POINTER_VSHEAR; break;
@@ -354,9 +359,9 @@
+ case 6: ePtr=POINTER_SSIZE; break;
+ case 7: ePtr=POINTER_SESIZE; break;
+ } // switch
- } else {
- switch (eKind) {
- case HDL_UPLFT: ePtr=POINTER_NWSIZE; break;
+ }
+ else
+ {
@@ -1641,6 +1645,66 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -424,7 +429,6 @@
class ImpSdrHdlListSorter: public ContainerSorter {
public:
ImpSdrHdlListSorter(Container& rNewCont): ContainerSorter(rNewCont) {}
-
--- svx/source/svdraw/svdmrkv.cxx.orig 2008-05-19 16:16:36.000000000 +0200
+++ svx/source/svdraw/svdmrkv.cxx 2008-05-19 23:16:25.000000000 +0200
@@ -709,10 +709,15 @@
Modified: trunk/patches/dev300/vba-get-nonfiltered-range-selection.diff
==============================================================================
--- trunk/patches/dev300/vba-get-nonfiltered-range-selection.diff (original)
+++ trunk/patches/dev300/vba-get-nonfiltered-range-selection.diff Wed Nov 26 16:04:03 2008
@@ -27,14 +27,14 @@
--- sc/source/ui/unoobj/viewuno.cxx
+++ sc/source/ui/unoobj/viewuno.cxx
@@ -544,7 +544,8 @@ ScTabViewObj::ScTabViewObj() :
- aPropSet( lcl_GetViewOptPropertyMap() ),
- aMouseClickHandlers( 0 ),
- aActivationListeners( 0 ),
-- bDrawSelModeSet(sal_False)
-+ bDrawSelModeSet(sal_False),
-+ bFilteredRangeSelection(sal_True)
- {
- }
+ //UNUSED2008-05 aPropSet( lcl_GetViewOptPropertyMap() ),
+ //UNUSED2008-05 aMouseClickHandlers( 0 ),
+ //UNUSED2008-05 aActivationListeners( 0 ),
+-//UNUSED2008-05 bDrawSelModeSet(sal_False)
++//UNUSED2008-05 bDrawSelModeSet(sal_False),
++//UNUSED2008-05 bFilteredRangeSelection(sal_True)
+ //UNUSED2008-05 {
+ //UNUSED2008-05 }
@@ -554,7 +555,8 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
aPropSet( lcl_GetViewOptPropertyMap() ),
@@ -44,8 +44,8 @@
+ bDrawSelModeSet(sal_False),
+ bFilteredRangeSelection(sal_True)
{
- if( pViewSh )
- {
+ //! Listening oder so
+ }
@@ -971,6 +973,15 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() throw(uno::RuntimeException)
ScRange aRange;
@@ -107,8 +107,8 @@
+using ::com::sun::star::uno::UNO_QUERY;
+using ::rtl::OUString;
- // #TODO is this defined somewhere else?
- #if ( defined UNX ) || ( defined OS2 ) //unix
+ // Enable our own join detection for Intersection and Union
+ // should be more efficient than using ScRangeList::Join ( because
@@ -151,33 +157,53 @@ uno::Any SAL_CALL
ScVbaApplication::getSelection() throw (uno::RuntimeException)
{
Modified: trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff
==============================================================================
--- trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff (original)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff Wed Nov 26 16:04:03 2008
@@ -7,10 +7,10 @@
-di dictionaries\cs_CZ nmake - all di_cs_CZ NULL
-di dictionaries\da_DK nmake - all di_da_DK NULL
-di dictionaries\de_AT nmake - all di_de_AT NULL
--di dictionaries\de_CH nmake - all di_de_CH di_de_AT NULL
+-di dictionaries\de_CH nmake - all di_de_CH NULL
-di dictionaries\de_DE nmake - all di_de_DE di_de_AT di_de_CH NULL
-di dictionaries\en_US nmake - all di_en_US NULL
--di dictionaries\en_ZA nmake - all di_en_ZA di_en_US NULL
+-di dictionaries\en_ZA nmake - all di_en_ZA NULL
-di dictionaries\en_GB nmake - all di_en_GB di_en_US di_en_ZA NULL
-di dictionaries\es_ES nmake - all di_es_ES NULL
-di dictionaries\et_EE nmake - all di_et_EE NULL
Modified: trunk/patches/dev300/zoom-combobox.diff
==============================================================================
--- trunk/patches/dev300/zoom-combobox.diff (original)
+++ trunk/patches/dev300/zoom-combobox.diff Wed Nov 26 16:04:03 2008
@@ -141,9 +141,9 @@
#include <svx/tbcontrl.hxx>
#include <svx/zoomctrl.hxx>
+#include <svx/zoomtbxctrl.hxx>
+ #include <svx/zoomsliderctrl.hxx>
#include <svx/pszctrl.hxx>
#include <svx/modctrl.hxx>
- #include <svx/fntctl.hxx>
@@ -242,6 +245,7 @@
// StatusBarControls registrieren
Modified: trunk/patches/gstreamer/gstreamer-config-office.diff
==============================================================================
--- trunk/patches/gstreamer/gstreamer-config-office.diff (original)
+++ trunk/patches/gstreamer/gstreamer-config-office.diff Wed Nov 26 16:04:03 2008
@@ -70,10 +70,10 @@
--- config_office-orig/set_soenv.in 2006-08-17 10:43:11.000000000 +0200
+++ config_office/set_soenv.in 2006-08-17 11:05:37.000000000 +0200
@@ -1495,6 +1495,7 @@
- ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
- ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
- ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
-+ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
+ ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
+ ToFile( "GNOMEVFS_HAS_LOCKING","@GNOMEVFS_HAS_LOCKING@", "e" );
++ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
+ ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" );
ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
Modified: trunk/patches/unittesting/unittesting-basegfx.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-basegfx.diff (original)
+++ trunk/patches/unittesting/unittesting-basegfx.diff Wed Nov 26 16:04:03 2008
@@ -5,7 +5,7 @@
--- basegfx/prj/build.lst 2008-02-12 17:24:53.000000000 +0100
+++ basegfx/prj/build.lst 2008-03-20 11:58:36.000000000 +0100
@@ -12,4 +12,3 @@ fx basegfx\source\tuple nmake - all
- fx basegfx\source\tools nmake - all fx_tools fx_inc NULL
- fx basegfx\source\vector nmake - all fx_vector fx_inc NULL
- fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector NULL
+ fx basegfx\source\pixel nmake - all fx_pixel fx_inc NULL
+ fx basegfx\source\raster nmake - all fx_raster fx_inc NULL
+ fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector fx_color fx_pixel fx_raster NULL
-fx basegfx\test nmake - all fx_tests fx_util NULL
Modified: trunk/patches/unittesting/unittesting-configmgr.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-configmgr.diff (original)
+++ trunk/patches/unittesting/unittesting-configmgr.diff Wed Nov 26 16:04:03 2008
@@ -1,11 +1,11 @@
--- configmgr/prj/build.lst 2006-10-30 09:13:50.000000000 +0100
+++ configmgr/prj/build.lst 2007-09-07 11:21:49.000000000 +0200
@@ -1,4 +1,4 @@
--cg configmgr : offapi comphelper cppuhelper tools vos NULL
-+cg configmgr : offapi comphelper cppuhelper tools vos vcl NULL
+-cg configmgr : BOOST:boost offapi comphelper cppuhelper salhelper tools vos NULL
++cg configmgr : BOOST:boost offapi comphelper cppuhelper salhelper tools vos vcl NULL
cg configmgr usr1 - all cg_mkout NULL
cg configmgr\inc nmake - all cg_inc NULL
- cg configmgr\source\cmdtools nmake - all cg_cmdtools cg_misc cg_inc NULL
+ cg configmgr\source\misc nmake - all cg_misc cg_inc NULL
--- configmgr/prj/tests.lst 1970-01-01 01:00:00.000000000 +0100
+++ configmgr/prj/tests.lst 2007-09-07 17:19:19.000000000 +0200
@@ -0,0 +1,8 @@
Modified: trunk/patches/unittesting/unittesting-stoc.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-stoc.diff (original)
+++ trunk/patches/unittesting/unittesting-stoc.diff Wed Nov 26 16:04:03 2008
@@ -17,7 +17,7 @@
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME1 "/UNO/SERVICES") ) ) );
-- Sequence< OUString > & rSNL =
+- const Sequence< OUString > & rSNL =
+ Sequence< OUString > aSNL =
::excomp_impl::ExampleComponent1Impl::getSupportedServiceNames_Static();
- const OUString * pArray = rSNL.getConstArray();
@@ -33,7 +33,7 @@
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
OUString( RTL_CONSTASCII_USTRINGPARAM("/" IMPLNAME2 "/UNO/SERVICES") ) ) );
-- Sequence< OUString > & rSNL =
+- const Sequence< OUString > & rSNL =
+ Sequence< OUString > aSNL =
::excomp2_impl::ExampleComponent2Impl::getSupportedServiceNames_Static();
- const OUString * pArray = rSNL.getConstArray();
Modified: trunk/patches/vba/basic-ide-module-object-name-combile.diff
==============================================================================
--- trunk/patches/vba/basic-ide-module-object-name-combile.diff (original)
+++ trunk/patches/vba/basic-ide-module-object-name-combile.diff Wed Nov 26 16:04:03 2008
@@ -74,10 +74,10 @@
if ( !aModName.Len() )
aModName = rDocument.createObjectName( E_SCRIPTS, aLibName );
-@@ -272,7 +293,20 @@ ModulWindow* BasicIDEShell::CreateBasWin
+@@ -272,6 +293,20 @@ ModulWindow* BasicIDEShell::CreateBasWin
DBG_ASSERT( nKey, "CreateBasWin: Kein Key- Fenster nicht gefunden!" );
}
- if( nKey )
++ if( nKey )
+ {
+ if( xLib.is() )
+ {
@@ -90,7 +90,8 @@
+ aModName.AppendAscii(" (").Append(sObjName).AppendAscii(")");
+ }
+ }
- pTabBar->InsertPage( (USHORT)nKey, aModName );
+- pTabBar->InsertPage( (USHORT)nKey, aModName );
++ pTabBar->InsertPage( (USHORT)nKey, aModName );
+ }
pTabBar->Sort();
pWin->GrabScrollBars( &aHScrollBar, &aVScrollBar );
Modified: trunk/patches/vba/vba-support-export-palette.diff
==============================================================================
--- trunk/patches/vba/vba-support-export-palette.diff (original)
+++ trunk/patches/vba/vba-support-export-palette.diff Wed Nov 26 16:04:03 2008
@@ -24,8 +24,8 @@
--- sc/source/filter/excel/xistyle.cxx 13 Jan 2006 16:58:37 -0000 1.26
+++ sc/source/filter/excel/xistyle.cxx 13 Mar 2006 12:58:17 -0000
@@ -136,11 +136,71 @@
-
#include "root.hxx"
+ #include "colrowst.hxx"
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/container/XIndexAccess.hpp>
Modified: trunk/patches/vba/vba-userform-geometry-tweak.diff
==============================================================================
--- trunk/patches/vba/vba-userform-geometry-tweak.diff (original)
+++ trunk/patches/vba/vba-userform-geometry-tweak.diff Wed Nov 26 16:04:03 2008
@@ -12,7 +12,7 @@
using namespace ::com::sun::star;
@@ -114,6 +115,14 @@ DialogWindow::DialogWindow( Window* pPar
- pEditor = new DlgEditor( rDocument.getDocument() );
+ pEditor = new DlgEditor();
pEditor->SetWindow( this );
+ // set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
+ if ( rDocument.getDocument().is() )
Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff Wed Nov 26 16:04:03 2008
@@ -1467,14 +1467,14 @@
--- /home/feng/work/ooo-build/build/dev300-m14/sc/source/core/data/documen2.cxx 2008-06-16 21:30:17.000000000 +0800
+++ sc/source/core/data/documen2.cxx 2008-06-16 14:35:26.000000000 +0800
@@ -93,6 +93,7 @@
+ #include "listenercalls.hxx"
#include "recursionhelper.hxx"
#include "lookupcache.hxx"
- #include "tabprotection.hxx"
+#include <com/sun/star/document/XVbaEventsHelper.hpp>
// pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
// dtor is convenient.
-@@ -1863,3 +1864,26 @@ void ScDocument::RemoveLookupCache( ScLo
+@@ -1863,6 +1864,29 @@ void ScDocument::RemoveLookupCache( ScLo
EndListeningArea( pCache->getRange(), &rCache);
}
}
@@ -1501,7 +1501,9 @@
+ }
+ return mxVbaEventsHelper;
+}
-
+
+ void ScDocument::ClearLookupCaches()
+ {
--- /home/feng/work/ooo-build/build/dev300-m14/sc/source/core/data/documen7.cxx 2008-06-16 21:30:17.000000000 +0800
+++ sc/source/core/data/documen7.cxx 2008-06-05 18:11:39.000000000 +0800
@@ -59,7 +59,15 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
