Kaydet (Commit) d0197ae7 authored tarafından Kohei Yoshida's avatar Kohei Yoshida Kaydeden (comit) Kohei Yoshida

All the other orcus-based filters should take the same code path.

Change-Id: Iac96c6eb842a769d70c3f39830cbdb0e1ee93dc8
Reviewed-on: https://gerrit.libreoffice.org/46657Reviewed-by: 's avatarKohei Yoshida <libreoffice@kohei.us>
Tested-by: 's avatarKohei Yoshida <libreoffice@kohei.us>
üst ca1a583e
......@@ -96,21 +96,9 @@ bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, SfxMedium& rMedium) const
{
ScOrcusFactory aFactory(rDoc);
aFactory.setStatusIndicator(getStatusIndicator(rMedium));
OString aSysPath = toSystemPath(rMedium.GetName());
const char* path = aSysPath.getStr();
try
{
orcus::orcus_csv filter(&aFactory);
filter.read_file(path);
}
catch (const std::exception&)
{
rDoc.InsertTab(SC_TAB_APPEND, "Foo");
rDoc.SetString(0, 0, 0, "Failed to load!!!");
return false;
}
return true;
orcus::orcus_csv filter(&aFactory);
return loadFileContent(rDoc, rMedium, filter);
}
bool ScOrcusFiltersImpl::importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const
......@@ -135,42 +123,18 @@ bool ScOrcusFiltersImpl::importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const
{
ScOrcusFactory aFactory(rDoc);
aFactory.setStatusIndicator(getStatusIndicator(rMedium));
OString aSysPath = toSystemPath(rMedium.GetName());
const char* path = aSysPath.getStr();
try
{
orcus::orcus_xlsx filter(&aFactory);
filter.read_file(path);
}
catch (const std::exception& e)
{
SAL_WARN("sc", "Unable to load xlsx file! " << e.what());
return false;
}
return true;
orcus::orcus_xlsx filter(&aFactory);
return loadFileContent(rDoc, rMedium, filter);
}
bool ScOrcusFiltersImpl::importODS(ScDocument& rDoc, SfxMedium& rMedium) const
{
ScOrcusFactory aFactory(rDoc);
aFactory.setStatusIndicator(getStatusIndicator(rMedium));
OString aSysPath = toSystemPath(rMedium.GetName());
const char* path = aSysPath.getStr();
try
{
orcus::orcus_ods filter(&aFactory);
filter.read_file(path);
}
catch (const std::exception& e)
{
SAL_WARN("sc", "Unable to load ods file! " << e.what());
return false;
}
return true;
orcus::orcus_ods filter(&aFactory);
return loadFileContent(rDoc, rMedium, filter);
}
bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) const
......
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