diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-15 18:41:58 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-15 18:02:58 +0000 |
commit | 41c5f5205a8e4155b34800064640b07caf79780f (patch) | |
tree | 8e6d01bd389433a4d819a57746f4e78ab630b582 /package | |
parent | 4c0bfbd4126e377e06d6a48c2bfcc56ffa422740 (diff) |
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 <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'package')
-rw-r--r-- | package/source/zippackage/ZipPackage.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 89b3f2f4e8dc..f0bff6ef42f1 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 ); |