From b325b4c286b56a63316063a3ac4648bf7b7efcbe Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Sat, 5 Mar 2016 20:09:34 -0500 Subject: Update liborcus to 0.11.0. Markus did half of this, and I simply carried the torch. Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71 Reviewed-on: https://gerrit.libreoffice.org/22943 Tested-by: Jenkins Reviewed-by: Kohei Yoshida Index: libreoffice-5.1.0.3/configure.ac =================================================================== --- libreoffice-5.1.0.3.orig/configure.ac +++ libreoffice-5.1.0.3/configure.ac @@ -9141,7 +9141,7 @@ if test -z "$enable_orcus" -o "$enable_o ENABLE_ORCUS="TRUE" AC_DEFINE(ENABLE_ORCUS) - libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 >= 0.9.0]) + libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.0]) if test "$with_system_orcus" != "yes"; then if test "$SYSTEM_BOOST" = "TRUE"; then # =========================================================== Index: libreoffice-5.1.0.3/sc/source/filter/inc/orcusinterface.hxx =================================================================== --- libreoffice-5.1.0.3.orig/sc/source/filter/inc/orcusinterface.hxx +++ libreoffice-5.1.0.3/sc/source/filter/inc/orcusinterface.hxx @@ -381,6 +381,7 @@ public: virtual void set_border_count(size_t n) override; virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) override; + virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style) override; virtual void set_border_color(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, @@ -431,6 +432,7 @@ public: virtual void set_cell_style_name(const char* s, size_t n) override; virtual void set_cell_style_xf(size_t index) override; virtual void set_cell_style_builtin(size_t index) override; + virtual void set_cell_style_parent_name(const char* s, size_t n) override; virtual size_t commit_cell_style() override; }; Index: libreoffice-5.1.0.3/sc/source/filter/orcus/filterdetect.cxx =================================================================== --- libreoffice-5.1.0.3.orig/sc/source/filter/orcus/filterdetect.cxx +++ libreoffice-5.1.0.3/sc/source/filter/orcus/filterdetect.cxx @@ -93,7 +93,7 @@ OUString OrcusFormatDetect::detect(css:: } orcus::format_t eFormat = orcus::detect(reinterpret_cast(aContent.getStr()), aContent.getLength()); - if (eFormat == orcus::format_gnumeric) + if (eFormat == orcus::format_t::gnumeric) return OUString("Gnumeric XML"); return OUString(); Index: libreoffice-5.1.0.3/sc/source/filter/orcus/interface.cxx =================================================================== --- libreoffice-5.1.0.3.orig/sc/source/filter/orcus/interface.cxx +++ libreoffice-5.1.0.3/sc/source/filter/orcus/interface.cxx @@ -55,7 +55,7 @@ void ScOrcusGlobalSettings::set_default_ orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const { - return orcus::spreadsheet::formula_grammar_unknown; + return orcus::spreadsheet::formula_grammar_t::unknown; } ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) : @@ -231,19 +231,19 @@ double translateToInternal(double nVal, { switch(unit) { - case orcus::length_unit_inch: + case orcus::length_unit_t::inch: return nVal * 72.0 * 20.0; break; - case orcus::length_unit_twip: + case orcus::length_unit_t::twip: return nVal; break; - case orcus::length_unit_point: + case orcus::length_unit_t::point: return nVal * 20.0; break; - case orcus::length_unit_centimeter: + case orcus::length_unit_t::centimeter: return nVal * 20.0 * 72.0 / 2.54; break; - case orcus::length_unit_unknown: + case orcus::length_unit_t::unknown: SAL_WARN("sc.orcus", "unknown unit"); break; default: @@ -393,18 +393,18 @@ void ScOrcusConditionalFormat::set_type( { switch (type) { - case os::conditional_format_condition: - case os::conditional_format_formula: + case os::conditional_format_t::condition: + case os::conditional_format_t::formula: meEntryType = condformat::CONDITION; // mpCurrentEntry.reset(new ScCondFormatEntry()); break; - case os::conditional_format_date: + case os::conditional_format_t::date: break; - case os::conditional_format_colorscale: + case os::conditional_format_t::colorscale: break; - case os::conditional_format_databar: + case os::conditional_format_t::databar: break; - case os::conditional_format_iconset: + case os::conditional_format_t::iconset: break; default: SAL_INFO("sc.orcus.condformat", "unknown conditional_format_t value"); @@ -549,17 +549,17 @@ formula::FormulaGrammar::Grammar getCalc formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF; switch(grammar) { - case orcus::spreadsheet::formula_grammar_ods: + case orcus::spreadsheet::formula_grammar_t::ods: eGrammar = formula::FormulaGrammar::GRAM_ODFF; break; - case orcus::spreadsheet::formula_grammar_xlsx_2007: - case orcus::spreadsheet::formula_grammar_xlsx_2010: + case orcus::spreadsheet::formula_grammar_t::xlsx_2007: + case orcus::spreadsheet::formula_grammar_t::xlsx_2010: eGrammar = formula::FormulaGrammar::GRAM_OOXML; break; - case orcus::spreadsheet::formula_grammar_gnumeric: + case orcus::spreadsheet::formula_grammar_t::gnumeric: eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1; break; - case orcus::spreadsheet::formula_grammar_unknown: + case orcus::spreadsheet::formula_grammar_t::unknown: break; } @@ -799,16 +799,16 @@ SvxBoxItemLine getDirection(os::border_d { switch (dir) { - case os::border_right: + case os::border_direction_t::right: return SvxBoxItemLine::RIGHT; break; - case os::border_left: + case os::border_direction_t::left: return SvxBoxItemLine::RIGHT; break; - case os::border_top: + case os::border_direction_t::top: return SvxBoxItemLine::RIGHT; break; - case os::border_bottom: + case os::border_direction_t::bottom: return SvxBoxItemLine::RIGHT; break; default: @@ -948,15 +948,15 @@ void ScOrcusStyles::set_font_underline(o { switch(e) { - case orcus::spreadsheet::underline_single: - case orcus::spreadsheet::underline_single_accounting: + case orcus::spreadsheet::underline_t::single_line: + case orcus::spreadsheet::underline_t::single_accounting: maCurrentFont.meUnderline = UNDERLINE_SINGLE; break; - case orcus::spreadsheet::underline_double: - case orcus::spreadsheet::underline_double_accounting: + case orcus::spreadsheet::underline_t::double_line: + case orcus::spreadsheet::underline_t::double_accounting: maCurrentFont.meUnderline = UNDERLINE_DOUBLE; break; - case orcus::spreadsheet::underline_none: + case orcus::spreadsheet::underline_t::none: maCurrentFont.meUnderline = UNDERLINE_NONE; break; } @@ -1020,6 +1020,12 @@ void ScOrcusStyles::set_border_style(orc // implement later } +void ScOrcusStyles::set_border_style( + orcus::spreadsheet::border_direction_t /*dir*/, orcus::spreadsheet::border_style_t /*style*/) +{ + // implement later +} + void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, @@ -1187,6 +1193,11 @@ void ScOrcusStyles::set_cell_style_built maCurrentCellStyle.mnBuiltInId = index; } +void ScOrcusStyles::set_cell_style_parent_name(const char* /*s*/, size_t /*n*/) +{ + // place holder +} + size_t ScOrcusStyles::commit_cell_style() { SAL_INFO("sc.orcus.style", "commit cell style: " << maCurrentCellStyle.maName);