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 /writerperfect | |
parent | 8a2745e1beee722c8c9691c397e493cc1160bedf (diff) |
tdf#117323 fix import of MS Multiplan for DOS
Change-Id: Ica053852c17ac993b4e50c4c58dbaf2ee4f33035
Diffstat (limited to 'writerperfect')
-rw-r--r-- | writerperfect/inc/strings.hrc | 1 | ||||
-rw-r--r-- | writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 7 |
2 files changed, 7 insertions, 1 deletions
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); |