Kaydet (Commit) d324ed83 authored tarafından osnola's avatar osnola Kaydeden (comit) David Tardon

tdf#117323 fix import of MS Multiplan for DOS

Change-Id: Ica053852c17ac993b4e50c4c58dbaf2ee4f33035
üst 8a2745e1
......@@ -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>
......
......@@ -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>
......
......@@ -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")
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment