Prioritize candidate types by extension first, then by document service.

This unfortunately breaks plain text format detection for writer, but I'll
get to that next.

Change-Id: I70382529596dbc3e3af4935d6e98ad6d58bb4d91

1 files changed, 20 insertions, 0 deletions

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 0b7a8874a97f..cac9b1456f72 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -106,7 +106,24 @@ TypeDetection::~TypeDetection()
     // <- SAFE
 }
 
+namespace {
 
+/**
+ * Types with matching extension come first, then types that are supported
+ * by the document service come next.
+ */
+struct SortByPriority : public std::binary_function<FlatDetectionInfo, FlatDetectionInfo, bool>
+{
+    bool operator() (const FlatDetectionInfo& r1, const FlatDetectionInfo& r2) const
+    {
+        if (r1.bMatchByExtension != r2.bMatchByExtension)
+            return r1.bMatchByExtension;
+
+        return r1.bPreselectedByDocumentService;
+    }
+};
+
+}
 
 ::rtl::OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor,
                                                               sal_Bool                                         bAllowDeep )
@@ -155,6 +172,9 @@ TypeDetection::~TypeDetection()
     aLock.clear();
     // <- SAFE ----------------------------------
 
+    // Properly prioritize all candidate types.
+    lFlatTypes.sort(SortByPriority());
+
     ::rtl::OUString sType      ;
     ::rtl::OUString sLastChance;