[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - package/source

Fri, 15 Mar 2013 11:04:42 -0700 

 package/source/zippackage/ZipPackage.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41c5f5205a8e4155b34800064640b07caf79780f
Author: Stephan Bergmann <[email protected]>
Date:   Fri Mar 15 18:41:58 2013 +0100

    compareToAscii(RTL_CONSTASCII_STRINGPARAM(s)) != compareToAscii(s)
    
    ...broken with 2cbdaf677c0a1e88aa582c6a17b496dff61a78b0 "package: no more
    RTL_CONSTASCII_USTRINGPARAM in zippackage"
    
    (cherry picked from commit 29c49b37048e550f4ba1d6af21c118c6b96a9288)
    Conflicts:
        package/source/zippackage/ZipPackage.cxx
    
    Change-Id: I867b9be723d1fde374ade68355e6b66df3c19332
    Reviewed-on: https://gerrit.libreoffice.org/2760
    Reviewed-by: LuboÅ¡ Luňák <[email protected]>
    Tested-by: LuboÅ¡ Luňák <[email protected]>

diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 89b3f2f..f0bff6e 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -385,7 +385,7 @@ void ZipPackage::parseManifest()
             if ( !bManifestParsed )
             {
                 // the manifest.xml could not be successfuly parsed, this is 
an inconsistent package
-                if ( aPackageMediatype.compareToAscii("application/vnd.") == 0 
)
+                if ( aPackageMediatype.startsWith("application/vnd.") )
                 {
                     // accept only types that look similar to own mediatypes
                     m_pRootFolder->SetMediaType( aPackageMediatype );

_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to