ooo-build r12709 - in trunk: . patches/dev300 patches/mono patches/unittesting patches/vba
- From: jholesovsky svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12709 - in trunk: . patches/dev300 patches/mono patches/unittesting patches/vba
- Date: Thu, 29 May 2008 16:01:34 +0000 (UTC)
Author: jholesovsky
Date: Thu May 29 16:01:33 2008
New Revision: 12709
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12709&view=rev
Log:
2008-05-29 Jan Holesovsky <kendy suse cz>
* Update/default to dev300-m14.
* patches/dev300/buildfix-disable-pdfimport.diff,
patches/dev300/buildfix-sdext-double-qualification.diff,
patches/dev300/buildfix-xmlhelp-system-expat.diff,
patches/dev300/config_office-gnome-vfs-lock-m12.diff,
patches/dev300/cws-hsqldb16.diff,
patches/dev300/cws-layoutdialogs-toolkit-m10.diff,
patches/dev300/cws-npower9.diff,
patches/dev300/default-no-registration-menu-m12.diff,
patches/dev300/filter-xhtml-title-title.diff,
patches/dev300/fix-system-hunspell-m11.diff,
patches/dev300/fixup-system-hyph.diff,
patches/dev300/gcc-4.3-bridges.diff,
patches/dev300/i86580-autocorr-exclamation.diff,
patches/dev300/odf-flatxml-import-export-m11.diff,
patches/dev300/offapi-calc-datapilot-drilldown.diff,
patches/dev300/pdfimport-no-license-m10.diff,
patches/dev300/presenterscreen-no-license-m12.diff,
patches/dev300/reportdesigner-no-license-m11.diff,
patches/dev300/sax-writer.diff,
patches/dev300/sc-calc-datapilot-drilldown.diff,
patches/dev300/sc-datapilot-dynamic-range-m12.diff,
patches/dev300/sc-formula-syntax-core.diff,
patches/dev300/sc-sheet-protection-options.diff,
patches/dev300/sdk-settings-honour-linux.diff,
patches/dev300/speed-pagein-sort.diff,
patches/dev300/svg-import-basegfx-m10.diff,
patches/dev300/svx-missing-initialization-m10.diff,
patches/dev300/system-lpsolve-config_office.diff,
patches/dev300/system-lpsolve-sccomp.diff,
patches/dev300/system-lpsolve-scp2.diff,
patches/dev300/uses-vfs-m12.diff,
patches/dev300/vcl-gcache-missing-initialisation.diff,
patches/dev300/webdav-locking-serve-dav-uri-m12.diff,
patches/dev300/win32-hyphen-h.diff,
patches/dev300/win32-prebuilt-writingaids-zip-m10.diff,
patches/dev300/wpsimport-scp2-m12.diff,
patches/dev300/xulrunner-1.9.diff,
patches/unittesting/unittesting-ucb-m12.diff,
patches/vba/vbaevents-services-sources-m12.diff: Not necessary for
m14.
* patches/dev300/form-control-visibility.diff,
patches/dev300/forms-radio-button-group-names.diff,
patches/dev300/novell-win32-odma.diff,
patches/dev300/reportdesigner-no-license.diff,
patches/dev300/scp2-3layer-nicer-paths.diff,
patches/dev300/webdav-locking-serve-dav-uri.diff,
patches/mono/cli_ure-mono-bridge.diff,
patches/mono/cli_ure-prj-build-lst.diff,
patches/mono/mono-build.diff,
patches/vba/vba-workbook-worksheet-events-dev300.diff: Update for
m14.
* patches/dev300/apply: Default to m14.
Removed:
trunk/patches/dev300/buildfix-disable-pdfimport.diff
trunk/patches/dev300/buildfix-sdext-double-qualification.diff
trunk/patches/dev300/buildfix-xmlhelp-system-expat.diff
trunk/patches/dev300/config_office-gnome-vfs-lock-m12.diff
trunk/patches/dev300/cws-hsqldb16.diff
trunk/patches/dev300/cws-layoutdialogs-toolkit-m10.diff
trunk/patches/dev300/cws-npower9.diff
trunk/patches/dev300/default-no-registration-menu-m12.diff
trunk/patches/dev300/filter-xhtml-title-title.diff
trunk/patches/dev300/fix-system-hunspell-m11.diff
trunk/patches/dev300/fixup-system-hyph.diff
trunk/patches/dev300/gcc-4.3-bridges.diff
trunk/patches/dev300/i86580-autocorr-exclamation.diff
trunk/patches/dev300/odf-flatxml-import-export-m11.diff
trunk/patches/dev300/offapi-calc-datapilot-drilldown.diff
trunk/patches/dev300/pdfimport-no-license-m10.diff
trunk/patches/dev300/presenterscreen-no-license-m12.diff
trunk/patches/dev300/reportdesigner-no-license-m11.diff
trunk/patches/dev300/sax-writer.diff
trunk/patches/dev300/sc-calc-datapilot-drilldown.diff
trunk/patches/dev300/sc-datapilot-dynamic-range-m12.diff
trunk/patches/dev300/sc-formula-syntax-core.diff
trunk/patches/dev300/sc-sheet-protection-options.diff
trunk/patches/dev300/sdk-settings-honour-linux.diff
trunk/patches/dev300/speed-pagein-sort.diff
trunk/patches/dev300/svg-import-basegfx-m10.diff
trunk/patches/dev300/svx-missing-initialization-m10.diff
trunk/patches/dev300/system-lpsolve-config_office.diff
trunk/patches/dev300/system-lpsolve-sccomp.diff
trunk/patches/dev300/system-lpsolve-scp2.diff
trunk/patches/dev300/uses-vfs-m12.diff
trunk/patches/dev300/vcl-gcache-missing-initialisation.diff
trunk/patches/dev300/webdav-locking-serve-dav-uri-m12.diff
trunk/patches/dev300/win32-hyphen-h.diff
trunk/patches/dev300/win32-prebuilt-writingaids-zip-m10.diff
trunk/patches/dev300/wpsimport-scp2-m12.diff
trunk/patches/dev300/xulrunner-1.9.diff
trunk/patches/unittesting/unittesting-ucb-m12.diff
trunk/patches/vba/vbaevents-services-sources-m12.diff
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/patches/dev300/apply
trunk/patches/dev300/form-control-visibility.diff
trunk/patches/dev300/forms-radio-button-group-names.diff
trunk/patches/dev300/novell-win32-odma.diff
trunk/patches/dev300/reportdesigner-no-license.diff
trunk/patches/dev300/scp2-3layer-nicer-paths.diff
trunk/patches/dev300/webdav-locking-serve-dav-uri.diff
trunk/patches/mono/cli_ure-mono-bridge.diff
trunk/patches/mono/cli_ure-prj-build-lst.diff
trunk/patches/mono/mono-build.diff
trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu May 29 16:01:33 2008
@@ -3,7 +3,7 @@
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=dev300-m10
+DEFAULT_TAG=dev300-m14
# For the upstream packages it is like:
# DEFAULT_TAG=OOH680_m12
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Thu May 29 16:01:33 2008
@@ -6,7 +6,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting
-OLDEST_SUPPORTED=dev300-m10
+OLDEST_SUPPORTED=dev300-m14
# -------- Functional sub-sets --------
Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -29,7 +29,7 @@
VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
UnUsedButNotYetRemovedFromSVN, \
PostgreSQL, SELinux, VOSremoval, Glib2, \
- UnitBootstrap, RadioButtons, UnstableLibwpd
+ UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress
# Optional sections
Optional : DejaVuFonts
# Binfilter patches: a special distro; applied only when building with binfilter
@@ -156,11 +156,6 @@
# Pagein types.rdb / services.rdb & the ui files
speed-pagein.diff, i#57679, michael
-[ TemporaryHacks < dev300-m14 ]
-# Sort the pagin information by inode number to improve read linearity
-speed-pagein-sort.diff, i#81912, michael
-
-[ TemporaryHacks ]
# Use d_type entry when possible to get file type instead of using stat
speed-getfilestatus-dtype.diff, rodo, i#63159
@@ -221,12 +216,6 @@
# until the internal compiler error is fixed
# buildfix-gcc-4.3-compiler-error.diff, n#370383, pmladek
-[ TemporaryHacks < dev300-m12 ]
-#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
@@ -284,20 +273,11 @@
wpsimport-config_office.diff
wpsimport-filter.diff
-[ CWSBackports < dev300-m13 ]
-wpsimport-scp2-m12.diff
-[ CWSBackports >= dev300-m13 ]
wpsimport-scp2.diff
-[ CWSBackports ]
wpsimport-writerperfect.diff
libwps.diff
-[ CWSBackports < dev300-m12 ]
-#dialog refactor
-cws-npower9.diff
-
-[ CWSBackports ]
#basic runtime fixes
cws-npower10.diff
cws-pflin10.diff
@@ -308,9 +288,6 @@
# the -fvisibility-inlines-hidden
buildfix-x86-64-visibility-workaround.diff
-[ CWSBackports < dev300-m13 ]
-cws-hsqldb16.diff, i#85087
-
[ WPG ]
# libwpg-based import filter for WordPerfect Graphics
@@ -349,12 +326,8 @@
scp2-3layer-nicer-paths.diff, jholesov
# Tell the desktop we support the VFS
-[ FixesNotForUpstream < dev300-m13 ]
-uses-vfs-m12.diff, i#43504, michael
-[ FixesNotForUpstream >= dev300-m13 ]
uses-vfs.diff, i#43504, michael
-[ FixesNotForUpstream ]
# add mozilla certificate dir detection to soffice
soffice-detect-mozilla-certificates.diff
@@ -366,24 +339,15 @@
redirect-extensions.diff
# no bogus license question when registering these extensions
-[ FixesNotForUpstream < dev300-m12 ]
-reportdesigner-no-license-m11.diff
-[ FixesNotForUpstream >= dev300-m12 ]
reportdesigner-no-license.diff
-[ FixesNotForUpstream ]
presentation-minimizer-no-license.diff
-[ FixesNotForUpstream < dev300-m11 ]
-pdfimport-no-license-m10.diff
-[ FixesNotForUpstream >= dev300-m11 ]
pdfimport-no-license.diff
-[ FixesNotForUpstream < dev300-m13 ]
-presenterscreen-no-license-m12.diff
-[ FixesNotForUpstream >= dev300-m13 ]
presenterscreen-no-license.diff
[ swextFixes ]
wiki-publisher-no-license.diff
+
[ Fixes ]
# sd printing fixes
printing-bugfix-254573.diff, n#254573, rodo
@@ -432,11 +396,6 @@
# use -Wl,--as-needed, save 1% of relocations
link-as-needed.diff, i#89511, pmladek
-[ Fixes < dev300-m11 ]
-# fixes some wrong usages of the function AddBytes that would malform the xml output
-sax-writer.diff, i#66693, pmladek
-
-[ Fixes ]
# Added support for "application/octet-stream" mime type in package manager
desktop-application-octet-stream-mime-type.diff, i#73301, flr
@@ -468,11 +427,6 @@
#don't accept all rows to be header rows in WW8 file
sw-rowsotrepeat.diff, i#69519, mloiseleur
-[ Fixes < dev300-m13 ]
-#generate xhtml that is acceptable for Internet Explorer
-filter-xhtml-title-title.diff,
-
-[ Fixes ]
#fix saving ( as doc format ) word documents with embedded word
#document ( containing macros ) crashing
save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
@@ -483,19 +437,9 @@
# convert kind of correctly nested positioned tables
# sw-nested-positionned-tables-ww8-import-fix.diff, i#86988, fridrich
-[ Fixes < dev300-m11 ]
-# init all members in svx's line geometry creator
-svx-missing-initialization-m10.diff, i#86163, thorsten
-
-[ Fixes >= dev300-m11 ]
# init all members in svx's line geometry creator
svx-missing-initialization.diff, i#86163, thorsten
-[ Fixes < dev300-13 ]
-# only use value if initialized
-vcl-gcache-missing-initialisation.diff, i#88005, thorsten
-
-[ Fixes ]
# init all members in VirDev's ctor
vcl-virdev-missing-initialisation.diff, i#88535, thorsten
@@ -545,13 +489,8 @@
# FIXME: file upstream when the correctness proven
ucb-gnome-vfs-lock.diff, n#203737, jholesov
sfx2-gnome-vfs-lock.diff, n#203737, jholesov
-
-[ GnomeVFS < dev300-m13 ]
-config_office-gnome-vfs-lock-m12.diff, n#203737, jholesov
-[ GnomeVFS >= dev300-m13 ]
config_office-gnome-vfs-lock.diff, n#203737, jholesov
-[ GnomeVFS ]
# Fix crash in reading the directories
# FIXME: file upstream together with the above
ucb-gnome-vfs-crashfix.diff, i#0, jholesov
@@ -603,13 +542,8 @@
# Implement uploading the changed stream to the server
webdav-locking-stream-can-save.diff, n#346711, i#29152, jholesov
-[ GnomeVFS > dev300-m12 ]
-# Serve dav:// and webdav:// protocols in the WebDAV UCP
-#FIXME webdav-locking-serve-dav-uri.diff, n#346713, i#29152, jholesov
-
-[ GnomeVFS <= dev300-m12 ]
# Serve dav:// and webdav:// protocols in the WebDAV UCP
-webdav-locking-serve-dav-uri-m12.diff, n#346713, i#29152, jholesov
+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
@@ -641,12 +575,10 @@
# External splash screen implementation / 2nd time accelerator
unxsplash-rework.diff, i#60696, michael/jholesov
-[ QuickStarter >= dev300-m13 ]
# FIXME: unxsplash-rework needs this function which was removed in m13
# due to being unused. fix properly.
hack-readd-GetStringParam.diff
-[ QuickStarter ]
# handling of osl pipe has changed, see i#84045
unxsplash-new-osl-pipe.diff, i#60696, jholesov
@@ -690,16 +622,10 @@
# Autofill doesnt fill filtered rows bxc 62499
sc-filters-fill-fix.diff, jody
-[ CalcFixes > dev300-m12 ]
# Support modification of data source range in DataPilot after table output has
# been generated.
sc-datapilot-dynamic-range.diff, i#23658, kohei
-[ CalcFixes <= dev300-m12 ]
-# Support modification of data source range in DataPilot after table output has
-# been generated.
-sc-datapilot-dynamic-range-m12.diff, i#23658, kohei
-
# Provision for data-pilot to give autoformat bxc #62162
#
# Upstream has already rejected this patch, and closed the issue as WONTFIX.
@@ -773,18 +699,13 @@
# able to paste it elsewhere (similar to Insert Cut Cells in Excel)
sc-delete-rows-columns-remembers-content.diff, i#71921, jholesov
-[ CalcFixes <= dev300-m12 ]
# load, store and save the sheet protection options from and to an Excel file,
# and use that information to constrain cell cursor movement when the sheet is
# protected.
-sc-sheet-protection-options.diff, i#71468, kohei
+#FIXME dev300-m14: cws-scsheetprotection02-sc.diff, i#60305, i#71468, i#84766, kohei
+#FIXME dev300-m14: cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
+#FIXME dev300-m14: cws-scsheetprotection02-svx.diff, i#60305, i#71468, i#84766, kohei
-[ CalcFixes > dev300-m12 ]
-cws-scsheetprotection02-sc.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-sfx2.diff, i#60305, i#71468, i#84766, kohei
-cws-scsheetprotection02-svx.diff, i#60305, i#71468, i#84766, kohei
-
-[ CalcFixes ]
# Ensure that Print Preview is consistent with Print output.
sc-print-selected-sheets.diff, n#335684, i#45497, jonp
@@ -1032,31 +953,12 @@
# even when it is built with JDK 1.5
#FIXME dev300-m10: build-java-target.diff, pmladek
-[ BuildBits == dev300-m13 ]
-# deliver hyphen.h also on Windows
-win32-hyphen-h.diff
-
-[ BuildBits < dev300-m11 ]
-buildfix-xmlhelp-system-expat.diff, i#86979
-buildfix-disable-pdfimport.diff, i#88375
-
-[ BuildBits ]
# fix the --enable-reportdesign configure check to work
buildfix-enable-reportdesign-check.diff, i#87518, pmladek
-[ BuildBits < dev300-m13 ]
-# double qulification
-buildfix-sdext-double-qualification.diff, i#88584
-
-[ BuildBits < dev300-m12 ]
-# fix build with system-hunspell
-fix-system-hunspell-m11.diff, i#87604
-[ BuildBits >= dev300-m12 ]
# fix build with system-hunspell
fix-system-hunspell.diff, i#87604
-[ BuildBits == dev300-m12 ]
-fixup-system-hyph.diff, i#89468
[ Gcc43 ]
# gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
@@ -1070,10 +972,6 @@
novell-win32-vrb-branding.diff, n#191913, i#68817
novell-win32-registry-branding.diff, n#191913
-[ NovellOnlyWin32 <= dev300-m10 ]
-win32-prebuilt-writingaids-zip-m10.diff
-
-[ NovellOnlyWin32 >= dev300-m12 ]
win32-prebuilt-writingaids-zip.diff
[ translate-org-za-common ]
@@ -1111,10 +1009,6 @@
# => Tango should be preferred over Industrial.
tango-prefer-over-industrial.diff, n#304615, pmladek
-[ Defaults < dev300-m13 ]
-# no Help->registration dialog by default
-default-no-registration-menu-m12.diff, michael
-[ Defaults >= dev300-m13 ]
# no Help->registration dialog by default
default-no-registration-menu.diff, michael
@@ -1144,12 +1038,6 @@
# should use --with-system-openssl
default-openssl-no-idea-alg.diff, pmladek
-[ Features < dev300-m12 ]
-# load and save also odf documents in flat xml format as opposed to the
-# compressed ones (conforming to the odf specifications)
-odf-flatxml-import-export-m11.diff
-
-[ Features >= dev300-m12 ]
# load and save also odf documents in flat xml format as opposed to the
# compressed ones (conforming to the odf specifications)
odf-flatxml-import-export.diff
@@ -1191,9 +1079,6 @@
# Workaround for compile failure with glibc 2.4's langinfo.h
i18nutil-glibc-braindamage-workaround.diff, brosenk
-[ BuildBits < dev300-m11 ]
-xulrunner-1.9.diff, i#86670
-
[ DebianOnly ]
seamonkey-is-iceape.diff
@@ -1254,14 +1139,6 @@
# fix build with vba as extension
buildfix-vba-as-extn.diff, i#86937, hmth
-[ BuildBits < dev300-m11 ]
-# fix build with gcc-4.3 on ix86
-gcc-4.3-bridges.diff, i#86551, pmladek
-
-[ SdkFixes < dev300-m11 ]
-# honour also linux as in s390-ibm-linux instead of only linux-gnu,
-# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476821
-sdk-settings-honour-linux.diff
[ BFBuildBits ]
SectionOwner => pmladek
@@ -1310,12 +1187,6 @@
# use getopt() and readdir_r() from system glibc
#FIXME src680: system-libc.diff, i#69033, rengelha
-[ SystemBits < dev300-m11 ]
-# add configure option for system lpsolve.
-system-lpsolve-config_office.diff
-system-lpsolve-scp2.diff
-system-lpsolve-sccomp.diff
-
[ Icons ]
# Make insensitive toolbar icons look far nicer
@@ -1415,7 +1286,6 @@
# fixes for visual studio express 2005 ( ooo-build only )
2005-express-stl-remove.diff, noelpwer, i#71404
-[ Win32Only >= dev300-m13 ]
comphelper-msvc8-fix.diff, thorsten, i#89973
[ VBABits ]
@@ -1518,9 +1388,6 @@
buildfix-climaker-disabled.diff
mono-climaker-bridgetest.diff
-[ VBAObjects < dev300-m13 ]
-vbaevents-services-sources-m12.diff, i#68893
-[ VBAObjects >= dev300-m13 ]
vbaevents-services-sources.diff, i#68893
[ VBAObjects ]
@@ -1725,10 +1592,6 @@
# Support several different formula syntax, and add a formula syntax
# configuration option in the Options page.
-[ CalcFixes < dev300-m13 ]
-sc-formula-syntax-core.diff, n#358558, kohei
-
-[ CalcFixes ]
sc-formula-syntax-ui.diff, n#358558, kohei
# allow special characters in a sheet name.
@@ -1954,22 +1817,11 @@
# Work in progress, but fairly usable already
svg-import-filter.diff, thorsten
-[ SVGImport < dev300-m11 ]
-svg-import-basegfx-m10.diff, thorsten
-
-[ SVGImport >= dev300-m11 ]
svg-import-basegfx.diff, thorsten
# like svg-import-filter.diff, but adds a graphic filter for SVG
svg-import-filter-gfxfilter.diff, thorsten
-[ CalcDataPilotDrillDown < dev300-m14 ]
-# Implements DataPilot cache table, result drill-down, and some extra UNO API.
-SectionOwner => kohei
-SectionIssue => i#57030, i#83250, i#84349, i#88473, i#88531
-sc-calc-datapilot-drilldown.diff
-offapi-calc-datapilot-drilldown.diff
-
[ SharedWorksheets ]
SectionOwner => jholesov
@@ -2030,14 +1882,7 @@
cws-layoutdialogs-scp2.diff
cws-layoutdialogs-svx.diff
cws-layoutdialogs-sw.diff
-
-[ LayoutDialogs < dev300-m11 ]
-cws-layoutdialogs-toolkit-m10.diff
-
-[ LayoutDialogs >= dev300-m11 ]
cws-layoutdialogs-toolkit.diff
-
-[ LayoutDialogs ]
cws-layoutdialogs-transex3.diff
layout-plugin-toolkit.diff
@@ -2131,12 +1976,7 @@
unittesting-xmloff.diff
unittesting-xmlscript.diff
unittesting-xmlsecurity.diff
-
-[ UnitTesting > dev300-m12 ]
-#FIXME unittesting-ucb.diff
-
-[ UnitTesting <= dev300-m12 ]
-unittesting-ucb-m12.diff
+unittesting-ucb.diff
[ UnitBootstrap ]
SectionOwner => michael
Modified: trunk/patches/dev300/form-control-visibility.diff
==============================================================================
--- trunk/patches/dev300/form-control-visibility.diff (original)
+++ trunk/patches/dev300/form-control-visibility.diff Thu May 29 16:01:33 2008
@@ -62,10 +62,10 @@
--- toolkit/inc/toolkit/helper/property.hxx.orig 2008-05-05 18:14:37.000000000 +0800
+++ toolkit/inc/toolkit/helper/property.hxx 2008-05-05 18:20:40.000000000 +0800
@@ -191,6 +191,7 @@ namespace rtl {
- #define BASEPROPERTY_DIALOGSOURCEURL 132
- #define BASEPROPERTY_NOLABEL 133 // ::rtl::OUString added for issue79712
- #define BASEPROPERTY_URL 134 // ::rtl::OUString
-+#define BASEPROPERTY_VISIBLE 135 // sal_Bool
+ #define BASEPROPERTY_URL 134 // ::rtl::OUString
+ #define BASEPROPERTY_UNIT 135 // ::awt::FieldUnit
+ #define BASEPROPERTY_CUSTOMUNITTEXT 136 // ::rtl::OUString
++#define BASEPROPERTY_VISIBLE 137 // sal_Bool
// Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
Modified: trunk/patches/dev300/forms-radio-button-group-names.diff
==============================================================================
--- trunk/patches/dev300/forms-radio-button-group-names.diff (original)
+++ trunk/patches/dev300/forms-radio-button-group-names.diff Thu May 29 16:01:33 2008
@@ -535,10 +535,10 @@
--- toolkit/inc/toolkit/helper/property.hxx
+++ toolkit/inc/toolkit/helper/property.hxx
@@ -192,6 +192,7 @@ namespace rtl {
- #define BASEPROPERTY_NOLABEL 133 // ::rtl::OUString added for issue79712
- #define BASEPROPERTY_URL 134 // ::rtl::OUString
- #define BASEPROPERTY_VISIBLE 135 // sal_Bool
-+#define BASEPROPERTY_GROUPNAME 136 // ::rtl::OUString
+ #define BASEPROPERTY_UNIT 135 // ::awt::FieldUnit
+ #define BASEPROPERTY_CUSTOMUNITTEXT 136 // ::rtl::OUString
+ #define BASEPROPERTY_VISIBLE 137 // sal_Bool
++#define BASEPROPERTY_GROUPNAME 138 // ::rtl::OUString
// Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
#define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
Modified: trunk/patches/dev300/novell-win32-odma.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-odma.diff (original)
+++ trunk/patches/dev300/novell-win32-odma.diff Thu May 29 16:01:33 2008
@@ -566,8 +566,8 @@
+ <value/>
+ </prop>
+ </node>
- </node>
- </node>
+ <!-- We want the Provider to be the final fallback provider -->
+ <node oor:name="Provider999" oor:op="replace" install:module="gio">
dummy line to avoid confusing diff-mode
--- scp2/source/ooo/file_library_ooo.scp 17 Feb 2006 16:52:02 -0000 1.184.2.2
+++ scp2/source/ooo/file_library_ooo.scp 13 Mar 2006 11:07:23 -0000
Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff (original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff Thu May 29 16:01:33 2008
@@ -57,7 +57,7 @@
@@ -1,5 +1,3 @@
- </simple-license>
- </registration>
- <version value="1.0.3"/>
+ <version value="1.0.4"/>
<identifier value="com.sun.reportdesigner"/>
<dependencies>
Index: util/pre.xml
Modified: trunk/patches/dev300/scp2-3layer-nicer-paths.diff
==============================================================================
--- trunk/patches/dev300/scp2-3layer-nicer-paths.diff (original)
+++ trunk/patches/dev300/scp2-3layer-nicer-paths.diff Thu May 29 16:01:33 2008
@@ -6,7 +6,7 @@
// Styles = (LAYERLINK);
Name = "basis-link";
Dir = gid_Dir_Brand_Root;
-- Target = "../openoffice.org/basis${OOOBASEVERSION}";
+- Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
+ Target = "basis${OOOBASEVERSION}";
End
#endif
@@ -17,9 +17,9 @@
+++ scp2/source/ooo/directory_ooo.scp
@@ -93,7 +93,7 @@ Directory gid_Dir_Ooo_Openofficeorg
#ifdef WNT
- HostName = "OpenOffice.org";
+ HostName = "${BASISROOTNAME}";
#else
-- HostName = "openoffice.org";
+- HostName = "${UNIXBASISROOTNAME}";
+ HostName = ".";
#endif
End
Modified: trunk/patches/dev300/webdav-locking-serve-dav-uri.diff
==============================================================================
--- trunk/patches/dev300/webdav-locking-serve-dav-uri.diff (original)
+++ trunk/patches/dev300/webdav-locking-serve-dav-uri.diff Thu May 29 16:01:33 2008
@@ -2,7 +2,7 @@
index 4c5f119..e553404 100644
--- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
-@@ -150,18 +150,62 @@
+@@ -150,17 +150,62 @@
<value/>
</prop>
</node>
@@ -17,7 +17,6 @@
- <value/>
- </prop>
- </node>
-- </node>
+ <node oor:name="Provider12" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
@@ -74,9 +73,9 @@
+ </prop>
+ </node>
+ </node>
- </node>
- </node>
- </node>
+ <!-- We want the Provider to be the final fallback provider -->
+ <node oor:name="Provider999" oor:op="replace" install:module="gio">
+ <prop oor:name="ServiceName">
diff --git tools/inc/tools/urlobj.hxx tools/inc/tools/urlobj.hxx
index 199079f..477c1ec 100644
--- tools/inc/tools/urlobj.hxx
Modified: trunk/patches/mono/cli_ure-mono-bridge.diff
==============================================================================
--- trunk/patches/mono/cli_ure-mono-bridge.diff (original)
+++ trunk/patches/mono/cli_ure-mono-bridge.diff Thu May 29 16:01:33 2008
@@ -4,7 +4,7 @@
@@ -8,5 +8,6 @@
ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
- ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_unotypes.w ure_source_ure.w ure_inc NULL
+ ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_inc NULL
+ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL
Modified: trunk/patches/mono/cli_ure-prj-build-lst.diff
==============================================================================
--- trunk/patches/mono/cli_ure-prj-build-lst.diff (original)
+++ trunk/patches/mono/cli_ure-prj-build-lst.diff Thu May 29 16:01:33 2008
@@ -3,14 +3,14 @@
+++ cli_ure/prj/build.lst 2007-07-31 18:12:37.000000000 +0200
@@ -4,10 +4,10 @@
ure cli_ure\version nmake - all ure_source_version ure_inc NULL
- ure cli_ure\source nmake - all ure_source_source ure_inc NULL
- ure cli_ure\source\basetypes nmake - all ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
--ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
-+ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_climaker ure_source_source ure_source_basetypes ure_inc ure_unotypes NULL
- ure cli_ure\source\climaker nmake - all ure_source_climaker ure_source_basetypes ure_inc NULL
- ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
--ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
-+ure cli_ure\source\ure nmake - all ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source ure_unotypes ure_inc NULL
- ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_unotypes ure_source_ure ure_inc NULL
+ ure cli_ure\source nmake - all ure_source_source ure_inc NULL
+ ure cli_ure\source\basetypes nmake - all ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
+-ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
++ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_climaker ure_source_source ure_source_basetypes ure_inc ure_unotypes NULL
+ ure cli_ure\source\climaker nmake - all ure_source_climaker ure_source_basetypes ure_inc NULL
+ ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
+-ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
++ure cli_ure\source\ure nmake - all ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source ure_unotypes ure_inc NULL
+ ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_inc NULL
ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
- ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
+ ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
Modified: trunk/patches/mono/mono-build.diff
==============================================================================
--- trunk/patches/mono/mono-build.diff (original)
+++ trunk/patches/mono/mono-build.diff Thu May 29 16:01:33 2008
@@ -149,20 +149,20 @@
-ure cli_ure\source\climaker nmake - w,vc7 ure_source_climaker ure_source_basetypes.w ure_inc NULL
-ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
-ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
--ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_unotypes.w ure_source_ure.w ure_inc NULL
+-ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_inc NULL
-ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
-ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
-#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL
-+ure cli_ure\source nmake - all ure_source_source ure_inc NULL
-+ure cli_ure\source\basetypes nmake - all ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
-+ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
-+ure cli_ure\source\climaker nmake - all ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
-+ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_unotypes ure_source_ure ure_inc NULL
++ure cli_ure\source nmake - all ure_source_source ure_inc NULL
++ure cli_ure\source\basetypes nmake - all ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
++ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
++ure cli_ure\source\climaker nmake - all ure_source_climaker ure_source_basetypes ure_inc NULL
++ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
++ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
++ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_inc NULL
+ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
-+ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
-+#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure ure_source_native NULL
++ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
++#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure ure_source_native NULL
Index: cli_ure/prj/d.lst
===================================================================
--- cli_ure/prj/d.lst.orig 2006-01-08 20:48:38.000000000 +0100
Modified: trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff (original)
+++ trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff Thu May 29 16:01:33 2008
@@ -768,9 +768,9 @@
--- backup/sc/source/ui/view/tabview3.cxx 2008-04-30 18:58:39.000000000 +0800
+++ sc/source/ui/view/tabview3.cxx 2008-04-30 19:02:20.000000000 +0800
@@ -80,6 +80,7 @@
+ #include "AccessibilityHints.hxx"
#include "rangeutl.hxx"
#include "client.hxx"
- #include "tabprotection.hxx"
+#include "vbaeventshelper.hxx"
#include <com/sun/star/chart2/data/HighlightedRange.hpp>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
