[Libreoffice-commits] core.git: package/source svl/source

[Stephan Bergmann]

 package/source/xstor/xfactory.cxx |    2 +-
 svl/source/fsstor/fsfactory.cxx   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5e9137c9635141430b946aae2d0317c432a471ef
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Aug 27 14:49:38 2013 +0200

    These shall apparently check for URL scheme prefix match
    
    ...they had originally been
    
      aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.pkg", 16 )
    
    etc., so where likely confused with the OUString compareTo functions that take a
    maxLength argument.
    
    Change-Id: Ie12df4f589dda310b7e49eb93535ad797f88a8a7

diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index 2aed9f7..db339ae 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -139,7 +139,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
             throw lang::IllegalArgumentException(); // TODO:
         }
 
-        if ( aURL.equalsIgnoreAsciiCase("vnd.sun.star.pkg") )
+        if ( aURL.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:") )
         {
             OSL_FAIL( "Packages URL's are not valid for storages!\n" ); // ???
             throw lang::IllegalArgumentException(); // TODO:
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 52c599e..2396bf0 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -127,8 +127,8 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
 
     // allow to use other ucp's
     // if ( !isLocalNotFile_Impl( aURL ) )
-    if ( aURL.equalsIgnoreAsciiCase("vnd.sun.star.pkg")
-      || aURL.equalsIgnoreAsciiCase("vnd.sun.star.zip")
+    if ( aURL.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:")
+      || aURL.startsWithIgnoreAsciiCase("vnd.sun.star.zip:")
       || ::utl::UCBContentHelper::IsDocument( aURL ) )
     {
         throw lang::IllegalArgumentException(