Kaydet (Commit) 41c5f520 authored tarafından Stephan Bergmann's avatar Stephan Bergmann Kaydeden (comit) Luboš Luňák

compareToAscii(RTL_CONSTASCII_STRINGPARAM(s)) != compareToAscii(s)

...broken with 2cbdaf67 "package: no more
RTL_CONSTASCII_USTRINGPARAM in zippackage"

(cherry picked from commit 29c49b37)
Conflicts:
	package/source/zippackage/ZipPackage.cxx

Change-Id: I867b9be723d1fde374ade68355e6b66df3c19332
Reviewed-on: https://gerrit.libreoffice.org/2760Reviewed-by: 's avatarLuboš Luňák <l.lunak@suse.cz>
Tested-by: 's avatarLuboš Luňák <l.lunak@suse.cz>
üst 4c0bfbd4
...@@ -385,7 +385,7 @@ void ZipPackage::parseManifest() ...@@ -385,7 +385,7 @@ void ZipPackage::parseManifest()
if ( !bManifestParsed ) if ( !bManifestParsed )
{ {
// the manifest.xml could not be successfuly parsed, this is an inconsistent package // 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 // accept only types that look similar to own mediatypes
m_pRootFolder->SetMediaType( aPackageMediatype ); m_pRootFolder->SetMediaType( aPackageMediatype );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment