[Libreoffice-commits] .: Branch 'libreoffice-3-5' - filter/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Jan 26 05:44:02 PST 2012


 filter/source/config/cache/typedetection.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b31d924cc7c30d09113a959f4a1b4bfd04da80f5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 26 14:30:24 2012 +0100

    Sort the catch-all detection at the end
    (cherry picked from commit 0d9aa8cce792d69d5147a2230b61b1cbdc089206)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index cc91746..25b3742 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -814,9 +814,9 @@ namespace
         if (rA == rB)
             return false;
         if (rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
-            return true;
-        if (rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
             return false;
+        if (rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.FormatDetector")))
+            return true;
         return rA < rB;
     }
 }


More information about the Libreoffice-commits mailing list