ooo-build r12888 - in trunk: . patches/dev300 patches/mono patches/unittesting
- From: jholesovsky svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12888 - in trunk: . patches/dev300 patches/mono patches/unittesting
- Date: Mon, 16 Jun 2008 12:08:48 +0000 (UTC)
Author: jholesovsky
Date: Mon Jun 16 12:08:47 2008
New Revision: 12888
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12888&view=rev
Log:
2008-06-16 Jan Holesovsky <kendy suse cz>
* Update to dev300-m19.
* patches/dev300/buildfix-cairo.diff,
patches/dev300/cws-native151-filter.diff,
patches/dev300/cws-native151-scp2.diff,
patches/dev300/cws-native151-setup_native.diff,
patches/dev300/ooo61812.svx.a11ycrash.diff,
patches/dev300/sal-approx-value.diff,
patches/dev300/svx-export-image-links.diff,
patches/dev300/svx-missing-initialization.diff,
patches/dev300/sw-debug-build.diff,
patches/dev300/sw-hindi-numbers.diff,
patches/dev300/sw-html-export-font.diff: Bin, in m19.
* patches/dev300/build-optimized-link.diff,
patches/dev300/cws-webdavandgvfslocking1-officecfg.diff,
patches/dev300/cws-webdavandgvfslocking1-ucb.diff,
patches/dev300/default-no-install-wizards.diff,
patches/dev300/fix-ppt-linespacing-import-export.diff,
patches/dev300/jvmfwk-detect-removed-java.diff,
patches/dev300/layout-plugin-toolkit.diff,
patches/dev300/layout-tab-toolkit.diff,
patches/dev300/linkwarn-svx-warning-dlg.diff,
patches/dev300/ooo86080.unopkg.bodge.diff,
patches/dev300/remove-sfx-notify-chart2.diff,
patches/dev300/sc-string-arg.diff,
patches/dev300/sfx2-remove-check-update-on-fileload.diff,
patches/dev300/slideshow-media-control.diff,
patches/dev300/svtools-dont-extern-sRTF-sHTML.diff,
patches/dev300/warning-string-comparsion-sw.diff,
patches/dev300/wpsimport-scp2.diff,
patches/mono/cli_ure-mono-bridge.diff,
patches/mono/cli_ure-prj-build-lst.diff,
patches/mono/mono-build.diff,
patches/unittesting/unittesting-configmgr.diff: Updated for m19.
* patches/dev300/buildfix-layoutdialogs-transex3.diff: New patch for
m19.
* patches/dev300/apply: Apply the changes.
Added:
trunk/patches/dev300/buildfix-layoutdialogs-transex3.diff
Removed:
trunk/patches/dev300/buildfix-cairo.diff
trunk/patches/dev300/cws-native151-filter.diff
trunk/patches/dev300/cws-native151-scp2.diff
trunk/patches/dev300/cws-native151-setup_native.diff
trunk/patches/dev300/ooo61812.svx.a11ycrash.diff
trunk/patches/dev300/sal-approx-value.diff
trunk/patches/dev300/svx-export-image-links.diff
trunk/patches/dev300/svx-missing-initialization.diff
trunk/patches/dev300/sw-debug-build.diff
trunk/patches/dev300/sw-hindi-numbers.diff
trunk/patches/dev300/sw-html-export-font.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/build-optimized-link.diff
trunk/patches/dev300/cws-webdavandgvfslocking1-officecfg.diff
trunk/patches/dev300/cws-webdavandgvfslocking1-ucb.diff
trunk/patches/dev300/default-no-install-wizards.diff
trunk/patches/dev300/fix-ppt-linespacing-import-export.diff
trunk/patches/dev300/jvmfwk-detect-removed-java.diff
trunk/patches/dev300/layout-plugin-toolkit.diff
trunk/patches/dev300/layout-tab-toolkit.diff
trunk/patches/dev300/linkwarn-svx-warning-dlg.diff
trunk/patches/dev300/ooo86080.unopkg.bodge.diff
trunk/patches/dev300/remove-sfx-notify-chart2.diff
trunk/patches/dev300/sc-string-arg.diff
trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff
trunk/patches/dev300/slideshow-media-control.diff
trunk/patches/dev300/svtools-dont-extern-sRTF-sHTML.diff
trunk/patches/dev300/warning-string-comparsion-sw.diff
trunk/patches/dev300/wpsimport-scp2.diff
trunk/patches/mono/cli_ure-mono-bridge.diff
trunk/patches/mono/cli_ure-prj-build-lst.diff
trunk/patches/mono/mono-build.diff
trunk/patches/unittesting/unittesting-configmgr.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Mon Jun 16 12:08:47 2008
@@ -6,7 +6,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting
-OLDEST_SUPPORTED=dev300-m14
+OLDEST_SUPPORTED=dev300-m19
# -------- Functional sub-sets --------
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -241,11 +241,7 @@
# this hack make sure that the object lives a bit longer
sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
-# 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
cairocanvas-fix-after-win32-removeval.diff, rodo
# don't lstat() that much while creating absolute URLs
@@ -288,7 +284,6 @@
# MS Works import filter (following patches depend on each other) Fridrich
wpsimport-config_office.diff
wpsimport-filter.diff
-
wpsimport-scp2.diff
wpsimport-writerperfect.diff
@@ -368,10 +363,10 @@
redirect-extensions.diff
# no bogus license question when registering these extensions
-reportdesigner-no-license.diff
-presentation-minimizer-no-license.diff
-pdfimport-no-license.diff
-presenterscreen-no-license.diff
+#FIXME dev300-m19: reportdesigner-no-license.diff
+#FIXME dev300-m19: presentation-minimizer-no-license.diff
+#FIXME dev300-m19: pdfimport-no-license.diff
+#FIXME dev300-m19: presenterscreen-no-license.diff
# ensure macros are imported ( not as comments ) for calc
vba-default-enable-calcmacros.diff
@@ -462,15 +457,9 @@
#document ( containing macros ) crashing
save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
-# enable build debug=t in sw module on x86_64
-sw-debug-build.diff, fridrich
-
# prevent some array out of bounds in ww8 exporter
sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff, n#391197, fridrich
-# init all members in svx's line geometry creator
-svx-missing-initialization.diff, i#86163, thorsten
-
# init all members in VirDev's ctor
vcl-virdev-missing-initialisation.diff, i#88535, thorsten
@@ -484,9 +473,6 @@
# adds fixes for printing transparent content
vcl-transparent-printing.diff, i#88536, thorsten
-# adds export for linked graphics to ppt
-svx-export-image-links.diff, n#283265, i#88713, thorsten
-
localize-pl-cygwin-paths.diff, tml
# vba types are not available, causes all sort strangeness
@@ -505,6 +491,7 @@
gengal-three-layer-install-svx.diff, i#89713, jannieuw
gengal-three-layer-install-scp2.diff, i#89713, jannieuw
+
[ RadioButtons ]
# Add a GroupName property to RadioButtons so that RadioButtons don't need to
# share the same name to be part of the same group.
@@ -555,10 +542,6 @@
[ WriterFixes ]
# Allows to copy/paste html text which is between 2 unknown tags.
sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
-# Allows to export font correctly, which fix copy/paste bugs, as a
-good side effect :)
-sw-html-export-font.diff, i#89626, mloiseleur
-
[ CalcFixes ]
@@ -710,11 +693,6 @@
# button.
sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
-# reduce precision to 15 significant digits for INT, FLOOR, CEILING functions
-# and possibly others that use approxFloor() or approxCeil() functions
-# internally.
-sal-approx-value.diff, n#310706, i#86775, kohei
-
# overwrite character level font attributes when changing them at cell level.
sc-overwrite-char-font-attrs.diff, n#374580, i#90102, kohei
@@ -1090,9 +1068,6 @@
# fixes warnings about that a variable is used unitialized
warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
-# warning: comparison with string literal results in unspecified results
-warning-string-comparsion-sw.diff, i#86880, pmladek
-
#fix a build issue on solaris with sunpro 5.9 aka Sun Studio 12
stlport-solaris-fileno.diff, fridrich
@@ -1439,9 +1414,9 @@
#also allow paramaters to be supported for Get properties
vba-support-properties-inmodules.diff
# object module support... getting there
-ObjectModule.diff
+#FIXME dev300-m19: ObjectModule.diff
# userform ( depends on ObjectModule.diff )
-vba-userform.diff
+#FIXME dev300-m19: vba-userform.diff
# another bug with event bindings for dialogs ( awaiting iz id from andreas )
vba-dialogs-fixsmoketest.diff
@@ -1723,8 +1698,6 @@
ooo73201.sw.a11yloadcrash.diff
-ooo61812.svx.a11ycrash.diff
-
ooo86080.unopkg.bodge.diff
[ CairoFonts ]
@@ -1769,6 +1742,9 @@
# don't export trivial strings in svtools, increases linking time, bloats size
svtools-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
sw-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
+# warning: comparison with string literal results in unspecified results
+warning-string-comparsion-sw.diff, i#86880, i#86772, pmladek
+
[ BFShrink ]
# don't export trivial strings in svtools, increases linking time, bloats size
@@ -1859,6 +1835,9 @@
cws-layoutdialogs-toolkit.diff
cws-layoutdialogs-transex3.diff
+# make it build with dev300-m19 - Janneke, please check :-)
+buildfix-layoutdialogs-transex3.diff
+
layout-plugin-toolkit.diff
layout-tab-toolkit.diff
@@ -2151,15 +2130,6 @@
#Using prebuilt Writing Aids for all platforms in OxygenOffice Professional
win32-prebuilt-writingaids-zip.diff
-[ Split < dev300-m18 ]
-SectionOwner => pmladek
-
-# FIXME: apply at the end because there are some conflicts
-# split binfilter from core
-cws-native151-filter.diff, i#79800
-cws-native151-setup_native.diff, i#79800
-cws-native151-scp2.diff, i#79800
-
[ Win32Only ]
mozilla-source-1.7.5.patch.diff, i#84961, tml
Modified: trunk/patches/dev300/build-optimized-link.diff
==============================================================================
--- trunk/patches/dev300/build-optimized-link.diff (original)
+++ trunk/patches/dev300/build-optimized-link.diff Mon Jun 16 12:08:47 2008
@@ -6,9 +6,9 @@
--- solenv/inc/unxlngi4.mk 28 Apr 2003 16:46:57 -0000 1.17
+++ solenv/inc/unxlngi4.mk 13 May 2003 09:46:12 -0000
@@ -145,7 +145,7 @@ LINK*=$(CC)
- LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
+ LINKFLAGSRUNPATH_NONE=
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+LINKFLAGS=-O2 -Bsymbolic -Wl,-z,combreloc $(LINKFLAGSDEFS)
Added: trunk/patches/dev300/buildfix-layoutdialogs-transex3.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-layoutdialogs-transex3.diff Mon Jun 16 12:08:47 2008
@@ -0,0 +1,31 @@
+--- transex3/inc/helpmerge.hxx 2008-06-16 13:11:36.000000000 +0200
++++ transex3/inc/helpmerge.hxx 2008-06-16 13:11:51.000000000 +0200
+@@ -75,9 +75,9 @@ public:
+ bool Merge( const ByteString &rSDFFile, const ByteString &rPathX , const ByteString &rPathY , bool bISO
+ , const std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir );
+
+-private:
+ static ByteString makeAbsolutePath( const ByteString& sHelpFile , const ByteString& rRoot_in );
+
++private:
+ ByteString GetOutpath( const ByteString& rPathX , const ByteString& sCur , const ByteString& rPathY );
+ bool MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile , const ByteString& sLanguage , ByteString sPath );
+
+--- transex3/layout/tralay.cxx 2008-06-16 12:54:38.000000000 +0200
++++ transex3/layout/tralay.cxx 2008-06-16 13:11:09.000000000 +0200
+@@ -265,13 +265,14 @@ static void insertMarker( XMLParentNode
+ void TranslateLayout::MergeLanguage( ByteString const& language )
+ {
+ ByteString xmlFile = mFiles.front();
++ ByteString absoluteFilePath = HelpParser::makeAbsolutePath( xmlFile, mRoot );
+
+ MergeDataFile mergeData( mLocalize, xmlFile,
+ FALSE, RTL_TEXTENCODING_MS_1252 );
+
+ SimpleXMLParser aParser;
+ LayoutXMLFile* layoutXml = new LayoutXMLFile( mMergeMode );
+- if ( !aParser.Execute( STRING( xmlFile ), layoutXml ) )
++ if ( !aParser.Execute( STRING( absoluteFilePath ), STRING( xmlFile ), layoutXml ) )
+ {
+ fprintf(stderr, "error: parsing: %s\n", xmlFile.GetBuffer() );
+ return;
Modified: trunk/patches/dev300/cws-webdavandgvfslocking1-officecfg.diff
==============================================================================
--- trunk/patches/dev300/cws-webdavandgvfslocking1-officecfg.diff (original)
+++ trunk/patches/dev300/cws-webdavandgvfslocking1-officecfg.diff Mon Jun 16 12:08:47 2008
@@ -6,87 +6,83 @@
diff -u -p -u -p -B -r1.12 -r1.10.112.2
--- officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 14 May 2008 14:54:47 -0000 1.12
+++ officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 2 Jun 2008 13:30:36 -0000 1.10.112.2
-@@ -145,17 +145,61 @@
+@@ -106,17 +145,6 @@
<value/>
</prop>
</node>
-- <node oor:name="Provider12" oor:op="replace">
-- <prop oor:name="ServiceName">
-- <value>com.sun.star.ucb.WebDAVContentProvider</value>
-- </prop>
-- <prop oor:name="URLTemplate">
-- <value>https</value>
-- </prop>
-- <prop oor:name="Arguments">
-- <value/>
-- </prop>
-- </node>
-+ <node oor:name="Provider12" oor:op="replace">
-+ <prop oor:name="ServiceName">
-+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
-+ </prop>
-+ <prop oor:name="URLTemplate">
-+ <value>https</value>
-+ </prop>
-+ <prop oor:name="Arguments">
-+ <value/>
-+ </prop>
-+ </node>
-+ <node oor:name="Provider13" oor:op="replace">
-+ <prop oor:name="ServiceName">
-+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
-+ </prop>
-+ <prop oor:name="URLTemplate">
-+ <value>dav</value>
-+ </prop>
-+ <prop oor:name="Arguments">
-+ <value/>
-+ </prop>
-+ </node>
-+ <node oor:name="Provider14" oor:op="replace">
-+ <prop oor:name="ServiceName">
-+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
-+ </prop>
-+ <prop oor:name="URLTemplate">
-+ <value>davs</value>
-+ </prop>
-+ <prop oor:name="Arguments">
-+ <value/>
-+ </prop>
-+ </node>
-+ <node oor:name="Provider15" oor:op="replace">
-+ <prop oor:name="ServiceName">
-+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
-+ </prop>
-+ <prop oor:name="URLTemplate">
-+ <value>webdav</value>
-+ </prop>
-+ <prop oor:name="Arguments">
-+ <value/>
-+ </prop>
-+ </node>
-+ <node oor:name="Provider16" oor:op="replace">
-+ <prop oor:name="ServiceName">
-+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
-+ </prop>
-+ <prop oor:name="URLTemplate">
-+ <value>webdavs</value>
-+ </prop>
-+ <prop oor:name="Arguments">
-+ <value/>
-+ </prop>
-+ </node>
- <!-- We want the Provider to be the final fallback provider -->
- <node oor:name="Provider999" oor:op="replace" install:module="gio">
+- <node oor:name="Provider7" oor:op="replace">
+- <prop oor:name="ServiceName">
+- <value>com.sun.star.ucb.WebDAVContentProvider</value>
+- </prop>
+- <prop oor:name="URLTemplate">
+- <value>dav</value>
+- </prop>
+- <prop oor:name="Arguments">
+- <value/>
+- </prop>
+- </node>
+ <node oor:name="Provider8" oor:op="replace">
<prop oor:name="ServiceName">
-@@ -167,8 +211,8 @@
- <prop oor:name="Arguments">
+ <value>com.sun.star.ucb.PackageContentProvider</value>
+@@ -145,17 +145,50 @@
<value/>
</prop>
+ </node>
+- <node oor:name="Provider13" oor:op="replace">
+- <prop oor:name="ServiceName">
+- <value>com.sun.star.ucb.WebDAVContentProvider</value>
+- </prop>
+- <prop oor:name="URLTemplate">
+- <value>davs</value>
+- </prop>
+- <prop oor:name="Arguments">
+- <value/>
+- </prop>
- </node>
-- </node>
-+ </node>
-+ </node>
- </node>
- </node>
- </node>
++ <node oor:name="Provider13" oor:op="replace">
++ <prop oor:name="ServiceName">
++ <value>com.sun.star.ucb.WebDAVContentProvider</value>
++ </prop>
++ <prop oor:name="URLTemplate">
++ <value>dav</value>
++ </prop>
++ <prop oor:name="Arguments">
++ <value/>
++ </prop>
++ </node>
++ <node oor:name="Provider14" oor:op="replace">
++ <prop oor:name="ServiceName">
++ <value>com.sun.star.ucb.WebDAVContentProvider</value>
++ </prop>
++ <prop oor:name="URLTemplate">
++ <value>davs</value>
++ </prop>
++ <prop oor:name="Arguments">
++ <value/>
++ </prop>
++ </node>
++ <node oor:name="Provider15" oor:op="replace">
++ <prop oor:name="ServiceName">
++ <value>com.sun.star.ucb.WebDAVContentProvider</value>
++ </prop>
++ <prop oor:name="URLTemplate">
++ <value>webdav</value>
++ </prop>
++ <prop oor:name="Arguments">
++ <value/>
++ </prop>
++ </node>
++ <node oor:name="Provider16" oor:op="replace">
++ <prop oor:name="ServiceName">
++ <value>com.sun.star.ucb.WebDAVContentProvider</value>
++ </prop>
++ <prop oor:name="URLTemplate">
++ <value>webdavs</value>
++ </prop>
++ <prop oor:name="Arguments">
++ <value/>
++ </prop>
++ </node>
+ <!-- We want the Provider to be the final fallback provider -->
+ <node oor:name="Provider999" oor:op="replace" install:module="gio">
+ <prop oor:name="ServiceName">
Modified: trunk/patches/dev300/cws-webdavandgvfslocking1-ucb.diff
==============================================================================
--- trunk/patches/dev300/cws-webdavandgvfslocking1-ucb.diff (original)
+++ trunk/patches/dev300/cws-webdavandgvfslocking1-ucb.diff Mon Jun 16 12:08:47 2008
@@ -2542,11 +2542,17 @@
ucbhelper::cancelCommandExecution(
uno::makeAny(
ucb::UnsupportedDataSinkException(
-@@ -2585,11 +2699,23 @@ void Content::transfer(
+@@ -2585,19 +2699,19 @@ void Content::transfer(
//
const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase();
if ( aScheme.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
+- {
+- sourceURI.SetScheme(
+- rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+- }
+- else if ( aScheme.equalsAsciiL(
+- RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ||
+ aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ||
@@ -2556,22 +2562,23 @@
sourceURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
}
-+ else if ( aScheme.equalsAsciiL(
+ else if ( aScheme.equalsAsciiL(
+- RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) ||
+ aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( PLAIN_WEBDAVS_URL_SCHEME ) ) )
-+ {
-+ sourceURI.SetScheme(
-+ rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
-+ }
- else
{
- if ( !aScheme.equalsAsciiL(
-@@ -2609,9 +2735,23 @@ void Content::transfer(
+ sourceURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
+@@ -2609,13 +2735,23 @@ void Content::transfer(
}
if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
+- targetURI.SetScheme(
+- rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+- else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
+- RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) ||
+ targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) ||
@@ -2659,28 +2666,18 @@
#include <ucbhelper/contentidentifier.hxx>
#include "webdavprovider.hxx"
#include "webdavcontent.hxx"
-@@ -133,10 +136,17 @@ ContentProvider::queryContent(
- !aScheme.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
+@@ -133,6 +136,10 @@ ContentProvider::queryContent(
+ !aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
-- RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) )
-- &&
-+ RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) &&
-+ !aScheme.equalsAsciiL(
-+ RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) ) &&
-+ !aScheme.equalsAsciiL(
-+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
- !aScheme.equalsAsciiL(
-- RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )
-+ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
-+ !aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( PLAIN_WEBDAV_URL_SCHEME ) ) &&
+ !aScheme.equalsAsciiL(
-+ RTL_CONSTASCII_STRINGPARAM( PLAIN_WEBDAVS_URL_SCHEME ) )
- )
- throw ucb::IllegalIdentifierException();
-
-@@ -155,14 +165,27 @@ ContentProvider::queryContent(
++ RTL_CONSTASCII_STRINGPARAM( PLAIN_WEBDAVS_URL_SCHEME ) ) &&
++ !aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) ) )
+ throw ucb::IllegalIdentifierException();
+
+@@ -155,32 +165,27 @@ ContentProvider::queryContent(
uno::Reference< ucb::XContentIdentifier > xCanonicId;
bool bNewId = false;
@@ -2704,6 +2701,24 @@
- rtl::OUString::createFromAscii(
- HTTP_URL_SCHEME ) );
- bNewId = true;
+- }
+- else if ( aScheme.equalsAsciiL(
+- RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+- {
+- aURL = aURL.replaceAt( 0,
+- DAV_URL_SCHEME_LENGTH,
+- rtl::OUString::createFromAscii(
+- HTTP_URL_SCHEME ) );
+- bNewId = true;
+- }
+- else if ( aScheme.equalsAsciiL(
+- RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
+- {
+- aURL = aURL.replaceAt( 0,
+- DAVS_URL_SCHEME_LENGTH,
+- rtl::OUString::createFromAscii(
+- HTTPS_URL_SCHEME ) );
+- bNewId = true;
+ if ( aScheme.equalsAscii( pScheme->from ) )
+ {
+ aURL = aURL.replaceAt( 0,
@@ -2723,7 +2738,7 @@
diff -u -p -u -p -B -r1.10 -r1.9.70.2
--- ucb/source/ucp/webdav/webdavprovider.hxx 10 Apr 2008 15:45:49 -0000 1.10
+++ ucb/source/ucp/webdav/webdavprovider.hxx 2 Jun 2008 13:29:37 -0000 1.9.70.2
-@@ -52,16 +52,19 @@ namespace webdav_ucp {
+@@ -52,21 +52,18 @@ namespace webdav_ucp {
// contents ) according to this scheme.
#define WEBDAV_URL_SCHEME \
"vnd.sun.star.webdav"
@@ -2735,14 +2750,15 @@
#define HTTPS_URL_SCHEME "https"
-#define HTTPS_URL_SCHEME_LENGTH 5
- #define FTP_URL_SCHEME "ftp"
+ #define DAV_URL_SCHEME "dav"
+-#define DAV_URL_SCHEME_LENGTH 3
-+#define DAV_URL_SCHEME "dav"
-+#define DAVS_URL_SCHEME "davs"
-+
+ #define DAVS_URL_SCHEME "davs"
+-#define DAVS_URL_SCHEME_LENGTH 4
+
+#define PLAIN_WEBDAV_URL_SCHEME "webdav"
+
+#define PLAIN_WEBDAVS_URL_SCHEME "webdavs"
-+
- #define HTTP_CONTENT_TYPE \
- "application/" HTTP_URL_SCHEME "-content"
+
+ #define FTP_URL_SCHEME "ftp"
Modified: trunk/patches/dev300/default-no-install-wizards.diff
==============================================================================
--- trunk/patches/dev300/default-no-install-wizards.diff (original)
+++ trunk/patches/dev300/default-no-install-wizards.diff Mon Jun 16 12:08:47 2008
@@ -5,26 +5,12 @@
diff -u -p -u -r1.31 Common.xcu
--- officecfg/registry/data/org/openoffice/Office/Common.xcu 23 Mar 2005 10:53:46 -0000 1.31
+++ officecfg/registry/data/org/openoffice/Office/Common.xcu 20 Jun 2005 14:05:26 -0000
-@@ -523,35 +523,6 @@
+@@ -509,21 +509,6 @@
<value >private:image/3216</value>
</prop>
</node>
- <node oor:name="m15" oor:op="replace" install:module="dicooo">
- <prop oor:name="URL" oor:type="xs:string">
-- <value >macro:///Launcher.DicOOo.StartDicOOo</value>
-- </prop>
-- <prop oor:name="Title">
-- <value xml:lang="en-US">Install new dictionaries...</value>
-- </prop>
-- <prop oor:name="TargetName" oor:type="xs:string">
-- <value >_self</value>
-- </prop>
-- <prop oor:name="ImageIdentifier" oor:type="xs:string">
-- <value >private:image/3216</value>
-- </prop>
-- </node>
-- <node oor:name="m16" oor:op="replace" install:module="dicooo">
-- <prop oor:name="URL" oor:type="xs:string">
- <value >macro:///Launcher.FontOOo.StartFontOOo</value>
- </prop>
- <prop oor:name="Title">
Modified: trunk/patches/dev300/fix-ppt-linespacing-import-export.diff
==============================================================================
--- trunk/patches/dev300/fix-ppt-linespacing-import-export.diff (original)
+++ trunk/patches/dev300/fix-ppt-linespacing-import-export.diff Mon Jun 16 12:08:47 2008
@@ -42,18 +42,8 @@
diff -rup ../ooh680-m1/sd/source/ui/dlg/paragr.cxx sd/source/ui/dlg/paragr.cxx
--- ../ooh680-m1/sd/source/ui/dlg/paragr.cxx 2006-12-12 18:07:46.000000000 +0100
+++ sd/source/ui/dlg/paragr.cxx 2008-01-28 16:30:13.000000000 +0100
-@@ -53,6 +53,9 @@
- #include <svx/flagsdef.hxx>
- #include "paragr.hxx"
- #include "sdresid.hxx"
-+#ifndef _SFXINTITEM_HXX
-+#include <svtools/intitem.hxx>
-+#endif
-
- /*************************************************************************
- |*
@@ -77,3 +80,17 @@ SdParagraphDlg::SdParagraphDlg( Window*
- AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
+
AddTabPage( RID_SVXPAGE_TABULATOR );
}
+
Modified: trunk/patches/dev300/jvmfwk-detect-removed-java.diff
==============================================================================
--- trunk/patches/dev300/jvmfwk-detect-removed-java.diff (original)
+++ trunk/patches/dev300/jvmfwk-detect-removed-java.diff Mon Jun 16 12:08:47 2008
@@ -87,3 +87,37 @@
{
fprintf(stderr,"javaldx failed! \n");
return -1;
+--- jvmfwk/source/elements.cxx 21 May 2008 08:24:47 -0000 1.22
++++ jvmfwk/source/elements.cxx 6 Jun 2008 08:37:17 -0000 1.23
+@@ -1232,12 +1195,12 @@ JavaInfo * MergedSettings::createJavaInf
+ {
+ return m_javaInfo.makeJavaInfo();
+ }
+-#ifdef WNT
++
+ bool MergedSettings::getJavaInfoAttrAutoSelect() const
+ {
+ return m_javaInfo.bAutoSelect;
+ }
+-#endif
++
+ void MergedSettings::getVmParametersArray(
+ rtl_uString *** parParams, sal_Int32 * size) const
+ {
+--- jvmfwk/source/elements.hxx 21 May 2008 08:24:59 -0000 1.12
++++ jvmfwk/source/elements.hxx 6 Jun 2008 08:37:30 -0000 1.13
+@@ -336,14 +327,12 @@ public:
+ */
+ ::rtl::OString const & getJavaInfoAttrVendorUpdate() const;
+
+-#ifdef WNT
+ /** returns the javaInfo autoSelect attribute.
+ Before calling this function loadFromSettings must be called.
+ It uses the javaInfo autoSelect attribute to determine
+ the return value;
+ */
+ bool getJavaInfoAttrAutoSelect() const;
+-#endif
+
+ /** returns an array.
+ Caller must free the strings and the array.
Modified: trunk/patches/dev300/layout-plugin-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-plugin-toolkit.diff (original)
+++ trunk/patches/dev300/layout-plugin-toolkit.diff Mon Jun 16 12:08:47 2008
@@ -624,9 +624,9 @@
#if TEST_LAYOUT
-#include <stdio.h>
+#include <cstdio>
+ #include "tools/getprocessworkingdir.hxx"
#endif
- #include <osl/process.h>
@@ -97,9 +97,7 @@ getFirstExisting( OUString const& aDir, std::list<OUString> const& aSubDirs,
i != aSubDirs.end(); i++ )
{
Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff (original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff Mon Jun 16 12:08:47 2008
@@ -4370,15 +4370,6 @@
index 9acb027..dc1f82b 100644
--- toolkit/workben/layout/wordcountdialog.cxx
+++ toolkit/workben/layout/wordcountdialog.cxx
-@@ -7,7 +7,7 @@
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: wordcountdialog.cxx,v $
-- * $Revision: 1.3 $
-+ * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -84,17 +84,12 @@ SwWordCountDialog::~SwWordCountDialog()
/*-- 06.04.2004 16:05:57---------------------------------------------------
@@ -4402,32 +4393,10 @@
aCurrentWordFI.SetText( String::CreateFromInt32(rCurrent.nWord ));
aCurrentCharacterFI.SetText(String::CreateFromInt32(rCurrent.nChar ));
aDocWordFI.SetText( String::CreateFromInt32(rDoc.nWord ));
-diff --git a/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx
-index 62e97bb..b0674e2 100644
---- toolkit/workben/layout/wordcountdialog.hxx
-+++ toolkit/workben/layout/wordcountdialog.hxx
-@@ -7,7 +7,7 @@
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: wordcountdialog.hxx,v $
-- * $Revision: 1.3 $
-+ * $Revision: 1.5 $
- *
- * This file is part of OpenOffice.org.
- *
diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
index 290a5ad..76c33b4 100644
--- toolkit/workben/layout/zoom.cxx
+++ toolkit/workben/layout/zoom.cxx
-@@ -7,7 +7,7 @@
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: zoom.cxx,v $
-- * $Revision: 1.3 $
-+ * $Revision: 1.12 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -127,9 +127,9 @@ static USHORT pRanges[] =
USHORT SvxZoomDialog::GetFactor() const
@@ -4503,15 +4472,6 @@
index 5832233..461cd5a 100644
--- toolkit/workben/layout/zoom.hxx
+++ toolkit/workben/layout/zoom.hxx
-@@ -7,7 +7,7 @@
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: zoom.hxx,v $
-- * $Revision: 1.3 $
-+ * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
@@ -67,9 +67,9 @@ class SvxZoomDialog : public SfxModalDialog
private:
FixedLine aZoomFl;
Modified: trunk/patches/dev300/linkwarn-svx-warning-dlg.diff
==============================================================================
--- trunk/patches/dev300/linkwarn-svx-warning-dlg.diff (original)
+++ trunk/patches/dev300/linkwarn-svx-warning-dlg.diff Mon Jun 16 12:08:47 2008
@@ -4,15 +4,15 @@
// Resource-Id's ------------------------------------------------------------
// Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
--#define RID_SVX_FIRSTFREE 302
+-#define RID_SVX_FIRSTFREE 303
+#define RID_SVX_FIRSTFREE 312
// ResId fuer die Hintergrund-TabPage
#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1)
@@ -437,6 +437,7 @@
- #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301)
+ #define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302)
+#define RID_SVXDLG_LINK_WARNING (RID_SVX_START + 311)
// !!! please update RID_SVX_FIRSTFREE !!! see line 46
Modified: trunk/patches/dev300/ooo86080.unopkg.bodge.diff
==============================================================================
--- trunk/patches/dev300/ooo86080.unopkg.bodge.diff (original)
+++ trunk/patches/dev300/ooo86080.unopkg.bodge.diff Mon Jun 16 12:08:47 2008
@@ -30,13 +30,14 @@
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
for arg in $@
-@@ -76,5 +99,7 @@
+@@ -76,6 +99,8 @@
export PATH
# execute binary
--exec "$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+-exec "$sd_prog/unopkg.bin" "$@" \
++"$sd_prog/unopkg.bin" "$@" \
+ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
-
-+"$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+if [ -n "$INSTDIR" ]; then
+ rm -rf $INSTDIR
+fi
Modified: trunk/patches/dev300/remove-sfx-notify-chart2.diff
==============================================================================
--- trunk/patches/dev300/remove-sfx-notify-chart2.diff (original)
+++ trunk/patches/dev300/remove-sfx-notify-chart2.diff Mon Jun 16 12:08:47 2008
@@ -2,7 +2,7 @@
index 4dba7a8..728e443 100644
--- chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
-@@ -342,14 +342,14 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const
+@@ -342,7 +342,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const
return false;
}
@@ -11,14 +11,15 @@
{
//prevent wrong reselection of objects
SdrModel* pSdrModel( this->GetModel() );
- if( pSdrModel && pSdrModel->isLocked() )
- return;
+@@ -342,7 +342,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const
+ return;
+ }
- E3dView::SFX_NOTIFY(rBC, rBCType, rHint, rHintType);
+ E3dView::Notify(rBC, rHint);
-
- const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
+
if( pSdrHint != 0 )
+ {
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index 6329d2e..b22b31b 100644
--- chart2/source/controller/inc/DrawViewWrapper.hxx
Modified: trunk/patches/dev300/sc-string-arg.diff
==============================================================================
--- trunk/patches/dev300/sc-string-arg.diff (original)
+++ trunk/patches/dev300/sc-string-arg.diff Mon Jun 16 12:08:47 2008
@@ -192,7 +192,7 @@
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/interpr5.cxx sc/source/core/tool/interpr5.cxx
--- sc.clean/source/core/tool/interpr5.cxx 2008-04-01 12:26:37.000000000 -0400
+++ sc/source/core/tool/interpr5.cxx 2008-04-21 11:34:12.000000000 -0400
-@@ -1419,7 +1419,12 @@ void ScInterpreter::ScAdd()
+@@ -1291,7 +1291,12 @@ void ScInterpreter::ScAdd()
pMat2 = GetMatrix();
else
{
@@ -206,7 +206,7 @@
switch ( nCurFmtType )
{
case NUMBERFORMAT_DATE :
-@@ -1440,7 +1445,12 @@ void ScInterpreter::ScAdd()
+@@ -1312,7 +1317,12 @@ void ScInterpreter::ScAdd()
pMat1 = GetMatrix();
else
{
@@ -220,7 +220,7 @@
switch ( nCurFmtType )
{
case NUMBERFORMAT_DATE :
-@@ -1614,7 +1624,11 @@ void ScInterpreter::ScSub()
+@@ -1486,7 +1496,11 @@ void ScInterpreter::ScSub()
pMat2 = GetMatrix();
else
{
@@ -233,7 +233,7 @@
switch ( nCurFmtType )
{
case NUMBERFORMAT_DATE :
-@@ -1635,7 +1649,12 @@ void ScInterpreter::ScSub()
+@@ -1507,7 +1521,12 @@ void ScInterpreter::ScSub()
pMat1 = GetMatrix();
else
{
@@ -247,7 +247,7 @@
switch ( nCurFmtType )
{
case NUMBERFORMAT_DATE :
-@@ -1729,7 +1748,12 @@ void ScInterpreter::ScMul()
+@@ -1601,7 +1620,12 @@ void ScInterpreter::ScMul()
pMat2 = GetMatrix();
else
{
@@ -261,7 +261,7 @@
switch ( nCurFmtType )
{
case NUMBERFORMAT_CURRENCY :
-@@ -1742,7 +1766,12 @@ void ScInterpreter::ScMul()
+@@ -1614,7 +1638,12 @@ void ScInterpreter::ScMul()
pMat1 = GetMatrix();
else
{
@@ -275,7 +275,7 @@
switch ( nCurFmtType )
{
case NUMBERFORMAT_CURRENCY :
-@@ -1807,7 +1836,12 @@ void ScInterpreter::ScDiv()
+@@ -1679,7 +1708,12 @@ void ScInterpreter::ScDiv()
pMat2 = GetMatrix();
else
{
@@ -289,7 +289,7 @@
// hier kein Currency uebernehmen, 123kg/456DM sind nicht DM
nFmtCurrencyType2 = nCurFmtType;
}
-@@ -1815,7 +1849,12 @@ void ScInterpreter::ScDiv()
+@@ -1687,7 +1721,12 @@ void ScInterpreter::ScDiv()
pMat1 = GetMatrix();
else
{
Modified: trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff
==============================================================================
--- trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff (original)
+++ trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff Mon Jun 16 12:08:47 2008
@@ -2,8 +2,8 @@
--- sfx2.clean/source/dialog/newerverwarn.cxx 2008-05-06 23:56:41.000000000 -0400
+++ sfx2/source/dialog/newerverwarn.cxx 2008-05-07 00:00:36.000000000 -0400
@@ -58,6 +58,7 @@ namespace lang = ::com::sun::star::lang
- namespace uno = ::com::sun::star::uno;
- namespace util = ::com::sun::star::util;
+
+ using namespace com::sun::star::system;
+#if 0
namespace sfx2
@@ -23,9 +23,9 @@
}
+#if 0
- // --> PB 2007-11-20 #i83653# Give warning if document contains features from new ODF version
- // Online Update Check enabled?
- sal_Bool bOnlineUpdateEnabled = sal_False;
+ if ( pMedium->GetInteractionHandler().is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
+ {
+ // scan the generator string (within meta.xml)
@@ -1125,6 +1126,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
}
}
Modified: trunk/patches/dev300/slideshow-media-control.diff
==============================================================================
--- trunk/patches/dev300/slideshow-media-control.diff (original)
+++ trunk/patches/dev300/slideshow-media-control.diff Mon Jun 16 12:08:47 2008
@@ -64,13 +64,12 @@
</prop>
</node>
<node oor:name="special" oor:op="replace">
-@@ -2068,7 +2083,8 @@
+@@ -2068,7 +2083,7 @@
</prop>
<prop oor:name="Effects" oor:type="oor:string-list">
- <value oor:separator=";">ooo-exit-disappear;ooo-exit-fly-out;ooo-exit-venetian-blinds;ooo-exit-box;ooo-exit-checkerboard;ooo-exit-circle;ooo-exit-crawl-out;ooo-exit-diamond;ooo-exit-dissolve;ooo-exit-flash-once;ooo-exit-peek-out;ooo-exit-plus;ooo-exit-random-bars;ooo-exit-diagonal-squares;ooo-exit-split;ooo-exit-wedge;ooo-exit-wheel;ooo-exit-wipe;ooo-exit-random</value>
-+ <value
-+ oor:separator=";">ooo-exit-disappear;ooo-exit-fly-out;ooo-exit-venetian-blinds;ooo-exit-box;ooo-exit-checkerboard;ooo-exit-circle;ooo-exit-crawl-out;ooo-exit-diamond;ooo-exit-dissolve;ooo-exit-flash-once;ooo-exit-peek-out;ooo-exit-plus;ooo-exit-random-bars;ooo-exit-diagonal-squares;ooo-exit-split;ooo-exit-wedge;ooo-exit-wheel;ooo-exit-wipe;ooo-exit-random;ooo-media-stop</value>
++ <value oor:separator=";">ooo-exit-disappear;ooo-exit-fly-out;ooo-exit-venetian-blinds;ooo-exit-box;ooo-exit-checkerboard;ooo-exit-circle;ooo-exit-crawl-out;ooo-exit-diamond;ooo-exit-dissolve;ooo-exit-flash-once;ooo-exit-peek-out;ooo-exit-plus;ooo-exit-random-bars;ooo-exit-diagonal-squares;ooo-exit-split;ooo-exit-wedge;ooo-exit-wheel;ooo-exit-wipe;ooo-exit-random;ooo-media-stop</value>
</prop>
</node>
<node oor:name="special" oor:op="replace">
Modified: trunk/patches/dev300/svtools-dont-extern-sRTF-sHTML.diff
==============================================================================
--- trunk/patches/dev300/svtools-dont-extern-sRTF-sHTML.diff (original)
+++ trunk/patches/dev300/svtools-dont-extern-sRTF-sHTML.diff Mon Jun 16 12:08:47 2008
@@ -1543,8 +1543,8 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: htmlkey2.cxx,v $
-- * $Revision: 1.9 $
+- * $RCSfile$
+- * $Revision$
- *
- * This file is part of OpenOffice.org.
- *
@@ -2696,8 +2696,8 @@
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: rtfkey2.cxx,v $
-- * $Revision: 1.14 $
+- * $RCSfile$
+- * $Revision$
- *
- * This file is part of OpenOffice.org.
- *
Modified: trunk/patches/dev300/warning-string-comparsion-sw.diff
==============================================================================
--- trunk/patches/dev300/warning-string-comparsion-sw.diff (original)
+++ trunk/patches/dev300/warning-string-comparsion-sw.diff Mon Jun 16 12:08:47 2008
@@ -1,11 +1,11 @@
---- sw/source/filter/html/htmlforw.cxx.old 2008-04-22 17:16:17.000000000 +0200
-+++ sw/source/filter/html/htmlforw.cxx 2008-04-22 17:27:00.000000000 +0200
+--- sw/source/filter/html/htmlforw.cxx.old 2007-09-27 11:48:34.000000000 +0200
++++ sw/source/filter/html/htmlforw.cxx 2008-03-07 13:29:49.000000000 +0100
@@ -1088,7 +1088,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Wri
sOut += sOptions;
-- if( sHTML_IT_image == pType )
-+ if( (const sal_Char *)sHTML_IT_image == (const sal_Char *)pType )
+- if( (const sal_Char *)sHTML_IT_image == (const sal_Char *)pType )
++ if( !strcmp( sHTML_IT_image, pType ) )
{
aTmp = xPropSet->getPropertyValue(
OUString::createFromAscii( "ImageURL" ) );
@@ -13,8 +13,8 @@
{
// Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen,
// das entsprechende Flag loeschen.
-- nFrmOpts |= (sHTML_IT_image == pType
-+ nFrmOpts |= ((const sal_Char *)sHTML_IT_image == (const sal_Char *)pType
+- nFrmOpts |= ((const sal_Char *)sHTML_IT_image == (const sal_Char *)pType
++ nFrmOpts |= ( !strcmp ( sHTML_IT_image, pType )
? HTML_FRMOPTS_IMG_CONTROL_CSS1
: HTML_FRMOPTS_CONTROL_CSS1);
}
@@ -22,11 +22,11 @@
if( rHTMLWrt.bCfgOutStyles )
{
-- sal_Bool bEdit = sHTML_textarea == pTag || sHTML_IT_file == pType ||
-- sHTML_IT_text == pType;
-+ sal_Bool bEdit = (const sal_Char *)sHTML_textarea == (const sal_Char *)pTag ||
-+ (const sal_Char *)sHTML_IT_file == (const sal_Char *)pType ||
-+ (const sal_Char *)sHTML_IT_text == (const sal_Char *)pType;
+- sal_Bool bEdit = sHTML_textarea == pTag || (const sal_Char *)sHTML_IT_file == (const sal_Char *)pType ||
+- (const sal_Char *)sHTML_IT_text == (const sal_Char *)pType;
++ sal_Bool bEdit = !strcmp ( sHTML_textarea, pTag ) ||
++ !strcmp ( sHTML_IT_file, pType ) ||
++ !strcmp (sHTML_IT_text, pType );
SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN,
RES_CHRATR_END );
@@ -35,7 +35,7 @@
rWrt.Strm() << '>';
- if( sHTML_select == pTag )
-+ if( (const sal_Char *)sHTML_select == (const sal_Char *)pTag )
++ if( !strcmp ( sHTML_select, pTag ) )
{
aTmp = xPropSet->getPropertyValue(
OUString::createFromAscii( "StringItemList" ) );
@@ -44,7 +44,7 @@
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_select, sal_False );
}
- else if( sHTML_textarea == pTag )
-+ else if( (const sal_Char *)sHTML_textarea == (const sal_Char *)pTag )
++ else if( !strcmp ( sHTML_textarea, pTag ) )
{
// In TextAreas duerfen keine zusaetzlichen Spaces oder LF exportiert
// werden!
@@ -52,20 +52,20 @@
}
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_textarea, sal_False );
}
-- else if( sHTML_IT_checkbox == pType || sHTML_IT_radio == pType )
-+ else if( (const sal_Char *)sHTML_IT_checkbox == (const sal_Char *)pType ||
-+ (const sal_Char *)sHTML_IT_radio == (const sal_Char *)pType )
+- else if( (const sal_Char *)sHTML_IT_checkbox == (const sal_Char *)pType || (const sal_Char *)sHTML_IT_radio == (const sal_Char *)pType )
++ else if( !strcmp ( sHTML_IT_checkbox, pType ) ||
++ !strcmp ( sHTML_IT_radio, pType ) )
{
aTmp = xPropSet->getPropertyValue( OUString::createFromAscii("Label") );
if( aTmp.getValueType() == ::getCppuType((const OUString*)0) &&
---- sw/source/filter/rtf/rtfatr.cxx.old 2008-04-22 17:16:30.000000000 +0200
-+++ sw/source/filter/rtf/rtfatr.cxx 2008-04-22 17:32:08.000000000 +0200
+--- sw/source/filter/rtf/rtfatr.cxx.old 2007-10-22 17:12:26.000000000 +0200
++++ sw/source/filter/rtf/rtfatr.cxx 2008-03-07 13:34:55.000000000 +0100
@@ -1615,7 +1615,7 @@ void ExportPICT(const Size &rOrig, const
const SwCropGrf &rCr, const char *pBLIPType, const sal_uInt8 *pGraphicAry,
unsigned long nSize, SwRTFWriter &rWrt)
{
-- bool bIsWMF = pBLIPType == sRTF_WMETAFILE ? true : false;
-+ bool bIsWMF = (const sal_Char *)pBLIPType == (const sal_Char *)sRTF_WMETAFILE ? true : false;
+- bool bIsWMF = (const char *)pBLIPType == (const char *)sRTF_WMETAFILE ? true : false;
++ bool bIsWMF = !strcmp(pBLIPType, sRTF_WMETAFILE) ? true : false;
if (pBLIPType && nSize && pGraphicAry)
{
rWrt.Strm() << '{' << sRTF_PICT;
@@ -73,8 +73,8 @@
the wmf format wrapped in nonshppict, so as to keep wordpad happy. If its
a wmf already then we don't need any such wrapping
*/
-- bool bIsWMF = pBLIPType == sRTF_WMETAFILE ? true : false;
-+ bool bIsWMF = (const sal_Char *)pBLIPType == (const sal_Char *)sRTF_WMETAFILE ? true : false;
+- bool bIsWMF = (const sal_Char*)pBLIPType == (const sal_Char*)sRTF_WMETAFILE ? true : false;
++ bool bIsWMF = !strcmp(pBLIPType, sRTF_WMETAFILE) ? true : false;
if (!bIsWMF)
OutComment(rRTFWrt, sRTF_SHPPICT);
Modified: trunk/patches/dev300/wpsimport-scp2.diff
==============================================================================
--- trunk/patches/dev300/wpsimport-scp2.diff (original)
+++ trunk/patches/dev300/wpsimport-scp2.diff Mon Jun 16 12:08:47 2008
@@ -2,13 +2,13 @@
+++ scp2/source/ooo/file_library_ooo.scp 7 May 2007 09:32:38 -0000 1.216.6.4
@@ -1432,6 +1432,8 @@ End
- STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Wpft,wpft)
+ STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
-+STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Msworks,msworks)
++STD_UNO_LIB_FILE(gid_File_Lib_Msworks,msworks)
+
- #if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
+ STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
- File gid_File_Lib_Mozabdrv
+ STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
--- scp2/source/writer/module_writer.scp 2 Jan 2007 15:31:51 -0000 1.17
+++ scp2/source/writer/module_writer.scp 29 Jan 2007 10:54:40 -0000 1.16.158.2
@@ -52,7 +52,7 @@
Modified: trunk/patches/mono/cli_ure-mono-bridge.diff
==============================================================================
--- trunk/patches/mono/cli_ure-mono-bridge.diff (original)
+++ trunk/patches/mono/cli_ure-mono-bridge.diff Mon Jun 16 12:08:47 2008
@@ -4,7 +4,7 @@
@@ -8,5 +8,6 @@
ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
- ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_inc NULL
+ ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
+ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL
Modified: trunk/patches/mono/cli_ure-prj-build-lst.diff
==============================================================================
--- trunk/patches/mono/cli_ure-prj-build-lst.diff (original)
+++ trunk/patches/mono/cli_ure-prj-build-lst.diff Mon Jun 16 12:08:47 2008
@@ -11,6 +11,6 @@
ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
-ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
+ure cli_ure\source\ure nmake - all ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source ure_unotypes ure_inc NULL
- ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_inc NULL
+ ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
Modified: trunk/patches/mono/mono-build.diff
==============================================================================
--- trunk/patches/mono/mono-build.diff (original)
+++ trunk/patches/mono/mono-build.diff Mon Jun 16 12:08:47 2008
@@ -149,7 +149,7 @@
-ure cli_ure\source\climaker nmake - w,vc7 ure_source_climaker ure_source_basetypes.w ure_inc NULL
-ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
-ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL
--ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_inc NULL
+-ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
-ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
-ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
-#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL
@@ -159,7 +159,7 @@
+ure cli_ure\source\climaker nmake - all ure_source_climaker ure_source_basetypes ure_inc NULL
+ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
+ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_unotypes ure_inc NULL
-+ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_inc NULL
++ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
+ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
+ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
+#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure ure_source_native NULL
Modified: trunk/patches/unittesting/unittesting-configmgr.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-configmgr.diff (original)
+++ trunk/patches/unittesting/unittesting-configmgr.diff Mon Jun 16 12:08:47 2008
@@ -1,8 +1,8 @@
--- configmgr/prj/build.lst 2006-10-30 09:13:50.000000000 +0100
+++ configmgr/prj/build.lst 2007-09-07 11:21:49.000000000 +0200
@@ -1,4 +1,4 @@
--cg configmgr : offapi comphelper cppuhelper vos NULL
-+cg configmgr : offapi comphelper cppuhelper vos vcl NULL
+-cg configmgr : offapi comphelper cppuhelper tools vos NULL
++cg configmgr : offapi comphelper cppuhelper tools vos vcl NULL
cg configmgr usr1 - all cg_mkout NULL
cg configmgr\inc nmake - all cg_inc NULL
cg configmgr\source\cmdtools nmake - all cg_cmdtools cg_misc cg_inc NULL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
