ooo-build r12365 - in trunk: . patches/dev300 patches/emf+ patches/gstreamer patches/mono patches/src680 patches/vba
- From: jholesovsky svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12365 - in trunk: . patches/dev300 patches/emf+ patches/gstreamer patches/mono patches/src680 patches/vba
- Date: Tue, 29 Apr 2008 08:48:55 +0100 (BST)
Author: jholesovsky
Date: Tue Apr 29 07:48:53 2008
New Revision: 12365
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12365&view=rev
Log:
2008-04-29 Jan Holesovsky <kendy suse cz>
* Update to dev300-m10.
* patches/dev300/ooo85470.workspace.cairotext01.diff,
patches/src680/config_office-msvc8-compat.diff,
patches/src680/fast-mkdepend.diff,
patches/src680/javaversion.diff,
patches/src680/shell-senddoc-moz-wrapper-symlink.diff,
patches/src680/shell-senddoc-support-groupwise.diff,
patches/src680/shell-senddoc-sylpheed-filenames.diff,
patches/src680/x11_extensions-new-xrender-headers.diff,
patches/vba/vba-fix-3-layer-crash.diff: Remove, not necessary with
m10.
* patches/dev300/buildfix-sdext-double-qualification.diff,
patches/dev300/buildfix-vba-as-extn.diff,
patches/dev300/default-autotext-and-form-name.diff,
patches/dev300/letter-wizard-resource-id.diff,
patches/dev300/linkoo-dev300.diff,
patches/dev300/mono-build.diff,
patches/dev300/novell-win32-agfa-monotype-fonts.diff,
patches/dev300/padmin-nofontconfig.diff,
patches/dev300/sc-datapilot-autoformat.diff,
patches/dev300/sc-formula-syntax-core.diff,
patches/dev300/split-binfilter-scp2.diff,
patches/dev300/system-lpsolve-scp2.diff,
patches/dev300/transogl-transitions-sd.diff,
patches/dev300/unxsplash-rework.diff,
patches/dev300/vba-workbook-worksheet-events.diff,
patches/dev300/vba-workbook-worksheet-events2.diff,
patches/dev300/xmlhelp-work-with-symlinks.diff,
patches/dev300/zoom-combobox.diff,
patches/emf+/emf+-canvas.diff,
patches/emf+/emf+-canvas-smooth-poly.diff,
patches/emf+/emf+-offapi-renderer.diff,
patches/emf+/emf+-vcl-bitmap.diff,
patches/emf+/emf+-vcl-renderer.diff,
patches/gstreamer/gstreamer-config-office.diff,
patches/mono/mono-testtools.diff,
patches/src680/autocorrect-accidental-caps-lock-svx.diff,
patches/src680/buildfix-x86-64-visibility-workaround.diff,
patches/src680/cjk-character-units-fix-376788.diff,
patches/src680/cjk-character-units-ui.diff,
patches/src680/cws-npower9.diff,
patches/src680/fpicker-kde-gcc4-visibility.diff,
patches/src680/gcc4-visibility-sc.diff,
patches/src680/help-support.diff,
patches/src680/lwp-filter-component.diff,
patches/src680/odf-converter-ignore-writerfilter.diff,
patches/src680/odf-flatxml-import-export.diff,
patches/src680/sal-strintern-speed.diff,
patches/src680/sc-calc-datapilot-drilldown.diff,
patches/src680/sc-copy-on-merged-cells.diff,
patches/src680/sc-dp-gridlayout.diff,
patches/src680/sc-export-shape-hlink-bindings.diff,
patches/src680/sc-overwrite-char-font-attrs.diff,
patches/src680/sdk-gid-module-name.diff,
patches/src680/sfx-check-real-help-path.diff,
patches/src680/speed-getfilestatus-dtype.diff,
patches/src680/store-core.diff,
patches/src680/svg-import-basegfx.diff,
patches/src680/svg-import-filter.diff,
patches/src680/svtools-dont-extern-sRTF-sHTML.diff,
patches/src680/ucb-gnome-vfs-lock.diff,
patches/src680/unittesting-build-pl.diff,
patches/src680/unittesting-xmlhelp.diff,
patches/src680/vba-sc-autoshapes-hyperlinks.diff,
patches/src680/vcl-transparent-printing.diff,
patches/src680/webdav-locking.diff,
patches/src680/webdav-locking-serve-dav-uri.diff,
patches/src680/webdav-locking-stream-can-save.diff,
patches/src680/webdav-locking-unlock-on-crash.diff,
patches/src680/wmf-pattern-brush.diff,
patches/vba/basic-caller-support-dev300.diff,
patches/vba/scp_vba_uno_service.diff,
patches/vba/vba-error-object.diff,
patches/vba/vbaevents-services-sources.diff,
patches/vba/vba-workbook-worksheet-events.diff: Update to m10.
* patches/dev300/apply,
configure.in: Default to dev300-m10.
Added:
trunk/patches/dev300/buildfix-cairo.diff
Removed:
trunk/patches/dev300/ooo85470.workspace.cairotext01.diff
trunk/patches/src680/config_office-msvc8-compat.diff
trunk/patches/src680/fast-mkdepend.diff
trunk/patches/src680/javaversion.diff
trunk/patches/src680/shell-senddoc-moz-wrapper-symlink.diff
trunk/patches/src680/shell-senddoc-support-groupwise.diff
trunk/patches/src680/shell-senddoc-sylpheed-filenames.diff
trunk/patches/src680/x11_extensions-new-xrender-headers.diff
trunk/patches/vba/vba-fix-3-layer-crash.diff
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/patches/dev300/apply
trunk/patches/dev300/buildfix-sdext-double-qualification.diff
trunk/patches/dev300/buildfix-vba-as-extn.diff
trunk/patches/dev300/default-autotext-and-form-name.diff
trunk/patches/dev300/letter-wizard-resource-id.diff
trunk/patches/dev300/linkoo-dev300.diff
trunk/patches/dev300/mono-build.diff
trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
trunk/patches/dev300/padmin-nofontconfig.diff
trunk/patches/dev300/sc-datapilot-autoformat.diff
trunk/patches/dev300/sc-formula-syntax-core.diff
trunk/patches/dev300/split-binfilter-scp2.diff
trunk/patches/dev300/system-lpsolve-scp2.diff
trunk/patches/dev300/transogl-transitions-sd.diff
trunk/patches/dev300/unxsplash-rework.diff
trunk/patches/dev300/vba-workbook-worksheet-events.diff
trunk/patches/dev300/vba-workbook-worksheet-events2.diff
trunk/patches/dev300/xmlhelp-work-with-symlinks.diff
trunk/patches/dev300/zoom-combobox.diff
trunk/patches/emf+/emf+-canvas-smooth-poly.diff
trunk/patches/emf+/emf+-canvas.diff
trunk/patches/emf+/emf+-offapi-renderer.diff
trunk/patches/emf+/emf+-vcl-bitmap.diff
trunk/patches/emf+/emf+-vcl-renderer.diff
trunk/patches/gstreamer/gstreamer-config-office.diff
trunk/patches/mono/mono-testtools.diff
trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff
trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff
trunk/patches/src680/cjk-character-units-fix-376788.diff
trunk/patches/src680/cjk-character-units-ui.diff
trunk/patches/src680/cws-npower9.diff
trunk/patches/src680/fpicker-kde-gcc4-visibility.diff
trunk/patches/src680/gcc4-visibility-sc.diff
trunk/patches/src680/help-support.diff
trunk/patches/src680/lwp-filter-component.diff
trunk/patches/src680/odf-converter-ignore-writerfilter.diff
trunk/patches/src680/odf-flatxml-import-export.diff
trunk/patches/src680/sal-strintern-speed.diff
trunk/patches/src680/sc-calc-datapilot-drilldown.diff
trunk/patches/src680/sc-copy-on-merged-cells.diff
trunk/patches/src680/sc-dp-gridlayout.diff
trunk/patches/src680/sc-export-shape-hlink-bindings.diff
trunk/patches/src680/sc-overwrite-char-font-attrs.diff
trunk/patches/src680/sdk-gid-module-name.diff
trunk/patches/src680/sfx-check-real-help-path.diff
trunk/patches/src680/speed-getfilestatus-dtype.diff
trunk/patches/src680/store-core.diff
trunk/patches/src680/svg-import-basegfx.diff
trunk/patches/src680/svg-import-filter.diff
trunk/patches/src680/svtools-dont-extern-sRTF-sHTML.diff
trunk/patches/src680/ucb-gnome-vfs-lock.diff
trunk/patches/src680/unittesting-build-pl.diff
trunk/patches/src680/unittesting-xmlhelp.diff
trunk/patches/src680/vba-sc-autoshapes-hyperlinks.diff
trunk/patches/src680/vcl-transparent-printing.diff
trunk/patches/src680/webdav-locking-serve-dav-uri.diff
trunk/patches/src680/webdav-locking-stream-can-save.diff
trunk/patches/src680/webdav-locking-unlock-on-crash.diff
trunk/patches/src680/webdav-locking.diff
trunk/patches/src680/wmf-pattern-brush.diff
trunk/patches/vba/basic-caller-support-dev300.diff
trunk/patches/vba/scp_vba_uno_service.diff
trunk/patches/vba/vba-error-object.diff
trunk/patches/vba/vba-workbook-worksheet-events.diff
trunk/patches/vba/vbaevents-services-sources.diff
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Tue Apr 29 07:48:53 2008
@@ -3,7 +3,7 @@
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=dev300-m4
+DEFAULT_TAG=dev300-m10
# 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 Tue Apr 29 07:48:53 2008
@@ -6,7 +6,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../src680
-OLDEST_SUPPORTED=dev300-m4
+OLDEST_SUPPORTED=dev300-m10
# -------- Functional sub-sets --------
Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -193,9 +193,6 @@
sal-strintern-speed.diff, i#78496, michael
sal-strintern-speed-fix.diff, i#78496, michael
-# Faster makedepend
-fast-mkdepend.diff, i#73081, jholesov
-
# temporary hack to avoid the warning about missing return values in gcc4
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
warning-return-values-stlport.diff, jholesov
@@ -204,7 +201,7 @@
fix-linkoo.diff, i#83548, jholesov
# Update linkoo for dev300 TODO file upstream
-#linkoo-dev300.diff, jholesov
+linkoo-dev300.diff, jholesov
# temporary compile sc/source/core/tool with -O1 with gcc-4.3 on x86_64
# until the internal compiler error is fixed
@@ -229,6 +226,9 @@
# do not display arabic/hindi numbers instead of decimal numbers
sw-hindi-numbers.diff, i#86811, pmladek
+# fix build in cairo
+buildfix-cairo.diff, i#88260, thorsten
+
[ CJK ]
#set default CJK font fontsize as 10.5pt
sw-default-cjk-fontsize.diff i#72010, jianhua
@@ -320,18 +320,14 @@
libwpd.diff, fridrich
writerperfect-nocondensedparagraphs.diff, fridrich
-#use newer xrender headears for platforms that cannot use the system ones
-#and still want to have the cairo canvas working
-x11_extensions-new-xrender-headers.diff
-
# no bogus license question when registering these extensions
reportdesigner-no-license.diff
presentation-minimizer-no-license.diff
-[ FixesNotForUpstream >= dev300-m6 ]
+# don't show license
presenterscreen-no-license.diff
-wiki-publisher-no-license.diff
-pdfimport-no-license.diff
+#FIXME dev300-m10: wiki-publisher-no-license.diff
+#FIXME dev300-m10: pdfimport-no-license.diff
[ Fixes ]
@@ -341,16 +337,6 @@
# let sd accept uri-list drop, n#183719
sd-accept-uri-list-drop.diff, n#183719, rodo
-# 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
-
-# detect the symlinked mozilla-like wrapper correctly; fixes "File/Send/Document as E-mail..."
-# to work correctly with seamonkey on openSUSE-10.3
-shell-senddoc-moz-wrapper-symlink.diff, n#368532, i#87258, pmladek
-
# 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
@@ -428,9 +414,6 @@
# convert kind of correctly nested positioned tables
# sw-nested-positionned-tables-ww8-import-fix.diff, i#86988, fridrich
-# make path detection look for VC2005er dlls, too
-config_office-msvc8-compat.diff, thorsten
-
# init all members in svx's line geometry creator
svx-missing-initialization.diff, i#86163, thorsten
@@ -441,7 +424,7 @@
vcl-gcache-missing-initialisation.diff, i#88005, thorsten
# don't use freed memory in slidesorter
-sd-slidesorter-dead-ptr.diff, i#88002, thorsten
+#FIXME dev300-m10: sd-slidesorter-dead-ptr.diff, i#88002, thorsten
# fix import of MSO Userform & Frame ( presence of scroll-top & scroll-left )
# screws things up
@@ -899,7 +882,7 @@
# search also /usr/share for icons
# it is a temporary hack; we should do more clean FHS compliant installation
# we need a good plan before, though ;-)
-split-icons-search-usr-share.diff, n#296502, pmladek
+#FIXME dev300-m10: split-icons-search-usr-share.diff, n#296502, pmladek
[ BuildBits ]
@@ -907,14 +890,13 @@
# 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
+#FIXME dev300-m10: build-java-target.diff, pmladek
buildfix-xmlhelp-system-expat.diff, i#86373
# fix the --enable-reportdesign configure check to work
buildfix-enable-reportdesign-check.diff, i#87518, pmladek
-[ BuildBits >= dev300-m6 ]
# double qulification
buildfix-sdext-double-qualification.diff, i#88584
@@ -985,8 +967,6 @@
vfs-kde-too.diff, michael
# Trade speed for reliability with valgrind
valgrind-alloc.diff, michael
-# Pack new JAVA Runtime
-javaversion.diff
# disable the IDEA algorithm in the internal openssl; It is pattented.
# There is no license fee only for non-commercial use.
@@ -1441,9 +1421,7 @@
vba-stringtodouble.diff, n#359943, noelpwer
#fix for n#309981
vba-fixup-singlerange-sheetref.diff, n#309981, noelpwer
-[ VBAObjects < dev300-m8 ]
-# this fix is in sb86 integrated in m8
-vba-fix-3-layer-crash.diff
+
[ VBAUntested ]
SectionOwner => noelpwer
# total hack at the moment
@@ -1552,6 +1530,7 @@
# navigating through cells.
sc-skip-overlapped-cells.diff, i#86943, n#362674, kohei
+
#[ OOXSTLport5 ]
#
## oox devs, please reconsider operator[] use,
@@ -1610,11 +1589,11 @@
cairo-prj-build-lst.diff, i#70519, tml
cairo-prj-d-lst.diff, i#70519, tml
cairo-makefile-mk.diff, i#70519, tml
-cairo-config_office-configure-in.diff, i#70519, tml
+#FIXME dev300-m10: cairo-config_office-configure-in.diff, i#70519, tml
cairo-cairo-1-4-10-diff.diff, i#70519, tml
# Additional diffs for cairocanvas on Win32
-cairo-canvas-win32.diff, i#70519, n#300398, tml
+#FIXME dev300-m10: cairo-canvas-win32.diff, i#70519, n#300398, tml
[ OpenGLTransitions ]
transogl-transitions-slideshow.diff
@@ -1710,10 +1689,6 @@
# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
ooo59127.vcl.honourcairofont.diff
-[ CairoFonts < dev300-m5 ]
-# help LCD displays
-ooo85470.workspace.cairotext01.diff, ccheney
-
[ GStreamer ]
SectionOwner => rodo
@@ -1843,10 +1818,10 @@
cws-layoutdialogs-scp2.diff
cws-layoutdialogs-svx.diff
cws-layoutdialogs-sw.diff
-cws-layoutdialogs-toolkit.diff
+#FIXME dev300-m10: cws-layoutdialogs-toolkit.diff
cws-layoutdialogs-transex3.diff
-layout-plugin-toolkit.diff
+#FIXME dev300-m10: layout-plugin-toolkit.diff
[ LocalizeLayout ]
cws-layoutdialogs-toolkit-localize.diff
@@ -2166,7 +2141,7 @@
sw-section-import-fix.diff, n#364533, freuter
sw-allow-negative-spacing.diff, n#364534, freuter
-sd-slideshow-slideshowview-transformation-fix.diff, rodo
+#FIXME dev300-m10: sd-slideshow-slideshowview-transformation-fix.diff, rodo
cairocanvas-fix-image-cache.diff, rodo
vcl-limited-bmp-subset-fix.diff, i#88818, thorsten
Added: trunk/patches/dev300/buildfix-cairo.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-cairo.diff Tue Apr 29 07:48:53 2008
@@ -0,0 +1,17 @@
+Index: source/cairo/cairo_canvashelper.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/source/cairo/cairo_canvashelper.hxx,v
+retrieving revision 1.5
+diff -u -r1.5 cairo_canvashelper.hxx
+--- canvas/source/cairo/cairo_canvashelper.hxx 9 Nov 2007 10:14:00 -0000 1.5
++++ canvas/source/cairo/cairo_canvashelper.hxx 14 Apr 2008 13:27:28 -0000
+@@ -331,7 +331,8 @@
+ Operation aOperation,
+ ::cairo::Cairo* pCairo,
+ const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >* pTextures=NULL,
+- SpriteCanvas* pDevice=NULL );
++ SpriteCanvas* pDevice=NULL,
++ ::com::sun::star::rendering::FillRule eFillrule=::com::sun::star::rendering::FillRule_EVEN_ODD);
+ void doOperation( Operation aOperation,
+ ::cairo::Cairo* pCairo,
+ sal_uInt32 nPolygonIndex=0,
Modified: trunk/patches/dev300/buildfix-sdext-double-qualification.diff
==============================================================================
--- trunk/patches/dev300/buildfix-sdext-double-qualification.diff (original)
+++ trunk/patches/dev300/buildfix-sdext-double-qualification.diff Tue Apr 29 07:48:53 2008
@@ -4,8 +4,8 @@
RCS file: /cvs/graphics/sdext/source/presenter/PresenterConfigurationAccess.hxx,v
retrieving revision 1.3
diff -u -u -r1.3 PresenterConfigurationAccess.hxx
---- source/presenter/PresenterConfigurationAccess.hxx 11 Apr 2008 11:21:15 -0000 1.3
-+++ source/presenter/PresenterConfigurationAccess.hxx 22 Apr 2008 11:01:19 -0000
+--- sdext/source/presenter/PresenterConfigurationAccess.hxx 11 Apr 2008 11:21:15 -0000 1.3
++++ sdext/source/presenter/PresenterConfigurationAccess.hxx 22 Apr 2008 11:01:19 -0000
@@ -126,7 +126,7 @@
@param rList
The list to be filled.
Modified: trunk/patches/dev300/buildfix-vba-as-extn.diff
==============================================================================
--- trunk/patches/dev300/buildfix-vba-as-extn.diff (original)
+++ trunk/patches/dev300/buildfix-vba-as-extn.diff Tue Apr 29 07:48:53 2008
@@ -5,6 +5,6 @@
.INCLUDE : target.mk
+COMP=
- .IF "$(VBA_EXTENSION)"=="YES" && "$(OS)" != "MACOSX" # see above
+ .IF "$(VBA_EXTENSION)"=="YES"
COMP=build_extn
.ENDIF
Modified: trunk/patches/dev300/default-autotext-and-form-name.diff
==============================================================================
--- trunk/patches/dev300/default-autotext-and-form-name.diff (original)
+++ trunk/patches/dev300/default-autotext-and-form-name.diff Tue Apr 29 07:48:53 2008
@@ -54,9 +54,9 @@
--- /data4/LatestSourceOnly/ooo-build/build/ooh680-m1/sc/source/filter/excel/xlescher.cxx 2007-05-22 20:51:34.000000000 +0100
+++ sc/source/filter/excel/xlescher.cxx 2008-01-17 15:37:51.000000000 +0000
@@ -58,6 +58,7 @@
- #ifndef SC_XESTREAM_HXX
+ #include "document.hxx"
+ #include "xistream.hxx"
#include "xestream.hxx"
- #endif
+#include "globstr.hrc"
using ::rtl::OUString;
Modified: trunk/patches/dev300/letter-wizard-resource-id.diff
==============================================================================
--- trunk/patches/dev300/letter-wizard-resource-id.diff (original)
+++ trunk/patches/dev300/letter-wizard-resource-id.diff Tue Apr 29 07:48:53 2008
@@ -9,8 +9,8 @@
public LocaleCodes (XMultiServiceFactory xmsf) {
super(xmsf, UNIT_NAME, MODULE_NAME);
-- 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
+- allLanguageStrings = getStringList(16300); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
++ allLanguageStrings = getStringList(16302); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
}
public String getLanguageString(String MSID) {
Modified: trunk/patches/dev300/linkoo-dev300.diff
==============================================================================
--- trunk/patches/dev300/linkoo-dev300.diff (original)
+++ trunk/patches/dev300/linkoo-dev300.diff Tue Apr 29 07:48:53 2008
@@ -25,8 +25,8 @@
-$program_dir = 'program';
-$program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
+$program_dir = 'openoffice.org/basis3.0/program';
-+$brand_program_dir = 'openoffice.org3.0/program';
-+$ure_misc_dir = 'ure/share/misc';
++$brand_program_dir = 'openoffice.org3/program';
++$ure_misc_dir = 'openoffice.org/ure/share/misc';
+
+$program_dir = 'openoffice.org/basis3.0/MacOS' if ($ENV{OS} eq 'MACOSX');
@@ -52,6 +52,15 @@
if (-l $ooo_res && -l $star_res) {
if ($dry_run) {
print "link $ooo_res to $star_res";
+@@ -285,7 +285,7 @@ sub link_types_rdb()
+ {
+ print "oovbaapi.rdb case:";
+ my $src = "$OOO_BUILD/oovbaapi/$TARGET/ucr";
+- my $dest = "$OOO_INSTALL/program";
++ my $dest = "$OOO_INSTALL/" . $program_dir;
+ do_link ($src, $dest, 'oovbaapi.db', 'oovbaapi.rdb');
+ print "\n";
+ }
@@ -293,7 +296,7 @@ sub link_types_rdb()
{
print "Types.rdb case:";
Modified: trunk/patches/dev300/mono-build.diff
==============================================================================
--- trunk/patches/dev300/mono-build.diff (original)
+++ trunk/patches/dev300/mono-build.diff Tue Apr 29 07:48:53 2008
@@ -2,31 +2,40 @@
===================================================================
--- config_office/configure.in.orig 2006-01-08 20:48:38.000000000 +0100
+++ config_office/configure.in 2006-01-08 20:48:45.000000000 +0100
-@@ -33,6 +33,9 @@ AC_ARG_WITH(gpc,
+@@ -29,6 +29,9 @@ AC_ARG_WITH(gpc,
[ --without-gpc Use the internal polygon clipping code instead of
the external GPC polygon clipping library.
],,if test ! -e ../external/gpc/gpc.c && test ! -e ../external/gpc/gpc.h; then without_gpc=yes; fi)
+AC_ARG_ENABLE(mono,
-+[ --enable-mono Enables the compilation of the Mono bindings
++[ --enable-mono Enables the compilation of the Mono bindings
+],,)
AC_ARG_ENABLE(ldap,
- [ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla or
- OpenLDAP LDAP SDK
-@@ -1357,6 +1360,8 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+ [ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
+ or OpenLDAP LDAP SDK
+@@ -1728,7 +1728,6 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+ dnl ===================================================================
+ dnl .NET needs special treatment
+ dnl ===================================================================
+-if test "$_os" = "WINNT"; then
+ if test "$COMEX" -ge "10"; then
+ dnl Check midl.exe
+ AC_PATH_PROG(MIDL_PATH, midl.exe)
+@@ -1779,6 +1779,8 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+ # Convert to posix path with 8.3 filename restrictions ( No spaces )
CSC_PATH=`cygpath -d "$CSC_PATH"`
CSC_PATH=`cygpath -u "$CSC_PATH"`
- AC_PATH_PROG(CSC_PATH, csc.exe)
+ CSC="$CSC_PATH/csc.exe"
+ AL="$CSC_PATH/al.exe"
- dnl Check nmake.exe for MS VC Toolkit
- if test -n "$ENABLE_VCTK"; then
-@@ -1407,9 +1412,61 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
+ dnl Check mscoree.lib / .NET Frameworks dir
+ dnl For VS2003/2005 $with_frame_home has to point to the directory with lib/mscoree.lib.
+@@ -1407,10 +1412,61 @@ if test "$COMEX" = "8" -o "$COMEX" = "10
FRAME_HOME=`cygpath -u "$FRAME_HOME"`
fi
AC_SUBST(MIDL_PATH)
-AC_SUBST(CSC_PATH)
AC_SUBST(FRAME_HOME)
+-fi
+if test "$_os" = "Linux"; then
+ AC_MSG_CHECKING([whether to enable Mono bindings])
Modified: trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff (original)
+++ trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff Tue Apr 29 07:48:53 2008
@@ -160,8 +160,8 @@
--- postprocess/prj/build.lst 2005-11-23 05:56:34.703125000 +0200
+++ postprocess/prj/build.lst 2005-11-23 05:56:48.812500000 +0200
@@ -1,4 +1,4 @@
--po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd 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 :: 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 SWEXT:swext writerfilter oox NULL
++po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd 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 SWEXT:swext writerfilter oox NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
Modified: trunk/patches/dev300/padmin-nofontconfig.diff
==============================================================================
--- trunk/patches/dev300/padmin-nofontconfig.diff (original)
+++ trunk/patches/dev300/padmin-nofontconfig.diff Tue Apr 29 07:48:53 2008
@@ -18,8 +18,8 @@
SRS1NAME=$(TARGET)
@@ -94,11 +98,13 @@ SLOFILES=\
$(SLO)$/newppdlg.obj \
+ $(SLO)$/progress.obj \
$(SLO)$/prtsetup.obj \
- $(SLO)$/prgsbar.obj \
- $(SLO)$/fontentry.obj \
$(SLO)$/helper.obj \
$(SLO)$/adddlg.obj \
@@ -38,21 +38,24 @@
diff -u -p -r1.13 padialog.cxx
--- padmin/source/padialog.cxx 9 Nov 2004 16:50:55 -0000 1.13
+++ padmin/source/padialog.cxx 25 Nov 2004 12:39:13 -0000
-@@ -89,9 +89,14 @@
- #ifndef _TOOLS_COLOR_HXX
+@@ -89,14 +89,13 @@
+ #include <vcl/event.hxx>
+ #include <tools/stream.hxx>
#include <tools/color.hxx>
- #endif
-+#ifndef _URLOBJ_HXX
+#include <tools/urlobj.hxx>
-+#endif
+#ifndef FONTCONFIG_FONTS
- #ifndef _PAD_PADIALOG_HRC_
+-#ifndef _PAD_PADIALOG_HRC_
#include <padialog.hrc>
- #endif
+-#endif
+#endif
- #ifndef _PAD_FONTENTRY_HXX_
#include <fontentry.hxx>
- #endif
+ #include <helper.hxx>
+-#ifndef _PSP_PRINTERINFOMANAGER_HXX_
+ #include <psprint/printerinfomanager.hxx>
+-#endif
+ #include <padialog.hxx>
+ #include <adddlg.hxx>
+ #include <prtsetup.hxx>
@@ -156,7 +161,9 @@ PADialog::PADialog( Window* pParent, BOO
m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
Modified: trunk/patches/dev300/sc-datapilot-autoformat.diff
==============================================================================
--- trunk/patches/dev300/sc-datapilot-autoformat.diff (original)
+++ trunk/patches/dev300/sc-datapilot-autoformat.diff Tue Apr 29 07:48:53 2008
@@ -162,16 +162,17 @@
diff -u -r ../../../sc.bak/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewdata.hxx
--- ../../../sc.bak/source/ui/inc/viewdata.hxx 2004-12-22 14:05:07.000000000 +0530
+++ sc/source/ui/inc/viewdata.hxx 2005-01-11 13:21:48.324369816 +0530
-@@ -331,6 +331,9 @@
+@@ -331,6 +331,10 @@
- BOOL GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
- SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab );
-+ void MoveNextRow();
-+ void MovePrevRow();
+ ScMarkType GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
+ SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const;
+
- BOOL GetSimpleArea( ScRange& rRange );
- void GetMultiArea( ScRangeListRef& rRange );
-
++ void MoveNextRow();
++ void MovePrevRow();
++
+ ScMarkType GetSimpleArea( ScRange& rRange ) const;
+ /// May modify rNewMark using MarkToSimple().
+ ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
diff -u -r ../../../sc.bak/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
--- ../../../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
@@ -386,11 +387,10 @@
diff -u -r ../../../sc.bak/source/ui/view/viewdata.cxx sc/source/ui/view/viewdata.cxx
--- ../../../sc.bak/source/ui/view/viewdata.cxx 2004-12-22 14:05:08.000000000 +0530
+++ sc/source/ui/view/viewdata.cxx 2005-01-11 13:23:56.430894664 +0530
-@@ -654,6 +654,23 @@
+@@ -654,6 +654,22 @@
aLogicMode.SetScaleY( GetZoomY() );
}
-+
+void ScViewData::MoveNextRow()
+{
+ ScRange aMarkRange;
@@ -407,6 +407,6 @@
+ aMarkData.SetMarkArea(aMarkRange);
+}
+
- BOOL ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab,
- SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab )
+ void ScViewData::SetPagebreakMode( BOOL bSet )
{
+ bPagebreak = bSet;
Modified: trunk/patches/dev300/sc-formula-syntax-core.diff
==============================================================================
--- trunk/patches/dev300/sc-formula-syntax-core.diff (original)
+++ trunk/patches/dev300/sc-formula-syntax-core.diff Tue Apr 29 07:48:53 2008
@@ -1884,12 +1884,12 @@
@@ -60,6 +60,8 @@
#endif
-
+ #include <com/sun/star/uno/Sequence.hxx>
+#include "grammar.hxx"
+
- #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
- #include <com/sun/star/uno/Sequence.hxx>
- #endif
+
+ class ScDocShell;
+ class ScDocument;
@@ -478,13 +480,13 @@
};
Modified: trunk/patches/dev300/split-binfilter-scp2.diff
==============================================================================
--- trunk/patches/dev300/split-binfilter-scp2.diff (original)
+++ trunk/patches/dev300/split-binfilter-scp2.diff Tue Apr 29 07:48:53 2008
@@ -57,14 +57,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_chart_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_chart_bf_filters.xcu";
+End
@@ -72,14 +72,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_calc_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_calc_bf_filters.xcu";
+End
@@ -87,14 +87,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_draw_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_draw_bf_filters.xcu";
+End
@@ -102,14 +102,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_global_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_global_bf_filters.xcu";
+End
@@ -117,14 +117,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_impress_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_impress_bf_filters.xcu";
+End
@@ -132,14 +132,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_math_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_math_bf_filters.xcu";
+End
@@ -147,14 +147,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_web_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_web_bf_filters.xcu";
+End
@@ -162,14 +162,14 @@
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types;
+ Name = "/registry/spool/fcfg_writer_bf_types.xcu";
+End
+
+File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu
+ TXT_FILE_BODY;
-+ Styles = (PACKED, PATCH);
++ Styles = (PACKED);
+ Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
+ Name = "/registry/spool/fcfg_writer_bf_filters.xcu";
+End
@@ -179,39 +179,39 @@
+ TXT_FILE_BODY;
+ Name = "legacy_binfilters.rdb";
+ Dir = gid_Dir_Program;
-+ Styles = (PACKED, STARREGISTRY, PATCH);
++ Styles = (PACKED, STARREGISTRY);
+End
+
+
+
-+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Go, bf_go)
-+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)
-+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sc, bf_sc)
-+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sd, bf_sd)
-+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sm, bf_sm)
-+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sw, bf_sw)
-+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Wrapper, bf_wrapper)
-+STD_LIB_FILE_PATCH( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
-+
-+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
-+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Bindet, bindet)
-+
-+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 )
-+STD_RES_FILE_PATCH( gid_File_Res_Bf_Sd, bf_sd )
-+STD_RES_FILE_PATCH( gid_File_Res_Bf_Sm, bf_sm)
-+STD_LIB_FILE_PATCH( gid_File_Lib_Bf_So, bf_so)
-+STD_RES_FILE_PATCH( gid_File_Res_Bf_Sw, bf_sw )
++STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go)
++STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch)
++STD_LIB_FILE( gid_File_Lib_Bf_Xo, bf_xo)
++STD_LIB_FILE( gid_File_Lib_Bf_Svx, bf_svx)
++STD_LIB_FILE( gid_File_Lib_Bf_Svt, bf_svt)
++STD_LIB_FILE( gid_File_Lib_Bf_Frm, bf_frm)
++STD_LIB_FILE( gid_File_Lib_Bf_Ofa, bf_ofa)
++STD_LIB_FILE( gid_File_Lib_Bf_Sb, bf_sb)
++STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc)
++STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd)
++STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
++STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
++STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
++STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
++
++STD_UNO_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
++STD_UNO_LIB_FILE( gid_File_Lib_Bindet, bindet)
++
++STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
++STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
++STD_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
++STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
++STD_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
++STD_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
++STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
++STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
++STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
++STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
--- scp2/source/binfilter/localize.sdf.old 2007-07-19 13:12:54.000000000 +0200
+++ scp2/source/binfilter/localize.sdf 2007-07-19 13:12:54.000000000 +0200
@@ -0,0 +1,43 @@
@@ -467,14 +467,14 @@
+++ scp2/source/calc/file_calc.scp 2008-04-23 17:18:40.000000000 +0200
@@ -74,19 +74,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Scd
- STD_LIB_FILE_PATCH( gid_File_Lib_Tfu, tfu)
+ STD_LIB_FILE( gid_File_Lib_Tfu, tfu)
-//
-// start binfilter #110743#
-//
-
-#ifndef WITHOUT_BINFILTER
--STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sc, bf_sc)
+-STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc)
-STD_RES_FILE( gid_File_Res_Bf_Sc, bf_sc)
-#endif
-
@@ -482,7 +482,7 @@
-// end binfilter #110743#
-//
-
- STD_RES_FILE_PATCH( gid_File_Res_Solver, solver)
+ STD_RES_FILE( gid_File_Res_Solver, solver)
STD_RES_FILE( gid_File_Res_Analysis, analysis)
--- scp2/source/calc/makefile.mk.old 2005-09-09 03:21:34.000000000 +0200
@@ -495,9 +495,9 @@
-SCPDEFS+=-DWITHOUT_BINFILTER
-.ENDIF
-
- SCP_PRODUCT_TYPE=osl
- PARFILES= \
- module_calc.par \
+ .IF "$(SYSTEM_LPSOLVE)" == "YES"
+ SCPDEFS+=-DSYSTEM_LPSOLVE
+ .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
@@ -43,7 +43,6 @@ Module gid_Module_Prg_Calc
@@ -529,15 +529,15 @@
+++ 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
- STD_RES_FILE_PATCH( gid_File_Res_Sm, sm )
+ STD_RES_FILE( gid_File_Res_Sm, sm )
-//
-// start binfilter #110743#
-//
-
-#ifndef WITHOUT_BINFILTER
--STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sm, bf_sm)
--STD_RES_FILE_PATCH( gid_File_Res_Bf_Sm, bf_sm)
+-STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
+-STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
-#endif
-
-//
@@ -546,7 +546,7 @@
-
File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu
TXT_FILE_BODY;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
--- scp2/source/math/makefile.mk.old 2007-07-17 21:12:01.000000000 +0200
+++ scp2/source/math/makefile.mk 2007-07-19 13:12:54.000000000 +0200
@@ -45,10 +45,6 @@ TARGETTYPE=CUI
@@ -593,35 +593,35 @@
+++ scp2/source/ooo/file_library_ooo.scp 2008-01-16 19:42:08.000000000 +0100
@@ -1630,32 +1630,6 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
+ STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
-//
-// start binfilter #110743#
-//
-
-#ifndef WITHOUT_BINFILTER
--STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Go, bf_go)
--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)
--STD_LIB_FILE_PATCH( gid_File_Lib_Bf_So, bf_so)
--STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sd, bf_sd)
--STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Sw, bf_sw)
--STD_LIB_FILE_PATCH( gid_File_Lib_Bf_Wrapper, bf_wrapper)
--STD_LIB_FILE_PATCH( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
--STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
--STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Bindet, bindet)
+-STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go)
+-STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch)
+-STD_LIB_FILE( gid_File_Lib_Bf_Xo, bf_xo)
+-STD_LIB_FILE( gid_File_Lib_Bf_Svx, bf_svx)
+-STD_LIB_FILE( gid_File_Lib_Bf_Svt, bf_svt)
+-STD_LIB_FILE( gid_File_Lib_Bf_Frm, bf_frm)
+-STD_LIB_FILE( gid_File_Lib_Bf_Ofa, bf_ofa)
+-STD_LIB_FILE( gid_File_Lib_Bf_Sb, bf_sb)
+-STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
+-STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd)
+-STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
+-STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
+-STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
+-STD_UNO_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
+-STD_UNO_LIB_FILE( gid_File_Lib_Bindet, bindet)
-#endif
-
-//
-// end binfilter #110743#
-//
-
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Scn, scn)
+ STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
File gid_File_Lib_Scriptframe
--- scp2/source/ooo/file_ooo.scp.old 2007-07-17 21:12:01.000000000 +0200
@@ -635,7 +635,7 @@
- TXT_FILE_BODY;
- Name = "legacy_binfilters.rdb";
- Dir = gid_Dir_Program;
-- Styles = (PACKED, STARREGISTRY, PATCH);
+- Styles = (PACKED, STARREGISTRY);
-End
-#endif
-
@@ -653,22 +653,22 @@
-//
-
-#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 )
--STD_RES_FILE_PATCH( gid_File_Res_Bf_Sw, bf_sw )
+-STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
+-STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
+-STD_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
+-STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
+-STD_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
+-STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
+-STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
-#endif
-
-//
-// end binfilter #110743#
-//
-
- STD_RES_FILE_PATCH( gid_File_Res_Sd, sd )
+ STD_RES_FILE( gid_File_Res_Sd, sd )
- STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx )
+ STD_RES_FILE( gid_File_Res_Sfx, sfx )
--- scp2/source/ooo/makefile.mk.old 2007-07-17 21:12:03.000000000 +0200
+++ scp2/source/ooo/makefile.mk 2007-07-19 13:12:54.000000000 +0200
@@ -143,10 +143,6 @@ SCPDEFS+=-DSYSTEM_CURL
Modified: trunk/patches/dev300/system-lpsolve-scp2.diff
==============================================================================
--- trunk/patches/dev300/system-lpsolve-scp2.diff (original)
+++ trunk/patches/dev300/system-lpsolve-scp2.diff Tue Apr 29 07:48:53 2008
@@ -8,16 +8,16 @@
+++ scp2/source/calc/file_calc.scp 10 Mar 2008 12:19:09 -0000 1.38.42.1
@@ -37,10 +37,12 @@
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Solver, solver)
+ STD_UNO_LIB_FILE( gid_File_Lib_Solver, solver)
+#ifndef SYSTEM_LPSOLVE
File gid_File_Lib_Lpsolve
Name = SPECIAL_NAME(lpsolve55);
- PACKED_LIB_FILE_BODY_PATCH;
+ PACKED_LIB_FILE_BODY;
End
+#endif
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Analysis, analysis)
+ STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
Index: scp2/source/calc/makefile.mk
===================================================================
Modified: trunk/patches/dev300/transogl-transitions-sd.diff
==============================================================================
--- trunk/patches/dev300/transogl-transitions-sd.diff (original)
+++ trunk/patches/dev300/transogl-transitions-sd.diff Tue Apr 29 07:48:53 2008
@@ -3,19 +3,19 @@
+++ sd/prj/build.lst 2008-01-07 21:03:56.000000000 +0100
@@ -31,7 +31,7 @@
sd sd\source\filter\cgm nmake - all sd_cgm sd_inc NULL
- sd sd\source\filter\eppt nmake - all sd_eppt sd_unotypes sd_inc NULL
+ sd sd\source\filter\eppt nmake - all sd_eppt sd_inc NULL
sd sd\source\filter\grf nmake - all sd_grf sd_inc NULL
-sd sd\source\filter\xml nmake - all sd_xml sd_inc NULL
+sd sd\source\filter\xml nmake - all sd_filter_xml sd_inc NULL
sd sd\source\filter\html nmake - all sd_html sd_inc NULL
- sd sd\source\ui\animations nmake - all sd_animations sd_unotypes sd_inc NULL
- sd sd\source\ui\slideshow nmake - all sd_slideshow sd_unotypes sd_sdi sd_inc NULL
+ sd sd\source\ui\animations nmake - all sd_animations sd_inc NULL
+ sd sd\source\ui\slideshow nmake - all sd_slideshow sd_sdi sd_inc NULL
@@ -42,4 +42,5 @@
- sd sd\source\ui\framework\toolbar nmake - all sd_framework_toolbar sd_inc NULL
+ sd sd\source\ui\framework\module nmake - all sd_framework_module sd_inc NULL
+ sd sd\source\ui\framework\factories nmake - all sd_framework_factories 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_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\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_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools 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_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools 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
Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff (original)
+++ trunk/patches/dev300/unxsplash-rework.diff Tue Apr 29 07:48:53 2008
@@ -2269,12 +2269,12 @@
@@ -2116,6 +2116,9 @@ File gid_File_Lib_Spell
End
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Spl, spl)
+ STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
+#ifdef UNX
-+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Spl_Unx, spl_unx)
++STD_UNO_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
+#endif
- SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Srtrs1,srtrs1)
+ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 8e113d3..2f49288 100644
@@ -2295,7 +2295,7 @@
+
// use this for high detail file open dialog >= 5.1 windows
// #ifdef WNT
- //
+ File gid_Brand_File_Bin_Soffice_Bin_Manifest
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 1576807..9492703 100644
--- vcl/inc/vcl/svapp.hxx
Modified: trunk/patches/dev300/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/dev300/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/dev300/vba-workbook-worksheet-events.diff Tue Apr 29 07:48:53 2008
@@ -290,13 +290,13 @@
--- /data4/sles/ooo-build-m180/ooo-build/build/ood680-m1/sc/source/ui/view/tabview5.cxx 2006-07-21 16:10:17.000000000 +0100
+++ sc/source/ui/view/tabview5.cxx 2006-09-08 13:59:24.000000000 +0100
@@ -70,6 +70,7 @@
- #include "seltrans.hxx"
#include "scmod.hxx"
#include "AccessibilityHints.hxx"
+ #include "docsh.hxx"
+#include "scextopt.hxx"
+ #include <vcl/svapp.hxx>
- // STATIC DATA -----------------------------------------------------------
@@ -338,6 +339,27 @@ void ScTabView::TabChanged()
aViewData.GetViewShell()->BroadcastAccessibility(aAccHint);
}
@@ -381,14 +381,15 @@
//-------------------------------------------------------------------------
--- 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 @@
- #ifndef SC_ACCESSIBILITYHINTS_HXX
+@@ -85,9 +85,81 @@
+ #include "gridwin.hxx"
+ #include <com/sun/star/view/DocumentZoomType.hpp>
#include "AccessibilityHints.hxx"
- #endif
--
+#include "scextopt.hxx"
+#include <comphelper/processfactory.hxx>
+
using namespace com::sun::star;
+
+String docMacroExists( ScDocShell* pShell,
+const String& sMod, const String& sMacro );
+bool executeWorkBookMacro( ScDocShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet );
@@ -424,7 +425,7 @@
+ }
+ return aRet;
+}
-
++
+uno::Any createRange( const uno::Any& aRange )
+{
+ uno::Any aRet;
Modified: trunk/patches/dev300/vba-workbook-worksheet-events2.diff
==============================================================================
--- trunk/patches/dev300/vba-workbook-worksheet-events2.diff (original)
+++ trunk/patches/dev300/vba-workbook-worksheet-events2.diff Tue Apr 29 07:48:53 2008
@@ -10,25 +10,20 @@
virtual void Deactivate();
--- sc/source/ui/docshell/docsh.cxx.bak 2008-04-07 16:25:30.000000000 +0800
+++ sc/source/ui/docshell/docsh.cxx 2008-04-10 15:19:30.000000000 +0800
-@@ -32,7 +32,8 @@
- * MA 02111-1307 USA
+@@ -32,6 +32,8 @@
*
************************************************************************/
--
+
+#define BEFORE 0
+#define AFTER 1
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
// System - Includes -----------------------------------------------------
-@@ -146,22 +147,25 @@
+@@ -146,19 +147,21 @@
#include "docsh.hxx"
#include "docshimp.hxx"
-
-+#include "uiitems.hxx"
-+
- #ifndef _RTL_LOGFILE_HXX_
#include <rtl/logfile.hxx>
- #endif
++#include "uiitems.hxx"
#include <comphelper/processfactory.hxx>
@@ -336,17 +331,19 @@
--- sc/source/ui/unoobj/viewuno.cxx.bak 2008-04-07 17:28:12.000000000 +0800
+++ sc/source/ui/unoobj/viewuno.cxx 2008-04-07 17:35:38.000000000 +0800
-@@ -85,79 +85,9 @@
- #ifndef SC_ACCESSIBILITYHINTS_HXX
+@@ -85,81 +85,11 @@
+ #include "gridwin.hxx"
+ #include <com/sun/star/view/DocumentZoomType.hpp>
#include "AccessibilityHints.hxx"
- #endif
-#include "scextopt.hxx"
-#include <comphelper/processfactory.hxx>
+
using namespace com::sun::star;
+
-String docMacroExists( ScDocShell* pShell,
-const String& sMod, const String& sMacro );
-bool executeWorkBookMacro( ScDocShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet );
-
+-
-uno::Any createWorkSheet( ScDocShell* pShell, SCTAB nTab )
-{
- uno::Any aRet;
@@ -414,6 +411,7 @@
- return aRet;
-}
+sal_Bool processSelectionChangeMacro( ScDocShell* pShell, SCTAB nTab, const uno::Any& rRange );
++
//------------------------------------------------------------------------
//! Clipping-Markierungen
Modified: trunk/patches/dev300/xmlhelp-work-with-symlinks.diff
==============================================================================
--- trunk/patches/dev300/xmlhelp-work-with-symlinks.diff (original)
+++ trunk/patches/dev300/xmlhelp-work-with-symlinks.diff Tue Apr 29 07:48:53 2008
@@ -1,15 +1,17 @@
--- xmlhelp/source/cxxhelp/provider/databases.cxx.old 2006-11-01 15:07:23.000000000 +0100
+++ xmlhelp/source/cxxhelp/provider/databases.cxx 2007-08-29 17:54:22.000000000 +0200
-@@ -45,6 +45,9 @@
- #ifndef _OSL_THREAD_H_
+@@ -45,10 +45,9 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_xmlhelp.hxx"
+ #include "db.hxx"
+-#ifndef _VOS_DIAGNOSE_HXX_
+ #include <vos/diagnose.hxx>
+-#endif
#include <osl/thread.h>
- #endif
-+#ifndef _OSL_PROCESS_H_
+#include <osl/process.h>
-+#endif
- #ifndef _RTL_URI_HXX_
#include <rtl/uri.hxx>
- #endif
+ #include <osl/file.hxx>
+ #include <rtl/memory.h>
@@ -181,17 +184,21 @@ static bool impl_getZipFile(
const rtl::OUString & rZipName,
rtl::OUString & rFileName )
Modified: trunk/patches/dev300/zoom-combobox.diff
==============================================================================
--- trunk/patches/dev300/zoom-combobox.diff (original)
+++ trunk/patches/dev300/zoom-combobox.diff Tue Apr 29 07:48:53 2008
@@ -69,16 +69,14 @@
dummy line to avoid confusing diff-mode
--- sw/source/ui/app/swmodule.cxx 2003-07-07 18:10:23.000000000 +0200
+++ sw/source/ui/app/swmodule.cxx 2003-08-13 22:52:29.000000000 +0200
-@@ -121,6 +121,9 @@
- #ifndef _SVX_VERT_TEXT_TBXCTRL_HXX
+@@ -121,6 +121,7 @@
+ #include <svx/fillctrl.hxx>
+ #include <svx/tbcontrl.hxx>
#include <svx/verttexttbxctrl.hxx>
- #endif
-+#ifndef _SVX_ZOOMTBXCTRL_HXX
+#include <svx/zoomtbxctrl.hxx>
-+#endif
- #ifndef _SVX_FORMATPAINTBRUSHCTRL_HXX
#include <svx/formatpaintbrushctrl.hxx>
- #endif
+ #include <svx/contdlg.hxx>
+ #include <svx/layctrl.hxx>
@@ -573,6 +576,7 @@
SvxFontSizeMenuControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod );
@@ -137,16 +135,14 @@
diff -u -r1.10 sddll2.cxx
--- sd/source/ui/app/sddll2.cxx 13 Sep 2002 13:42:54 -0000 1.10
+++ sd/source/ui/app/sddll2.cxx 18 Aug 2003 19:03:03 -0000
-@@ -114,6 +114,9 @@
- #ifndef _SVX_ZOOMCTRL_HXX //autogen
+@@ -114,6 +114,7 @@
+ #include <svx/linectrl.hxx>
+ #include <svx/tbcontrl.hxx>
#include <svx/zoomctrl.hxx>
- #endif
-+#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen
+#include <svx/zoomtbxctrl.hxx>
-+#endif
- #ifndef _SVX_PSZCTRL_HXX //autogen
#include <svx/pszctrl.hxx>
- #endif
+ #include <svx/modctrl.hxx>
+ #include <svx/fntctl.hxx>
@@ -242,6 +245,7 @@
// StatusBarControls registrieren
@@ -162,16 +158,14 @@
diff -u -r1.5 smdll.cxx
--- starmath/source/smdll.cxx 12 Oct 2001 15:54:37 -0000 1.5
+++ starmath/source/smdll.cxx 18 Aug 2003 19:10:56 -0000
-@@ -73,6 +73,9 @@
- #ifndef _SVX_ZOOMCTRL_HXX //autogen
- #include <svx/zoomctrl.hxx>
+@@ -73,6 +73,7 @@
#endif
-+#ifndef _SVX_ZOOMTBXCTRL_HXX //autogen
+ #include <svx/modctrl.hxx>
+ #include <svx/zoomctrl.hxx>
+#include <svx/zoomtbxctrl.hxx>
-+#endif
- #ifndef _SFX_OBJFAC_HXX
#include <sfx2/docfac.hxx>
- #endif
+ #include <svx/lboxctrl.hxx>
+ #include <sfx2/docfile.hxx>
@@ -147,6 +150,7 @@
SmViewShell::RegisterFactory(1);
@@ -485,7 +479,7 @@
--- /dev/null 2004-08-25 23:04:59.000000000 +0530
+++ svx/source/tbxctrls/zoomtbxctrl.cxx 2005-04-01 15:02:35.346989875 +0530
-@@ -0,0 +1,291 @@
+@@ -0,0 +1,281 @@
+/*************************************************************************
+ *
+ * $RCSfile$
@@ -549,21 +543,11 @@
+
+#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
+
-+#ifndef _SV_TOOLBOX_HXX
+#include <vcl/toolbox.hxx>
-+#endif
-+#ifndef _SFXAPP_HXX
+#include <sfx2/app.hxx>
-+#endif
-+#ifndef _SFXDISPATCH_HXX
+#include <sfx2/dispatch.hxx>
-+#endif
-+#ifndef _SFXVIEWSH_HXX
+#include <sfx2/viewsh.hxx>
-+#endif
-+#ifndef _SV_COMBOBOX_HXX
+#include <vcl/combobox.hxx>
-+#endif
+
+#include <svx/dialogs.hrc>
+
Modified: trunk/patches/emf+/emf+-canvas-smooth-poly.diff
==============================================================================
--- trunk/patches/emf+/emf+-canvas-smooth-poly.diff (original)
+++ trunk/patches/emf+/emf+-canvas-smooth-poly.diff Tue Apr 29 07:48:53 2008
@@ -23,8 +23,8 @@
- if( ! bIsBezier ) {
+ if( ! bIsBezier && bIsRectangle ) {
- nX = ::rtl::math::round( nX );
- nY = ::rtl::math::round( nY );
+ nX = basegfx::fround( nX );
+ nY = basegfx::fround( nY );
}
@@ -961,7 +963,7 @@ namespace cairocanvas
nY = aP.getY();
@@ -32,6 +32,6 @@
- if( ! bIsBezier ) {
+ if( ! bIsBezier && bIsRectangle ) {
- nX = ::rtl::math::round( nX );
- nY = ::rtl::math::round( nY );
+ nX = basegfx::fround( nX );
+ nY = basegfx::fround( nY );
}
Modified: trunk/patches/emf+/emf+-canvas.diff
==============================================================================
--- trunk/patches/emf+/emf+-canvas.diff (original)
+++ trunk/patches/emf+/emf+-canvas.diff Tue Apr 29 07:48:53 2008
@@ -156,7 +156,7 @@
diff -rup canvas-orig/source/cairo/cairo_cairo.hxx canvas/source/cairo/cairo_cairo.hxx
--- canvas-orig/source/cairo/cairo_cairo.hxx 2007-08-21 13:19:18.000000000 +0200
+++ canvas/source/cairo/cairo_cairo.hxx 2007-10-10 17:35:34.000000000 +0200
-@@ -67,6 +67,11 @@ namespace cairo {
+@@ -103,6 +103,11 @@ namespace cairo {
{
return mpRenderFormat;
}
@@ -165,9 +165,9 @@
+ {
+ mbFreePixmap = false;
+ }
- #endif
+ #endif
- // use only for surfaces made on X Drawables
+ int getXFormat( Content aContent );
diff -rup canvas-orig/source/cairo/cairo_canvasbitmap.hxx canvas/source/cairo/cairo_canvasbitmap.hxx
--- canvas-orig/source/cairo/cairo_canvasbitmap.hxx 2007-08-21 13:19:18.000000000 +0200
+++ canvas/source/cairo/cairo_canvasbitmap.hxx 2007-10-24 13:07:12.000000000 +0200
Modified: trunk/patches/emf+/emf+-offapi-renderer.diff
==============================================================================
--- trunk/patches/emf+/emf+-offapi-renderer.diff (original)
+++ trunk/patches/emf+/emf+-offapi-renderer.diff Tue Apr 29 07:48:53 2008
@@ -1,16 +1,14 @@
diff -rup offapi-orig/com/sun/star/rendering/makefile.mk offapi/com/sun/star/rendering/makefile.mk
--- offapi-orig/com/sun/star/rendering/makefile.mk 2007-09-05 21:51:02.000000000 +0200
+++ offapi/com/sun/star/rendering/makefile.mk 2007-11-05 17:24:52.000000000 +0100
-@@ -113,7 +113,8 @@ IDLFILES=\
- XIeeeDoubleBitmap.idl \
- XIeeeFloatBitmap.idl \
- XIntegerBitmap.idl \
-- CanvasFactory.idl
-+ CanvasFactory.idl \
-+ MtfRenderer.idl
-
- # ------------------------------------------------------------------
-
+@@ -61,6 +61,7 @@ IDLFILES=\
+ IntegerBitmapFormat.idl \
+ IntegerBitmapLayout.idl \
+ InterpolationMode.idl \
++ MtfRenderer.idl \
+ Panose.idl \
+ PanoseArmStyle.idl \
+ PanoseContrast.idl \
--- /dev/null 2007-10-08 22:21:59.000000000 +0200
+++ offapi/com/sun/star/rendering/MtfRenderer.idl 2007-11-07 15:00:35.000000000 +0100
@@ -0,0 +1,19 @@
Modified: trunk/patches/emf+/emf+-vcl-bitmap.diff
==============================================================================
--- trunk/patches/emf+/emf+-vcl-bitmap.diff (original)
+++ trunk/patches/emf+/emf+-vcl-bitmap.diff Tue Apr 29 07:48:53 2008
@@ -65,9 +65,9 @@
--- ../src680-m224/vcl/unx/source/gdi/salbmp.cxx 2007-06-27 22:49:34.000000000 +0200
+++ vcl/unx/source/gdi/salbmp.cxx 2007-10-23 18:29:07.000000000 +0200
@@ -72,6 +72,7 @@
- #ifndef _SV_BITMAP_HXX
+ #include <salbmp.h>
+ #include <salinst.h>
#include <vcl/bitmap.hxx>
- #endif
+#include <com/sun/star/beans/XFastPropertySet.hpp>
// -----------
Modified: trunk/patches/emf+/emf+-vcl-renderer.diff
==============================================================================
--- trunk/patches/emf+/emf+-vcl-renderer.diff (original)
+++ trunk/patches/emf+/emf+-vcl-renderer.diff Tue Apr 29 07:48:53 2008
@@ -12,49 +12,28 @@
diff -rup vcl-orig/source/gdi/gdimtf.cxx vcl/source/gdi/gdimtf.cxx
--- vcl-orig/source/gdi/gdimtf.cxx 2007-11-09 16:53:43.000000000 +0100
+++ vcl/source/gdi/gdimtf.cxx 2007-11-09 17:09:31.000000000 +0100
-@@ -66,8 +66,47 @@
- #ifndef _SV_VIRDEV_HXX
+@@ -66,12 +66,24 @@
+ #include <vcl/salbtype.hxx>
+ #include <vcl/outdev.hxx>
+ #include <vcl/window.hxx>
+-#ifndef _SV_CVTSVM_HXX
+ #include <vcl/cvtsvm.hxx>
+-#endif
#include <vcl/virdev.hxx>
- #endif
-+#ifndef _SV_SALBMP_HXX
+#include <vcl/salbmp.hxx>
-+#endif
-+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
-+#endif
-+#ifndef _SV_SVDATA_HXX
+#include <vcl/svdata.hxx>
-+#endif
-+#ifndef _SV_SALINST_HXX
+#include <vcl/salinst.hxx>
-+#endif
-+#ifndef _SV_GDIMTF_HXX
#include <vcl/gdimtf.hxx>
-+#endif
-+#ifndef _SV_GRAPHICTOOLS_HXX
#include <vcl/graphictools.hxx>
-+#endif
-+#ifndef _SV_CANVASTOOLS_HXX
+#include <vcl/canvastools.hxx>
-+#endif
-+#ifndef _SV_UNOHELP_HXX
+#include <vcl/unohelp.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HPP_
++
+#include <com/sun/star/beans/XFastPropertySet.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP_
+#include <com/sun/star/rendering/XCanvas.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_RENDERING_MTFRENDERER_HPP_
+#include <com/sun/star/rendering/MtfRenderer.hpp>
-+#endif
-+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#endif
+
+using namespace com::sun::star;
Modified: trunk/patches/gstreamer/gstreamer-config-office.diff
==============================================================================
--- trunk/patches/gstreamer/gstreamer-config-office.diff (original)
+++ trunk/patches/gstreamer/gstreamer-config-office.diff Tue Apr 29 07:48:53 2008
@@ -1,45 +1,45 @@
--- config_office-orig/configure.in 2006-08-17 10:43:11.000000000 +0200
+++ config_office/configure.in 2006-08-17 10:48:43.000000000 +0200
@@ -718,6 +718,7 @@ case "$build_os" in
- test_x=yes
+ solaris*)
test_gtk=yes
build_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=yes
- _os=SunOS
+ test_randr=yes
@@ -745,6 +746,7 @@ case "$build_os" in
- test_x=yes
+ linux-gnu*)
test_gtk=yes
build_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=yes
- if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
+ test_randr=yes
@@ -767,6 +769,7 @@ case "$build_os" in
test_cups=yes
- test_gtk=no
- build_cairo=no
+ test_gtk=yes
+ build_cairo=yes
+ build_gstreamer=no
+ test_randr=no
_os=Darwin
if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
- AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
@@ -773,6 +776,7 @@ case "$build_os" in
- test_x=yes
+ freebsd*)
test_gtk=yes
build_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=yes
- AC_MSG_CHECKING([the FreeBSD operating system release])
+ test_randr=yes
@@ -805,6 +809,7 @@ case "$build_os" in
- test_x=yes
+ netbsd)
test_gtk=yes
build_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=no
- PTHREAD_CFLAGS="-pthread"
+ test_randr=yes
@@ -4602,6 +4607,26 @@ AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
Modified: trunk/patches/mono/mono-testtools.diff
==============================================================================
--- trunk/patches/mono/mono-testtools.diff (original)
+++ trunk/patches/mono/mono-testtools.diff Tue Apr 29 07:48:53 2008
@@ -59,8 +59,8 @@
CLI_CPPUHELPER = $(SOLARBINDIR)$/cli_cppuhelper.dll
CLI_TYPES_BRIDGETEST = $(BIN)$/cli_types_bridgetest.dll
--CSCFLAGS = -warnaserror+ -incremental-
-+CSCFLAGS = -incremental-
+-CSCFLAGS = -warnaserror+
++CSCFLAGS =
.IF "$(CCNUMVER)" <= "001399999999"
VBC_FLAGS = -warnaserror+
.ELSE
Modified: trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff
==============================================================================
--- trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff (original)
+++ trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff Tue Apr 29 07:48:53 2008
@@ -397,9 +397,9 @@
class SvtCTLOptions;
+class Window;
+
- #ifndef SVX_SPELL_PORTIONS_HXX
#include <svx/SpellPortions.hxx>
- #endif
+
+
@@ -333,7 +335,7 @@ public:
BOOL IsVertical() const;
Modified: trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff
==============================================================================
--- trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff (original)
+++ trunk/patches/src680/buildfix-x86-64-visibility-workaround.diff Tue Apr 29 07:48:53 2008
@@ -10,7 +10,7 @@
if test "$USE_SYSTEM_STL" = "YES"; then
AC_MSG_CHECKING([if hash_map will be in __gnu_cxx namespace])
AC_LANG_PUSH([C++])
-@@ -2405,18 +2406,19 @@ using namespace std;
+@@ -2405,9 +2406,9 @@ using namespace std;
gccvisok=no)
AC_MSG_RESULT([$gccvisok])
if test "$gccvisok" = "no"; then
@@ -23,9 +23,7 @@
fi
LDFLAGS=$sharedlink_ldflags_save
- fi
-
- AC_LANG_POP([C++])
+@@ -2442,6 +2442,7 @@ using namespace std;
fi
AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
Modified: trunk/patches/src680/cjk-character-units-fix-376788.diff
==============================================================================
--- trunk/patches/src680/cjk-character-units-fix-376788.diff (original)
+++ trunk/patches/src680/cjk-character-units-fix-376788.diff Tue Apr 29 07:48:53 2008
@@ -1,15 +1,13 @@
--- sw/source/ui/app/swmodul1.cxx 2008-04-14 14:05:13.000000000 +0800
+++ sw/source/ui/app/swmodul1.cxx 2008-04-17 13:51:11.000000000 +0800
-@@ -91,6 +91,9 @@
- #ifndef _SV_MSGBOX_HXX
+@@ -91,6 +91,7 @@
+ #include <svx/colritem.hxx>
+ #include <svx/brshitem.hxx>
#include <vcl/msgbox.hxx>
- #endif
-+#ifndef _SVTOOLS_CJKOPTIONS_HXX
+#include <svtools/cjkoptions.hxx>
-+#endif
- #ifndef _SWMODULE_HXX
#include <swmodule.hxx>
- #endif
+ #include <swtypes.hxx>
+ #include <usrpref.hxx>
@@ -384,10 +387,15 @@ void SwModule::ApplyUserCharUnit(BOOL bA
}
else
Modified: trunk/patches/src680/cjk-character-units-ui.diff
==============================================================================
--- trunk/patches/src680/cjk-character-units-ui.diff (original)
+++ trunk/patches/src680/cjk-character-units-ui.diff Tue Apr 29 07:48:53 2008
@@ -334,16 +334,14 @@
diff -uNr sw/source/ui/misc/pggrid.cxx sw/source/ui/misc/pggrid.cxx
--- sw/source/ui/misc/pggrid.cxx 2007-12-16 23:22:58.000000000 +0800
+++ sw/source/ui/misc/pggrid.cxx 2007-12-17 01:41:49.000000000 +0800
-@@ -78,6 +78,9 @@
- #ifndef _SVX_FRMDIRITEM_HXX
+@@ -78,6 +78,7 @@
+ #include <svx/ulspitem.hxx>
+ #include <svx/boxitem.hxx>
#include <svx/frmdiritem.hxx>
- #endif
-+#ifndef _SVX_RULER_HXX
+#include <svx/ruler.hxx>
-+#endif
- #ifndef _PGGRID_HXX
#include <pggrid.hxx>
- #endif
+ #include <tgrditem.hxx>
+ #include <pggrid.hrc>
@@ -105,10 +108,12 @@
aLayoutFL (this, SW_RES(FL_LAYOUT )),
aLinesPerPageFT (this, SW_RES(FT_LINESPERPAGE )),
Modified: trunk/patches/src680/cws-npower9.diff
==============================================================================
--- trunk/patches/src680/cws-npower9.diff (original)
+++ trunk/patches/src680/cws-npower9.diff Tue Apr 29 07:48:53 2008
@@ -10,14 +10,12 @@
diff -u -p -u -p -b -w -B -r1.13 -r1.13.22.2
--- scripting/source/dlgprov/dlgevtatt.cxx 20 Jun 2007 10:27:38 -0000 1.13
+++ scripting/source/dlgprov/dlgevtatt.cxx 15 Jan 2008 17:08:46 -0000 1.13.22.2
-@@ -92,7 +92,9 @@
- #ifndef _COM_SUN_STAR_BEANS_XMATERIALHOLDER_HPP_
+@@ -92,7 +92,7 @@
+ #include <com/sun/star/reflection/XIdlMethod.hpp>
+ #include <com/sun/star/beans/MethodConcept.hpp>
#include <com/sun/star/beans/XMaterialHolder.hpp>
- #endif
-
-+#ifdef FAKE_VBA_EVENT_SUPPORT
+#include <org/openoffice/vba/XVBAToOOEventDescGen.hpp>
-+#endif
using namespace ::com::sun::star;
using namespace ::com::sun::star::awt;
@@ -670,20 +668,22 @@
diff -u -p -u -p -b -w -B -r1.6 -r1.6.22.2
--- scripting/source/dlgprov/dlgprov.hxx 20 Jun 2007 10:28:40 -0000 1.6
+++ scripting/source/dlgprov/dlgprov.hxx 15 Jan 2008 12:57:32 -0000 1.6.22.2
-@@ -66,6 +66,9 @@
- #ifndef _COM_SUN_STAR_BEANS_XINTROSPECTION_HPP_
+@@ -66,15 +66,15 @@
+ #include <com/sun/star/lang/XInitialization.hpp>
+ #include <com/sun/star/script/XScriptEventsAttacher.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+-#ifndef _COM_SUN_STAR_BEANS_XINTROSPECTION_HPP_
#include <com/sun/star/beans/XIntrospectionAccess.hpp>
- #endif
+-#endif
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/resource/XStringResourceManager.hpp>
- #ifndef _CPPUHELPER_IMPLBASE3_HXX_
+-#ifndef _CPPUHELPER_IMPLBASE3_HXX_
#include <cppuhelper/implbase4.hxx>
-@@ -73,7 +76,7 @@
- #ifndef _OSL_MUTEX_HXX_
+-#endif
++
#include <osl/mutex.hxx>
- #endif
-
+#include <memory>
Modified: trunk/patches/src680/fpicker-kde-gcc4-visibility.diff
==============================================================================
--- trunk/patches/src680/fpicker-kde-gcc4-visibility.diff (original)
+++ trunk/patches/src680/fpicker-kde-gcc4-visibility.diff Tue Apr 29 07:48:53 2008
@@ -1,18 +1,15 @@
--- svtools/inc/svtools/svtdata.hxx.old 2004-06-25 18:31:52.000000000 +0200
+++ svtools/inc/svtools/svtdata.hxx 2005-04-29 15:19:20.000000000 +0200
-@@ -62,6 +62,12 @@
+@@ -62,6 +62,9 @@
#ifndef _SVTOOLS_SVTDATA_HXX
#define _SVTOOLS_SVTDATA_HXX
-+#ifndef INCLUDED_SVLDLLAPI_H
+#include "svtools/svldllapi.h"
-+#endif
-+#ifndef INCLUDED_SVTDLLAPI_H
+#include "svtools/svtdllapi.h"
-+#endif
- #ifndef _TOOLS_RESID_HXX
++
#include <tools/resid.hxx>
- #endif
+ #include <tools/simplerm.hxx>
+
@@ -102,15 +108,15 @@
public:
Modified: trunk/patches/src680/gcc4-visibility-sc.diff
==============================================================================
--- trunk/patches/src680/gcc4-visibility-sc.diff (original)
+++ trunk/patches/src680/gcc4-visibility-sc.diff Tue Apr 29 07:48:53 2008
@@ -16,14 +16,11 @@
--- sc/inc/optutil.hxx.old 2000-11-02 20:08:15.000000000 +0100
+++ sc/inc/optutil.hxx 2005-08-02 19:32:54.000000000 +0200
-@@ -70,6 +70,10 @@
+@@ -70,6 +70,7 @@
+ #include <unotools/configitem.hxx>
#include <tools/link.hxx>
- #endif
-+#ifndef INCLUDED_SCDLLAPI_H
+#include "scdllapi.h"
-+#endif
-+
class ScOptionsUtil
{
Modified: trunk/patches/src680/help-support.diff
==============================================================================
--- trunk/patches/src680/help-support.diff (original)
+++ trunk/patches/src680/help-support.diff Tue Apr 29 07:48:53 2008
@@ -5,19 +5,15 @@
diff -u -r1.30.116.1 appserv.cxx
--- sfx2/source/appl/appserv.cxx 20 Jan 2004 10:43:08 -0000 1.30.116.1
+++ sfx2/source/appl/appserv.cxx 9 Sep 2004 10:45:38 -0000
-@@ -123,6 +123,12 @@
- #ifndef _SV_MSGBOX_HXX
+@@ -123,6 +123,8 @@
+ #include <tools/config.hxx>
+ #include <tools/diagnose_ex.h>
#include <vcl/msgbox.hxx>
- #endif
-+#ifndef _COM_SUN_STAR_SYSTEM_XSYSTEMSHELLEXECUTE_HPP_
+#include <com/sun/star/system/XSystemShellExecute.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_SYSTEM_SYSTEMSHELLEXECUTEFLAGS_HPP_
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-+#endif
- #ifndef _SFXCANCEL_HXX //autogen
#include <svtools/cancel.hxx>
- #endif
+ #include <svtools/intitem.hxx>
+ #include <svtools/eitem.hxx>
@@ -467,9 +473,24 @@
break;
}
Modified: trunk/patches/src680/lwp-filter-component.diff
==============================================================================
--- trunk/patches/src680/lwp-filter-component.diff (original)
+++ trunk/patches/src680/lwp-filter-component.diff Tue Apr 29 07:48:53 2008
@@ -1,46 +1,20 @@
--- /dev/null 2006-03-20 09:28:16.436453250 +0000
+++ lotuswordpro/source/filter/LotusWordProImportFilter.cxx 2006-03-20 12:31:24.000000000 +0000
-@@ -0,0 +1,423 @@
-+#ifndef _OSL_DIAGNOSE_H_
+@@ -0,0 +1,397 @@
+#include <osl/diagnose.h>
-+#endif
-+#ifndef _RTL_TENCINFO_H_
+#include <rtl/tencinfo.h>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XATTRIBUTELIST_HPP_
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_
+#include <com/sun/star/xml/sax/XParser.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
+#include <com/sun/star/uno/Reference.hxx>
-+#endif
-+#ifndef _ATTRLIST_HPP_
+#include <xmloff/attrlist.hxx>
-+#endif
-+#ifndef _XMLKYWD_HPP
+#include <xmloff/xmlkywd.hxx>
-+#endif
+
-+#ifndef _UCBHELPER_CONTENT_HXX
+#include <ucbhelper/content.hxx>
-+#endif
+
+#include <tools/stream.hxx>
+
@@ -426,31 +400,17 @@
+}
--- /dev/null 2006-03-20 09:28:16.436453250 +0000
+++ lotuswordpro/source/filter/LotusWordProImportFilter.hxx 2006-03-20 10:10:03.000000000 +0000
-@@ -0,0 +1,104 @@
+@@ -0,0 +1,90 @@
+#ifndef _WORDPERFECTIMPORTFILTER_HXX
+#define _WORDPERFECTIMPORTFILTER_HXX
+
-+#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
+#include <com/sun/star/document/XFilter.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
+#include <com/sun/star/document/XImporter.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
+#include <com/sun/star/lang/XInitialization.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
+#include <com/sun/star/lang/XServiceInfo.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-+#endif
-+#ifndef _CPPUHELPER_IMPLBASE5_HXX_
+#include <cppuhelper/implbase5.hxx>
-+#endif
+#include <rtl/ustrbuf.hxx>
+
+enum FilterType
@@ -763,11 +723,11 @@
--- 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 15 Mar 2006 11:48:56 -0000
@@ -1399,6 +1399,8 @@ End
- STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Msworks,msworks)
+ STD_UNO_LIB_FILE(gid_File_Lib_Msworks,msworks)
- STD_UNO_LIB_FILE_PATCH(gid_File_Lib_T602Filter,t602filter)
+ STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
+
-+STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Wlwp,lwpft)
++STD_UNO_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
Modified: trunk/patches/src680/odf-converter-ignore-writerfilter.diff
==============================================================================
--- trunk/patches/src680/odf-converter-ignore-writerfilter.diff (original)
+++ trunk/patches/src680/odf-converter-ignore-writerfilter.diff Tue Apr 29 07:48:53 2008
@@ -121,28 +121,24 @@
index e9030ac..9f910ae 100644
--- writerfilter/source/filter/WriterFilterDetection.cxx
+++ writerfilter/source/filter/WriterFilterDetection.cxx
-@@ -58,6 +58,21 @@
- #ifndef _UNOTOOLS_STREAMHELPER_HXX_
+@@ -58,6 +58,17 @@
+ //#include <sfx2/docfile.hxx>
+ //#endif
#include <unotools/ucbstreamhelper.hxx>
- #endif
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/deployment/thePackageManagerFactory.hpp>
-+
+#include <com/sun/star/uno/Sequence.hxx>
+
-+#include <ucbhelper/commandenvironment.hxx>
-+
+#include <comphelper/processfactory.hxx>
-+
++#include <ucbhelper/commandenvironment.hxx>
+#include <unotools/bootstrap.hxx>
+
+#include <osl/file.hxx>
-+
+
using namespace ::rtl;
using namespace ::cppu;
- using namespace ::com::sun::star;
@@ -91,6 +95,57 @@ OUString WriterFilterDetection_getImplementationName () throw (uno::RuntimeExcep
OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& rDescriptor )
throw( uno::RuntimeException )
Modified: trunk/patches/src680/odf-flatxml-import-export.diff
==============================================================================
--- trunk/patches/src680/odf-flatxml-import-export.diff (original)
+++ trunk/patches/src680/odf-flatxml-import-export.diff Tue Apr 29 07:48:53 2008
@@ -13,9 +13,9 @@
..\source\xslt\import\spreadsheetml\*.xsl %_DEST%\bin%_EXT%\xslt\import\spreadsheetml\*.xsl
..\source\xslt\import\wordml\*.xsl %_DEST%\bin%_EXT%\xslt\import\wordml\*.xsl
+..\source\odfflatxml\*.xsl %_DEST%\bin%_EXT%\xslt\odfflatxml\*.xsl
+ ..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
..\%__SRC%\bin\*.xsl %_DEST%\bin%_EXT%\*.xsl
..\%__SRC%\bin\*.stw %_DEST%\bin%_EXT%\*.stw
- ..\%__SRC%\misc\filters\modulepacks\fcfg_*.xcu %_DEST%\xml%_EXT%\registry\spool\fcfg_*.xcu
--- filter/source/config/fragments/fcfg_xslt.mk 21 Mar 2005 11:48:40 -0000 1.7
+++ filter/source/config/fragments/fcfg_xslt.mk 2 Jul 2007 09:34:15 -0000
@@ -3,13 +3,21 @@
Modified: trunk/patches/src680/sal-strintern-speed.diff
==============================================================================
--- trunk/patches/src680/sal-strintern-speed.diff (original)
+++ trunk/patches/src680/sal-strintern-speed.diff Tue Apr 29 07:48:53 2008
@@ -5,15 +5,12 @@
diff -u -r1.3 hash.cxx
--- sal/rtl/source/hash.cxx 19 Apr 2007 11:56:36 -0000 1.3
+++ sal/rtl/source/hash.cxx 15 Jun 2007 09:06:33 -0000
-@@ -34,15 +34,17 @@
+@@ -34,12 +34,15 @@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sal.hxx"
--
--#ifndef INCLUDED_RTL_ALLOCATOR_HXX
-#include "rtl/allocator.hxx"
--#endif
+// #include "precompiled_sal.hxx"
#include "hash.h"
@@ -22,9 +19,7 @@
+
+#if 0
-+#ifndef INCLUDED_RTL_ALLOCATOR_HXX
+#include "rtl/allocator.hxx"
-+#endif
#include <hash_set>
Modified: trunk/patches/src680/sc-calc-datapilot-drilldown.diff
==============================================================================
--- trunk/patches/src680/sc-calc-datapilot-drilldown.diff (original)
+++ trunk/patches/src680/sc-calc-datapilot-drilldown.diff Tue Apr 29 07:48:53 2008
@@ -9,17 +9,15 @@
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.9.508.5
--- sc/inc/dapiuno.hxx 13 Jan 2006 16:51:24 -0000 1.9
+++ sc/inc/dapiuno.hxx 18 Apr 2008 15:07:06 -0000 1.9.508.5
-@@ -56,9 +56,7 @@
+@@ -56,7 +56,7 @@
+ #include "rangeutl.hxx" // ScArea
+ #include <svtools/lstner.hxx>
#include <svtools/itemprop.hxx>
- #endif
-
--#ifndef _COM_SUN_STAR_SHEET_XDATAPILOTTABLE_HPP_
-#include <com/sun/star/sheet/XDataPilotTable.hpp>
--#endif
+#include <com/sun/star/sheet/XDataPilotTable2.hpp>
- #ifndef _COM_SUN_STAR_SHEET_XDATAPILOTTABLES_HPP_
#include <com/sun/star/sheet/XDataPilotTables.hpp>
- #endif
+ #include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -124,6 +122,11 @@
#include <memory>
#include <vector>
@@ -340,9 +338,9 @@
#include <vector>
+#include <hash_set>
-
- #ifndef SC_DPTABDAT_HXX
#include "dptabdat.hxx"
+
+ class ScDocument;
@@ -102,6 +103,8 @@
const ScDPItemData& GetName() const { return aGroupName; }
bool HasElement( const ScDPItemData& rData ) const;
@@ -493,20 +491,15 @@
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.9 -r1.8.112.6
--- sc/inc/dpoutput.hxx 26 Nov 2007 15:18:57 -0000 1.9
+++ sc/inc/dpoutput.hxx 4 Dec 2007 06:06:26 -0000 1.8.112.6
-@@ -52,6 +52,8 @@
+@@ -52,13 +52,16 @@
+ #include <com/sun/star/sheet/DataResult.hpp>
+ #include <com/sun/star/sheet/MemberResult.hpp>
#include <com/sun/star/sheet/GeneralFunction.hpp>
- #endif
-
+#include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
-+
- #ifndef SC_SCGLOB_HXX
#include "global.hxx"
- #endif
-@@ -60,10 +62,12 @@
#include "address.hxx"
- #endif
-
+#include "dpcachetable.hxx"
+
#include <vector>
namespace com { namespace sun { namespace star { namespace sheet {
@@ -681,16 +674,14 @@
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.6 -r1.6.216.6
--- sc/inc/dptabdat.hxx 25 Jan 2007 11:03:15 -0000 1.6
+++ sc/inc/dptabdat.hxx 25 Apr 2008 00:02:15 -0000 1.6.216.6
-@@ -40,10 +40,21 @@
- #include "address.hxx"
- #endif
+@@ -40,8 +40,19 @@
+ #define SC_DPTABDAT_HXX
+ #include "address.hxx"
+#include "dpoutput.hxx"
+#include "dpcachetable.hxx"
+
- #ifndef _STRING_HXX
#include <tools/string.hxx>
- #endif
+#include <vector>
+#include <set>
@@ -993,22 +984,19 @@
--- sc/inc/dptabsrc.hxx 26 Nov 2007 15:19:15 -0000 1.10
+++ sc/inc/dptabsrc.hxx 6 Dec 2007 06:41:12 -0000 1.8.216.4
@@ -93,6 +93,7 @@
- #ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_
+ #include <com/sun/star/sheet/DataPilotFieldReference.hpp>
+ #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
- #endif
+#include <com/sun/star/sheet/XDrillDownDataSupplier.hpp>
- #ifndef _COM_SUN_STAR_UTIL_XCLONEABLE_HPP_
#include <com/sun/star/util/XCloneable.hpp>
- #endif
-@@ -115,14 +116,20 @@
- #ifndef _CPPUHELPER_IMPLBASE5_HXX_
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+@@ -115,11 +116,17 @@
+ #include <cppuhelper/implbase2.hxx>
+ #include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase5.hxx>
- #endif
+#include <cppuhelper/implbase6.hxx>
-
- #ifndef SC_DPTABDAT_HXX
#include "dptabdat.hxx"
- #endif
-namespace com { namespace sun { namespace star { namespace sheet {
+namespace com { namespace sun { namespace star {
@@ -1898,17 +1886,15 @@
diff -u -b -I $Revision.*$ -I $Author.*$ -r1.7 -r1.7.202.5
--- sc/source/core/data/dpgroup.cxx 27 Feb 2007 12:03:31 -0000 1.7
+++ sc/source/core/data/dpgroup.cxx 24 Apr 2008 23:26:45 -0000 1.7.202.5
-@@ -51,10 +51,29 @@
+@@ -51,7 +51,29 @@
#include "collect.hxx"
#include "global.hxx"
#include "document.hxx"
+#include "dpcachetable.hxx"
+#include "dptabsrc.hxx"
+#include "dptabres.hxx"
-
--#ifndef _COM_SUN_STAR_SHEET_DATAPILOTFIELDGROUPBY_HPP_
++
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
--#endif
+#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
+
+#include <vector>
@@ -4520,7 +4506,7 @@
#include <tools/debug.hxx>
#include <rtl/math.hxx>
-@@ -66,8 +70,10 @@
+@@ -66,8 +70,11 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
@@ -4528,9 +4514,10 @@
#include <com/sun/star/sheet/DataPilotFieldReferenceType.hpp>
#include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
-
- #ifndef _UNOTOOLS_COLLATORWRAPPER_HXX
++
#include <unotools/collatorwrapper.hxx>
+ #include <unotools/calendarwrapper.hxx>
+ #include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
@@ -80,6 +86,12 @@
#endif
@@ -5103,17 +5090,14 @@
#include "pivot.hxx"
#include "rangeutl.hxx"
#include "unoguard.hxx"
-@@ -76,12 +77,24 @@
+@@ -76,10 +77,21 @@
+ #include <com/sun/star/sheet/XMembersSupplier.hpp>
+ #include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
- #endif
-
+#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
+#include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
+#include <com/sun/star/sheet/DataPilotTablePositionData.hpp>
-+
- #ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
- #endif
using namespace com::sun::star;
@@ -5290,15 +5274,13 @@
#include "scitems.hxx"
#include <sfx2/bindings.hxx>
#include <vcl/svapp.hxx>
-@@ -53,15 +54,15 @@
+@@ -53,13 +54,14 @@
#include <com/sun/star/sheet/MemberResultFlags.hpp>
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
+-#include <com/sun/star/sheet/MemberResultFlags.hpp>
+#include <com/sun/star/sheet/DataPilotTableHeaderData.hpp>
- #include <com/sun/star/sheet/MemberResultFlags.hpp>
--#ifndef _COM_SUN_STAR_SHEET_DATAPILOTFIELDGROUPBY_HPP_
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
--#endif
#include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
+#include <com/sun/star/sheet/XDrillDownDataSupplier.hpp>
+#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
Modified: trunk/patches/src680/sc-copy-on-merged-cells.diff
==============================================================================
--- trunk/patches/src680/sc-copy-on-merged-cells.diff (original)
+++ trunk/patches/src680/sc-copy-on-merged-cells.diff Tue Apr 29 07:48:53 2008
@@ -1,6 +1,6 @@
--- sc/source/ui/view/viewfun3.cxx.orig 2007-10-27 11:24:05.000000000 +0200
+++ sc/source/ui/view/viewfun3.cxx 2007-10-27 15:59:19.000000000 +0200
-@@ -982,18 +982,32 @@
+@@ -982,17 +982,32 @@
return FALSE;
}
@@ -17,10 +17,9 @@
+ }
if (bClipOver)
- if (lcl_SelHasAttrib( pDoc, nStartCol,nStartRow, nUndoEndCol,nUndoEndRow, rMark, HASATTR_OVERLAPPED ))
+ if (lcl_SelHasAttrib( pDoc, nStartCol,nStartRow, nUndoEndCol,nUndoEndRow, aFilteredMark, HASATTR_OVERLAPPED ))
- { // "Cell merge not possible if cells already merged"
- ErrorMessage(STR_MSSG_PASTEFROMCLIP_1);
-- delete pTransClip;
- return FALSE;
+ { // "Cell merge are possible if we unmerge cells before insertion"
+ ScRange destRange( nStartCol, nStartRow, nStartTab, nUndoEndCol, nUndoEndRow, nEndTab );
@@ -49,7 +48,7 @@
- pDocSh->GetDocFunc().UnmergeCells( aUserRange, FALSE, TRUE );
+ rDocFunc.UnmergeCells( aUserRange, FALSE, TRUE );
- pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, rMark, TRUE ); // Refresh
+ pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, TRUE ); // Refresh
// und Bereich neu
@@ -1183,6 +1197,8 @@
}
Modified: trunk/patches/src680/sc-dp-gridlayout.diff
==============================================================================
--- trunk/patches/src680/sc-dp-gridlayout.diff (original)
+++ trunk/patches/src680/sc-dp-gridlayout.diff Tue Apr 29 07:48:53 2008
@@ -352,13 +352,11 @@
diff -rup sc/source/filter/inc/xlpivot.hxx sc/source/filter/inc/xlpivot.hxx
--- sc/source/filter/inc/xlpivot.hxx 2006-10-18 07:46:00.000000000 -0400
+++ sc/source/filter/inc/xlpivot.hxx 2006-11-01 12:06:03.000000000 -0500
-@@ -63,6 +63,9 @@
- #ifndef SC_XLADDRESS_HXX
+@@ -63,6 +63,7 @@
+ #include <tools/datetime.hxx>
+ #include "ftools.hxx"
#include "xladdress.hxx"
- #endif
-+#ifndef SC_DPOBJECT_HXX
+#include "dpobject.hxx"
-+#endif
class XclImpStream;
class XclExpStream;
Modified: trunk/patches/src680/sc-export-shape-hlink-bindings.diff
==============================================================================
--- trunk/patches/src680/sc-export-shape-hlink-bindings.diff (original)
+++ trunk/patches/src680/sc-export-shape-hlink-bindings.diff Tue Apr 29 07:48:53 2008
@@ -144,15 +144,14 @@
{
--- svx/inc/svx/escherex.hxx.b4 2007-09-27 15:42:25.000000000 +0100
+++ svx/inc/svx/escherex.hxx 2007-09-27 15:55:52.000000000 +0100
-@@ -77,7 +77,7 @@
- #ifndef INCLUDED_SVXDLLAPI_H
+@@ -77,6 +77,7 @@
+ #include <com/sun/star/drawing/BitmapMode.hpp>
+ #include <svx/msdffdef.hxx>
#include "svx/svxdllapi.h"
- #endif
--
+#include <memory>
+
/*Record Name FBT-Value Instance Contents Wrd Exl PPt Ver*/
// In der Mickysoft-Doku heissen die msofbt... statt ESCHER_...
- #define ESCHER_DggContainer 0xF000 /* per-document data
@@ -1273,6 +1273,19 @@ public:
const Rectangle& rRect ) = 0;
};
Modified: trunk/patches/src680/sc-overwrite-char-font-attrs.diff
==============================================================================
--- trunk/patches/src680/sc-overwrite-char-font-attrs.diff (original)
+++ trunk/patches/src680/sc-overwrite-char-font-attrs.diff Tue Apr 29 07:48:53 2008
@@ -26,23 +26,16 @@
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/cell.hxx sc/inc/cell.hxx
--- sc.clean/inc/cell.hxx 2008-04-01 12:26:30.000000000 -0400
+++ sc/inc/cell.hxx 2008-04-21 12:25:29.000000000 -0400
-@@ -39,6 +39,7 @@
+@@ -39,6 +39,9 @@
#include <stddef.h>
#include <set>
+#include <vector>
-
- #ifndef _SVMEMPOOL_HXX //autogen
- #include <tools/mempool.hxx>
-@@ -67,6 +68,8 @@
- #include <vcl/fontcvt.hxx>
- #endif
-
+#include <boost/shared_ptr.hpp>
+
- #define USE_MEMPOOL
- #define TEXTWIDTH_DIRTY 0xffff
-
+ #include <tools/mempool.hxx>
+ #include <svtools/listener.hxx>
+ #include "global.hxx"
@@ -82,6 +85,7 @@ class ScCodeArray;
class ScTokenArray;
class ScProgress;
Modified: trunk/patches/src680/sdk-gid-module-name.diff
==============================================================================
--- trunk/patches/src680/sdk-gid-module-name.diff (original)
+++ trunk/patches/src680/sdk-gid-module-name.diff Tue Apr 29 07:48:53 2008
@@ -6,8 +6,8 @@
Start
-module = "gid_Module_Root"
+module = "gid_Module_Root_SDK"
- solarispackagename = "OpenOfficeorgSDK"
- packagename = "openoffice.org-sdk"
+ solarispackagename = "OpenOfficeorg%WITHOUTDOTPRODUCTVERSIONSDK"
+ packagename = "openoffice.org%PRODUCTVERSION-sdk"
copyright = "2005-2007 by OpenOffice.org"
--- scp2/source/sdkoo/sdkoo.scp.old 2005-11-09 10:40:01.000000000 +0100
+++ scp2/source/sdkoo/sdkoo.scp 2006-04-25 16:44:28.000000000 +0200
Modified: trunk/patches/src680/sfx-check-real-help-path.diff
==============================================================================
--- trunk/patches/src680/sfx-check-real-help-path.diff (original)
+++ trunk/patches/src680/sfx-check-real-help-path.diff Tue Apr 29 07:48:53 2008
@@ -1,15 +1,17 @@
--- sfx2/source/appl/sfxhelp.cxx.old 2007-07-06 12:16:30.000000000 +0200
+++ sfx2/source/appl/sfxhelp.cxx 2007-08-28 21:57:04.000000000 +0200
-@@ -105,6 +105,9 @@
- #ifndef _UTL_CONFIGMGR_HXX_
+@@ -105,10 +105,10 @@
+ #include <com/sun/star/frame/XModuleManager.hpp>
#include <unotools/configmgr.hxx>
- #endif
-+#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX
+ #include <unotools/configitem.hxx>
+#include <unotools/localfilehelper.hxx>
-+#endif
- #ifndef _UCBHELPER_CONTENT_HXX
+ #include <svtools/helpopt.hxx>
+ #include <svtools/moduleoptions.hxx>
+ #include <tools/urlobj.hxx>
+-#include <unotools/configmgr.hxx>
#include <ucbhelper/content.hxx>
- #endif
+
+ #include <svtools/pathoptions.hxx>
@@ -185,13 +188,13 @@ rtl::OUString HelpLocaleString()
bool bOk = (aLocale >>= aLocaleStr);
if ( bOk )
Modified: trunk/patches/src680/speed-getfilestatus-dtype.diff
==============================================================================
--- trunk/patches/src680/speed-getfilestatus-dtype.diff (original)
+++ trunk/patches/src680/speed-getfilestatus-dtype.diff Tue Apr 29 07:48:53 2008
@@ -126,17 +126,14 @@
diff -u -p -r1.6 file_stat.cxx
--- sal/osl/unx/file_stat.cxx 8 Sep 2005 14:56:14 -0000 1.6
+++ sal/osl/unx/file_stat.cxx 18 Jan 2006 14:38:41 -0000
-@@ -45,6 +45,10 @@
+@@ -45,6 +45,7 @@
#include <unistd.h>
#endif
-
-+#ifndef _DIRENT_H
-+#include <dirent.h>
-+#endif
-+
- #ifndef _OSL_FILE_H_
#include <osl/file.h>
- #endif
++#include <dirent.h>
+
+ #ifndef _ERRNO_H
+ #include <errno.h>
@@ -69,6 +73,9 @@
#include "file_error_transl.h"
#endif
Modified: trunk/patches/src680/store-core.diff
==============================================================================
--- trunk/patches/src680/store-core.diff (original)
+++ trunk/patches/src680/store-core.diff Tue Apr 29 07:48:53 2008
@@ -99,19 +99,17 @@
diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.cxx store/source/storbase.cxx
--- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.cxx 2006-09-17 03:11:51.000000000 +0200
+++ store/source/storbase.cxx 2007-03-29 10:34:20.000000000 +0200
-@@ -56,6 +56,9 @@
- #ifndef _RTL_REF_HXX_
+@@ -56,6 +56,7 @@
+ #include <sal/types.h>
+ #include <rtl/alloc.h>
#include <rtl/ref.hxx>
- #endif
-+#ifndef _RTL_MEMORY_H_
+#include <rtl/memory.h>
-+#endif
-
- #ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
+ #include <osl/endian.h>
+ #include <osl/mutex.hxx>
@@ -81,6 +84,12 @@
+ #include <store/lockbyte.hxx>
#include <storbase.hxx>
- #endif
+#ifdef WNT
+#include <malloc.h>
Modified: trunk/patches/src680/svg-import-basegfx.diff
==============================================================================
--- trunk/patches/src680/svg-import-basegfx.diff (original)
+++ trunk/patches/src680/svg-import-basegfx.diff Tue Apr 29 07:48:53 2008
@@ -52,9 +52,9 @@
+#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
-
- #ifndef _RTL_USTRING_
#include <rtl/ustring.hxx>
+ #include <rtl/math.hxx>
+
@@ -74,7 +76,7 @@
}
}
Modified: trunk/patches/src680/svg-import-filter.diff
==============================================================================
--- trunk/patches/src680/svg-import-filter.diff (original)
+++ trunk/patches/src680/svg-import-filter.diff Tue Apr 29 07:48:53 2008
@@ -1507,34 +1507,28 @@
--- filter/source/svg/svgfilter.hxx 2008-04-11 08:49:31.000000000 +0200
+++ filter/source/svg/svgfilter.hxx 2008-04-11 00:09:55.000000000 +0200
-@@ -57,11 +57,9 @@
- #ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_
+@@ -57,9 +57,7 @@
+ #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
+ #include <com/sun/star/presentation/XPresentationSupplier.hpp>
#include <com/sun/star/document/XFilter.hpp>
- #endif
-#ifdef SOLAR_JAVA
- #ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_
#include <com/sun/star/document/XImporter.hpp>
- #endif
-#endif // SOLAR_JAVA
- #ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_
#include <com/sun/star/document/XExporter.hpp>
- #endif
-@@ -80,15 +78,9 @@
- #ifndef _CPPUHELPER_IMPLBASE1_HXX_
+ #include <com/sun/star/lang/XInitialization.hpp>
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+@@ -80,11 +78,7 @@
+ #include <com/sun/star/beans/XPropertySet.hpp>
+ #include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/implbase1.hxx>
- #endif
-#ifdef SOLAR_JAVA
- #ifndef _CPPUHELPER_IMPLBASE5_HXX_
#include <cppuhelper/implbase5.hxx>
- #endif
-#else // !SOLAR_JAVA
--#ifndef _CPPUHELPER_IMPLBASE4_HXX_
-#include <cppuhelper/implbase4.hxx>
-#endif
--#endif
- #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #endif
+ #include <com/sun/star/io/XActiveDataSource.hpp>
+ #include <com/sun/star/presentation/AnimationEffect.hpp>
@@ -231,18 +223,11 @@
class SVGActionWriter;
class EditFieldInfo;
Modified: trunk/patches/src680/svtools-dont-extern-sRTF-sHTML.diff
==============================================================================
--- trunk/patches/src680/svtools-dont-extern-sRTF-sHTML.diff (original)
+++ trunk/patches/src680/svtools-dont-extern-sRTF-sHTML.diff Tue Apr 29 07:48:53 2008
@@ -2,17 +2,12 @@
index 87ff760..1f4f8bb 100644
--- svtools/inc/htmlkywd.hxx
+++ svtools/inc/htmlkywd.hxx
-@@ -36,817 +36,804 @@
+@@ -36,812 +36,802 @@
#ifndef _HTMLKYWD_HXX
#define _HTMLKYWD_HXX
--#ifndef INCLUDED_SVTDLLAPI_H
-#include "svtools/svtdllapi.h"
--#endif
--
- #ifndef _SAL_TYPES_H_
#include "sal/types.h"
- #endif
-#ifndef SVTOOLS_CONSTASCII_DECL
-#define SVTOOLS_CONSTASCII_DECL( n, s ) n[sizeof(s)]
@@ -1539,39 +1534,34 @@
index 3a28484..0000000
--- svtools/source/svhtml/htmlkey2.cxx
+++ /dev/null
-@@ -1,835 +0,0 @@
+@@ -1,830 +0,0 @@
-/*************************************************************************
- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: htmlkey2.cxx,v $
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * Copyright 2008 by Sun Microsystems, Inc.
- *
-- * $Revision: 1.8 $
+- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * last change: $Author: obo $ $Date: 2006/09/17 15:26:06 $
+- * $RCSfile: htmlkey2.cxx,v $
+- * $Revision: 1.9 $
- *
-- * The Contents of this file are made available subject to
-- * the terms of GNU Lesser General Public License Version 2.1.
+- * This file is part of OpenOffice.org.
- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
- *
-- * GNU Lesser General Public License Version 2.1
-- * =============================================
-- * Copyright 2005 by Sun Microsystems, Inc.
-- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License version 2.1, as published by the Free Software Foundation.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307 USA
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org. If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
@@ -2697,39 +2687,34 @@
index 9efa039..0000000
--- svtools/source/svrtf/rtfkey2.cxx
+++ /dev/null
-@@ -1,1146 +0,0 @@
+@@ -1,1141 +0,0 @@
-/*************************************************************************
- *
-- * OpenOffice.org - a multi-platform office productivity suite
-- *
-- * $RCSfile: rtfkey2.cxx,v $
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * Copyright 2008 by Sun Microsystems, Inc.
- *
-- * $Revision: 1.13 $
+- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * last change: $Author: obo $ $Date: 2006/09/17 15:27:28 $
+- * $RCSfile: rtfkey2.cxx,v $
+- * $Revision: 1.14 $
- *
-- * The Contents of this file are made available subject to
-- * the terms of GNU Lesser General Public License Version 2.1.
+- * This file is part of OpenOffice.org.
- *
+- * OpenOffice.org is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License version 3
+- * only, as published by the Free Software Foundation.
- *
-- * GNU Lesser General Public License Version 2.1
-- * =============================================
-- * Copyright 2005 by Sun Microsystems, Inc.
-- * 901 San Antonio Road, Palo Alto, CA 94303, USA
+- * OpenOffice.org is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Lesser General Public License version 3 for more details
+- * (a copy is included in the LICENSE file that accompanied this code).
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License version 2.1, as published by the Free Software Foundation.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307 USA
+- * You should have received a copy of the GNU Lesser General Public License
+- * version 3 along with OpenOffice.org. If not, see
+- * <http://www.openoffice.org/license.html>
+- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
@@ -3848,18 +3833,13 @@
index 1deccb9..346e4a8 100644
--- svtools/source/svrtf/rtfkeywd.hxx
+++ svtools/source/svrtf/rtfkeywd.hxx
-@@ -36,1128 +36,1117 @@
+@@ -36,1123 +36,1113 @@
#ifndef _RTFKEYWD_HXX
#define _RTFKEYWD_HXX
--#ifndef INCLUDED_SVTDLLAPI_H
-#include "svtools/svtdllapi.h"
--#endif
+-#include "sal/types.h"
-
- #ifndef _SAL_TYPES_H_
- #include "sal/types.h"
- #endif
-
-#ifndef SVTOOLS_CONSTASCII_DECL
-#define SVTOOLS_CONSTASCII_DECL( n, s ) n[sizeof(s)]
-#endif
Modified: trunk/patches/src680/ucb-gnome-vfs-lock.diff
==============================================================================
--- trunk/patches/src680/ucb-gnome-vfs-lock.diff (original)
+++ trunk/patches/src680/ucb-gnome-vfs-lock.diff Tue Apr 29 07:48:53 2008
@@ -1,25 +1,21 @@
--- ucb/source/ucp/gvfs/content.cxx 2007-04-03 15:32:17.000000000 +0200
+++ ucb/source/ucp/gvfs/content.cxx 2007-04-03 15:33:24.000000000 +0200
-@@ -63,6 +63,9 @@
- #ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_
+@@ -63,6 +63,7 @@
+ #include <com/sun/star/beans/PropertySetInfoChangeEvent.hpp>
+ #include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
- #endif
-+#ifndef _COM_SUN_STAR_IO_XACTIVEDATASTREAMER_HPP_
+#include <com/sun/star/io/XActiveDataStreamer.hpp>
-+#endif
- #ifndef _COM_SUN_STAR_LANG_ILLEGALACCESSEXCEPTION_HPP_
#include <com/sun/star/lang/IllegalAccessException.hpp>
- #endif
-@@ -93,6 +96,9 @@
- #ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKWRITEEXCEPTION_HPP_
+ #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
+ #include <com/sun/star/ucb/InsertCommandArgument.hpp>
+@@ -93,6 +96,7 @@
+ #include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
+ #include <com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp>
#include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
- #endif
-+#ifndef _COM_SUN_STAR_UCB_IOERRORCODE_HPP_
+#include <com/sun/star/ucb/IOErrorCode.hpp>
-+#endif
- #ifndef _COM_SUN_STAR_UCB_NAMECLASH_HPP_
#include <com/sun/star/ucb/NameClash.hpp>
- #endif
+ #include <com/sun/star/ucb/NameClashException.hpp>
+ #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
@@ -206,7 +212,8 @@ Content::Content(
throw ( ucb::ContentCreationException )
: ContentImplHelper( rxSMgr, pProvider, Identifier ),
Modified: trunk/patches/src680/unittesting-build-pl.diff
==============================================================================
--- trunk/patches/src680/unittesting-build-pl.diff (original)
+++ trunk/patches/src680/unittesting-build-pl.diff Tue Apr 29 07:48:53 2008
@@ -10,31 +10,35 @@
### main ###
-@@ -494,18 +497,22 @@ sub dmake_dir {
+@@ -494,21 +497,25 @@ sub dmake_dir {
+ };
+ RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
return if ($cmd_file || $show);
- chdir $BuildDir;
- getcwd();
-+ my $dmake_check = "";
+- $error_code = run_job($dmake, $BuildDir);
++ my $dmake_command = $dmake;
+ if ($unit_tests && exists $unit_tests_dirs{$BuildDir} && $unit_tests_dirs{$BuildDir}) {
-+ $dmake_check = "check";
++ $dmake_command .= " check";
+ }
- if ($html) {
- my $log_file = $jobs_hash{$BuildDir}->{LONG_LOG_PATH};
- my $log_dir = File::Basename::dirname($log_file);
- if (!-d $log_dir) {
- system("$perl $mkout");
- };
-- $error_code = system ("$dmake > $log_file 2>&1");
-+ $error_code = system ("$dmake $dmake_check > $log_file 2>&1");
- if (!$grab_output && -f $log_file) {
- system("cat $log_file");
- };
- } else {
-- $error_code = system ("$dmake");
-+ $error_code = system ("$dmake $dmake_check");
- };
- html_store_dmake_dir_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child);
- };
++ $error_code = run_job($dmake_command, $BuildDir);
+ # chdir $BuildDir;
+ # getcwd();
+ # if ($html) {
+ # my $log_file = $jobs_hash{$BuildDir}->{LONG_LOG_PATH};
+ # my $log_dir = File::Basename::dirname($log_file);
+ # if (!-d $log_dir) {
+ # system("$perl $mkout");
+ # };
+-# $error_code = system ("$dmake > $log_file 2>&1");
++# $error_code = system ("$dmake $dmake_check > $log_file 2>&1");
+ # if (!$grab_output && -f $log_file) {
+ # system("cat $log_file");
+ # };
+ # } else {
+-# $error_code = system ("$dmake");
++# $error_code = system ("$dmake $dmake_check");
+ # };
+
+ html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child);
@@ -545,8 +552,27 @@ sub store_build_list_content {
} else {
if (open (BUILD_LST, $build_list_path)) {
Modified: trunk/patches/src680/unittesting-xmlhelp.diff
==============================================================================
--- trunk/patches/src680/unittesting-xmlhelp.diff (original)
+++ trunk/patches/src680/unittesting-xmlhelp.diff Tue Apr 29 07:48:53 2008
@@ -1,25 +1,3 @@
---- xmlhelp/inc/db/BtreeDictParameters.hxx 2005-09-09 14:07:32.000000000 +0200
-+++ xmlhelp/inc/db/BtreeDictParameters.hxx 2007-09-07 12:51:39.000000000 +0200
-@@ -36,7 +36,7 @@
- #define _XMLSEARCH_DB_BTREEDICTPARAMETERS_HXX_
-
- #ifndef _RTL_USTRING_
--#include <rtl/ustring>
-+#include <rtl/ustring.hxx>
- #endif
- #ifndef _XMLSEARCH_DB_DBPARTPARAMETERS_HXX_
- #include <db/DBPartParameters.hxx>
---- xmlhelp/inc/db/DBPartParameters.hxx 2005-09-09 14:08:13.000000000 +0200
-+++ xmlhelp/inc/db/DBPartParameters.hxx 2007-09-07 12:52:09.000000000 +0200
-@@ -40,7 +40,7 @@
- #define INCLUDED_STL_HASH_MAP
- #endif
- #ifndef _RTL_USTRING_
--#include <rtl/ustring>
-+#include <rtl/ustring.hxx>
- #endif
- #ifndef _XMLSEARCH_DB_SCHEMA_HXX_
- #include <db/Schema.hxx>
--- xmlhelp/prj/tests.lst 1970-01-01 01:00:00.000000000 +0100
+++ xmlhelp/prj/tests.lst 2007-09-07 12:52:56.000000000 +0200
@@ -0,0 +1 @@
Modified: trunk/patches/src680/vba-sc-autoshapes-hyperlinks.diff
==============================================================================
--- trunk/patches/src680/vba-sc-autoshapes-hyperlinks.diff (original)
+++ trunk/patches/src680/vba-sc-autoshapes-hyperlinks.diff Tue Apr 29 07:48:53 2008
@@ -564,15 +564,14 @@
diff -rup ../src680_m217-dr55-applied/sc/source/filter/xml/XMLTableShapeImportHelper.cxx sc/source/filter/xml/XMLTableShapeImportHelper.cxx
--- ../src680_m217-dr55-applied/sc/source/filter/xml/XMLTableShapeImportHelper.cxx 2007-05-22 21:03:11.000000000 +0100
+++ sc/source/filter/xml/XMLTableShapeImportHelper.cxx 2007-07-04 10:07:38.000000000 +0100
-@@ -82,7 +82,7 @@
- #ifndef _COM_SUN_STAR_DRAWING_XSHAPES_HPP_
- #include <com/sun/star/drawing/XShapes.hpp>
- #endif
--
+@@ -36,6 +36,7 @@
+ #include "drwlayer.hxx"
+ #include "xmlannoi.hxx"
+ #include "rangeutl.hxx"
+#include "unonames.hxx"
- #define SC_LAYERID "LayerID"
-
- using namespace ::com::sun::star;
+ #include <xmloff/nmspmap.hxx>
+ #include <xmloff/xmlnmspe.hxx>
+ #include <xmloff/xmluconv.hxx>
@@ -119,6 +119,13 @@ void XMLTableShapeImportHelper::finishSh
{
XMLShapeImportHelper::finishShape( rShape, xAttrList, rShapes );
Modified: trunk/patches/src680/vcl-transparent-printing.diff
==============================================================================
--- trunk/patches/src680/vcl-transparent-printing.diff (original)
+++ trunk/patches/src680/vcl-transparent-printing.diff Tue Apr 29 07:48:53 2008
@@ -26,9 +26,9 @@
#include <vector>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
-
- #ifndef _DEBUG_HXX
#include <tools/debug.hxx>
+ #include <vcl/virdev.hxx>
+ #include <vcl/metaact.hxx>
@@ -82,11 +84,43 @@
#define MAX_TILE_WIDTH 1024
#define MAX_TILE_HEIGHT 1024
Modified: trunk/patches/src680/webdav-locking-serve-dav-uri.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-serve-dav-uri.diff (original)
+++ trunk/patches/src680/webdav-locking-serve-dav-uri.diff Tue Apr 29 07:48:53 2008
@@ -205,14 +205,14 @@
--- ucb/source/ucp/webdav/webdavprovider.cxx
+++ ucb/source/ucp/webdav/webdavprovider.cxx
@@ -42,6 +42,8 @@
+ **************************************************************************
*************************************************************************/
-
-+#include <string.h>
+
- #ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
++#include <string.h>
#include <ucbhelper/contentidentifier.hxx>
- #endif
+ #include "webdavprovider.hxx"
+ #include "webdavcontent.hxx"
@@ -146,10 +146,17 @@ ContentProvider::queryContent(
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
Modified: trunk/patches/src680/webdav-locking-stream-can-save.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-stream-can-save.diff (original)
+++ trunk/patches/src680/webdav-locking-stream-can-save.diff Tue Apr 29 07:48:53 2008
@@ -83,13 +83,11 @@
index 720bd65..c969218 100644
--- ucb/source/ucp/webdav/NeonInputStream.cxx
+++ ucb/source/ucp/webdav/NeonInputStream.cxx
-@@ -45,6 +45,9 @@
- #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+@@ -36,6 +36,7 @@
+
#include <comphelper/processfactory.hxx>
- #endif
-+#ifndef _COM_SUN_STAR_UCB_COMMANDFAILEDEXCEPTION_HPP_
+ #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
-+#endif
#include <cstdio>
Modified: trunk/patches/src680/webdav-locking-unlock-on-crash.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-unlock-on-crash.diff (original)
+++ trunk/patches/src680/webdav-locking-unlock-on-crash.diff Tue Apr 29 07:48:53 2008
@@ -51,13 +51,13 @@
--- ucb/source/ucp/webdav/NeonInputStream.hxx
+++ ucb/source/ucp/webdav/NeonInputStream.hxx
@@ -38,6 +38,7 @@
- #ifndef _SAL_TYPES_H_
+ #define _NEONINPUTSTREAM_HXX_
+
#include <sal/types.h>
- #endif
+#include <osl/signal.h>
- #ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
- #endif
+ #include <cppuhelper/weak.hxx>
+
@@ -93,6 +94,8 @@ private:
com::sun::star::ucb::Lock *m_pLock;
rtl::OUString m_aURL;
Modified: trunk/patches/src680/webdav-locking.diff
==============================================================================
--- trunk/patches/src680/webdav-locking.diff (original)
+++ trunk/patches/src680/webdav-locking.diff Tue Apr 29 07:48:53 2008
@@ -302,25 +302,18 @@
index 8462f5a..df5ac71 100644
--- ucb/source/ucp/webdav/DAVSession.hxx
+++ ucb/source/ucp/webdav/DAVSession.hxx
-@@ -42,12 +42,18 @@
- #include <rtl/ustring.hxx>
- #endif
+@@ -42,8 +42,11 @@
-+#ifndef _COM_SUN_STAR_IO_XSTREAM_HPP_
+ #include <memory>
+ #include <rtl/ustring.hxx>
+#include <com/sun/star/io/XStream.hpp>
-+#endif
- #ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
#include <com/sun/star/io/XInputStream.hpp>
- #endif
- #ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_
#include <com/sun/star/io/XOutputStream.hpp>
- #endif
-+#ifndef _COM_SUN_STAR_UCB_LOCK_HPP_
+#include <com/sun/star/ucb/Lock.hpp>
-+#endif
-
- #ifndef _DAVEXCEPTION_HXX_
++
#include "DAVException.hxx"
+ #include "DAVProperties.hxx"
+ #include "DAVResource.hxx"
@@ -140,7 +146,7 @@ public:
const DAVRequestEnvironment & rEnv )
throw( DAVException ) = 0;
@@ -354,15 +347,12 @@
index 334e457..720bd65 100644
--- ucb/source/ucp/webdav/NeonInputStream.cxx
+++ ucb/source/ucp/webdav/NeonInputStream.cxx
-@@ -36,24 +36,31 @@
+@@ -36,21 +36,28 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_ucb.hxx"
#include "NeonInputStream.hxx"
+#include "DAVResourceAccess.hxx"
-
- #ifndef _RTL_MEMORY_H_
#include <rtl/memory.h>
- #endif
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -655,34 +645,24 @@
index 517e6d8..ba470e6 100644
--- ucb/source/ucp/webdav/NeonInputStream.hxx
+++ ucb/source/ucp/webdav/NeonInputStream.hxx
-@@ -45,12 +45,27 @@
+@@ -45,9 +45,16 @@
+ #include <sal/types.h>
+ #include <rtl/ustring.hxx>
#include <cppuhelper/weak.hxx>
- #endif
-
-+#ifndef _COM_SUN_STAR_IO_XSTREAM_HPP_
++
+#include <com/sun/star/io/XStream.hpp>
-+#endif
- #ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
#include <com/sun/star/io/XInputStream.hpp>
- #endif
-+#ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_
+#include <com/sun/star/io/XOutputStream.hpp>
-+#endif
- #ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
#include <com/sun/star/io/XSeekable.hpp>
- #endif
-+#ifndef _COM_SUN_STAR_IO_XTRUNCATE_HPP_
+#include <com/sun/star/io/XTruncate.hpp>
-+#endif
+
-+#ifndef _COM_SUN_STAR_UCB_LOCK_HPP_
+#include <com/sun/star/ucb/Lock.hpp>
-+#endif
+
+#include "DAVRequestEnvironment.hxx"
-
+-
namespace webdav_ucp
+ {
@@ -61,21 +76,33 @@ namespace webdav_ucp
// A simple XInputStream implementation provided specifically for use
// by the DAVSession::GET method.
@@ -1167,13 +1147,11 @@
index 63a8d68..5086f96 100644
--- ucb/source/ucp/webdav/NeonTypes.hxx
+++ ucb/source/ucp/webdav/NeonTypes.hxx
-@@ -48,6 +48,9 @@
- #ifndef NE_PROPS_H
+@@ -48,6 +48,7 @@
+ #include <ne_utils.h>
+ #include <ne_basic.h>
#include <ne_props.h>
- #endif
-+#ifndef NE_LOCKS_H
+#include <ne_locks.h>
-+#endif
typedef ne_session HttpSession;
typedef ne_status HttpStatus;
@@ -1189,19 +1167,17 @@
index 7b3d7c5..80f752e 100644
--- ucb/source/ucp/webdav/webdavcontent.cxx
+++ ucb/source/ucp/webdav/webdavcontent.cxx
-@@ -76,6 +76,9 @@
- #ifndef _COM_SUN_STAR_IO_XACTIVEDATASINK_HPP_
+@@ -76,6 +76,7 @@
+ #include <com/sun/star/beans/PropertySetInfoChangeEvent.hpp>
+ #include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/io/XActiveDataSink.hpp>
- #endif
-+#ifndef _COM_SUN_STAR_IO_XACTIVEDATASTREAMER_HPP_
+#include <com/sun/star/io/XActiveDataStreamer.hpp>
-+#endif
- #ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_
#include <com/sun/star/io/XOutputStream.hpp>
- #endif
+ #include <com/sun/star/lang/IllegalAccessException.hpp>
+ #include "com/sun/star/ucb/AuthenticationRequest.hpp"
@@ -190,6 +193,8 @@
+ #include "NeonUri.hxx"
#include "UCBDeadPropertyValue.hxx"
- #endif
+#include "NeonInputStream.hxx"
+
Modified: trunk/patches/src680/wmf-pattern-brush.diff
==============================================================================
--- trunk/patches/src680/wmf-pattern-brush.diff (original)
+++ trunk/patches/src680/wmf-pattern-brush.diff Tue Apr 29 07:48:53 2008
@@ -89,9 +89,9 @@
#include "winmtf.hxx"
#include <vcl/metaact.hxx>
+#include <vcl/graphictools.hxx>
- #ifndef _SV_METRIC_HXX
#include <vcl/metric.hxx>
- #endif
+ #include <rtl/tencinfo.h>
+
@@ -1046,7 +1048,8 @@ void WinMtfOutput::UpdateFillStyle()
if (!( maLatestFillStyle == maFillStyle ) )
{
Modified: trunk/patches/vba/basic-caller-support-dev300.diff
==============================================================================
--- trunk/patches/vba/basic-caller-support-dev300.diff (original)
+++ trunk/patches/vba/basic-caller-support-dev300.diff Tue Apr 29 07:48:53 2008
@@ -1,24 +1,21 @@
diff -up /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.hxx scripting/source/basprov/basscript.hxx
--- /data4/Latest/ooo-build/build/ooh680-m1/scripting/source/basprov/basscript.hxx 2005-09-09 03:24:12.000000000 +0100
+++ scripting/source/basprov/basscript.hxx 2007-12-19 17:19:58.000000000 +0000
-@@ -36,6 +36,7 @@
+@@ -36,11 +36,13 @@
#ifndef SCRIPTING_BASSCRIPT_HXX
#define SCRIPTING_BASSCRIPT_HXX
+#include "bcholder.hxx"
- #ifndef _COM_SUN_STAR_SCRIPT_PROVIDER_XSCRIPT_HPP_
#include <com/sun/star/script/provider/XScript.hpp>
- #endif
-@@ -45,7 +46,8 @@
- #ifndef _CPPUHELPER_IMPLBASE1_HXX_
+ #include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <cppuhelper/implbase1.hxx>
- #endif
--
+#include <comphelper/proparrhlp.hxx>
+#include <comphelper/propertycontainer.hxx>
- #ifndef _SB_SBMETH_HXX
#include <basic/sbmeth.hxx>
- #endif
+-
+
+ class BasicManager;
+
@@ -66,7 +68,11 @@ namespace basprov
::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
@@ -342,17 +339,15 @@
NOOPTFILES=\
--- /data4/Latest/ooo-build/build/ooh680-m1/svx/source/form/fmscriptingenv.cxx 2008-01-08 09:36:27.000000000 +0000
+++ svx/source/form/fmscriptingenv.cxx 2008-01-10 12:10:21.000000000 +0000
-@@ -59,6 +59,10 @@
- #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
+@@ -59,6 +59,8 @@
+ #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+ #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
- #endif
-+
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/awt/XControl.hpp>
-+
/** === end UNO includes === **/
-
- #ifndef TOOLS_DIAGNOSE_EX_H
+ #include <tools/diagnose_ex.h>
+ #include <cppuhelper/implbase1.hxx>
@@ -111,6 +115,9 @@ namespace svxform
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Sequence;
@@ -408,9 +403,9 @@
--- scripting/source/basprov/basscript.cxx 2008-04-25 18:33:48.000000000 +0100
+++ scripting/source/basprov/basscript.cxx 2008-04-25 18:23:29.000000000 +0100
@@ -64,7 +64,10 @@
- #ifndef _COM_SUN_STAR_SCRIPT_PROVIDER_SCRIPTFRAMEWORKERRORTYPE_HPP_
+ #include <basic/sbmeth.hxx>
+ #include <basic/basmgr.hxx>
#include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
- #endif
-
+#include "bcholder.hxx"
+#include <comphelper/proparrhlp.hxx>
Modified: trunk/patches/vba/scp_vba_uno_service.diff
==============================================================================
--- trunk/patches/vba/scp_vba_uno_service.diff (original)
+++ trunk/patches/vba/scp_vba_uno_service.diff Tue Apr 29 07:48:53 2008
@@ -19,6 +19,6 @@
+End
+#endif // ENABLE_VBA
+
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Bib , bib)
+ STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
File gid_File_Lib_Brdgfctr
Modified: trunk/patches/vba/vba-error-object.diff
==============================================================================
--- trunk/patches/vba/vba-error-object.diff (original)
+++ trunk/patches/vba/vba-error-object.diff Tue Apr 29 07:48:53 2008
@@ -353,11 +353,10 @@
--- basic.orig/source/runtime/step0.cxx 2006-11-27 13:06:41.000000000 +0000
+++ basic/source/runtime/step0.cxx 2006-12-07 20:25:43.000000000 +0000
-@@ -42,7 +42,7 @@
- #ifndef _FSYS_HXX //autogen
+@@ -42,6 +42,7 @@
+ #include <vcl/msgbox.hxx>
#include <tools/fsys.hxx>
- #endif
--
+
+#include "errobject.hxx"
#include "runtime.hxx"
#include "sbintern.hxx"
Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff Tue Apr 29 07:48:53 2008
@@ -290,13 +290,13 @@
--- /data4/sles/ooo-build-m180/ooo-build/build/ood680-m1/sc/source/ui/view/tabview5.cxx 2006-07-21 16:10:17.000000000 +0100
+++ sc/source/ui/view/tabview5.cxx 2006-09-08 13:59:24.000000000 +0100
@@ -70,6 +70,7 @@
- #include "seltrans.hxx"
#include "scmod.hxx"
#include "AccessibilityHints.hxx"
+ #include "docsh.hxx"
+#include "scextopt.hxx"
+ #include <vcl/svapp.hxx>
- // STATIC DATA -----------------------------------------------------------
@@ -338,6 +339,27 @@ void ScTabView::TabChanged()
aViewData.GetViewShell()->BroadcastAccessibility(aAccHint);
}
@@ -359,14 +359,15 @@
--- 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 @@
- #ifndef SC_ACCESSIBILITYHINTS_HXX
+@@ -85,9 +85,81 @@
+ #include "gridwin.hxx"
+ #include <com/sun/star/view/DocumentZoomType.hpp>
#include "AccessibilityHints.hxx"
- #endif
--
+#include "scextopt.hxx"
+#include <comphelper/processfactory.hxx>
+
using namespace com::sun::star;
+
+String docMacroExists( ScDocShell* pShell,
+const String& sMod, const String& sMacro );
+bool executeWorkBookMacro( ScDocShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet );
@@ -402,7 +403,7 @@
+ }
+ return aRet;
+}
-
++
+uno::Any createRange( const uno::Any& aRange )
+{
+ uno::Any aRet;
Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff (original)
+++ trunk/patches/vba/vbaevents-services-sources.diff Tue Apr 29 07:48:53 2008
@@ -233,59 +233,38 @@
diff -rup sc/source/filter/excel/xlocx.cxx sc/source/filter/excel/xlocx.cxx
--- sc/source/filter/excel/xlocx.cxx 2007-02-15 11:53:17.000000000 +0000
+++ sc/source/filter/excel/xlocx.cxx 2007-02-15 11:50:10.000000000 +0000
-@@ -58,13 +58,49 @@
- #ifndef _COM_SUN_STAR_FORM_XFORMCOMPONENT_HPP_
+@@ -58,8 +58,30 @@
+ #include <com/sun/star/drawing/XControlShape.hpp>
+ #include <com/sun/star/form/XFormsSupplier.hpp>
#include <com/sun/star/form/XFormComponent.hpp>
- #endif
--#ifndef _COM_SUN_STAR_SCRIPT_SCRIPTEVENTDESCRIPTOR_HPP_
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
--#endif
- #ifndef _COM_SUN_STAR_SCRIPT_XEVENTATTACHERMANAGER_HPP_
#include <com/sun/star/script/XEventAttacherManager.hpp>
- #endif
-
++
+#ifdef ENABLE_VBA
-+#ifndef _SB_SBSTAR_HXX
+#include <basic/sbstar.hxx>
-+#endif
-+#ifndef _SB_SBMOD_HXX
+#include <basic/sbmod.hxx>
-+#endif
-+#ifndef _SB_SBMETH_HXX
+#include <basic/sbmeth.hxx>
-+#endif
-+#ifndef _SBXCLASS_HXX
+#include <basic/sbx.hxx>
-+#endif
-+#ifndef SC_SCEXTOPT_HXX
+#include <scextopt.hxx>
-+#endif
-+#ifndef _COM_SUN_STAR_AWT_XCONTROL_HPP_
+#include <com/sun/star/awt/XControl.hpp>
-+#endif
-+#ifndef _ORG_OPENOFFICE_VBA_XVBATOOOEVENTDESCGEN_HPP_
+#include <org/openoffice/vba/XVBAToOOEventDescGen.hpp>
-+#endif
-+#ifndef _CPPUHELPER_BOOTSTRAP_HXX_
+#include <cppuhelper/bootstrap.hxx>
-+#endif
+#include <sfx2/objsh.hxx>
+
+using org::openoffice::vba::XVBAToOOEventDescGen;
+using com::sun::star::uno::XComponentContext;
+using com::sun::star::awt::XControl;
+using com::sun::star::uno::UNO_QUERY_THROW;
-+#else
-+#ifndef _COM_SUN_STAR_SCRIPT_SCRIPTEVENTDESCRIPTOR_HPP_
++
++#else // ENABLE_VBA
++
+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-+#endif
+
+#endif //ENABLE_VBA
+
-+
- #ifndef _SVDPAGE_HXX
#include <svx/svdpage.hxx>
- #endif
+ #include <svx/unoapi.hxx>
+ #include "fapihelper.hxx"
@@ -178,6 +214,10 @@ SdrObject* XclImpOcxConverter::CreateSdr
// reads from mxStrm into xShape, inserts the control model into the form of the sheet
if( ReadOCXExcelKludgeStream( mxStrm, &xShape, TRUE ) )
@@ -456,14 +435,15 @@
diff -rup sc/source/filter/inc/xlocx.hxx sc/source/filter/inc/xlocx.hxx
--- sc/source/filter/inc/xlocx.hxx 2007-02-15 11:53:17.000000000 +0000
+++ sc/source/filter/inc/xlocx.hxx 2007-02-15 11:40:59.000000000 +0000
-@@ -46,6 +46,11 @@
- #ifndef SC_XEROOT_HXX
+@@ -46,6 +46,12 @@
+ #include <svx/msocximex.hxx>
+ #include "xiroot.hxx"
#include "xeroot.hxx"
- #endif
++
+#ifdef ENABLE_VBA
-+#ifndef _COM_SUN_STAR_SCRIPT_SCRIPTEVENTDESCRIPTOR_HPP_
++
+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-+#endif
++
+#endif //ENABLE_VBA
// 0 = Export TBX form controls, 1 = Export OCX form controls.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
