[Libreoffice-commits] .: 2 commits - filter/source lotuswordpro/source writerperfect/source

[Fridrich Strba]

 filter/source/config/cache/typedetection.cxx            |    4 ++--
 lotuswordpro/source/filter/LotusWordProImportFilter.hxx |    4 ++--
 writerperfect/source/wpsimp/MSWorksImportFilter.hxx     |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0d9aa8cce792d69d5147a2230b61b1cbdc089206
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

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index f1a835d..7a5ec96 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;
     }
 }
commit 1f65dc9ef52436bb34a6fd7ebc16c629fc9ac70c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 26 14:29:10 2012 +0100

    Use the right define

diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
index b0e8806..8fa89b6 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx
@@ -29,8 +29,8 @@
  * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
  * instead of those above.
  */
-#ifndef _WORDPERFECTIMPORTFILTER_HXX
-#define _WORDPERFECTIMPORTFILTER_HXX
+#ifndef _LOTUSWORDPROIMPORTFILTER_HXX
+#define _LOTUSWORDPROIMPORTFILTER_HXX
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
diff --git a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
index 4de92f3..b75f669 100644
--- a/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
+++ b/writerperfect/source/wpsimp/MSWorksImportFilter.hxx
@@ -27,8 +27,8 @@
 /* "This product is not manufactured, approved, or supported by
  * Corel Corporation or Corel Corporation Limited."
  */
-#ifndef _WORDPERFECTIMPORTFILTER_HXX
-#define _WORDPERFECTIMPORTFILTER_HXX
+#ifndef _MSWORKSIMPORTFILTER_HXX
+#define _MSWORKSIMPORTFILTER_HXX
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>