ooo-build r12974 - in trunk: . patches/dev300

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Jun 26 15:42:28 2008
New Revision: 12974
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12974&view=rev

Log:
2008-06-26  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/sw-hyperlinks-without-scheme.diff,
          patches/dev300/apply: When there's no scheme in the hyperlink, it's
          probably a file.


Added:
   trunk/patches/dev300/sw-hyperlinks-without-scheme.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jun 26 15:42:28 2008
@@ -450,6 +450,9 @@
 samba-hyperlinks-sc-sd.diff, n#382718, jholesov
 tools-qa-urlobj-unittest.diff, n#261623, flr
 
+# When there's no scheme in the hyperlink, it's probably a file
+sw-hyperlinks-without-scheme.diff, n#376389, i#91105, jholesov
+
 # try autodetection if it is allowed and the current java has been removed
 jvmfwk-detect-removed-java.diff, i#83140, n#336242, pmladek
 # allow to overwrite broken java configuration; it is related

Added: trunk/patches/dev300/sw-hyperlinks-without-scheme.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw-hyperlinks-without-scheme.diff	Thu Jun 26 15:42:28 2008
@@ -0,0 +1,13 @@
+diff --git sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par5.cxx
+index 583f46d..0c8ce65 100644
+--- sw/source/filter/ww8/ww8par5.cxx
++++ sw/source/filter/ww8/ww8par5.cxx
+@@ -436,7 +436,7 @@ void SwWW8ImplReader::ConvertFFileName( String& rName, const String& rOrg )
+     //#82900# Need the more sophisticated url converter. cmc
+     if (rName.Len())
+         rName = URIHelper::SmartRel2Abs(
+-            INetURLObject(sBaseURL), rName, URIHelper::GetMaybeFileHdl());
++            INetURLObject(sBaseURL), rName, URIHelper::GetMaybeFileHdl(), false);
+ }
+ 
+ // ConvertUFNneme uebersetzt FeldParameter-Namen u. ae. in den