[PATCH libreoffice-4-0] compareToAscii(RTL_CONSTASCII_STRINGPARAM(s)) != compareToAs...

[Stephan Bergmann (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2760

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/2760/1

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
---
M package/source/zippackage/ZipPackage.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



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 @@
             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 );

-- 
To view, visit https://gerrit.libreoffice.org/2760
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I867b9be723d1fde374ade68355e6b66df3c19332
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman at redhat.com>