[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 c8ee27bbde3330d4aa9073f274feb019a4c8e44f
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Wed Aug 2 03:34:24 2017 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jul 13 18:26:04 2018 +0200

    tdf#110987: type detection, binary Office formats > templates
    
    The templates for binary MS Office formats were higher prioritized
    than non-templates, this caused files in binary format and lacking
    file extension to be identified as templates.
    
    Change-Id: I5638b38dfa0a7520dd09cb497c05b6af0eb00834
    Reviewed-on: https://gerrit.libreoffice.org/57397
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 7b867177412c..d1f7817eea9a 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_Vorlage",
         "writer_MS_Word_97",
-        "writer_MS_Word_95_Vorlage",
+        "writer_MS_Word_97_Vorlage",
         "writer_MS_Word_95",
+        "writer_MS_Word_95_Vorlage",
         "writer_MS_WinWord_60",
         "writer_MS_WinWord_5",
         "MS Excel 2007 Binary",
-        "calc_MS_Excel_97_VorlageTemplate",
         "calc_MS_Excel_97",
-        "calc_MS_Excel_95_VorlageTemplate",
+        "calc_MS_Excel_97_VorlageTemplate",
         "calc_MS_Excel_95",
-        "calc_MS_Excel_5095_VorlageTemplate",
+        "calc_MS_Excel_95_VorlageTemplate",
         "calc_MS_Excel_5095",
-        "calc_MS_Excel_40_VorlageTemplate",
+        "calc_MS_Excel_5095_VorlageTemplate",
         "calc_MS_Excel_40",
+        "calc_MS_Excel_40_VorlageTemplate",
         "calc_Pocket_Excel_File",
-        "impress_MS_PowerPoint_97_Vorlage",
-        "impress_MS_PowerPoint_97_AutoPlay",
         "impress_MS_PowerPoint_97",
+        "impress_MS_PowerPoint_97_AutoPlay",
+        "impress_MS_PowerPoint_97_Vorlage",
         "calc_Lotus",
         "calc_QPro",
         "calc_SYLK",