diff options
| -rw-r--r-- | filter/Configuration_filter.mk | 8 | ||||
| -rw-r--r-- | filter/source/config/fragments/filters/Beagle_Works_Calc.xcu | 29 | ||||
| -rw-r--r-- | filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu (renamed from filter/source/config/fragments/filters/Great_Works_Calc.xcu) | 6 | ||||
| -rw-r--r-- | filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu | 30 | ||||
| -rw-r--r-- | filter/source/config/fragments/types/MWAW_Database.xcu (renamed from filter/source/config/fragments/types/calc_Great_Works.xcu) | 14 | ||||
| -rw-r--r-- | filter/source/config/fragments/types/MWAW_Spreadsheet.xcu (renamed from filter/source/config/fragments/types/calc_Beagle_Works.xcu) | 14 | ||||
| -rw-r--r-- | filter/source/config/fragments/types/calc_Mac_Wingz.xcu | 29 | ||||
| -rw-r--r-- | writerperfect/source/calc/MWAWCalcImportFilter.cxx | 88 |
8 files changed, 36 insertions, 182 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index bf6dc921b0cd..64f24d57b15c 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -518,13 +518,12 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,f calc_MS_Works_Document \ calc_WPS_Lotus_Document \ calc_WPS_QPro_Document \ - calc_Beagle_Works \ calc_ClarisWorks \ calc_Claris_Resolve \ - calc_Great_Works \ calc_Mac_Works \ - calc_Mac_Wingz \ calc_AppleNumbers \ + MWAW_Database \ + MWAW_Spreadsheet \ )) $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\ @@ -561,11 +560,8 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x MS_Works_Calc \ WPS_Lotus_Calc \ WPS_QPro_Calc \ - Beagle_Works_Calc \ ClarisWorks_Calc \ Claris_Resolve_Calc \ - Great_Works_Calc \ - Mac_Wingz_Calc \ Mac_Works_Calc \ AppleNumbers \ )) diff --git a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu deleted file mode 100644 index a5af0c1c672d..000000000000 --- a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu +++ /dev/null @@ -1,29 +0,0 @@ -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * ---> - -<node oor:name="Beagle_Works_Calc" oor:op="replace"> - <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> - </prop> - <prop oor:name="FilterService"> - <value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value> - </prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Spreadsheet</value> - </prop> - <prop oor:name="FileFormatVersion"> - <value>0</value> - </prop> - <prop oor:name="Type"> - <value>calc_Beagle_Works</value> - </prop> - <prop oor:name="DocumentService"> - <value>com.sun.star.sheet.SpreadsheetDocument</value> - </prop> -</node> diff --git a/filter/source/config/fragments/filters/Great_Works_Calc.xcu b/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu index 6e5d76554481..05a0d4bc5942 100644 --- a/filter/source/config/fragments/filters/Great_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu @@ -7,7 +7,7 @@ * --> -<node oor:name="Great_Works_Calc" oor:op="replace"> +<node oor:name="MWAW_Spreadsheet" oor:op="replace"> <prop oor:name="Flags"> <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> @@ -15,13 +15,13 @@ <value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value> </prop> <prop oor:name="UIName"> - <value xml:lang="en-US">GreatWorks Spreadsheet</value> + <value xml:lang="en-US">Legacy Mac Spreadsheet/Database</value> </prop> <prop oor:name="FileFormatVersion"> <value>0</value> </prop> <prop oor:name="Type"> - <value>calc_Great_Works</value> + <value>MWAW_Spreadsheet</value> </prop> <prop oor:name="DocumentService"> <value>com.sun.star.sheet.SpreadsheetDocument</value> diff --git a/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu b/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu deleted file mode 100644 index 790dceacaa3f..000000000000 --- a/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> - <node oor:name="Mac_Wingz_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">Wingz for Mac Document</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>calc_Mac_Wingz</value></prop> - <prop oor:name="TemplateName"/> - <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop> - </node> diff --git a/filter/source/config/fragments/types/calc_Great_Works.xcu b/filter/source/config/fragments/types/MWAW_Database.xcu index f14480d186e6..f4c6d81fb5f1 100644 --- a/filter/source/config/fragments/types/calc_Great_Works.xcu +++ b/filter/source/config/fragments/types/MWAW_Database.xcu @@ -7,23 +7,19 @@ * --> -<node oor:name="calc_Great_Works" oor:op="replace"> +<node oor:name="MWAW_Database" oor:op="replace"> <prop oor:name="DetectService"> <value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value> </prop> - <prop oor:name="Extensions"> - <value>dummy</value> - </prop> - <prop oor:name="MediaType"> - <value></value> - </prop> + <prop oor:name="Extensions"/> + <prop oor:name="MediaType"/> <prop oor:name="Preferred"> <value>true</value> </prop> <prop oor:name="PreferredFilter"> - <value>Great_Works_Calc</value> + <value>MWAW_Spreadsheet</value> </prop> <prop oor:name="UIName"> - <value>GreatWorks Document</value> + <value>Legacy Mac Database</value> </prop> </node> diff --git a/filter/source/config/fragments/types/calc_Beagle_Works.xcu b/filter/source/config/fragments/types/MWAW_Spreadsheet.xcu index 840e0a7ea5c7..2349f0564c9f 100644 --- a/filter/source/config/fragments/types/calc_Beagle_Works.xcu +++ b/filter/source/config/fragments/types/MWAW_Spreadsheet.xcu @@ -7,23 +7,19 @@ * --> -<node oor:name="calc_Beagle_Works" oor:op="replace"> +<node oor:name="MWAW_Spreadsheet" oor:op="replace"> <prop oor:name="DetectService"> <value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value> </prop> - <prop oor:name="Extensions"> - <value>dummy</value> - </prop> - <prop oor:name="MediaType"> - <value></value> - </prop> + <prop oor:name="Extensions"/> + <prop oor:name="MediaType"/> <prop oor:name="Preferred"> <value>true</value> </prop> <prop oor:name="PreferredFilter"> - <value>Beagle_Works_Calc</value> + <value>MWAW_Spreadsheet</value> </prop> <prop oor:name="UIName"> - <value>BeagleWorks/WordPerfect Works Document</value> + <value>Legacy Mac Spreadsheet</value> </prop> </node> diff --git a/filter/source/config/fragments/types/calc_Mac_Wingz.xcu b/filter/source/config/fragments/types/calc_Mac_Wingz.xcu deleted file mode 100644 index bde4eac06124..000000000000 --- a/filter/source/config/fragments/types/calc_Mac_Wingz.xcu +++ /dev/null @@ -1,29 +0,0 @@ -<!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> - <node oor:name="calc_Mac_Wingz" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>Mac_Wingz_Calc</value></prop> - <prop oor:name="UIName"> - <value>Wingz for Mac Document</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx index 752a64dbbef0..18173f840333 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx @@ -54,90 +54,44 @@ bool MWAWCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O if (confidence == MWAWDocument::MWAW_C_EXCELLENT) { - if (docKind == MWAWDocument::MWAW_K_SPREADSHEET || docKind == MWAWDocument::MWAW_K_DATABASE) + switch (docKind) + { + case MWAWDocument::MWAW_K_DATABASE: { switch (docType) { - case MWAWDocument::MWAW_T_BEAGLEWORKS: - rTypeName = "calc_Beagle_Works"; + case MWAWDocument::MWAW_T_CLARISWORKS: + rTypeName = "calc_ClarisWorks"; break; + case MWAWDocument::MWAW_T_MICROSOFTWORKS: + rTypeName = "calc_Mac_Works"; + break; + default: + rTypeName = "MWAW_Database"; + break; + } + } + case MWAWDocument::MWAW_K_SPREADSHEET: + { + switch (docType) + { case MWAWDocument::MWAW_T_CLARISRESOLVE: rTypeName = "calc_Claris_Resolve"; break; case MWAWDocument::MWAW_T_CLARISWORKS: rTypeName = "calc_ClarisWorks"; break; - case MWAWDocument::MWAW_T_GREATWORKS: - rTypeName = "calc_Great_Works"; - break; case MWAWDocument::MWAW_T_MICROSOFTWORKS: rTypeName = "calc_Mac_Works"; break; - case MWAWDocument::MWAW_T_WINGZ: - rTypeName = "calc_Mac_Wingz"; - break; - - case MWAWDocument::MWAW_T_ACTA: - case MWAWDocument::MWAW_T_ADOBEILLUSTRATOR: - case MWAWDocument::MWAW_T_DBASE: - case MWAWDocument::MWAW_T_DOCMAKER: - case MWAWDocument::MWAW_T_EDOC: - case MWAWDocument::MWAW_T_FAMILYTREEMAKER: - case MWAWDocument::MWAW_T_FILEMAKER: - case MWAWDocument::MWAW_T_FOXBASE: - case MWAWDocument::MWAW_T_FRAMEMAKER: - case MWAWDocument::MWAW_T_FULLIMPACT: - case MWAWDocument::MWAW_T_FULLPAINT: - case MWAWDocument::MWAW_T_FULLWRITE: - case MWAWDocument::MWAW_T_INFOGENIE: - case MWAWDocument::MWAW_T_KALEIDAGRAPH: - case MWAWDocument::MWAW_T_HANMACWORDJ: - case MWAWDocument::MWAW_T_HANMACWORDK: - case MWAWDocument::MWAW_T_LIGHTWAYTEXT: - case MWAWDocument::MWAW_T_MACDOC: - case MWAWDocument::MWAW_T_MACDRAFT: - case MWAWDocument::MWAW_T_MACDRAW: - case MWAWDocument::MWAW_T_MACDRAWPRO: - case MWAWDocument::MWAW_T_MACPAINT: - case MWAWDocument::MWAW_T_MACWRITE: - case MWAWDocument::MWAW_T_MACWRITEPRO: - case MWAWDocument::MWAW_T_MARINERWRITE: - case MWAWDocument::MWAW_T_MINDWRITE: - case MWAWDocument::MWAW_T_MICROSOFTFILE: - case MWAWDocument::MWAW_T_MICROSOFTMULTIPLAN: - case MWAWDocument::MWAW_T_MICROSOFTWORD: - case MWAWDocument::MWAW_T_MORE: - case MWAWDocument::MWAW_T_NISUSWRITER: - case MWAWDocument::MWAW_T_OVERVUE: - case MWAWDocument::MWAW_T_PAGEMAKER: - case MWAWDocument::MWAW_T_PIXELPAINT: - case MWAWDocument::MWAW_T_RAGTIME: - case MWAWDocument::MWAW_T_READYSETGO: - case MWAWDocument::MWAW_T_SUPERPAINT: - case MWAWDocument::MWAW_T_SYMPOSIUM: - case MWAWDocument::MWAW_T_TEACHTEXT: - case MWAWDocument::MWAW_T_TEXEDIT: - case MWAWDocument::MWAW_T_TRAPEZE: - case MWAWDocument::MWAW_T_WRITENOW: - case MWAWDocument::MWAW_T_WRITERPLUS: - case MWAWDocument::MWAW_T_XPRESS: - case MWAWDocument::MWAW_T_ZWRITE: - case MWAWDocument::MWAW_T_4DIMENSION: - - case MWAWDocument::MWAW_T_RESERVED1: - case MWAWDocument::MWAW_T_RESERVED2: - case MWAWDocument::MWAW_T_RESERVED3: - case MWAWDocument::MWAW_T_RESERVED4: - case MWAWDocument::MWAW_T_RESERVED5: - case MWAWDocument::MWAW_T_RESERVED6: - case MWAWDocument::MWAW_T_RESERVED7: - case MWAWDocument::MWAW_T_RESERVED8: - case MWAWDocument::MWAW_T_RESERVED9: - case MWAWDocument::MWAW_T_UNKNOWN: default: + rTypeName = "MWAW_Spreadsheet"; break; } } + default: + break; + } } return !rTypeName.isEmpty(); |