From c1817a5b12da642e365a3ef72b556d33c6e29a76 Mon Sep 17 00:00:00 2001 From: Aron Budea Date: Wed, 2 Aug 2017 03:34:24 +0200 Subject: 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/40651 Tested-by: Jenkins Reviewed-by: Jan Holesovsky --- filter/source/config/cache/typedetection.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 5810a34b392a..445c6ed09cf7 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", -- cgit v1.2.3