[Libreoffice-commits] core.git: sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 5 02:06:50 UTC 2018
sc/source/filter/inc/orcusinterface.hxx | 12 ++-
sc/source/filter/orcus/interface.cxx | 97 +++++++++++++++++++++-------
sc/source/filter/orcus/orcusfiltersimpl.cxx | 5 -
3 files changed, 87 insertions(+), 27 deletions(-)
New commits:
commit 5e8fd488f17fe0433cc9b31ace6527fb06ea3bb0
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
AuthorDate: Tue Sep 4 20:21:26 2018 -0400
Commit: Kohei Yoshida <libreoffice at kohei.us>
CommitDate: Wed Sep 5 04:06:26 2018 +0200
tdf#116453: Pick up non-UTF8 encoding and use it for string values.
Change-Id: Ibb0455359ad41871e86a8858f6fe0c5b834bcb13
Reviewed-on: https://gerrit.libreoffice.org/60013
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index dce0d5b0a64e..cca677f9435c 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -49,6 +49,7 @@ class ScOrcusGlobalSettings : public orcus::spreadsheet::iface::import_global_se
ScDocumentImport& mrDoc;
formula::FormulaGrammar::Grammar meCalcGrammar;
orcus::spreadsheet::formula_grammar_t meOrcusGrammar;
+ rtl_TextEncoding mnTextEncoding;
public:
ScOrcusGlobalSettings(ScDocumentImport& rDoc);
@@ -63,6 +64,11 @@ public:
{
return meCalcGrammar;
}
+
+ rtl_TextEncoding getTextEncoding() const
+ {
+ return mnTextEncoding;
+ }
};
class ScOrcusRefResolver : public orcus::spreadsheet::iface::import_reference_resolver
@@ -178,7 +184,7 @@ private:
class ScOrcusAutoFilter : public orcus::spreadsheet::iface::import_auto_filter
{
public:
- ScOrcusAutoFilter();
+ ScOrcusAutoFilter( const ScOrcusGlobalSettings& rGS );
virtual ~ScOrcusAutoFilter() override;
@@ -193,6 +199,7 @@ public:
virtual void commit() override;
private:
+ const ScOrcusGlobalSettings& mrGlobalSettings;
ScRange maRange;
};
@@ -339,6 +346,7 @@ public:
class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles
{
private:
+ ScOrcusFactory& mrFactory;
ScDocument& mrDoc;
struct font
@@ -470,7 +478,7 @@ private:
void applyXfToItemSet(SfxItemSet& rSet, const xf& rXf);
public:
- ScOrcusStyles(ScDocument& rDoc, bool bSkipDefaultStyles=false);
+ ScOrcusStyles( ScOrcusFactory& rFactory, ScDocument& rDoc, bool bSkipDefaultStyles=false );
void applyXfToItemSet(SfxItemSet& rSet, size_t xfId);
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 7b8425d3007d..44dc12201531 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -93,6 +93,7 @@ ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocumentImport& rDoc)
: mrDoc(rDoc)
, meCalcGrammar(formula::FormulaGrammar::GRAM_UNSPECIFIED)
, meOrcusGrammar(os::formula_grammar_t::unknown)
+ , mnTextEncoding(RTL_TEXTENCODING_UTF8)
{
}
@@ -101,9 +102,56 @@ void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day)
mrDoc.setOriginDate(year, month, day);
}
-void ScOrcusGlobalSettings::set_character_set(orcus::character_set_t /*cs*/)
+void ScOrcusGlobalSettings::set_character_set(orcus::character_set_t cs)
{
- // TODO
+ switch (cs)
+ {
+ case orcus::character_set_t::iso_2022_jp:
+ case orcus::character_set_t::iso_2022_jp_2:
+ mnTextEncoding = RTL_TEXTENCODING_ISO_2022_JP;
+ break;
+ case orcus::character_set_t::jis_x0201:
+ mnTextEncoding = RTL_TEXTENCODING_JIS_X_0201;
+ break;
+ case orcus::character_set_t::shift_jis:
+ mnTextEncoding = RTL_TEXTENCODING_SHIFT_JIS;
+ break;
+ case orcus::character_set_t::us_ascii:
+ mnTextEncoding = RTL_TEXTENCODING_ASCII_US;
+ break;
+ case orcus::character_set_t::utf_7:
+ mnTextEncoding = RTL_TEXTENCODING_UTF7;
+ break;
+ case orcus::character_set_t::windows_1250:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1250;
+ break;
+ case orcus::character_set_t::windows_1251:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1251;
+ break;
+ case orcus::character_set_t::windows_1252:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1252;
+ break;
+ case orcus::character_set_t::windows_1253:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1253;
+ break;
+ case orcus::character_set_t::windows_1254:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1254;
+ break;
+ case orcus::character_set_t::windows_1255:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1255;
+ break;
+ case orcus::character_set_t::windows_1256:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1256;
+ break;
+ case orcus::character_set_t::windows_1257:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1257;
+ break;
+ case orcus::character_set_t::windows_1258:
+ mnTextEncoding = RTL_TEXTENCODING_MS_1258;
+ break;
+ default:
+ ; // Add more as needed.
+ }
}
void ScOrcusGlobalSettings::set_default_formula_grammar(os::formula_grammar_t grammar)
@@ -122,7 +170,7 @@ ScOrcusRefResolver::ScOrcusRefResolver( const ScOrcusGlobalSettings& rGS ) :
os::address_t ScOrcusRefResolver::resolve_address(const char* p, size_t n)
{
- OUString aStr(p, n, RTL_TEXTENCODING_UTF8);
+ OUString aStr(p, n, mrGlobalSettings.getTextEncoding());
ScAddress aAddr;
aAddr.Parse(aStr, nullptr,
@@ -144,7 +192,7 @@ os::address_t ScOrcusRefResolver::resolve_address(const char* p, size_t n)
os::range_t ScOrcusRefResolver::resolve_range(const char* p, size_t n)
{
- OUString aStr(p, n, RTL_TEXTENCODING_UTF8);
+ OUString aStr(p, n, mrGlobalSettings.getTextEncoding());
ScRange aRange;
aRange.Parse(aStr, nullptr,
@@ -174,8 +222,8 @@ ScOrcusNamedExpression::ScOrcusNamedExpression(
void ScOrcusNamedExpression::define_name(const char* p_name, size_t n_name, const char* p_exp, size_t n_exp)
{
- OUString aName(p_name, n_name, RTL_TEXTENCODING_UTF8);
- OUString aExpr(p_exp, n_exp, RTL_TEXTENCODING_UTF8);
+ OUString aName(p_name, n_name, mrGlobalSettings.getTextEncoding());
+ OUString aExpr(p_exp, n_exp, mrGlobalSettings.getTextEncoding());
ScRangeName* pNames = mnTab >= 0 ? mrDoc.getDoc().GetRangeName(mnTab) : mrDoc.getDoc().GetRangeName();
if (!pNames)
@@ -235,13 +283,13 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc, bool bSkipDefaultStyles) :
maGlobalSettings(maDoc),
maSharedStrings(*this),
maNamedExpressions(maDoc, maGlobalSettings),
- maStyles(rDoc, bSkipDefaultStyles),
+ maStyles(*this, rDoc, bSkipDefaultStyles),
mnProgress(0) {}
orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(
orcus::spreadsheet::sheet_t sheet_index, const char* sheet_name, size_t sheet_name_length)
{
- OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
+ OUString aTabName(sheet_name, sheet_name_length, maGlobalSettings.getTextEncoding());
if (sheet_index == 0)
{
@@ -273,7 +321,7 @@ public:
orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::get_sheet(const char* sheet_name, size_t sheet_name_length)
{
- OUString aTabName(sheet_name, sheet_name_length, RTL_TEXTENCODING_UTF8);
+ OUString aTabName(sheet_name, sheet_name_length, maGlobalSettings.getTextEncoding());
SCTAB nTab = maDoc.getSheetIndex(aTabName);
if (nTab < 0)
// Sheet by that name not found.
@@ -822,7 +870,7 @@ ScOrcusSheet::ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& r
mnTab(nTab),
mrFactory(rFactory),
mrStyles(static_cast<ScOrcusStyles&>(*mrFactory.get_styles())),
- maAutoFilter(),
+ maAutoFilter(rFactory.getGlobalSettings()),
maProperties(mnTab, mrDoc),
maConditionalFormat(mnTab, rDoc.getDoc()),
maNamedExpressions(rDoc, rFactory.getGlobalSettings(), nTab),
@@ -866,7 +914,7 @@ void ScOrcusFormula::set_position(os::row_t row, os::col_t col)
void ScOrcusFormula::set_formula(os::formula_grammar_t grammar, const char* p, size_t n)
{
- maFormula = OUString(p, n, RTL_TEXTENCODING_UTF8);
+ maFormula = OUString(p, n, mrSheet.getFactory().getGlobalSettings().getTextEncoding());
meGrammar = getCalcGrammarFromOrcus(grammar);
}
@@ -987,7 +1035,7 @@ void ScOrcusArrayFormula::set_range(const os::range_t& range)
void ScOrcusArrayFormula::set_formula(os::formula_grammar_t grammar, const char* p, size_t n)
{
meGrammar = getCalcGrammarFromOrcus(grammar);
- maFormula = OUString(p, n, RTL_TEXTENCODING_UTF8);
+ maFormula = OUString(p, n, mrSheet.getFactory().getGlobalSettings().getTextEncoding());
}
void ScOrcusArrayFormula::set_result_value(os::row_t /*row*/, os::col_t /*col*/, double /*value*/)
@@ -1071,7 +1119,7 @@ os::iface::import_array_formula* ScOrcusSheet::get_array_formula()
void ScOrcusSheet::set_auto(os::row_t row, os::col_t col, const char* p, size_t n)
{
- OUString aVal(p, n, RTL_TEXTENCODING_UTF8);
+ OUString aVal(p, n, mrFactory.getGlobalSettings().getTextEncoding());
mrFactory.pushCellStoreAutoToken(ScAddress(col, row, mnTab), aVal);
cellInserted();
}
@@ -1164,13 +1212,13 @@ ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
size_t ScOrcusSharedStrings::append(const char* s, size_t n)
{
- OUString aNewString(s, n, RTL_TEXTENCODING_UTF8);
+ OUString aNewString(s, n, mrFactory.getGlobalSettings().getTextEncoding());
return mrFactory.appendString(aNewString);
}
size_t ScOrcusSharedStrings::add(const char* s, size_t n)
{
- OUString aNewString(s, n, RTL_TEXTENCODING_UTF8);
+ OUString aNewString(s, n, mrFactory.getGlobalSettings().getTextEncoding());
return mrFactory.addString(aNewString);
}
@@ -1209,10 +1257,12 @@ void ScOrcusSharedStrings::append_segment(const char* s, size_t n)
size_t ScOrcusSharedStrings::commit_segments()
{
OString aStr = maCurSegment.makeStringAndClear();
- return mrFactory.addString(OStringToOUString(aStr, RTL_TEXTENCODING_UTF8));
+ return mrFactory.addString(
+ OStringToOUString(aStr, mrFactory.getGlobalSettings().getTextEncoding()));
}
-ScOrcusStyles::ScOrcusStyles(ScDocument& rDoc, bool bSkipDefaultStyles):
+ScOrcusStyles::ScOrcusStyles( ScOrcusFactory& rFactory, ScDocument& rDoc, bool bSkipDefaultStyles ) :
+ mrFactory(rFactory),
mrDoc(rDoc)
{
if (!bSkipDefaultStyles && !mrDoc.GetStyleSheetPool()->HasStandardStyles())
@@ -1519,7 +1569,7 @@ void ScOrcusStyles::set_font_italic(bool b)
void ScOrcusStyles::set_font_name(const char* s, size_t n)
{
- OUString aName(s, n, RTL_TEXTENCODING_UTF8);
+ OUString aName(s, n, mrFactory.getGlobalSettings().getTextEncoding());
maCurrentFont.maName = aName;
maCurrentFont.mbHasFontAttr = true;
}
@@ -1894,7 +1944,7 @@ void ScOrcusStyles::set_number_format_identifier(size_t)
void ScOrcusStyles::set_number_format_code(const char* s, size_t n)
{
- OUString aCode(s, n, RTL_TEXTENCODING_UTF8);
+ OUString aCode(s, n, mrFactory.getGlobalSettings().getTextEncoding());
maCurrentNumberFormat.maCode = aCode;
maCurrentNumberFormat.mbHasNumberFormatAttr = true;
}
@@ -2050,7 +2100,7 @@ void ScOrcusStyles::set_cell_style_count(size_t /*n*/)
void ScOrcusStyles::set_cell_style_name(const char* s, size_t n)
{
- OUString aName(s, n, RTL_TEXTENCODING_UTF8);
+ OUString aName(s, n, mrFactory.getGlobalSettings().getTextEncoding());
maCurrentCellStyle.maName = aName;
}
@@ -2067,7 +2117,7 @@ void ScOrcusStyles::set_cell_style_builtin(size_t index)
void ScOrcusStyles::set_cell_style_parent_name(const char* s, size_t n)
{
- OUString aParentName(s, n, RTL_TEXTENCODING_UTF8);
+ OUString aParentName(s, n, mrFactory.getGlobalSettings().getTextEncoding());
maCurrentCellStyle.maParentName = aParentName;
}
@@ -2100,7 +2150,8 @@ size_t ScOrcusStyles::commit_cell_style()
// auto filter import
-ScOrcusAutoFilter::ScOrcusAutoFilter()
+ScOrcusAutoFilter::ScOrcusAutoFilter( const ScOrcusGlobalSettings& rGS ) :
+ mrGlobalSettings(rGS)
{
}
@@ -2123,7 +2174,7 @@ void ScOrcusAutoFilter::set_column(orcus::spreadsheet::col_t col)
void ScOrcusAutoFilter::append_column_match_value(const char* p, size_t n)
{
- OUString aString(p, n, RTL_TEXTENCODING_UTF8);
+ OUString aString(p, n, mrGlobalSettings.getTextEncoding());
SAL_INFO("sc.orcus.autofilter", "append_column_match_value: " << aString);
}
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 1b888f220e7a..808a99033fde 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -144,8 +144,9 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con
try
{
std::string content = orcus::load_file_content(path);
- ScOrcusStyles styles(rDoc);
- orcus::import_ods::read_styles(content.c_str(), content.size(), &styles);
+ ScOrcusFactory aFactory(rDoc);
+ ScOrcusStyles aStyles(aFactory, rDoc);
+ orcus::import_ods::read_styles(content.c_str(), content.size(), &aStyles);
}
catch (const std::exception& e)
{
More information about the Libreoffice-commits
mailing list