diff options
| author | osnola <alonso@loria.fr> | 2018-04-30 15:25:24 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2018-05-01 07:59:04 +0200 |
| commit | d324ed83fa6941f5408402d7ab0ec65f5c18d1d2 (patch) | |
| tree | 9dc4e227175c66da6cd01eea931dcaedf838fcda | |
| parent | 8a2745e1beee722c8c9691c397e493cc1160bedf (diff) | |
tdf#117323 fix import of MS Multiplan for DOS
Change-Id: Ica053852c17ac993b4e50c4c58dbaf2ee4f33035
4 files changed, 11 insertions, 6 deletions
diff --git a/filter/source/config/fragments/filters/MS_Multiplan.xcu b/filter/source/config/fragments/filters/MS_Multiplan.xcu index f10e0ddcf6f9..780901d5329f 100644 --- a/filter/source/config/fragments/filters/MS_Multiplan.xcu +++ b/filter/source/config/fragments/filters/MS_Multiplan.xcu @@ -12,7 +12,7 @@ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> <prop oor:name="FilterService"> - <value>org.libreoffice.comp.Calc.MSWorksCalcImportFilter</value> + <value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value> </prop> <prop oor:name="UIName"> <value xml:lang="en-US">Microsoft Multiplan</value> diff --git a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu index d6feee60af25..8f2bba34f0a2 100644 --- a/filter/source/config/fragments/types/calc_MS_Multiplan.xcu +++ b/filter/source/config/fragments/types/calc_MS_Multiplan.xcu @@ -9,11 +9,10 @@ <node oor:name="calc_MS_Multiplan" oor:op="replace"> <prop oor:name="DetectService"> - <value>org.libreoffice.comp.Calc.MSWorksCalcImportFilter</value> - </prop> - <prop oor:name="Extensions"> - <value>*</value> + <value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value> </prop> + <prop oor:name="Extensions"/> + <prop oor:name="URLPattern"/> <prop oor:name="Preferred"> <value>true</value> </prop> diff --git a/writerperfect/inc/strings.hrc b/writerperfect/inc/strings.hrc index 9f9b60d8bee8..2bd8d27ac82a 100644 --- a/writerperfect/inc/strings.hrc +++ b/writerperfect/inc/strings.hrc @@ -13,6 +13,7 @@ #define NC_(Context, String) (Context "\004" u8##String) #define STR_ENCODING_DIALOG_TITLE NC_("STR_ENCODING_DIALOG_TITLE", "Import file") +#define STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN NC_("STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN", "Import MS Multiplan for DOS file") #define STR_ENCODING_DIALOG_TITLE_MSWORKS NC_("STR_ENCODING_DIALOG_TITLE_MSWORKS", "Import MS Works file") #define STR_ENCODING_DIALOG_TITLE_MSWRITE NC_("STR_ENCODING_DIALOG_TITLE_MSWRITE", "Import MS Write file") #define STR_ENCODING_DIALOG_TITLE_DOSWORD NC_("STR_ENCODING_DIALOG_TITLE_DOSWORD", "Import MS Word for DOS file") diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 04dcffcdac48..969f0e0b4417 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -210,11 +210,16 @@ bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream& rInp title = WpResId(STR_ENCODING_DIALOG_TITLE_SYMPHONY); encoding = "CP437"; } - else + else if (creator == libwps::WPS_QUATTRO_PRO) { title = WpResId(STR_ENCODING_DIALOG_TITLE_QUATTROPRO); encoding = "CP437"; } + else + { + title = WpResId(STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN); + encoding = "CP437"; + } try { const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg(title, encoding); |