[Libreoffice-commits] core.git: 2 commits - sw/source

[Matteo Casalin]

 sw/source/core/graphic/ndgrf.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 43ccd83d2598256de2193348c0b3c7f85fb4870e
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Thu Oct 17 23:31:03 2013 +0200

    URI schemes must be matched case-insensitive
    
    Change-Id: I0ca761cdbf2509ab225101984484905c94e8b3a1

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 1cd2bd5..ef84d5d 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -479,7 +479,7 @@ StreamAndStorageNames lcl_GetStreamStorageNames( const OUString sUserData )
         return aNames;
 
     const OUString aProt( "vnd.sun.star.Package:" );
-    if (sUserData.startsWith(aProt))
+    if (sUserData.startsWithIgnoreAsciiCase(aProt))
     {
         // 6.0 (XML) Package
         const sal_Int32 nPos = sUserData.indexOf('/');
commit fc357b79e71577916e8d1970c6419619b950bd1c
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Thu Oct 17 23:21:18 2013 +0200

    Remove dead check for start of string
    
    Change-Id: Ib8fcc3dc5d216d1cfae569f605a3f415f80770c4

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 70436b0..1cd2bd5 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -489,9 +489,7 @@ StreamAndStorageNames lcl_GetStreamStorageNames( const OUString sUserData )
         }
         else
         {
-            sal_Int32 nPathStart = aProt.getLength();
-            if (sUserData.startsWith("./"))
-                nPathStart += 2;
+            const sal_Int32 nPathStart = aProt.getLength();
             aNames.sStorage = sUserData.copy( nPathStart, nPos-nPathStart );
             aNames.sStream = sUserData.copy( nPos+1 );
         }