ooo-build r11951 - in trunk: . patches/dev300
- From: jholesovsky svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11951 - in trunk: . patches/dev300
- Date: Wed, 19 Mar 2008 17:08:41 +0000 (GMT)
Author: jholesovsky
Date: Wed Mar 19 17:08:41 2008
New Revision: 11951
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11951&view=rev
Log:
2008-03-19 Jan Holesovsky <kendy suse cz>
* patches/dev300: Update to the recent state & make it apply patches
[does not have to compile yet ;-)]
* patches/dev300/buildfix-libformula-gcj-source.diff,
patches/dev300/buildfix-sal-system.h-no-asm-sigcontext.h.diff,
patches/dev300/buildfix-stl-anachronism.diff,
patches/dev300/build-java-target-m3.diff,
patches/dev300/cairo-canvas-fail-if-no-xrender.diff,
patches/dev300/cws-awtfixes1.diff,
patches/dev300/cws-layout-scp2.diff,
patches/dev300/cws-newportstl.diff,
patches/dev300/cws-sdk24fix.diff,
patches/dev300/cws-thiscomponent-basctl.diff,
patches/dev300/cws-thiscomponent-sfx2.diff,
patches/dev300/cws-transogl02-officecfg.diff,
patches/dev300/cws-transogl02-sd.diff,
patches/dev300/cws-transogl02-slideshow.diff,
patches/dev300/cws-transogl02-vcl.diff,
patches/dev300/cws-unifysound01-vcl-m1.diff,
patches/dev300/cws-unifysound01-vcl-m4.diff,
patches/dev300/cws-xmlfilter02-sc-m3.diff,
patches/dev300/dmake-heap-corruption.diff,
patches/dev300/evoab2-adapt-to-new-api.diff,
patches/dev300/gperf-3-is-needed-m5.diff,
patches/dev300/i18npool-less-dependencies.diff,
patches/dev300/libsn-removal.diff,
patches/dev300/ooo84684.vcl.fixfontconfig.diff,
patches/dev300/psprint-do-not-substitute.diff,
patches/dev300/reportdesigner-fix-jarlist.diff,
patches/dev300/reportdesigner-no-license-m1.diff,
patches/dev300/reportdesigner-no-license-m3.diff,
patches/dev300/scaddins-erf-crash-fix-065.diff,
patches/dev300/sc-export-shape-macro-bindings-m3.diff,
patches/dev300/sc-hyperlink-excel-a1-style.diff,
patches/dev300/sc-hyperlink-rename-sheet-name.diff,
patches/dev300/sc-indirect-named-range.diff,
patches/dev300/sc-lotus123-import-sheetname.diff,
patches/dev300/sd-default-format-n285959.diff,
patches/dev300/sdk-remove-non-free.diff,
patches/dev300/Simplified_Traditional_Chinese_convertion_table_n200505.diff,
patches/dev300/solaris-dont-depend-on-core10.diff,
patches/dev300/solenv-really-use-unsinged-char-on-ppc-m1.diff,
patches/dev300/speed-text-search-performance-i18npool.diff,
patches/dev300/speed-text-search-performance-unotools.diff,
patches/dev300/startup-wizard-speedup.diff,
patches/dev300/svx-delay-load-forms.diff,
patches/dev300/svx-sdr-contact-visibility.diff,
patches/dev300/sw-export-empty-headers-footers.diff,
patches/dev300/sw-my-mess.diff,
patches/dev300/sw-paste-czech-characters.diff,
patches/dev300/sw-special-locales-date-string.diff,
patches/dev300/text_grid_enhancement_filter.diff,
patches/dev300/text_grid_enhancement_layout.diff,
patches/dev300/ucb-neon-0.24.diff,
patches/dev300/unxsplash-rework-m1.diff,
patches/dev300/vba-brackets-params-fix-m5-m7.diff,
patches/dev300/vba-keep-codenames-in-sync-m3.diff,
patches/dev300/warning-too-few-arguments-icc.diff,
patches/dev300/webdav-locking-m3.diff,
patches/dev300/wizards-source-importwizard-filesmodul-xba-m3.diff,
patches/dev300/wmf-pattern-brush-m3.diff: Bin.
* patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff,
patches/dev300/cjk-character-units-fix.diff,
patches/dev300/cjk-character-units-imp.diff,
patches/dev300/default-autotext-and-form-name.diff,
patches/dev300/default-no-registration-menu.diff,
patches/dev300/gstreamer-sd.diff,
patches/dev300/gstreamer-slideshow.diff,
patches/dev300/internal-mesa-headers-slideshow.diff,
patches/dev300/letter-wizard-resource-id.diff,
patches/dev300/offapi-calc-datapilot-drilldown.diff,
patches/dev300/padmin-nofontconfig.diff,
patches/dev300/sc-datapilot-autoformat.diff,
patches/dev300/sc-r1c1.diff,
patches/dev300/scs-sc-menubar.diff,
patches/dev300/speed-pagein.diff,
patches/dev300/sw-dont-extern-sRTF-sHTML.diff,
patches/dev300/transogl-transitions-sd.diff,
patches/dev300/unittesting-basegfx.diff,
patches/dev300/unxsplash-rework.diff,
patches/dev300/vba-workbook-worksheet-events.diff,
patches/dev300/wpsimport-filter.diff,
patches/dev300/wpsimport-scp2.diff,
patches/dev300/wpsimport-writerperfect.diff,
patches/dev300/xmlhelp-work-with-symlinks.diff,
patches/dev300/zoom-combobox.diff: From patches/src680 & updated to apply.
* patches/dev300/split-binfilter-scp2.diff,
patches/dev300/novell-win32-agfa-monotype-fonts.diff,
patches/dev300/apply: Updated.
Added:
trunk/patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/binfilter-dont-extern-sRTF-sHTML.diff
trunk/patches/dev300/cjk-character-units-fix.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/cjk-character-units-fix.diff
trunk/patches/dev300/cjk-character-units-imp.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/cjk-character-units-imp.diff
trunk/patches/dev300/default-autotext-and-form-name.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/default-autotext-and-form-name.diff
trunk/patches/dev300/default-no-registration-menu.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/default-no-registration-menu.diff
trunk/patches/dev300/gstreamer-sd.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/gstreamer/gstreamer-sd.diff
trunk/patches/dev300/gstreamer-slideshow.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/gstreamer/gstreamer-slideshow.diff
trunk/patches/dev300/internal-mesa-headers-slideshow.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/internal-mesa-headers-slideshow.diff
trunk/patches/dev300/letter-wizard-resource-id.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/gstreamer/letter-wizard-resource-id.diff
trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff
trunk/patches/dev300/offapi-calc-datapilot-drilldown.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/offapi-calc-datapilot-drilldown.diff
trunk/patches/dev300/padmin-nofontconfig.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/padmin-nofontconfig.diff
trunk/patches/dev300/sc-datapilot-autoformat.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/sc-datapilot-autoformat.diff
trunk/patches/dev300/sc-r1c1.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/sc-r1c1.diff
trunk/patches/dev300/scs-sc-menubar.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/scsolver/scs-sc-menubar.diff
trunk/patches/dev300/speed-pagein.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/speed-pagein.diff
trunk/patches/dev300/sw-dont-extern-sRTF-sHTML.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/sw-dont-extern-sRTF-sHTML.diff
trunk/patches/dev300/transogl-transitions-sd.diff
- copied, changed from r11934, /trunk/patches/src680/transogl-transitions-sd.diff
trunk/patches/dev300/unittesting-basegfx.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/unittesting-basegfx.diff
trunk/patches/dev300/unxsplash-rework.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/unxsplash-rework.diff
trunk/patches/dev300/vba-workbook-worksheet-events.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/vba/vba-workbook-worksheet-events.diff
trunk/patches/dev300/wpsimport-filter.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/wpsimport-filter.diff
trunk/patches/dev300/wpsimport-scp2.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/wpsimport-scp2.diff
trunk/patches/dev300/wpsimport-writerperfect.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/wpsimport-writerperfect.diff
trunk/patches/dev300/xmlhelp-work-with-symlinks.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/xmlhelp-work-with-symlinks.diff
trunk/patches/dev300/zoom-combobox.diff (contents, props changed)
- copied, changed from r11934, /trunk/patches/src680/zoom-combobox.diff
Removed:
trunk/patches/dev300/Simplified_Traditional_Chinese_convertion_table_n200505.diff
trunk/patches/dev300/build-java-target-m3.diff
trunk/patches/dev300/buildfix-libformula-gcj-source.diff
trunk/patches/dev300/buildfix-sal-system.h-no-asm-sigcontext.h.diff
trunk/patches/dev300/buildfix-stl-anachronism.diff
trunk/patches/dev300/cairo-canvas-fail-if-no-xrender.diff
trunk/patches/dev300/cws-awtfixes1.diff
trunk/patches/dev300/cws-layout-scp2.diff
trunk/patches/dev300/cws-newportstl.diff
trunk/patches/dev300/cws-sdk24fix.diff
trunk/patches/dev300/cws-thiscomponent-basctl.diff
trunk/patches/dev300/cws-thiscomponent-sfx2.diff
trunk/patches/dev300/cws-transogl02-officecfg.diff
trunk/patches/dev300/cws-transogl02-sd.diff
trunk/patches/dev300/cws-transogl02-slideshow.diff
trunk/patches/dev300/cws-transogl02-vcl.diff
trunk/patches/dev300/cws-unifysound01-vcl-m1.diff
trunk/patches/dev300/cws-unifysound01-vcl-m4.diff
trunk/patches/dev300/cws-xmlfilter02-sc-m3.diff
trunk/patches/dev300/dmake-heap-corruption.diff
trunk/patches/dev300/evoab2-adapt-to-new-api.diff
trunk/patches/dev300/gperf-3-is-needed-m5.diff
trunk/patches/dev300/i18npool-less-dependencies.diff
trunk/patches/dev300/libsn-removal.diff
trunk/patches/dev300/ooo84684.vcl.fixfontconfig.diff
trunk/patches/dev300/psprint-do-not-substitute.diff
trunk/patches/dev300/reportdesigner-fix-jarlist.diff
trunk/patches/dev300/reportdesigner-no-license-m1.diff
trunk/patches/dev300/reportdesigner-no-license-m3.diff
trunk/patches/dev300/sc-export-shape-macro-bindings-m3.diff
trunk/patches/dev300/sc-hyperlink-excel-a1-style.diff
trunk/patches/dev300/sc-hyperlink-rename-sheet-name.diff
trunk/patches/dev300/sc-indirect-named-range.diff
trunk/patches/dev300/sc-lotus123-import-sheetname.diff
trunk/patches/dev300/scaddins-erf-crash-fix-065.diff
trunk/patches/dev300/sd-default-format-n285959.diff
trunk/patches/dev300/sdk-remove-non-free.diff
trunk/patches/dev300/solaris-dont-depend-on-core10.diff
trunk/patches/dev300/solenv-really-use-unsinged-char-on-ppc-m1.diff
trunk/patches/dev300/speed-text-search-performance-i18npool.diff
trunk/patches/dev300/speed-text-search-performance-unotools.diff
trunk/patches/dev300/startup-wizard-speedup.diff
trunk/patches/dev300/svx-delay-load-forms.diff
trunk/patches/dev300/svx-sdr-contact-visibility.diff
trunk/patches/dev300/sw-export-empty-headers-footers.diff
trunk/patches/dev300/sw-my-mess.diff
trunk/patches/dev300/sw-paste-czech-characters.diff
trunk/patches/dev300/sw-special-locales-date-string.diff
trunk/patches/dev300/text_grid_enhancement_filter.diff
trunk/patches/dev300/text_grid_enhancement_layout.diff
trunk/patches/dev300/ucb-neon-0.24.diff
trunk/patches/dev300/unxsplash-rework-m1.diff
trunk/patches/dev300/vba-brackets-params-fix-m5-m7.diff
trunk/patches/dev300/vba-keep-codenames-in-sync-m3.diff
trunk/patches/dev300/warning-too-few-arguments-icc.diff
trunk/patches/dev300/webdav-locking-m3.diff
trunk/patches/dev300/wizards-source-importwizard-filesmodul-xba-m3.diff
trunk/patches/dev300/wmf-pattern-brush-m3.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/split-binfilter-scp2.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Wed Mar 19 17:08:41 2008
@@ -6,50 +6,50 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../scsolver:../gstreamer:../ooxml:../postgresql:../emf+:../src680
-# Copied from ooh680-m6: svn r11539
-OLDEST_SUPPORTED=src680-m241
+# copied from svn r11934
+OLDEST_SUPPORTED=dev300-m3
# -------- Functional sub-sets --------
Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
Fixes, DefaultSettings, Features, VCL, Misc, \
Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
- SpeedImageList, GStreamer, CWSBackports, WPG, Cleanups, WMF, \
+ GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, \
Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
- OOXML, EMFPlus
+ OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting
LinuxCommon : Common, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
- FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
- cairocanvas, msaccess, GnomeVFS, OpenGLTransitions, \
- Fpickers, Mono, AddressBooks, QuickStarter, UnitTesting
+ FedoraFixes, LinuxOnly, SystemBits, \
+ cairocanvas, msaccess, OpenGLTransitions, InternalMesaHeaders, \
+ Fpickers, Mono, AddressBooks, QuickStarter
MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
Win32Common : Common, Defaults, TangoIcons, \
- Win32Only, NotDebian, NotMacOSX
+ Win32Only, NotDebian
# Experimental sections
Experimental: DebianBaseNoHelpContent, \
VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
UnUsedButNotYetRemovedFromSVN, \
PostgreSQL, SELinux, VOSremoval, Glib2, \
- SVGImport
+ UnitBootstrap
# Binfilter patches: a special distro; applied only when building with binfilter
-Binfilter : BFBuildBits, BFFixes
+Binfilter : BFBuildBits, BFFixes, BFShrink
# System patches: a special distro; applied only when building with the system tarball unpacked
System : SystemBuildBits
# Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
-Sdk :
+Sdk : SdkFixes
#Localize
Localize :
# Novell
NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
NotDebian, Lockdown, CalcSolver, Split, Shrink, \
- CalcDataPilotDrillDown
+ CalcDataPilotDrillDown, CustomKeyBinding
SUSE-9.1 : NovellBase
SUSE-9.2 : NovellBase
SUSE-9.3 : NovellBase
SUSE-10.0 : NovellBase
SUSE-10.1 : NovellBase, BerkeleyDB43
-SUSE-10.2 : NovellBase, BerkeleyDB43
-SUSE-10.3 : NovellBase, BerkeleyDB43
-SUSE : NovellBase, BerkeleyDB43, Gcc43
+SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus
+SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus
+SUSE : NovellBase, BerkeleyDB43, Gcc43, EMFPlus
SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
# Debian
DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, CalcSolver, BerkeleyDB43, Split, PostgreSQL
@@ -65,6 +65,8 @@
UbuntuFeisty64 : UbuntuBased, CairoFonts, UbuntuFeistyOnly
UbuntuGutsy : UbuntuBased, CairoFonts, UbuntuGutsyOnly, Debian32Only
UbuntuGutsy64 : UbuntuBased, CairoFonts, UbuntuGutsyOnly
+UbuntuHardy : UbuntuBased, CairoFonts, UbuntuHardyOnly, Debian32Only
+UbuntuHardy64 : UbuntuBased, CairoFonts, UbuntuHardyOnly
UbuntuL10n : UbuntuBased, UbuntuL10nOnly, Debian32Only
# a copy of the UbuntuDapper* lines ("Ubuntu: UbuntuDapper" doesn't work)
Ubuntu : UbuntuBased, UbuntuDapperOnly, Debian32Only
@@ -75,7 +77,7 @@
# Ark Linux
Ark: LinuxCommon, NotDebian, ArkOnly, BerkeleyDB43, Gcc43
# www.pld-linux.org
-PLDBase: LinuxCommon, NotDebian, CalcSolver, CairoFonts, STLport5, OOXSTLport5, PLDOnly
+PLDBase: LinuxCommon, NotDebian, CalcSolver, CairoFonts, PLDOnly
PLD: PLDBase
PLD64: PLDBase
# Mandriva Linux
@@ -87,7 +89,7 @@
# openmamba
openmamba: LinuxCommon, GlobalDesktopFiles
#Gentoo
-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, STLport5, OOXSTLport5
+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43
GentooUnstable: GentooBase, GentooExperimental
Gentoo : GentooBase
Gentoo64: GentooBase
@@ -100,7 +102,7 @@
# translate.org.za
translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas, Fpickers
+NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas, Fpickers, CustomKeyBinding
# Novell
NovellWin32: NovellLikeWin32
NovellWin32ISO: NovellLikeWin32
@@ -116,12 +118,12 @@
# Universal Upstream-like packages
GoOoLinux: NovellBase, Glib2
# OxygenOffice Professional
-OxygenOfficeLinuxCommon : Common, FontConfigTemporaryHacks, \
- FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
- cairocanvas, msaccess, GnomeVFS, OpenGLTransitions, \
- Fpickers, Mono, AddressBooks, QuickStarter, UnitTesting
+OxygenOfficeLinuxCommon : Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
+ FedoraFixes, LinuxOnly, SystemBits, \
+ cairocanvas, msaccess, OpenGLTransitions, \
+ Fpickers, Mono, AddressBooks, QuickStarter
OxygenOfficeMacOSXCommon : Common, SystemBits
-OxygenOfficeWin32Common : Common, Win32Only, NotDebian, NotMacOSX
+OxygenOfficeWin32Common : Common, Win32Only, NotDebian
OxygenOfficeLinux: OxygenOfficeLinuxCommon, CalcSolver, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
OxygenOfficeWindows: OxygenOfficeWin32Common, CalcSolver, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
@@ -168,7 +170,7 @@
selection-crash-svx-svdmrkv.diff, i#76084, jianhua
#Improve the behavior of input field dialog.
-sw-input-field-dialog.diff, Zhang Yun
+#FIXME sw-input-field-dialog.diff, Zhang Yun
# Improve the behavior of input fields inline editing.
# sw-input-field-inline-edit.diff, Zhang Yun # removed since it causes some
@@ -200,22 +202,14 @@
# Fix linkoo, the ultimate hacker tool
fix-linkoo.diff, i#83548, jholesov
-[ TemporaryHacks < src680-m241 ]
-# libspl680*so does not have to be loaded when we present no startup wizard
-startup-wizard-speedup.diff, i#84169, jholesov
-
-[ TemporaryHacks < src680-m241 ]
-# fixed for n#200505
-Simplified_Traditional_Chinese_convertion_table_n200505.diff, Fong Lin, n#200505
-
-# move gl_ES to localedata_es to save dependency & memory
-i18npool-less-dependencies.diff, i#84206, jholesov
-
-# dont initialize forms on the Writer startup, rather do it when the first form
-# control is created
-svx-delay-load-forms.diff, i#84259, jholesov
+# temporary compile sc/source/core/tool with -O1 with gcc-4.3 on x86_64
+# until the internal compiler error is fixed
+# buildfix-gcc-4.3-compiler-error.diff, n#370383, pmladek
+
+#Fix: no autocorrection when "!" (exclamation mark) was typed
+#This is timar's patch, will be fixed in 3.0 in the stream
+i86580-autocorr-exclamation.diff, i#86580, szalaik
-[ TemporaryHacks ]
# Make the historically very verbose build quieter, helps us see warnings.
quiet-build.diff, i#84497, michael
@@ -225,24 +219,18 @@
# gcc OOMs here otherwise (x86_64)
writerfilter-qnametostr-NOOPTFILES.diff
-# always enable file save even when the document is not modified.
-sfx2-always-allow-save-document.diff, n#347423, kohei
-
[ CJK ]
#set default CJK font fontsize as 10.5pt
sw-default-cjk-fontsize.diff i#72010, jianhua
-# Text grid enhancement for better CJK support
-text_grid_enhancement_ww8_filter.diff, Fong Lin
-text_grid_enhancement_officecfg.diff, Fong Lin
-text_grid_enhancement_layout.diff, Fong Lin
-#FIXME:
-#text_grid_enhancement_filter.diff, Fong Lin
-
# add a new unit 'character unit'
cjk-character-units-ui.diff, Amelia Wang
cjk-character-units-imp.diff, Amelia Wang
cjk-character-units-rulers-sync-with-pggrid-fix.diff, Amelia Wang
+cjk-character-units-fix.diff, i#356101, Amelia Wang
+
+# text layout enhancement for better CJK support
+cjk-punctuation-compress.diff, Amelia Wang
#[ CJKTemporaryHacks ]
# the following patch is disabled temporary.
@@ -264,54 +252,20 @@
wpsimport-writerperfect.diff
libwps.diff
-# T602 import filter
-cws-t602import01.diff
-
-# removal of nas, sndfile, portaudio
-cws-unifysound01-avmedia.diff
-cws-unifysound01-config_office.diff
-cws-unifysound01-filter.diff
-cws-unifysound01-fpicker.diff
-cws-unifysound01-framework.diff
-cws-unifysound01-helpcontent2.diff
-cws-unifysound01-sc.diff
-cws-unifysound01-scp2.diff
-cws-unifysound01-sd.diff
-#cws-unifysound01-slideshow.diff
-cws-unifysound01-solenv.diff
-cws-unifysound01-svx.diff
-cws-unifysound01-sw.diff
-
-[ CWSBackports < src680-m241 ]
-cws-unifysound01-vcl-m1.diff
-
-[ CWSBackports >= src680-m241 < src680-m241 ]
-cws-unifysound01-vcl-m4.diff
-
-[ CWSBackports >= src680-m241 ]
-cws-unifysound01-vcl.diff
-
-[ CWSBackports < src680-m241 ]
-# Use stlport just on the archs where it is needed from historical reasons
-cws-newportstl.diff
-
-[ CWSBackports ]
#dialog refactor
cws-npower9.diff
#basic runtime fixes
cws-npower10.diff
#api changes
cws-npower11.diff
-[ CWSBackports < src680-m241 ]
-buildfix-stl-anachronism.diff, i#83519
-[ CWSBackports ]
-# not for upstreaming: hack to work even on gcc's with broken -fvisibility-inlines-hidden
+cws-s390port01.diff, i#86425
+# not for upstreaming: don't disable the entire visibility, just
+# the -fvisibility-inlines-hidden
buildfix-x86-64-visibility-workaround.diff
-[ CWSBackports < src680-m241 ]
-cws-thiscomponent-basctl.diff
-cws-thiscomponent-sfx2.diff
+cws-hsqldb16.diff, i#85087
+
[ WPG ]
# libwpg-based import filter for WordPerfect Graphics
@@ -335,8 +289,6 @@
# JDKs too
buildfix-qadevOOo-java-encoding.diff, brosenk
-[ GCJ >= src680-m241 < src680-m241 ]
-buildfix-libformula-gcj-source.diff, i#85249
# Fixes that were not accepted up-stream, but are still useful
[ FixesNotForUpstream ]
@@ -364,18 +316,10 @@
sdext-no-license.diff
-[ FixesNotForUpstream < src680-m241 ]
-# no bogus license question when registering this extension
-reportdesigner-no-license-m1.diff
-
-[ FixesNotForUpstream >= src680-m241 < src680-m241 ]
-# no bogus license question when registering this extension
-reportdesigner-no-license-m3.diff
-
-[ FixesNotForUpstream >= src680-m241 ]
# no bogus license question when registering this extension
reportdesigner-no-license.diff
+
[ Fixes ]
# sd printing fixes
printing-bugfix-254573.diff, n#254573, rodo
@@ -383,11 +327,12 @@
# let sd accept uri-list drop, n#183719
sd-accept-uri-list-drop.diff, n#183719, rodo
-[ Fixes < src680-m241 ]
-# default formatting PPT export bug n#285959
-sd-default-format-n285959.diff, i#81395, n#285959, hub
+# support the groupwise mail client
+shell-senddoc-support-groupwise.diff, n#368044, i#86886, pmladek
+
+# allow to send documents with a space in the name via sylpheed-claws
+shell-senddoc-sylpheed-filenames.diff, n#362773, i#86887, pmladek
-[ Fixes ]
# add some shortcuts to Impress + needed fixes. bug n#352330
sd-text-shortcut-n352330.diff, i#85247, n#352330, hub
svx-text-move-fix-i59061.diff, i#59061, hub
@@ -405,15 +350,9 @@
# disable font management dialog in padmin
padmin-nofontconfig.diff, michael
-[ Fixes < src680-m241 ]
-# Fix for n#113235
-wizards-source-importwizard-filesmodul-xba-m3.diff, i#56633, noelpwer
-
-[ Fixes >= src680-m241 ]
# Fix for n#113235
wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
-[ Fixes ]
# testtool doesn't like oobuild basic compatability defaults
# ooo-build only fix n#145906#
automation-testtool-oobuildfix.diff, n#145906, noelpwer
@@ -434,8 +373,6 @@
# Added support for "application/octet-stream" mime type in package manager
desktop-application-octet-stream-mime-type.diff, i#73301, flr
-win32-quickstarter-exit.diff, i#73550, tml
-
# find locked certs, fix by Jacob Berkman <jberkman novell com>
libxmlsec-findcerts.diff, i#76870, pmladek
# allow other types of signing certs, fix by Jacob Berkman <jberkman novell com>
@@ -451,18 +388,6 @@
# try autodetection if it is allowed and the current java has been removed
jvmfwk-detect-removed-java.diff, i#83140, n#336242, pmladek
-# allow dmake create_patch produce diffable patches
-solenv-dmake-create_patch.diff, i#68917, fridrich
-
-[ Fixes < src680-m241 ]
-# fix visibility for controls
-svx-sdr-contact-visibility.diff, i#83611. noelpwer
-
-[ Fixes ]
-# look for libmawt.so on x86_64 too
-# FIXED in m245
-# sun-java-amd64-jreextralibdir.diff
-
# check real help path defined in registry instead of the $(instpath)/help
sfx-check-real-help-path.diff, i#81139, pmladek
@@ -482,23 +407,15 @@
# enable build debug=t in sw module on x86_64
sw-debug-build.diff, fridrich
-# fix a regression created by my header/footer patch
-sw-my-mess.diff, fridrich
+# convert kind of correctly nested positioned tables
+# sw-nested-positionned-tables-ww8-import-fix.diff, i#86988, fridrich
-[ Fixes < src680-m241 ]
-#fix conversion of date/time strings in Dutch Word documents
-sw-special-locales-date-string.diff, i#84469, n#344306, fridrich
-
-#fix bug in export to WW8 of page styles without headers/footers
-#that follow sections with headers/footers
-sw-export-empty-headers-footers.diff, i#84747, n#178981, fridrich
-
-# Fix pasting Czech characters (UTF-8 html was not treated as UTF-8)
-sw-paste-czech-characters.diff, i#84642, n#334930, jholesov
-
-[ Fixes == src680-m241 ]
-# not REPRORTJARFILES
-reportdesigner-fix-jarlist.diff, i#85359
+# make path detection look for VC2005er dlls, too
+config_office-msvc8-compat.diff, thorsten
+
+# fix import of MSO Userform & Frame ( presence of scroll-top & scroll-left )
+# screws things up
+userform-scrollleftandtop.diff, i#87007, noelpwer
[ SELinux ]
# make OOo work under SELinux
@@ -555,31 +472,53 @@
# Move gnome-vfs out of the startup sequence, load it only when needed
gnome-vfs-late-init.diff, i#84137, jholesov
-[ GnomeVFS >= src680-m241 ]
+# Keep the file read/write after reload
+gnome-vfs-reload.diff, n#264140, jholesov
+
+# Show the file size in the Properties dialog
+gnome-vfs-properties.diff, n#264585, jholesov
+
# WebDAV locking
# It is in this section because it needs part of the gvfs-related patches
webdav-locking.diff, n#346711, i#29152, jholesov
-[ GnomeVFS < src680-m241 ]
-# WebDAV locking
-# It is in this section because it needs part of the gvfs-related patches
-webdav-locking-m3.diff, n#346711, i#29152, jholesov
+# Fix the behaviour for the servers that do not support locking
+webdav-locking-not-locking-servers.diff, n#346711, i#29152, jholesov
-[ QuickStarter < src680-m241 ]
-# External splash screen implementation / 2nd time accelerator
-unxsplash-rework-m1.diff, i#60696, michael/jholesov
+# Implement uploading the changed stream to the server
+webdav-locking-stream-can-save.diff, n#346711, i#29152, jholesov
+
+# Serve dav:// and webdav:// protocols in the WebDAV UCP
+webdav-locking-serve-dav-uri.diff, n#346713, i#29152, jholesov
+
+# Fix the runtime for neon 0.24
+webdav-locking-neon24.diff, n#357048, i#29152, jholesov
-[ QuickStarter >= src680-m241 ]
+# Fix Save As
+webdav-locking-save-as.diff, i#29152, jholesov
+
+# Catch possible exceptions in flush(), otherwise can crash
+webdav-locking-catch-flush-exceptions.diff, n#363093, i#29152, jholesov
+
+# The http(s)/dav(s)/webdav(s) protocols can contain even username/passwd
+webdav-locking-can-have-username.diff, n#363363, i#29152, jholesov
+
+# ne_lockstore_add() must be called _after_ ne_lock()
+webdav-locking-lockstore.diff, i#29152, jholesov
+
+# unlock the stream on crash/terminate/...
+webdav-locking-unlock-on-crash.diff, i#29152, jholesov
+
+
+[ QuickStarter ]
# External splash screen implementation / 2nd time accelerator
unxsplash-rework.diff, i#60696, michael/jholesov
-[ QuickStarter ]
# handling of osl pipe has changed, see i#84045
unxsplash-new-osl-pipe.diff, i#60696, jholesov
-[ QuickStarter < src680-m241 ]
-# libstartup-notification is not necessary with oosplash.bin
-libsn-removal.diff, i#84179, jholesov
+# when OOo fails during startup, don't loop endlessly
+unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
[ WriterFixes ]
@@ -608,10 +547,8 @@
# Autofill doesnt fill filtered rows bxc 62499
sc-filters-fill-fix.diff, jody
-# Provision for dynamic range in data pilot bxc 62522
-# Previously sc-dp-database-crash.diff and sc-pv-crasher.diff are now
-# incorporated into this patch since these two patches are improvement to
-# this patch below.
+# Support modification of data source range in DataPilot after table output has
+# been generated.
sc-datapilot-dynamic-range.diff, i#23658, kohei
# Provision for data-pilot to give autoformat bxc #62162
@@ -637,8 +574,8 @@
# sc-dp-gridlayout.diff, i#68544 n#190970, jody
sc-dp-gridlayout.diff, i#68544, n#190970, jody
-# compatibility for numbers in string cells (with leading/trailing space) - i#47811
-sc-string-arg.diff, i#47811, muthusub
+# Excel compatibility for handling of "string numbers".
+#FIXME dev300: sc-string-arg.diff, i#5658, kohei
# To make CSV Text Import settings persistent
sc-preserve-imp-opts.diff, i#3687, muthusub
@@ -665,11 +602,16 @@
# Paste clipboard when ENTER is pressed, then clear clipboard.
sc-paste-on-enter.diff, n#358545, i#28535, jonp
-[ CalcFixes < src680-m241 ]
-# Add named range support for INDIRECT and INDIRECT_XL
-sc-indirect-named-range.diff, i#4695, n#274387, kohei
+# Allow 'june-2007' to be properly parsed as June 1 2007 in en-US locales.
+sc-date-fix.diff, n#358750, jonp
+
+# For multi-line cell contents, bolding the first line shouldn't bold the
+# entire cell.
+sc-no-apply-pattern-for-cursor.diff, n#359690, jonp
+
+# Add extra padding so that the cell height is larger -- increases legibility.
+sc-extra-cell-margins.diff, n#361358, jonp
-[ CalcFixes ]
# Change default numbering scheme of x-y plot chart from Row 1, Row2, ... to
# 1, 2, 3... when the X labels are not explicitly given. This is what Excel
# does.
@@ -689,19 +631,10 @@
# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets.diff, n#335684, i#45497, jonp
-[ CalcFixes < src680-m241 ]
-# allow Excel A1 style format (e.g. #Sheet2!A2) in hyperlink destination.
-sc-hyperlink-excel-a1-style.diff, i#80448, kohei
-
-# rename sheet name in URL on import when invalid characters are used (such as
-# '&').
-sc-hyperlink-rename-sheet-name.diff, n#246629, i#81154, kohei
-
-# Speed up recalculation of SEARCH function when thousands of cells use it.
-speed-text-search-performance-unotools.diff, i#80981, kohei
-speed-text-search-performance-i18npool.diff, i#80981, kohei
+# After selecting a block, the next movement should move from the *start* of
+# the block selection, not the end.
+sc-move-from-origin.diff, n#364351, jonp
-[ CalcFixes ]
# Allow biffdump.cxx to compile on 64-bit platforms
sc-biffdump.diff, i#82184, jonp
@@ -722,28 +655,6 @@
# Launch navigator when double-clicking the leftmost status area box.
sc-status-bar-launch-navigator.diff, i#49491, kohei
-[ CalcFixes < src680-m241 ]
-# Fix crashes on erf(0.65). This is fixed in dr58 CWS upstream.
-scaddins-erf-crash-fix-065.diff, i#84395, kohei
-
-# Import sheet names properly from Lotus 1-2-3 document.
-sc-lotus123-import-sheetname.diff, i#84496, kohei
-
-[ CalcFixes ]
-# Enhance FREQUENCY function to make it behave like Excel (ODFF).
-sc-openformula-frequency.diff, i#8946, kohei
-
-# Enhance MATCH function to accept array as the 2nd parameter (ODFF).
-sc-openformula-match.diff, i#8947, kohei
-
-# Enhance SUMIF function to make Calc's handling of the 3rd parameter identical
-# to Excel's (ODFF).
-sc-openformula-sumif.diff, i#85000, kohei
-
-# Return 0 by MIN/MAX/MINA/MAXA when referenced cells are all empty (patch
-# contributed from Lv Yue) (ODFF).
-sc-openformula-minmax.diff, i#38759, kohei
-
# Support print & page preview for files containing only lines
sc-print-lines.diff, n#351468, i#85076, jonp
@@ -754,6 +665,13 @@
# instead of importing them as an empty chart object.
sc-skip-pivot-charts.diff, n#355300, i#85658, kohei
+# Have cell background paint over the gridlines.
+sc-cellbackground-over-gridlines.diff, n#361360, i#3907, kohei
+
+# Make cell number format toolbar icons togglable & remove the standard format
+# button.
+sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
+
[ LinuxOnly ]
# accelerate linking, by extreme cunning i#63927
speed-local-link-except.diff, i#63927, michael
@@ -763,12 +681,6 @@
# fix: this breaks win32
fpicker-kde-gcc4-visibility.diff, pmladek
-[ NotMacOSX ]
-
-# Make the delete key happy again in starcalc - wontfix [!]
-#gui-sc-delete.diff, i#17965, michael
-# Swap the delete and backspace key bindings but leave the menus alone.
-sc-default-delete-backspace-key.diff, i#17965, kohei
[ Misc ]
# Insert symbol defaults to the Symbol font - not a random one
@@ -793,9 +705,8 @@
# display command line help '-h' to stdout instead of stderr.
desktop-cmdhelp-stdout.diff, kohei
-[ Misc < src680-m241 ]
-# Don't substitute downloadable fonts with resident fonts.
-psprint-do-not-substitute.diff, i#84481, kohei
+# always enable file save even when the document is not modified.
+sfx2-always-allow-save-document.diff, n#347423, i#5226, kohei
[ EasterEgg ]
@@ -810,16 +721,9 @@
# Some Novell colors ...
novell-palette.diff, michael
-[ NovellOnly > src680-m241 ]
-
# finally disable -fsigned-char on pcc
solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
-[ NovellOnly <= src680-m241 ]
-
-# finally disable -fsigned-char on pcc
-solenv-really-use-unsinged-char-on-ppc-m1.diff, i#81127, n#169875, pmladek
-
[ NotDebian ]
@@ -836,9 +740,19 @@
# use --hash-style=gnu linking when supported
# disabled for Debian as Debian policy (for now) is to use=both
speed-hash-style.diff, pmladek
+# re-direct to plugins via http://extensions.go-oo.org/
+redirect-extensions.diff
+
+
+[ CustomKeyBinding ]
+SectionOwner => kohei
+
+# Swap the delete and backspace key bindings but leave the menus alone.
+sc-default-delete-backspace-key.diff, i#17965, kohei
+
+# migrate keyboard shortcuts properly.
+desktop-keyconfig-migration.diff n#367160, kohei
-[ DebianBaseOnly < src680-m241 ]
-sdk-remove-non-free.diff
[ DebianBaseOnly ]
SectionOwner => rengelha
@@ -923,31 +837,13 @@
[ BuildBits ]
novell-win32-agfa-monotype-fonts.diff, tml
-[ BuildBits < src680-m241 ]
-# allow to define java target, so the build is usable with the JVM 1.4
-# even when it is built with JDK 1.5
-build-java-target-m3.diff, pmladek
-
-[ BuildBits >= src680-m241 ]
# allow to define java target, so the build is usable with the JVM 1.4
# even when it is built with JDK 1.5
build-java-target.diff, pmladek
-[ BuildBits < src680-m241 ]
-# don't include asm/sigcontext.h, see Debian Bug #442418
-buildfix-sal-system.h-no-asm-sigcontext.h.diff
-
-[ BuildBits ]
# fix build with gcc-4.2.1 and -fvisibility-hidden
buildfix-xmloff-exportxforms.diff, i#84965
-[ BuildBits < src680-m241 ]
-# fix building with system neon-0.24
-ucb-neon-0.24.diff, pmladek, i#85265
-
-[ BuildBits == src680-m241 ]
-# fix evoab2 build
-evoab2-adapt-to-new-api.diff, i#85487
[ NovellOnlyWin32 ]
SectionOwner => tml
@@ -996,6 +892,7 @@
# => Tango should be preferred over Industrial.
tango-prefer-over-industrial.diff, n#304615, pmladek
+
[ DefaultSettings ]
# default to anti-alias at point size of 1 point
@@ -1043,10 +940,10 @@
installer-strip-optional.diff, i#48814, pmladek
# add possibility to set ARCH_FLAGS when building libnas
-nas-use-arch-flags.diff, pmladek
+#FIXME dev300: nas-use-arch-flags.diff, pmladek
# add missing #include <stdio.h> in autodoc, breaks when building with STLport5
-autodoc-add-missing-stdio-h.diff, rengelha
+#autodoc-add-missing-stdio-h.diff, rengelha
# do not pack any potential .orig files with ppds
psprint_config-no-orig.diff, jholesov
@@ -1058,9 +955,7 @@
# Workaround for compile failure with glibc 2.4's langinfo.h
i18nutil-glibc-braindamage-workaround.diff, brosenk
-# fix build with system libnss installed apart from mozilla
-# strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
-# FIXME src680: libxmlsec-system-nss.diff, i#69368, pmladek
+xulrunner-1.9.diff, i#86670
# allow separate helpcontent build
#FIXME src680: separate-helpcontent.diff, jholesov
@@ -1109,18 +1004,17 @@
# fixes warnings about that a variable is used unitialized
warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
+# warning: comparison with string literal results in unspecified results
+warning-string-comparsion-sw.diff, i#86880, pmladek
+
#fix a build issue on solaris with sunpro 5.9 aka Sun Studio 12
stlport-solaris-fileno.diff, fridrich
-[ BuildBits >= src680-m241 ]
+# fix build with vba as extension
+buildfix-vba-as-extn.diff, i#86937, hmth
-# fix build with gcc-4.3 on x86_64
-gcc-4.3-icc.diff, i#85771, pmladek
-
-[ BuildBits >= src680-m241 < src680-m241 ]
-
-# fixes missing sprintf argument
-warning-too-few-arguments-icc.diff. i#85736, pmladek
+# fix build with gcc-4.3 on ix86
+gcc-4.3-bridges.diff, i#86551, pmladek
[ BFBuildBits ]
@@ -1128,7 +1022,7 @@
# STLport fixes
binfilter-stl.diff, i#63770, hmth
-cws-gcc430two-binfilter.diff, i#83276, pmladek
+
[ SystemBuildBits ]
SectionOwner => fridrich
@@ -1265,8 +1159,6 @@
vba-attribute.diff, i#37347, noelpwer
#basic depends on built and delivered ooovbaapi
basic-prj-build_lst.diff
-#for NULL and IsNULL compatibility with MSO
-vba-basic-null.diff i#85349, jjiao
[ ArkOnly ]
@@ -1281,6 +1173,8 @@
# Gnu JRE paths.
gentooexperimental-gnujre.diff
+# test system libxmlsec
+system-xmlsec.diff
[ GentooOnly ]
SectionOwner => aprosky
@@ -1382,21 +1276,15 @@
vba-workbook-worksheet-events.diff
vba-workbook-worksheet-events-buildfix.diff
-[ VBAObjects < src680-m241 ]
-vba-keep-codenames-in-sync-m3.diff
-
-[ VBAObjects >= src680-m241 ]
vba-keep-codenames-in-sync.diff
[ VBAObjects ]
#associating sheet and codename when insert a sheet
# sc-insert-sheet-codename.diff, i#80869, jianhua
-[ VBAObjects < src680-m241 ]
vba-brackets-params-fix.diff, i#79918, n#292861
vba-negnumber-inparam-withoutbrackets.diff, n#294302
-[ VBAObjects ]
# hack for when resolving a symbol in the module ThisWorkbook
vba-symbol-searchhack-for-thisworkbook.diff
vba-allow-ranges-for-cell-functions.diff
@@ -1425,15 +1313,9 @@
# core changes not yet upstream
sc-source-ui-vba-makefile-mk.diff
-[ VBAObjects < src680-m241 ]
-# export of macro bindings for shapes
-sc-export-shape-macro-bindings-m3.diff, n#304739, noelpwer
-
-[ VBAObjects >= src680-m241 ]
# export of macro bindings for shapes
sc-export-shape-macro-bindings.diff, n#304739, noelpwer
-[ VBAObjects ]
# export of hlink bindings for shapes
sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
@@ -1443,7 +1325,7 @@
# add support for passing a caller to basic when calling a script
# via the scripting framework - note depends on vbaevents-services-sources.diff
-basic-caller-support.diff
+#FIXME dev300: basic-caller-support.diff
# fix --disable-vba build
oovbaapi-disable-vba.diff
@@ -1455,12 +1337,26 @@
# fix for n#353242. missing APIs
# a set of CommandBar APIs.
vba-commandbar-bundle.diff, n#353242, Jianhua
+# fix for n#365557. missing APIs of XInterior
+vba-interior.diff, n#365557, Jianhua
+vba-stringtodouble.diff, n#359943, noelpwer
+
[ VBAUntested ]
SectionOwner => noelpwer
+# start LCL hacks
+# incomplete solution ( works for import of ocx radio buttons only )
+radiobutton-group-hack.diff, n#359937, jonp
+# end LCL hacks
basic-source-classes-eventatt-cxx.diff, #no-upstream
#ditto
+# null patch below was removed because it causes
+# other problems, e.g. the current NULL behavour fails
+# for vba api
+#for NULL and IsNULL compatibility with MSO
+#vba-basic-null.diff i#85349, jjiao
vba-support-stoc-typeprovider-xexactname.diff, #no-upstream
+
#must ask kendy about this ( noelp )
vba-parallel-build.diff, #no-upstream
#not so useful but perhaps we can build on it later
@@ -1483,7 +1379,8 @@
vba-getattr-function.diff, n#294187, Fong
# Fomat function enhancement for VBA
vba-format-function.diff, n#294187, Fong
-
+# Error function compatible with VBA
+vba-error-function.diff, n#294187, Fong
# Is function only valid for objects
#vba-is-behaviour.diff
@@ -1494,10 +1391,12 @@
# Pre- and postprocessing capabilities for loading and saving.
sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
+# hack to ignore writerfilter if odf-converter is present
+odf-converter-ignore-writerfilter.diff, n#348471, jholesov
[ Lockdown ]
# Disable UI [toolbars, menus] customization
-ui-desktop-integration.diff, michael
+#FIXME dev300: ui-desktop-integration.diff, michael
[ msaccess ]
@@ -1519,21 +1418,11 @@
#msaccess-db-create-dialog-fix.diff
-[ STLport5 ]
-SectionOwner => hmth
-SectionIssue => i#63770
-
-# system STLport5 support
-system-stlport5-config.diff
-system-stlport5-STLPORT_VER.diff
-
-system-stlport5.diff
-
-# system stlport51 support
-system-stlport51.diff
-# new wrapper func in cws chart11
-cws-chart11.diff
-system-stlport5_cppu.diff, i#78909
+#[ STLport5 ]
+#SectionIssue => i#63770
+#
+#system-stlport5.diff, i#79875
+#system-stlport51.diff, i#79876
[ CalcSolver ]
@@ -1563,58 +1452,39 @@
#scsolver-enable-extension.diff
-[ OOXML < src680-m241 ]
-cws-xmlfilter02-sc-m3.diff
-
-[ OOXML < src680-m245 ]
-cws-xmlfilter02-sc.diff
-
-[ OOXML < src680-m245 ]
-cws-xmlfilter02-config_office.diff
-cws-xmlfilter02-filter.diff
-cws-xmlfilter02-goodies.diff
-cws-xmlfilter02-offapi.diff
-cws-xmlfilter02-postprocess.diff
-cws-xmlfilter02-sal.diff
-cws-xmlfilter02-sax.diff
-cws-xmlfilter02-scp2.diff
-cws-xmlfilter02-sd.diff
-cws-xmlfilter02-solenv.diff
-cws-xmlfilter02-svx.diff
-cws-xmlfilter02-sw.diff
-cws-xmlfilter02-toolkit.diff
-
[ OOXML ]
-cws-xmlfilter03-sw.diff
-cws-xmlfilter03-offapi.diff
-
win32-installer-register-moox-types.diff
-oox-depends-on-tools.diff, i#85614
writerfilter-module-writer.diff
-[ OOXML < src680-m241 ]
-gperf-3-is-needed-m5.diff
+writerfilter-source-dmapper-domainmapper-debug.diff
-[ OOXML >= src680-m241 ]
gperf-3-is-needed.diff
-[ OOXML ]
-writerfilter-source-dmapper-domainmapper-debug.diff
-
-writerfilter-source-resourcemodel-util_cxx.diff
+#FIXME dev300: oox-token-deps.diff
[ CalcFixes ]
# Allow comma as a cell separators in functions
# The patch depends on the cws-xmlfilter03 stuff
-sc-localized-arg-separator.diff, n#358558, kohei
+#FIXME dev300: sc-localized-arg-separator.diff, n#358558, kohei
-[ OOXSTLport5 ]
-SectionOwner => hmth
+# Toggle gridline display per sheet.
+#FIXME dev300: sc-sheet-gridline-toggle.diff, kohei
-system-stlport51-oox.diff
-system-stlport51-oox-map.diff
+# Fix a regression where a pasted cell range is not highlighted.
+#FIXME dev300: sc-fix-paste-cellrange-selection.diff, i#86894, kohei
+
+# Skip overlapped cells (cells that are hidden under a merged cell) when
+# navigating through cells.
+sc-skip-overlapped-cells.diff, i#86943, n#362674, kohei
+
+#[ OOXSTLport5 ]
+#
+## oox devs, please reconsider operator[] use,
+## see i#80084/cws chart11 ! thank you!
+#system-stlport51-oox.diff
+#system-stlport51-oox-map.diff
[ PostgreSQL ]
sdbc-postgresql.diff
@@ -1670,25 +1540,19 @@
cairo-config_office-configure-in.diff, i#70519, tml
cairo-cairo-1-4-10-diff.diff, i#70519, tml
-[ cairocanvas < src680-m241 ]
-# don't crash if xrender extension is not present
-cairo-canvas-fail-if-no-xrender.diff, i#84049, fridrich
-
-[ cairocanvas ]
# Additional diffs for cairocanvas on Win32
cairo-canvas-win32.diff, i#70519, n#300398, tml
-[ OpenGLTransitions < src680-m241 ]
-cws-transogl02-officecfg.diff
-cws-transogl02-sd.diff
-cws-transogl02-slideshow.diff
-cws-transogl02-vcl.diff
-
[ OpenGLTransitions ]
transogl-transitions-slideshow.diff
transogl-transitions-sd.diff
transogl-transitions-officecfg.diff
transogl-transitions-scp2.diff
+transogl-more-transitions.diff
+transogl-vsync.diff
+transogl-shader-transitions.diff
+transogl-mesa-fallback.diff
+transogl-shader-transitions-1.diff
[ Experimental ]
# sal_uInt32 -> sal_uIntPtr for events on some places
@@ -1744,14 +1608,17 @@
system-lpsolve-rpath.diff, rengelha
#gccXXXXX.solenv.javaregistration.diff
+[ UbuntuHardyOnly ]
+static-libs-use-_pic.diff, rengelha
+unxlngi6-notune.diff, doko
+ubuntu-no-stack-protector.diff, doko
+# link dynamically with liblpsolve55.so
+system-lpsolve-rpath.diff, rengelha
+#gccXXXXX.solenv.javaregistration.diff
[ FedoraFixes ]
ooo64508.vcl.honourfontconfighinting.diff
-[ FedoraFixes < src680-m241 ]
-ooo84684.vcl.fixfontconfig.diff
-
-[ FedoraFixes ]
ooo67658.sfx2.reloadcrash.diff
oooXXXXX.vcl.x86_64.impressatk.diff
@@ -1801,10 +1668,13 @@
# kill >1Mb of bloat in sal
size-sal-textenc.diff, i#70166
-[ NovellOnlyWin32 ]
-SectionOwner => tml
-
-novell-win32-odma.diff, i#6885, i#32741
+# don't export trivial strings in svtools, increases linking time, bloats size
+svtools-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
+sw-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
+
+[ BFShrink ]
+# don't export trivial strings in svtools, increases linking time, bloats size
+binfilter-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
[ NovellOnlyUnix ]
@@ -1815,12 +1685,12 @@
[ SVGImport ]
# Very partial implementation of SVG import
# Work in progress, don't use, hic sunt leones, etc.
-svg-import.diff, jholesov
+#svg-import.diff, jholesov
# Marco Cecchetti's work on importing text
-svg-import-text.diff, jholesov
+#svg-import-text.diff, jholesov
-# allow internal libsvg, hic sunt (still always) leones, HACK!!!
-libsvg-module.diff, fridrich
+svg-import-basegfx.diff, thorsten
+svg-import-filter.diff, thorsten
[ CalcDataPilotDrillDown ]
# Implements DataPilot cache table, result drill-down, and some extra UNO API.
@@ -1860,6 +1730,7 @@
[ UnUsedButNotYetRemovedFromSVN ]
# diffs kept for reference as there might soon be a need to resurrect
# part of the code
+win32-quickstarter-exit.diff, i#73550, tml
[ Store ]
SectionOwner => rodo
@@ -1879,31 +1750,19 @@
novell-win32-avoid-premature-shutdown.diff
-[ WMF < src680-m241 ]
-wmf-pattern-brush-m3.diff, n#232232, rodo
-[ WMF >= src680-m241 ]
+[ WMF ]
wmf-pattern-brush.diff, n#232232, rodo
-[ Layout < src680-m241]
-SectionOwner => jannie
-cws-awtfixes1.diff, i#78291, i#80754
-
-[ Layout ]
-SectionOwner => janniew
-cws-layout-svtools.diff
-
-
-[ LayoutDialogs]
-SectionOwner => janniew
-cws-layout-config_office.diff
-cws-layout-offapi.diff
-cws-layout-scp2.diff
-cws-layout-solenv.diff
-cws-layout-svx.diff
-cws-layout-sw.diff
-cws-layout-toolkit.diff
-cws-layout-transex3.diff
+[ AutoCorrectCapsLock ]
+SectionOwner => kohei
+
+autocorrect-accidental-caps-lock-offapi.diff
+autocorrect-accidental-caps-lock-officecfg.diff
+autocorrect-accidental-caps-lock-sc.diff
+autocorrect-accidental-caps-lock-sw.diff
+autocorrect-accidental-caps-lock-svx.diff
+autocorrect-accidental-caps-lock-vcl.diff
[ UnitTesting ]
@@ -1980,6 +1839,14 @@
unittesting-xmlscript.diff
unittesting-xmlsecurity.diff
+[ UnitBootstrap ]
+SectionOwner => michael
+SectionIssue => i#86525
+
+# initial cut at a unit testing framework
+unit-deliver.diff
+unit-comphelper.diff
+unit-sc.diff
[ ReducedDefaults ]
SectionOwner => jholesov
@@ -1987,6 +1854,12 @@
# disable automatic spellchecking by default
reduced-disable-auto-spellcheck.diff
+[ NovellOnlyWin32 ]
+SectionOwner => tml
+
+novell-win32-odma.diff, i#6885, i#32741
+
+
[ VOSremoval ]
# remove vos/process.hxx
@@ -2044,10 +1917,6 @@
vosremoval-cleanup.diff
-[ Gcc43 ]
-# Make it compile with gcc 4.3
-cws-gcc430two.diff, i#83276
-
[ OxygenOfficePalettes ]
palette-enhanced-arrow.diff
palette-enhanced-color.diff
@@ -2063,8 +1932,6 @@
cairocanvas-image-borders.diff, n#340142, rodo
goodies-eps-filter-unix.diff, n#200053, rodo
-[ Fixes < src680-m241 ]
-solaris-dont-depend-on-core10.diff, fridrich
[ EMFPlus ]
emf+-canvas.diff
@@ -2083,6 +1950,9 @@
emf+-svtools.diff
emf+-scp2-renderer.diff
emf+-dxcanvas.diff
+emf+-crash-fix.diff, n#361534, rodo
+vcl-grey-alpha-unix-sal-bitmap.diff, rodo
+cairocanvas-alpha-pixmap-rewrite.diff, rodo
[ OxygenOfficeDefaultSettings ]
# Always enable extended tips
@@ -2091,6 +1961,8 @@
i54709-default-impress-ruler.diff
# Full branding for Windows installer
ooop-win32-installer-branding.diff
+#Update URL added to the OxygenOffice
+ooop-update-URL.diff
[ OxygenOfficeExtras ]
# Adding new items to extras module
@@ -2146,10 +2018,10 @@
[ 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
-xmloff-field-patch.diff, flr, n#248354
+#FIXME dev300: offapi-field-patch.diff, flr, n#248354
+#FIXME dev300: svtools-field-patch.diff, flr, n#248354
+#FIXME dev300: sw-field-patch.diff, flr, n#248354
+#FIXME dev300: xmloff-field-patch.diff, flr, n#248354
[ NovellOnly ]
#only enable enhanced field work in Novell OOo by default
@@ -2159,8 +2031,9 @@
[ Fixes ]
sc-xclimpchangetrack-discard-bogus-formula-size.diff, n#355304, tml
-[ Fixes < src680-m241 ]
-dmake-heap-corruption.diff, i#85381, tml
+# Fix pasting with middle button in Calc
+sc-middle-button-should-paste-text.diff, n#282767, i#86734, jholesov
+
[ Glib2 ]
external-package-glib2.diff
@@ -2169,3 +2042,13 @@
[ Fixes ]
fix-ppt-linespacing-import-export.diff, n#355302, rodo
+sw-section-import-fix.diff, n#364533, freuter
+sw-allow-negative-spacing.diff, n#364534, freuter
+
+sd-slideshow-slideshowview-transformation-fix.diff, rodo
+cairocanvas-fix-image-cache.diff, rodo
+
+[ InternalMesaHeaders ]
+internal-mesa-headers-config_office.diff, fridrich
+internal-mesa-headers-slideshow.diff, fridrich
+internal-mesa-headers-mesa.diff, fridrich
Copied: trunk/patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff (from r11934, /trunk/patches/src680/binfilter-dont-extern-sRTF-sHTML.diff)
==============================================================================
--- /trunk/patches/src680/binfilter-dont-extern-sRTF-sHTML.diff (original)
+++ trunk/patches/dev300/binfilter-dont-extern-sRTF-sHTML.diff Wed Mar 19 17:08:41 2008
@@ -2,16 +2,15 @@
index f309c89..959ed93 100644
--- binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
+++ binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
-@@ -69,12 +69,6 @@
- class SfxItemSet;
+@@ -69,11 +69,6 @@
namespace binfilter {
--extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_O_hidden, "HIDDEN" );
--extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_HIDDEN_false, "FALSE" );
--extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_O_archive, "ARCHIVE" );
--extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_O_archives, "ARCHIVES" );
--extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_O_object, "OBJECT" );
--
+ class SfxItemSet;
+-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_hidden, "HIDDEN" );
+-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_HIDDEN_false, "FALSE" );
+-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_archive, "ARCHIVE" );
+-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_archives, "ARCHIVES" );
+-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_object, "OBJECT" );
+
class SwApplet_Impl
{
- SvAppletObjectRef xApplet; // das aktuelle Applet
Copied: trunk/patches/dev300/cjk-character-units-fix.diff (from r11934, /trunk/patches/src680/cjk-character-units-fix.diff)
==============================================================================
--- /trunk/patches/src680/cjk-character-units-fix.diff (original)
+++ trunk/patches/dev300/cjk-character-units-fix.diff Wed Mar 19 17:08:41 2008
@@ -1,26 +1,7 @@
diff -uNpr officecfg-orig/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs
--- officecfg-orig/registry/schema/org/openoffice/Office/Writer.xcs 2008-03-07 12:01:16.000000000 +0800
+++ officecfg/registry/schema/org/openoffice/Office/Writer.xcs 2008-03-03 14:49:15.000000000 +0800
-@@ -1515,18 +1515,6 @@
- </info>
- <value>false</value>
- </prop>
-- <!-- added for apply char unit 2006-12-1 -->
-- <prop oor:name="ApplyCharUnit" oor:type="xs:boolean">
-- <!-- OldPath: Writer/Layout -->
-- <!-- OldLocation: Soffice.cfg -->
-- <!-- UIHints: Tools - Options - Text document - Layout - [Section] Apply char unit -->
-- <info>
-- <author>OS</author>
-- <desc>apply char unit to calculate the paragraph's indent</desc>
-- <label>apply char unit</label>
-- </info>
-- <value>true</value>
-- </prop>
- </group>
- <group oor:name="Other">
- <info>
-@@ -1608,6 +1596,18 @@
+@@ -1596,6 +1596,18 @@
</info>
<value>true</value>
</prop>
@@ -39,6 +20,25 @@
</group>
<group oor:name="Zoom">
<info>
+@@ -1659,18 +1659,6 @@
+ </info>
+ <value>false</value>
+ </prop>
+- <!-- added for apply char unit 2006-12-1 -->
+- <prop oor:name="ApplyCharUnit" oor:type="xs:boolean">
+- <!-- OldPath: Writer/Layout -->
+- <!-- OldLocation: Soffice.cfg -->
+- <!-- UIHints: Tools - Options - Text document - Layout - [Section] Apply char unit -->
+- <info>
+- <author>OS</author>
+- <desc>apply char unit to calculate the paragraph's indent</desc>
+- <label>apply char unit</label>
+- </info>
+- <value>true</value>
+- </prop>
+ </group>
+ </group>
+ <group oor:name="Grid">
diff -uNpr sw-orig/source/ui/app/appopt.cxx sw/source/ui/app/appopt.cxx
--- sw-orig/source/ui/app/appopt.cxx 2008-02-22 11:55:53.000000000 +0800
+++ sw/source/ui/app/appopt.cxx 2008-03-04 22:18:51.000000000 +0800
@@ -105,13 +105,13 @@
aLayoutConfig(bWeb, *this),
aGridConfig(bWeb, *this),
@@ -351,7 +352,7 @@ void SwLayoutViewConfig::Commit()
- case 14: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
- case 15: bSet = rParent.IsVRulerRight(); break;// "Window/IsVerticalRulerRight",
- case 16: bSet = rParent.IsSquaredPageMode(); break;// "Other/IsSquaredPageMode",
-- case 17: bSet = rParent.IsApplyCharUnit(); break;// "Other/IsApplyCharUnit",
-+ case 17: bSet = rParent.IsApplyCharUnit(); break;// "Other/ApplyCharUnit",
+ case 16: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
+ case 17: bSet = rParent.IsVRulerRight(); break;// "Window/IsVerticalRulerRight",
+ case 18: bSet = rParent.IsSquaredPageMode(); break;// "Other/IsSquaredPageMode",
+- case 19: bSet = rParent.IsApplyCharUnit(); break;// "Other/IsApplyCharUnit",
++ case 19: bSet = rParent.IsApplyCharUnit(); break;// "Other/ApplyCharUnit",
}
- if(nProp < 8 || nProp == 10 || nProp == 16 || nProp == 17)
+ if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 || nProp == 19 )
pValues[nProp].setValue(&bSet, ::getBooleanCppuType());
diff -uNpr sw-orig/source/ui/misc/pggrid.cxx sw/source/ui/misc/pggrid.cxx
--- sw-orig/source/ui/misc/pggrid.cxx 2008-02-22 11:55:53.000000000 +0800
@@ -140,17 +140,16 @@
diff -uNpr sw-orig/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
--- sw-orig/source/ui/uiview/view.cxx 2008-02-25 17:22:20.000000000 +0800
+++ sw/source/ui/uiview/view.cxx 2008-02-28 16:03:47.000000000 +0800
-@@ -266,7 +266,9 @@
- #endif
+@@ -273,6 +273,9 @@
+ #include <com/sun/star/document/XDocumentProperties.hpp>
+ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
- #include <unomid.h>
--
+#ifndef _SVTOOLS_CJKOPTIONS_HXX
+#include <svtools/cjkoptions.hxx>
+#endif
+
using namespace ::com::sun::star;
- using namespace ::com::sun::star::uno;
@@ -1065,13 +1067,14 @@ SwView::SwView( SfxViewFrame *_pFrame, S
FieldUnit eMetric = pUsrPref->GetHScrollMetric();
Copied: trunk/patches/dev300/cjk-character-units-imp.diff (from r11934, /trunk/patches/src680/cjk-character-units-imp.diff)
==============================================================================
--- /trunk/patches/src680/cjk-character-units-imp.diff (original)
+++ trunk/patches/dev300/cjk-character-units-imp.diff Wed Mar 19 17:08:41 2008
@@ -342,26 +342,26 @@
--- sw/source/ui/config/usrpref.cxx 2007-12-17 01:41:54.000000000 +0800
+++ sw/source/ui/config/usrpref.cxx 2007-12-17 11:14:00.000000000 +0800
@@ -283,9 +283,10 @@
- "Other/MeasureUnit", //13
- "Other/TabStop", //14
"Window/IsVerticalRulerRight", //15
-- "Other/IsSquaredPageMode" //16
-+ "Other/IsSquaredPageMode", //16
-+ "Other/ApplyCharUnit" //17
+ "ViewLayout/Columns", //16
+ "ViewLayout/BookMode" //17
+- "Other/IsSquaredPageMode" //18
++ "Other/IsSquaredPageMode", //18
++ "Other/ApplyCharUnit" //19
};
-- const int nCount = bWeb ? 14 : 17;
-+ const int nCount = bWeb ? 14 : 18;
+- const int nCount = bWeb ? 14 : 19;
++ const int nCount = bWeb ? 14 : 20;
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -350,8 +351,9 @@
- case 14: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
- case 15: bSet = rParent.IsVRulerRight(); break;// "Window/IsVerticalRulerRight",
- case 16: bSet = rParent.IsSquaredPageMode(); break;// "Other/IsSquaredPageMode",
-+ case 17: bSet = rParent.IsApplyCharUnit(); break;// "Other/IsApplyCharUnit",
+ case 16: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(rParent.GetDefTab())); break;// "Other/TabStop",
+ case 17: bSet = rParent.IsVRulerRight(); break;// "Window/IsVerticalRulerRight",
+ case 18: bSet = rParent.IsSquaredPageMode(); break;// "Other/IsSquaredPageMode",
++ case 19: bSet = rParent.IsApplyCharUnit(); break;// "Other/IsApplyCharUnit",
}
-- if(nProp < 8 || nProp == 10 || nProp == 16)
-+ if(nProp < 8 || nProp == 10 || nProp == 16 || nProp == 17)
+- if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 )
++ if(nProp < 8 || nProp == 10 || nProp == 15 || nProp == 17 || nProp == 18 || nProp == 19 )
pValues[nProp].setValue(&bSet, ::getBooleanCppuType());
}
PutProperties(aNames, aValues);
@@ -369,16 +369,16 @@
{
if(pValues[nProp].hasValue())
{
-- sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 16? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
-+ sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 16 || nProp == 17? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
+- sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 17 || nProp == 18 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
++ sal_Bool bSet = nProp < 8 || nProp == 10 || nProp == 17 || nProp == 18 || nProp == 19 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False;
switch(nProp)
{
case 0: rParent.SetCrossHair(bSet); break;// "Line/Guide",
@@ -429,6 +431,7 @@
break;// "Other/TabStop",
- case 15: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
- case 16: rParent.SetDefaultPageMode(bSet); break;// "Other/IsSquaredPageMode",
-+ case 17: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
+ case 17: rParent.SetVRulerRight(bSet); break;// "Window/IsVerticalRulerRight",
+ case 18: rParent.SetDefaultPageMode(bSet); break;// "Other/IsSquaredPageMode",
++ case 19: rParent.SetApplyCharUnit(bSet); break;// "Other/ApplyUserChar"
}
}
}
Copied: trunk/patches/dev300/default-autotext-and-form-name.diff (from r11934, /trunk/patches/src680/default-autotext-and-form-name.diff)
==============================================================================
--- /trunk/patches/src680/default-autotext-and-form-name.diff (original)
+++ trunk/patches/dev300/default-autotext-and-form-name.diff Wed Mar 19 17:08:41 2008
@@ -112,27 +112,27 @@
--- backup/sc/inc/globstr.hrc 2007-11-26 14:41:12.000000000 +0000
+++ sc/inc/globstr.hrc 2008-01-21 15:34:45.000000000 +0000
@@ -563,7 +563,23 @@
- #define STR_ERR_LONG_NESTED_ARRAY 419
- #define STR_UNDO_TEXTTOCOLUMNS 420
+ #define STR_UNKNOWN_USER 429
+ #define STR_LONG_ERR_NULL 430
--#define STR_COUNT 421
-+#define STR_SHAPE_AUTOSHAPE 421
-+#define STR_SHAPE_RECTANGLE 422
-+#define STR_SHAPE_LINE 423
-+#define STR_SHAPE_OVAL 424
-+#define STR_SHAPE_TEXTBOX 425
-+
-+#define STR_FORM_BUTTON 426
-+#define STR_FORM_CHECKBOX 427
-+#define STR_FORM_OPTIONBOX 428
-+#define STR_FORM_LABEL 429
-+#define STR_FORM_LISTBOX 430
-+#define STR_FORM_GROUPBOX 431
-+#define STR_FORM_DROPDOWN 432
-+#define STR_FORM_SPINNER 433
-+#define STR_FORM_SCROLLBAR 434
+-#define STR_COUNT 431
++#define STR_SHAPE_AUTOSHAPE 431
++#define STR_SHAPE_RECTANGLE 432
++#define STR_SHAPE_LINE 433
++#define STR_SHAPE_OVAL 434
++#define STR_SHAPE_TEXTBOX 435
++
++#define STR_FORM_BUTTON 436
++#define STR_FORM_CHECKBOX 437
++#define STR_FORM_OPTIONBOX 438
++#define STR_FORM_LABEL 439
++#define STR_FORM_LISTBOX 440
++#define STR_FORM_GROUPBOX 441
++#define STR_FORM_DROPDOWN 442
++#define STR_FORM_SPINNER 443
++#define STR_FORM_SCROLLBAR 444
+
-+#define STR_COUNT 434
++#define STR_COUNT 445
#endif
Copied: trunk/patches/dev300/default-no-registration-menu.diff (from r11934, /trunk/patches/src680/default-no-registration-menu.diff)
==============================================================================
--- /trunk/patches/src680/default-no-registration-menu.diff (original)
+++ trunk/patches/dev300/default-no-registration-menu.diff Wed Mar 19 17:08:41 2008
@@ -28,21 +28,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
-Index: dbaccess/uiconfig/dbbrowser/menubar/menubar.xml
-===================================================================
-RCS file: /cvs/dba/dbaccess/uiconfig/dbbrowser/menubar/menubar.xml,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 menubar.xml
---- dbaccess/uiconfig/dbbrowser/menubar/menubar.xml 23 Sep 2005 12:48:06 -0000 1.6
-+++ dbaccess/uiconfig/dbbrowser/menubar/menubar.xml 15 Feb 2006 11:59:33 -0000
-@@ -64,7 +64,6 @@
- <menu:menuitem menu:id=".uno:ActiveHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
Index: dbaccess/uiconfig/dbquery/menubar/menubar.xml
===================================================================
RCS file: /cvs/dba/dbaccess/uiconfig/dbquery/menubar/menubar.xml,v
Copied: trunk/patches/dev300/gstreamer-sd.diff (from r11934, /trunk/patches/gstreamer/gstreamer-sd.diff)
==============================================================================
--- /trunk/patches/gstreamer/gstreamer-sd.diff (original)
+++ trunk/patches/dev300/gstreamer-sd.diff Wed Mar 19 17:08:41 2008
@@ -1,24 +1,3 @@
-diff -rup sd-orig/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/animations/CustomAnimationDialog.cxx
---- sd-orig/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:48:52.000000000 +0200
-+++ sd/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:50:37.000000000 +0200
-@@ -1942,13 +1942,17 @@ void CustomAnimationEffectTabPage::openS
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_QuickTime"
- #else
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
-
- void CustomAnimationEffectTabPage::onSoundPreview()
- {
diff -rup sd-orig/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx
--- sd-orig/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:48:52.000000000 +0200
+++ sd/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:54:35.000000000 +0200
Copied: trunk/patches/dev300/gstreamer-slideshow.diff (from r11934, /trunk/patches/gstreamer/gstreamer-slideshow.diff)
==============================================================================
--- /trunk/patches/gstreamer/gstreamer-slideshow.diff (original)
+++ trunk/patches/dev300/gstreamer-slideshow.diff Wed Mar 19 17:08:41 2008
@@ -1,53 +1,6 @@
-diff -rup slideshow-orig/source/engine/soundplayer.cxx slideshow/source/engine/soundplayer.cxx
---- slideshow-orig/source/engine/soundplayer.cxx 2006-08-17 16:15:39.000000000 +0200
-+++ slideshow/source/engine/soundplayer.cxx 2006-08-17 16:17:17.000000000 +0200
-@@ -57,14 +57,17 @@ using namespace ::com::sun::star;
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_QuickTime"
- #else
- # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
--
-+#endif
-
- namespace presentation
- {
diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
--- slideshow-orig/source/engine/shapes/viewmediashape.cxx 2006-08-17 16:15:39.000000000 +0200
+++ slideshow/source/engine/shapes/viewmediashape.cxx 2006-08-17 17:26:09.000000000 +0200
-@@ -107,13 +107,24 @@
- #include "mediashape.hxx"
- #include "tools.hxx"
-
-+#ifdef GSTREAMER
-+#ifndef _SV_SYSDATA_HXX
-+#include <vcl/sysdata.hxx>
-+#endif
-+
-+// TODO(Q3): This breaks encapsulation. Either export
-+// these strings from avmedia, or provide an XManager
-+// factory there
-+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
- #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_QuickTime"
- #else
- #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
-
- using namespace ::com::sun::star;
-
@@ -182,7 +193,11 @@ namespace presentation
mxPlayerWindow.clear();
}
Copied: trunk/patches/dev300/internal-mesa-headers-slideshow.diff (from r11934, /trunk/patches/src680/internal-mesa-headers-slideshow.diff)
==============================================================================
--- /trunk/patches/src680/internal-mesa-headers-slideshow.diff (original)
+++ trunk/patches/dev300/internal-mesa-headers-slideshow.diff Wed Mar 19 17:08:41 2008
@@ -1,8 +1,8 @@
--- slideshow/prj/build.lst 2008-03-17 12:43:53.000000000 +0100
+++ slideshow/prj/build.lst 2008-03-17 12:44:22.000000000 +0100
@@ -1,4 +1,4 @@
--pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx goodies unotools toolkit animations NULL
-+pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx goodies unotools toolkit animations MESA:Mesa NULL
+-pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx goodies unotools toolkit animations avmedia NULL
++pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx goodies unotools toolkit animations avmedia MESA:Mesa NULL
pe slideshow usr1 - all pe_mkout NULL
pe slideshow\inc nmake - all pe_inc NULL
pe slideshow\source\api nmake - all pe_api pe_inc NULL
Copied: trunk/patches/dev300/letter-wizard-resource-id.diff (from r11934, /trunk/patches/gstreamer/letter-wizard-resource-id.diff)
==============================================================================
--- /trunk/patches/gstreamer/letter-wizard-resource-id.diff (original)
+++ trunk/patches/dev300/letter-wizard-resource-id.diff Wed Mar 19 17:08:41 2008
@@ -9,8 +9,8 @@
public LocaleCodes (XMultiServiceFactory xmsf) {
super(xmsf, UNIT_NAME, MODULE_NAME);
-- allLanguageStrings = getStringList(16298); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools
-+ allLanguageStrings = getStringList(16300); // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools
+- allLanguageStrings = getStringList(16299); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
++ allLanguageStrings = getStringList(16301); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
}
public String getLanguageString(String MSID) {
Copied: trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff (from r11934, /trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff)
==============================================================================
--- /trunk/patches/src680/novell-win32-agfa-monotype-fonts.diff (original)
+++ trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff Wed Mar 19 17:08:41 2008
@@ -160,9 +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 scp2 scripting sd ODK:sdk_oo 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 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 scp2 scripting sd ODK:sdk_oo 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 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 ODK:sdk_oo 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 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 ODK:sdk_oo 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 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
-
Copied: trunk/patches/dev300/offapi-calc-datapilot-drilldown.diff (from r11934, /trunk/patches/src680/offapi-calc-datapilot-drilldown.diff)
==============================================================================
--- /trunk/patches/src680/offapi-calc-datapilot-drilldown.diff (original)
+++ trunk/patches/dev300/offapi-calc-datapilot-drilldown.diff Wed Mar 19 17:08:41 2008
@@ -806,11 +806,11 @@
--- offapi/com/sun/star/sheet/makefile.mk.orig 2008-01-15 11:37:11.000000000 -0500
+++ offapi/com/sun/star/sheet/makefile.mk 2008-01-15 11:40:44.000000000 -0500
@@ -315,7 +315,14 @@
- XViewPanesSupplier.idl\
- XViewSplitable.idl\
- XVolatileResult.idl\
-- _NamedRange.idl
-+ _NamedRange.idl\
+ SolverConstraint.idl\
+ XSolver.idl\
+ XSolverDescription.idl\
+- Solver.idl
++ Solver.idl\
+ DataPilotTablePositionData.idl\
+ DataPilotTablePositionType.idl\
+ DataPilotOutputRangeType.idl\
Copied: trunk/patches/dev300/padmin-nofontconfig.diff (from r11934, /trunk/patches/src680/padmin-nofontconfig.diff)
==============================================================================
--- /trunk/patches/src680/padmin-nofontconfig.diff (original)
+++ trunk/patches/dev300/padmin-nofontconfig.diff Wed Mar 19 17:08:41 2008
@@ -54,7 +54,7 @@
#include <fontentry.hxx>
#endif
@@ -156,7 +161,9 @@ PADialog::PADialog( Window* pParent, BOO
- m_aComment( this, PaResId( RID_PA_TXT_COMMENT_STRING ) ),
+ m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
m_aAddPB( this, PaResId( RID_PA_BTN_ADD ) ),
+ #ifndef FONTCONFIG_FONTS
@@ -63,13 +63,14 @@
m_aCancelButton( this, PaResId( RID_PA_BTN_CANCEL ) ),
m_aDefPrt( PaResId( RID_PA_STR_DEFPRT ) ),
m_aRenameStr( PaResId( RID_PA_STR_RENAME ) ),
-@@ -184,13 +191,15 @@ void PADialog::Init()
+@@ -184,14 +191,16 @@ void PADialog::Init()
m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
+ m_aCUPSCB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
+ #ifndef FONTCONFIG_FONTS
+ m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
@@ -80,7 +81,7 @@
}
PADialog::~PADialog()
-@@ -227,12 +236,13 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushBu
+@@ -227,11 +236,13 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushBu
PrintTestPage();
else if( pButton == &m_aAddPB )
AddDevice();
@@ -90,11 +91,10 @@
FontNameDlg aDialog( this );
aDialog.Execute();
}
--
+ #endif
- return 0;
- }
-
+ else if( static_cast<Button*>(pButton) == &m_aCUPSCB )
+ {
+ m_rPIManager.setCUPSDisabled( m_aCUPSCB.IsChecked() );
Index: padmin/source/padialog.hxx
===================================================================
RCS file: /cvs/gsl/padmin/source/padialog.hxx,v
Copied: trunk/patches/dev300/sc-datapilot-autoformat.diff (from r11934, /trunk/patches/src680/sc-datapilot-autoformat.diff)
==============================================================================
--- /trunk/patches/src680/sc-datapilot-autoformat.diff (original)
+++ trunk/patches/dev300/sc-datapilot-autoformat.diff Wed Mar 19 17:08:41 2008
@@ -176,11 +176,11 @@
--- ../../../sc.bak/source/ui/miscdlgs/makefile.mk 2004-12-22 14:05:08.000000000 +0530
+++ sc/source/ui/miscdlgs/makefile.mk 2005-01-11 14:43:07.477625776 +0530
@@ -136,7 +136,9 @@
- $(SLO)$/highred.obj \
- $(SLO)$/simpref.obj \
- $(SLO)$/redcom.obj \
-- $(SLO)$/warnbox.obj
-+ $(SLO)$/warnbox.obj \
+ $(SLO)$/warnbox.obj \
+ $(SLO)$/scuiautofmt.obj \
+ $(SLO)$/conflictsdlg.obj \
+- $(SLO)$/sharedocdlg.obj
++ $(SLO)$/sharedocdlg.obj \
+ $(SLO)$/scuiautofmt.obj \
+ $(SLO)$/strindlg.obj
Copied: trunk/patches/dev300/sc-r1c1.diff (from r11934, /trunk/patches/src680/sc-r1c1.diff)
==============================================================================
--- /trunk/patches/src680/sc-r1c1.diff (original)
+++ trunk/patches/dev300/sc-r1c1.diff Wed Mar 19 17:08:41 2008
@@ -61,10 +61,10 @@
diff -urp sc.clean/sdi/scalc.sdi sc/sdi/scalc.sdi
--- sc.clean/sdi/scalc.sdi 2007-11-14 10:13:10.000000000 -0500
+++ sc/sdi/scalc.sdi 2007-11-14 10:22:13.000000000 -0500
-@@ -7706,3 +7706,31 @@ SfxBoolItem SheetRightToLeft FID_TAB_RTL
- GroupId = GID_FORMAT;
+@@ -7706,3 +7706,30 @@ SfxBoolItem SheetRightToLeft FID_TAB_RTL
+ ToolBoxConfig = FALSE,
+ GroupId = GID_OPTIONS;
]
-
+
+//--------------------------------------------------------------------------
+SfxBoolItem SheetUseR1C1 FID_TAB_USE_R1C1
@@ -92,7 +92,6 @@
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
-+
diff -urp sc.clean/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx
--- sc.clean/source/core/inc/interpre.hxx 2007-11-14 10:13:15.000000000 -0500
+++ sc/source/core/inc/interpre.hxx 2007-11-14 10:22:17.000000000 -0500
Copied: trunk/patches/dev300/scs-sc-menubar.diff (from r11934, /trunk/patches/scsolver/scs-sc-menubar.diff)
==============================================================================
--- /trunk/patches/scsolver/scs-sc-menubar.diff (original)
+++ trunk/patches/dev300/scs-sc-menubar.diff Wed Mar 19 17:08:41 2008
@@ -10,9 +10,9 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:GoalSeekDialog"/>
+ <menu:menuitem menu:id="scsolver.SolverImpl:execute"/>
+ <menu:menuitem menu:id=".uno:SolverDialog"/>
<menu:menuitem menu:id=".uno:ScenarioManager"/>
<menu:menuseparator/>
- <menu:menu menu:id=".uno:ProtectMenu">
Copied: trunk/patches/dev300/speed-pagein.diff (from r11934, /trunk/patches/src680/speed-pagein.diff)
==============================================================================
--- /trunk/patches/src680/speed-pagein.diff (original)
+++ trunk/patches/dev300/speed-pagein.diff Wed Mar 19 17:08:41 2008
@@ -15,20 +15,20 @@
+ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
UNODLLPOST=.uno$(DLLPOST)
- UPDDLLPOST=$(UPD)$(DLLPOSTFIX)$(DLLPOST)
+ DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default
@@ -99,7 +100,6 @@ $(MISC)$/$(TARGET)-writer : makefile.mk
- @-echo $(DLLPRE)sw$(UPDDLLPOST) > $@
- @-echo $(DLLPRE)svx$(UPDDLLPOST) >> $@
+ @-echo $(DLLPRE)sw$(DFTDLLPOST) > $@
+ @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@
-# sorted in reverse load order (ld.so.1)
$(MISC)$/$(TARGET)-common : makefile.mk
@echo Making: $@
@-echo $(DLLPRE)icui18n$(ICUDLLPOST) > $@
@@ -138,5 +138,39 @@ $(MISC)$/$(TARGET)-common : makefile.mk
- @-echo $(DLLPRE)svl$(UPDDLLPOST) >> $@
- @-echo $(DLLPRE)vcl$(UPDDLLPOST) >> $@
- @-echo $(DLLPRE)tk$(UPDDLLPOST) >> $@
-- @-echo $(DLLPRE)svt$(UPDDLLPOST) >> $@
+ @-echo $(DLLPRE)svl$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)vcl$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)tk$(DFTDLLPOST) >> $@
+- @-echo $(DLLPRE)svt$(DFTDLLPOST) >> $@
+ @-echo types.rdb >> $@
+ @-echo services.rdb >> $@
@-echo soffice.bin >> $@
@@ -41,15 +41,15 @@
+ @-echo $(DLLPRE)xstor$(DLLPOST) >> $@
+ @-echo $(DLLPRE)package2$(DLLPOST) >> $@
+ @-echo $(DLLPRE)filterconfig1$(DLLPOST) >> $@
-+ @-echo $(DLLPRE)uui$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)lng$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)svt$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)spl$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)basegfx$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)avmedia$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)dtransX11$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)helplinker$(UPDDLLPOST) >> $@
-+ @-echo $(DLLPRE)vclplug_gen$(UPDDLLPOST) >> $@
++ @-echo $(DLLPRE)uui$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)lng$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)svt$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)spl$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)basegfx$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)avmedia$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)dtransX11$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)helplinker$(DFTDLLPOST) >> $@
++ @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)icule$(ICUDLLPOST) >> $@
+ @-echo $(DLLPRE)icudata$(ICUDLLPOST) >> $@
+ @-echo sax$(UNODLLPOST) >> $@
Modified: trunk/patches/dev300/split-binfilter-scp2.diff
==============================================================================
--- trunk/patches/dev300/split-binfilter-scp2.diff (original)
+++ trunk/patches/dev300/split-binfilter-scp2.diff Wed Mar 19 17:08:41 2008
@@ -1,14 +1,14 @@
--- scp2/prj/build.lst.old 2006-12-12 17:17:06.000000000 +0100
+++ scp2/prj/build.lst 2007-07-19 13:12:54.000000000 +0200
-@@ -3,6 +3,7 @@
+@@ -3,6 +3,7 @@ cp scp2 : setup_native transex3
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
cp scp2\source\activex nmake - all cp_activex cp_langmacros cp_langtemplates NULL
-+cp scp2\source\binfilter nmake - all cp_binfilter cp_langmacros NULL
++cp scp2\source\binfilter nmake - all cp_binfilter cp_langmacros cp_langtemplates NULL
cp scp2\source\calc nmake - all cp_calc cp_langmacros cp_langtemplates NULL
cp scp2\source\canvas nmake - all cp_canvas cp_langmacros cp_langtemplates NULL
cp scp2\source\crashrep nmake - all cp_crashrep cp_langmacros cp_langtemplates NULL
-@@ -27,4 +28,4 @@
+@@ -27,4 +27,4 @@ cp scp2\source\winexplorerext nmake
cp scp2\source\ure nmake - all cp_ure cp_langmacros cp_langtemplates NULL
cp scp2\source\onlineupdate nmake - all cp_update cp_langmacros cp_langtemplates NULL
cp scp2\source\ooo_wo_ure nmake - all cp_ooo_wo_ure cp_langmacros cp_langtemplates NULL
@@ -16,7 +16,7 @@
+cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
--- scp2/source/binfilter/file_binfilter.scp.old 2007-07-19 13:12:54.000000000 +0200
+++ scp2/source/binfilter/file_binfilter.scp 2007-07-19 13:12:54.000000000 +0200
-@@ -0,0 +1,193 @@
+@@ -0,0 +1,195 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -188,6 +188,7 @@
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sch, bf_sch)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Xo, bf_xo)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svx, bf_svx)
++STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svt, bf_svt)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Frm, bf_frm)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Ofa, bf_ofa)
+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sb, bf_sb)
@@ -203,6 +204,7 @@
+
+STD_RES_FILE_PATCH( gid_File_Res_Bf_Sch, bf_sch )
+STD_RES_FILE_PATCH( gid_File_Res_Bf_Svx, bf_svx )
++STD_RES_FILE_PATCH( gid_File_Res_Bf_Svt, bf_svt )
+STD_RES_FILE_PATCH( gid_File_Res_Bf_Frm, bf_frm )
+STD_RES_FILE_PATCH( gid_File_Res_Bf_Ofa, bf_ofa )
+STD_RES_FILE_PATCH( gid_File_Res_Bf_Sc, bf_sc )
@@ -319,7 +321,7 @@
+.INCLUDE : target.mk
--- /dev/null 2006-06-16 15:54:00.000000000 +0200
+++ scp2/source/binfilter/module_binfilter.scp 2008-01-16 21:04:35.000000000 +0100
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,88 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -385,6 +387,7 @@
+ gid_File_Lib_Bf_Lng,
+ gid_File_Lib_Bf_Xo,
+ gid_File_Lib_Bf_Svx,
++ gid_File_Lib_Bf_Svt,
+ gid_File_Lib_Bf_Frm,
+ gid_File_Lib_Bf_Ofa,
+ gid_File_Lib_Bf_Sb,
@@ -452,7 +455,7 @@
+en-US = "Legacy filters, e.g. StarOffice 5.2 binary file formats."
--- scp2/source/calc/file_calc.scp.old 2007-07-17 21:12:03.000000000 +0200
+++ scp2/source/calc/file_calc.scp 2007-07-19 13:12:54.000000000 +0200
-@@ -82,19 +82,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Scd
+@@ -93,19 +93,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Scd
STD_LIB_FILE_PATCH( gid_File_Lib_Tfu, tfu)
@@ -469,9 +472,9 @@
-// end binfilter #110743#
-//
-
- STD_RES_FILE( gid_File_Res_Analysis, analysis)
+ STD_RES_FILE_PATCH( gid_File_Res_Solver, solver)
- STD_RES_FILE_PATCH( gid_File_Res_Date, date)
+ STD_RES_FILE( gid_File_Res_Analysis, analysis)
--- scp2/source/calc/makefile.mk.old 2007-07-17 21:12:03.000000000 +0200
+++ scp2/source/calc/makefile.mk 2007-07-19 13:12:54.000000000 +0200
@@ -45,10 +45,6 @@ TARGETTYPE=CUI
@@ -487,24 +490,23 @@
.ENDIF
--- scp2/source/calc/module_calc.scp.old 2008-01-15 20:44:19.000000000 +0100
+++ scp2/source/calc/module_calc.scp 2008-01-16 20:06:26.000000000 +0100
-@@ -42,7 +42,6 @@
- Sortkey = "200";
+@@ -54,7 +54,6 @@ Module gid_Module_Prg_Calc
+ Styles =(APPLICATIONMODULE);
End
-// #110743# Added gid_File_Lib_Bf_Sc and gid_File_Res_Bf_Sc for binfilter
Module gid_Module_Prg_Calc_Bin
MOD_NAME_DESC ( MODULE_PRG_CALC_BIN );
ParentID = gid_Module_Prg_Calc;
-@@ -52,7 +51,7 @@
- Files = (gid_File_Lib_Calc,gid_File_Exe_Scalc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+@@ -64,7 +63,7 @@ Module gid_Module_Prg_Calc_Bin
+ Files = (gid_File_Lib_Calc,gid_File_Exe_Scalc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scd,gid_File_Res_Sc,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Xdg_Calc, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
- gid_File_Lib_Bf_Sc,gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
+ gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf);
End
- // Module gid_Module_Prg_Calc_Help
-
+ Module gid_Module_Prg_Calc_Help
--- scp2/source/math/file_math.scp.old 2007-08-02 19:20:28.000000000 +0200
+++ scp2/source/math/file_math.scp 2008-01-16 20:03:03.000000000 +0100
@@ -57,19 +57,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Smd
@@ -542,7 +544,7 @@
module_math.par \
--- scp2/source/math/module_math.scp.old 2007-07-17 21:12:01.000000000 +0200
+++ scp2/source/math/module_math.scp 2007-07-19 13:12:54.000000000 +0200
-@@ -42,7 +42,6 @@
+@@ -42,7 +42,6 @@ Module gid_Module_Prg_Math
Sortkey = "600";
End
@@ -550,9 +552,9 @@
Module gid_Module_Prg_Math_Bin
MOD_NAME_DESC ( MODULE_PRG_MATH_BIN );
ParentID = gid_Module_Prg_Math;
-@@ -51,7 +50,7 @@
+@@ -49,7 +48,7 @@ Module gid_Module_Prg_Math_Bin
Default = YES;
- Files = (gid_File_Html_W3c_Ipr,gid_File_Dtd_Math,gid_File_Exe_Smath,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
+ Files = (gid_File_Html_W3c_Ipr,gid_File_Dtd_Math,gid_File_Exe_Smath,gid_File_Res_Sm,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs
- gid_File_Lib_Bf_Sm, gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
+ gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu,
@@ -561,7 +563,7 @@
End
--- scp2/source/ooo/file_library_ooo.scp.old 2008-01-15 20:44:17.000000000 +0100
+++ scp2/source/ooo/file_library_ooo.scp 2008-01-16 19:42:08.000000000 +0100
-@@ -2013,31 +2013,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox
+@@ -2013,32 +2013,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
@@ -574,6 +576,7 @@
-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sch, bf_sch)
-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Xo, bf_xo)
-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svx, bf_svx)
+-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Svt, bf_svt)
-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Frm, bf_frm)
-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Ofa, bf_ofa)
-STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sb, bf_sb)
@@ -613,7 +616,7 @@
Name = "services.rdb";
--- scp2/source/ooo/file_resource_ooo.scp.old 2007-07-17 21:11:57.000000000 +0200
+++ scp2/source/ooo/file_resource_ooo.scp 2007-07-19 13:12:54.000000000 +0200
-@@ -90,23 +90,6 @@ STD_RES_FILE( gid_File_Res_San, san )
+@@ -90,24 +90,6 @@ STD_RES_FILE( gid_File_Res_San, san )
#endif
@@ -624,6 +627,7 @@
-#ifndef WITHOUT_BINFILTER
-STD_RES_FILE_PATCH( gid_File_Res_Bf_Sch, bf_sch )
-STD_RES_FILE_PATCH( gid_File_Res_Bf_Svx, bf_svx )
+-STD_RES_FILE_PATCH( gid_File_Res_Bf_Svt, bf_svt )
-STD_RES_FILE_PATCH( gid_File_Res_Bf_Frm, bf_frm )
-STD_RES_FILE_PATCH( gid_File_Res_Bf_Ofa, bf_ofa )
-STD_RES_FILE_PATCH( gid_File_Res_Bf_Sd, bf_sd )
@@ -668,7 +672,7 @@
gid_File_Lib_Pcr,
gid_File_Lib_Pdffilter,
gid_File_Lib_Pk,
-@@ -377,21 +375,6 @@ Module gid_Module_Root_Files_5
+@@ -377,22 +375,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Officebean,
gid_File_Lib_Openssl,
gid_File_Lib_Package2,
@@ -677,6 +681,7 @@
- gid_File_Lib_Bf_Go,
- gid_File_Lib_Bf_Xo,
- gid_File_Lib_Bf_Svx,
+- gid_File_Lib_Bf_Svt,
- gid_File_Lib_Bf_Frm,
- gid_File_Lib_Bf_Ofa,
- gid_File_Lib_Bf_Sd,
Copied: trunk/patches/dev300/sw-dont-extern-sRTF-sHTML.diff (from r11934, /trunk/patches/src680/sw-dont-extern-sRTF-sHTML.diff)
==============================================================================
--- /trunk/patches/src680/sw-dont-extern-sRTF-sHTML.diff (original)
+++ trunk/patches/dev300/sw-dont-extern-sRTF-sHTML.diff Wed Mar 19 17:08:41 2008
@@ -44,7 +44,7 @@
index 324a645..d56365f 100644
--- sw/source/filter/html/htmlfld.hxx
+++ sw/source/filter/html/htmlfld.hxx
-@@ -40,99 +40,99 @@
+@@ -40,100 +40,100 @@
#include <svtools/htmlkywd.hxx>
#endif
@@ -86,6 +86,7 @@
-extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_info2, "INFO2" );
-extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_info3, "INFO3" );
-extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_info4, "INFO4" );
+-extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_custom, "CUSTOM" );
-extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_create, "CREATE" );
-extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_change, "CHANGE" );
-
@@ -179,6 +180,7 @@
+#define sHTML_FS_info2 "INFO2"
+#define sHTML_FS_info3 "INFO3"
+#define sHTML_FS_info4 "INFO4"
++#define sHTML_FS_custom "CUSTOM"
+#define sHTML_FS_create "CREATE"
+#define sHTML_FS_change "CHANGE"
+
@@ -241,7 +243,7 @@
index db43b83..2df1790 100644
--- sw/source/filter/html/htmlfldw.cxx
+++ sw/source/filter/html/htmlfldw.cxx
-@@ -76,101 +76,6 @@ using namespace nsSwDocInfoSubType;
+@@ -76,102 +76,6 @@ using namespace nsSwDocInfoSubType;
//-----------------------------------------------------------------------
@@ -283,6 +285,7 @@
-sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_info2, "INFO2" );
-sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_info3, "INFO3" );
-sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_info4, "INFO4" );
+-sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_custom, "CUSTOM" );
-sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_create, "CREATE" );
-sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_change, "CHANGE" );
-
Copied: trunk/patches/dev300/transogl-transitions-sd.diff (from r11934, /trunk/patches/src680/transogl-transitions-sd.diff)
==============================================================================
--- /trunk/patches/src680/transogl-transitions-sd.diff (original)
+++ trunk/patches/dev300/transogl-transitions-sd.diff Wed Mar 19 17:08:41 2008
@@ -14,8 +14,8 @@
sd sd\source\ui\framework\toolbar nmake - all sd_framework_toolbar sd_inc NULL
sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
sd sd\source\ui\framework\command nmake - all sd_framework_command sd_inc NULL
--sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_slideshow sd_undo sd_helper sd_framework_pane sd_framework_view sd_framework_configuration sd_framework_module sd_framework_toolbar sd_framework_tools sd_framework_command NULL
-+sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_slideshow sd_undo sd_helper sd_framework_pane sd_framework_view sd_framework_configuration sd_framework_module sd_framework_toolbar sd_framework_tools sd_framework_command NULL
+-sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_undo sd_helper sd_framework_pane sd_framework_view sd_framework_configuration sd_framework_module sd_framework_toolbar sd_framework_tools sd_framework_command NULL
++sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_undo sd_helper sd_framework_pane sd_framework_view sd_framework_configuration sd_framework_module sd_framework_toolbar sd_framework_tools sd_framework_command NULL
+sd sd\xml nmake - all sd_xml NULL
--- /dev/null 2007-09-21 21:12:45.000000000 +0200
+++ sd/xml/makefile.mk 2008-01-07 17:19:14.000000000 +0100
Copied: trunk/patches/dev300/unittesting-basegfx.diff (from r11934, /trunk/patches/src680/unittesting-basegfx.diff)
==============================================================================
--- /trunk/patches/src680/unittesting-basegfx.diff (original)
+++ trunk/patches/dev300/unittesting-basegfx.diff Wed Mar 19 17:08:41 2008
@@ -2,22 +2,3 @@
+++ basegfx/prj/tests.lst 2007-09-07 10:56:26.000000000 +0200
@@ -0,0 +1 @@
+fx basegfx\test nmake - all fx_test fx_util NULL
---- basegfx/test/makefile.mk 2005-09-07 22:57:24.000000000 +0200
-+++ basegfx/test/makefile.mk 2007-09-07 10:40:57.000000000 +0200
-@@ -55,14 +55,13 @@ SHL1OBJS= \
- $(SLO)$/tools.obj
-
- SHL1TARGET= tests
--SHL1STDLIBS= $(TOOLSLIB) \
-+SHL1STDLIBS= \
- $(SALLIB) \
- $(BASEGFXLIB) \
- $(VOSLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
-- $(CPPUNITLIB) \
-- $(UNOTOOLSLIB)
-+ $(CPPUNITLIB)
-
- SHL1IMPLIB= i$(SHL1TARGET)
-
Copied: trunk/patches/dev300/unxsplash-rework.diff (from r11934, /trunk/patches/src680/unxsplash-rework.diff)
==============================================================================
--- /trunk/patches/src680/unxsplash-rework.diff (original)
+++ trunk/patches/dev300/unxsplash-rework.diff Wed Mar 19 17:08:41 2008
@@ -24,11 +24,11 @@
dt desktop\source\pkgchk\unopkg nmake - all dt_unopkg dt_dp_misc dt_app dt_inc NULL
dt desktop\source\pkgchk nmake - all dt_pkgchk NULL
@@ -32,5 +34,5 @@ dt desktop\source\deployment\registry\component nmake - all dt_dp_registry_comp
+ dt desktop\source\deployment\registry\component nmake - all dt_dp_registry_component dt_inc NULL
dt desktop\source\deployment\registry\configuration nmake - all dt_dp_registry_configuration dt_inc NULL
dt desktop\scripts nmake - u dt_scripts dt_inc NULL
- dt desktop\macosx\source nmake - u dt_macosx_icons dt_inc NULL
--dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_migr dt_macosx_icons.u NULL
-+dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_migr dt_macosx_icons.u NULL
+-dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_migr NULL
++dt desktop\util nmake - all dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_migr NULL
dt desktop\zipintro nmake - all dt_zipintro NULL
diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index ebfc739..b550b26 100644
Copied: trunk/patches/dev300/vba-workbook-worksheet-events.diff (from r11934, /trunk/patches/vba/vba-workbook-worksheet-events.diff)
==============================================================================
--- /trunk/patches/vba/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/dev300/vba-workbook-worksheet-events.diff Wed Mar 19 17:08:41 2008
@@ -339,24 +339,24 @@
BOOL DoMacroQuery( const String& rScriptType );
--- /data4/sles/ooo-mLnew/ooo-build/build/ooc680-m2/sfx2/source/doc/objmisc.cxx 2006-05-22 08:25:06.000000000 +0100
+++ sfx2/source/doc/objmisc.cxx 2006-06-02 13:29:02.000000000 +0100
-@@ -1396,7 +1396,7 @@ ErrCode SfxObjectShell::CallXScript( con
- ::com::sun::star::uno::Any& aRet,
- ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
-- aOutParam)
-+ aOutParam, bool bRaiseError )
- {
- OSL_TRACE( "in CallXScript" );
- ErrCode nErr = ERRCODE_NONE;
-@@ -1470,7 +1470,7 @@ ErrCode SfxObjectShell::CallXScript( con
+@@ -1556,7 +1556,7 @@ ErrCode SfxObjectShell::CallXScript( con
nErr = ERRCODE_BASIC_INTERNAL_ERROR;
}
- if ( bCaughtException )
+ if ( bCaughtException && bRaiseError )
{
+ ::std::auto_ptr< VclAbstractDialog > pScriptErrDlg;
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-
+@@ -1580,7 +1580,7 @@ ErrCode SfxObjectShell::CallXScript( con
+ ::com::sun::star::uno::Any& aRet,
+ ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >&
+- aOutParam)
++ aOutParam, bool bRaiseError )
+ {
+ return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam );
+ }
--- backup/sc/source/ui/unoobj/viewuno.cxx 2007-11-26 14:43:13.000000000 +0000
+++ sc/source/ui/unoobj/viewuno.cxx 2008-01-23 17:29:08.000000000 +0000
@@ -85,9 +85,79 @@
Copied: trunk/patches/dev300/wpsimport-filter.diff (from r11934, /trunk/patches/src680/wpsimport-filter.diff)
==============================================================================
--- /trunk/patches/src680/wpsimport-filter.diff (original)
+++ trunk/patches/dev300/wpsimport-filter.diff Wed Mar 19 17:08:41 2008
@@ -5,17 +5,17 @@
$(T4_WRITER_BINFILTER) \
writer_WordPerfect_Document \
+ writer_MS_Works_Document \
+ writer_T602_Document \
writer_Text \
writer_Text_encoded \
- writer_JustSystem_Ichitaro_10 \
@@ -79,6 +80,7 @@ F4_WRITER = \
StarOffice_XML__Writer_ \
$(F4_WRITER_BINFILTER) \
WordPerfect \
+ MS_Works \
+ T602Document \
Text \
Text__encoded_ \
- writer_JustSystem_Ichitaro_10 \
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ filter/source/config/fragments/filters/MS_Works.xcu 30 Jan 2007 14:12:47 -0000 1.1.2.2
@@ -0,0 +1,13 @@
Copied: trunk/patches/dev300/wpsimport-scp2.diff (from r11934, /trunk/patches/src680/wpsimport-scp2.diff)
==============================================================================
--- /trunk/patches/src680/wpsimport-scp2.diff (original)
+++ trunk/patches/dev300/wpsimport-scp2.diff Wed Mar 19 17:08:41 2008
@@ -16,6 +16,6 @@
gid_File_Lib_Swui,
gid_File_Lib_Wpft,
+ gid_File_Lib_Msworks,
+ gid_File_Lib_T602Filter,
gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
- gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml,
Copied: trunk/patches/dev300/wpsimport-writerperfect.diff (from r11934, /trunk/patches/src680/wpsimport-writerperfect.diff)
==============================================================================
--- /trunk/patches/src680/wpsimport-writerperfect.diff (original)
+++ trunk/patches/dev300/wpsimport-writerperfect.diff Wed Mar 19 17:08:41 2008
@@ -120,22 +120,19 @@
const WPXPropertyListVector &xColumns,
--- writerperfect/source/filter/makefile.mk 23 Jan 2007 12:18:02 -0000 1.4
+++ writerperfect/source/filter/makefile.mk 18 Dec 2006 13:12:18 -0000 1.3.6.2
-@@ -7,12 +7,20 @@ ENABLE_EXCEPTIONS=true
+@@ -7,12 +7,16 @@ ENABLE_EXCEPTIONS=true
.INCLUDE : settings.mk
.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS) -I..
+INCPRE+=$(LIBWPD_CFLAGS)
- .ELSE
+-.ELSE
-# broken but ... necessary, internal include shafted ...
--INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd -I..
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+-INCPRE+=-I..
+.ENDIF
+
+.IF "$(SYSTEM_LIBWPS)" == "YES"
+INCPRE+=$(LIBWPS_CFLAGS)
-+.ELSE
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
.ENDIF
+# broken but ... necessary, internal include shafted ...
@@ -227,22 +224,19 @@
#endif
--- writerperfect/source/wpdimp/makefile.mk 23 Jan 2007 12:19:31 -0000 1.2
+++ writerperfect/source/wpdimp/makefile.mk 18 Dec 2006 13:12:20 -0000 1.1.4.1
-@@ -7,12 +7,20 @@ ENABLE_EXCEPTIONS=true
+@@ -7,12 +7,16 @@ ENABLE_EXCEPTIONS=true
.INCLUDE : settings.mk
.IF "$(SYSTEM_LIBWPD)" == "YES"
-INCPRE+=$(LIBWPD_CFLAGS) -I..
+INCPRE+=$(LIBWPD_CFLAGS)
- .ELSE
+-.ELSE
-# broken but ... necessary, internal include shafted ...
--INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd -I..
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+-INCPRE+=-I..
+.ENDIF
+
+.IF "$(SYSTEM_LIBWPS)" == "YES"
+INCPRE+=$(LIBWPS_CFLAGS)
-+.ELSE
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
.ENDIF
+# broken but ... necessary, internal include shafted ...
Copied: trunk/patches/dev300/xmlhelp-work-with-symlinks.diff (from r11934, /trunk/patches/src680/xmlhelp-work-with-symlinks.diff)
==============================================================================
--- /trunk/patches/src680/xmlhelp-work-with-symlinks.diff (original)
+++ trunk/patches/dev300/xmlhelp-work-with-symlinks.diff Wed Mar 19 17:08:41 2008
@@ -50,19 +50,20 @@
sal_uInt64 a = m_nCustomCSSDocLength,b = m_nCustomCSSDocLength;
--- xmlhelp/source/treeview/tvread.cxx.old 2006-11-01 14:50:18.000000000 +0100
+++ xmlhelp/source/treeview/tvread.cxx 2007-08-29 17:55:33.000000000 +0200
-@@ -789,9 +789,14 @@ ConfigData TVChildTarget::init( const Re
+@@ -789,9 +789,15 @@ ConfigData TVChildTarget::init( const Re
rtl::OUString baseName = aFileName.copy(0,idx_).toAsciiLowerCase();
if(! showBasic && baseName.compareToAscii("sbasic") == 0 )
continue;
-
-- configData.filelen[j] = aFileStatus.getFileSize();
-- configData.fileurl[j++] = aFileUrl ;
-+
+- configData.vFileLen.push_back( aFileStatus.getFileSize() );
+- configData.vFileURL.push_back( aFileUrl );
+ osl::File aFile( aFileUrl );
+ if( osl::FileBase::E_None == aFile.open( OpenFlag_Read ) )
+ {
-+ aFile.getSize( configData.filelen[j] );
-+ configData.fileurl[j++] = aFileUrl ;
++ sal_uInt64 nSize;
++ aFile.getSize( nSize );
++ configData.vFileLen.push_back( aFileStatus.getFileSize() );
++ configData.vFileURL.push_back( aFileUrl );
+ aFile.close();
+ }
}
Copied: trunk/patches/dev300/zoom-combobox.diff (from r11934, /trunk/patches/src680/zoom-combobox.diff)
==============================================================================
--- /trunk/patches/src680/zoom-combobox.diff (original)
+++ trunk/patches/dev300/zoom-combobox.diff Wed Mar 19 17:08:41 2008
@@ -785,9 +785,9 @@
..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx
..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx
+..\inc\svx\zoomtbxctrl.hxx %_DEST%\inc%_EXT%\svx\zoomtbxctrl.hxx
- ..\source\items\boxobj.hxx %_DEST%\inc%_EXT%\svx\boxobj.hxx
- ..\inc\svx\itemtype.hxx %_DEST%\inc%_EXT%\svx\itemtype.hxx
- ..\inc\svx\outliner.hxx %_DEST%\inc%_EXT%\svx\outliner.hxx
+ ..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx
+ ..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx
+ ..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx
--- /dev/null 2004-08-25 23:04:59.000000000 +0530
+++ svx/inc/svx/zoomtbxctrl.hxx 2005-04-07 16:50:49.483537921 +0530
@@ -0,0 +1,90 @@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
