[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                              |    2 +-
 patches/dev300/tools-urlobj-smb-scheme-patch.diff |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 44b17e374c436fe4e0bd9aab910fdeb23e9911e5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 12:29:38 2009 +0300

    Update tools-urlobj-smb-scheme-patch.diff to dev300-m57

diff --git a/patches/dev300/tools-urlobj-smb-scheme-patch.diff b/patches/dev300/tools-urlobj-smb-scheme-patch.diff
index 288311f..ecd9109 100644
--- a/patches/dev300/tools-urlobj-smb-scheme-patch.diff
+++ b/patches/dev300/tools-urlobj-smb-scheme-patch.diff
@@ -64,18 +64,18 @@
 --- sw/source/filter/ww8/wrtw8nds.cxx	26 Jun 2007 10:44:02 -0000	1.100
 +++ sw/source/filter/ww8/wrtw8nds.cxx	8 Oct 2007 10:18:08 -0000
 @@ -913,7 +913,7 @@
-     SwWW8Writer::WriteLong( *rWrt.pDataStrm, nFlag );
+     SwWW8Writer::WriteLong( *m_rWW8Export.pDataStrm, nFlag );
  
      INetProtocol eProto = aURL.GetProtocol();
--    if (eProto == INET_PROT_FILE)
-+    if (eProto == INET_PROT_FILE || eProto == INET_PROT_SMB)
+-    if ( eProto == INET_PROT_FILE )
++    if ( eProto == INET_PROT_FILE || eProto == INET_PROT_SMB )
      {
- // version 1 (for a document)
+         // version 1 (for a document)
  
 @@ -931,7 +931,7 @@
  
          // save the links to files as relative
-         sURL = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), sURL );
+         sURL = URIHelper::simpleNormalizedMakeRelative( m_rWW8Export.GetWriter().GetBaseURL(), sURL );
 -        if ( sURL.EqualsAscii( "/", 0, 1 ) )
 +        if ( eProto == INET_PROT_FILE && sURL.EqualsAscii( "/", 0, 1 ) )
              sURL = aURL.PathToFileName();
@@ -94,6 +94,6 @@
 +            sURL.SearchAndReplaceAll( '/', '\\' );
 +        }
 +
-         rWrt.pDataStrm->Write( MAGIC_C, sizeof(MAGIC_C) );
-         SwWW8Writer::WriteLong( *rWrt.pDataStrm, sURL.Len()+1 );
-         SwWW8Writer::WriteString8( *rWrt.pDataStrm, sURL, true,
+         m_rWW8Export.pDataStrm->Write( MAGIC_C, sizeof(MAGIC_C) );
+         SwWW8Writer::WriteLong( *m_rWW8Export.pDataStrm, sURL.Len()+1 );
+         SwWW8Writer::WriteString8( *m_rWW8Export.pDataStrm, sURL, true,
commit 8e2b850dd8d2921cbbcb2b132347f8fbcc42087b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 12:29:14 2009 +0300

    OLDEST_SUPPORTED=dev300-m57

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3330811..0ae8b78 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -8,7 +8,7 @@
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp
 
 # might be space separated list to support more MWS
-OLDEST_SUPPORTED=dev300-m56
+OLDEST_SUPPORTED=dev300-m57
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \