[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - filter/source

Mike Kaganski mike.kaganski at collabora.com
Thu Apr 6 20:54:15 UTC 2017


 filter/source/xmlfilterdetect/filterdetect.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cce7c5da974152cdd86e88e17b5acad8a0423823
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Apr 5 10:11:36 2017 +0300

    sType and sSubType are already normalized to ASCII lower case
    
    ... upon successful return from INetContentType::parse
    
    Change-Id: I8a0c50c1c655477138578e59031b64fb6b2b7218
    Reviewed-on: https://gerrit.libreoffice.org/36129
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 97f048e633f07655eda000ae4f4da818c935091e)
    Reviewed-on: https://gerrit.libreoffice.org/36146
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 6e336c43a239f515cc882a3da1bad63e3507b230)
    Reviewed-on: https://gerrit.libreoffice.org/36236

diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 3e13cb17d607..7bf2e2925a8f 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -56,13 +56,13 @@ bool IsMediaTypeXML( const OUString& mediaType )
     {
         OUString sType, sSubType;
         INetContentTypes::parse(mediaType, sType, sSubType);
-        if (sType.equalsIgnoreAsciiCase("application"))
+        if (sType == "application")
         {
             // RFC 3023: application/xml; don't detect text/xml
-            if (sSubType.equalsIgnoreAsciiCase("xml"))
+            if (sSubType == "xml")
                 return true;
             // Registered media types: application/XXXX+xml
-            if (sSubType.endsWithIgnoreAsciiCase("+xml"))
+            if (sSubType.endsWith("+xml"))
                 return true;
         }
     }


More information about the Libreoffice-commits mailing list