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

[Libreoffice Gerrit user]

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

New commits:
commit 3f2def73c4e7884fb008aeef81573931c79a7eb6
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Sat Sep 8 14:27:41 2018 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Sat Sep 8 21:14:25 2018 +0200

    Revert "tdf#110987: type detection, binary Office formats > templates"
    
    This reverts commit c1817a5b12da642e365a3ef72b556d33c6e29a76.
    
    Change-Id: Ia1442dedd07436e5954943c6ff09ed8d9d2b9fc6
    Reviewed-on: https://gerrit.libreoffice.org/60197
    Tested-by: Jenkins
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit 1bb732acc6b4d3de94f343041472ccc096723b30)
    Reviewed-on: https://gerrit.libreoffice.org/60204
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index d1f7817eea9a..7b867177412c 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -187,25 +187,25 @@ int getFlatTypeRank(const OUString& rType)
         "writer_T602_Document",
         "writer_WordPerfect_Document",
         "writer_MS_Works_Document",
-        "writer_MS_Word_97",
         "writer_MS_Word_97_Vorlage",
-        "writer_MS_Word_95",
+        "writer_MS_Word_97",
         "writer_MS_Word_95_Vorlage",
+        "writer_MS_Word_95",
         "writer_MS_WinWord_60",
         "writer_MS_WinWord_5",
         "MS Excel 2007 Binary",
-        "calc_MS_Excel_97",
         "calc_MS_Excel_97_VorlageTemplate",
-        "calc_MS_Excel_95",
+        "calc_MS_Excel_97",
         "calc_MS_Excel_95_VorlageTemplate",
-        "calc_MS_Excel_5095",
+        "calc_MS_Excel_95",
         "calc_MS_Excel_5095_VorlageTemplate",
-        "calc_MS_Excel_40",
+        "calc_MS_Excel_5095",
         "calc_MS_Excel_40_VorlageTemplate",
+        "calc_MS_Excel_40",
         "calc_Pocket_Excel_File",
-        "impress_MS_PowerPoint_97",
-        "impress_MS_PowerPoint_97_AutoPlay",
         "impress_MS_PowerPoint_97_Vorlage",
+        "impress_MS_PowerPoint_97_AutoPlay",
+        "impress_MS_PowerPoint_97",
         "calc_Lotus",
         "calc_QPro",
         "calc_SYLK",