Skip to content

C
core
Kaydet (Commit) 38c4f463 authored tarafından Kohei Yoshida's avatar Kohei Yoshida Kaydeden (comit) Kohei Yoshida
Dosyalara gözat
Seçenekler

Updated liborcus to 0.13.1. 

Change-Id: Id5aa07f87603879fe7a21dc96cad207f1b168286
Reviewed-on: https://gerrit.libreoffice.org/44850Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKohei Yoshida <libreoffice@kohei.us>
üst 0557a9aa
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 89 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 38c4f463
......@@ -3230,7 +3230,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.12 \
-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.13 \
)
$(if $(SYSTEM_BOOST), \
......@@ -3249,7 +3249,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.12 \
-L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.13 \
)
endef
......
download.lst
Dosyayı görüntüle @ 38c4f463
......@@ -180,8 +180,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
export OPENLDAP_TARBALL := openldap-2.4.45.tgz
export OPENSSL_SHA256SUM := 8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f
export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908
export ORCUS_TARBALL := liborcus-0.12.1.tar.gz
export ORCUS_SHA256SUM := d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937
export ORCUS_TARBALL := liborcus-0.13.1.tar.gz
export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
export PAGEMAKER_SHA256SUM := 3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33
......
external/liborcus/ExternalPackage_liborcus.mk
Dosyayı görüntüle @ 38c4f463
......@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
$(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.0.dylib,src/liborcus/.libs/liborcus-0.12.0.dylib))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.0.dylib,src/parser/.libs/liborcus-parser-0.12.0.dylib))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.0.dylib,src/liborcus/.libs/liborcus-0.13.0.dylib))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.0.dylib,src/parser/.libs/liborcus-parser-0.13.0.dylib))
else ifeq ($(DISABLE_DYNLOADING),)
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.12.so.0,src/liborcus/.libs/liborcus-0.12.so.0.0.0))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.12.so.0,src/parser/.libs/liborcus-parser-0.12.so.0.0.0))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-0.13.so.0,src/liborcus/.libs/liborcus-0.13.so.0.0.0))
$(eval $(call gb_ExternalPackage_add_file,liborcus,$(LIBO_LIB_FOLDER)/liborcus-parser-0.13.so.0,src/parser/.libs/liborcus-parser-0.13.so.0.0.0))
endif
# vim: set noet sw=4 ts=4:
external/liborcus/ExternalProject_liborcus.mk
Dosyayı görüntüle @ 38c4f463
......@@ -114,8 +114,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(MAKE) \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.12.0.dylib \
$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.12.0.dylib \
$(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.13.0.dylib \
$(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.13.0.dylib \
) \
)
......
external/liborcus/Library_orcus.mk
Dosyayı görüntüle @ 38c4f463
......@@ -67,8 +67,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/odf_namespace_types \
UnpackedTarball/liborcus/src/liborcus/odf_number_formatting_context \
UnpackedTarball/liborcus/src/liborcus/odf_para_context \
UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
UnpackedTarball/liborcus/src/liborcus/odf_styles \
UnpackedTarball/liborcus/src/liborcus/odf_styles_context \
UnpackedTarball/liborcus/src/liborcus/odf_tokens \
UnpackedTarball/liborcus/src/liborcus/ods_content_xml_context \
UnpackedTarball/liborcus/src/liborcus/ods_content_xml_handler \
......@@ -86,23 +86,24 @@ $(eval $(call gb_Library_add_generated_exception_objects,orcus,\
UnpackedTarball/liborcus/src/liborcus/orcus_import_ods \
UnpackedTarball/liborcus/src/liborcus/orcus_import_xlsx \
UnpackedTarball/liborcus/src/liborcus/orcus_ods \
UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
UnpackedTarball/liborcus/src/liborcus/orcus_xls_xml \
UnpackedTarball/liborcus/src/liborcus/orcus_xlsx \
UnpackedTarball/liborcus/src/liborcus/orcus_xml \
UnpackedTarball/liborcus/src/liborcus/session_context \
UnpackedTarball/liborcus/src/liborcus/spreadsheet_interface \
UnpackedTarball/liborcus/src/liborcus/spreadsheet_types \
UnpackedTarball/liborcus/src/liborcus/string_helper \
UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_handler \
UnpackedTarball/liborcus/src/liborcus/xlsx_helper \
UnpackedTarball/liborcus/src/liborcus/xls_xml_context \
UnpackedTarball/liborcus/src/liborcus/xls_xml_detection_handler \
UnpackedTarball/liborcus/src/liborcus/xls_xml_handler \
UnpackedTarball/liborcus/src/liborcus/xls_xml_namespace_types \
UnpackedTarball/liborcus/src/liborcus/xls_xml_tokens \
UnpackedTarball/liborcus/src/liborcus/xlsx_autofilter_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_conditional_format_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_drawing_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_handler \
UnpackedTarball/liborcus/src/liborcus/xlsx_helper \
UnpackedTarball/liborcus/src/liborcus/xlsx_pivot_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_revision_context \
UnpackedTarball/liborcus/src/liborcus/xlsx_session_data \
......
external/liborcus/UnpackedTarball_liborcus.mk
Dosyayı görüntüle @ 38c4f463
......@@ -18,10 +18,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/visibility.patch.0 \
external/liborcus/nullptr-in-ostringstream.patch.1 \
external/liborcus/orcus_allow_missing_xml_header.patch.1 \
external/liborcus/orcus_allow_underscore_in_names.patch.1 \
))
ifeq ($(OS),WNT)
......
external/liborcus/nullptr-in-ostringstream.patch.1 deleted 100644 → 0
Dosyayı görüntüle @ 0557a9aa
diff -ur liborcus.org/src/liborcus/xml_context_base.cpp liborcus/src/liborcus/xml_context_base.cpp
--- liborcus.org/src/liborcus/xml_context_base.cpp 2017-06-30 14:32:19.044195127 +0200
+++ liborcus/src/liborcus/xml_context_base.cpp 2017-06-30 14:34:27.580268421 +0200
@@ -171,7 +171,7 @@
// Create a generic error message.
ostringstream os;
- os << "element '" << ns << ":" << m_tokens.get_token_name(name) << "' expected, but '";
+ os << "element '" << (ns ? ns : "") << ":" << m_tokens.get_token_name(name) << "' expected, but '";
os << elem.first << ":" << m_tokens.get_token_name(elem.second) << "' encountered.";
throw xml_structure_error(os.str());
}
external/liborcus/orcus_allow_missing_xml_header.patch.1 deleted 100644 → 0
Dosyayı görüntüle @ 0557a9aa
diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp
--- liborcus.org/include/orcus/sax_parser.hpp 2017-08-12 09:44:21.379509116 +0200
+++ liborcus/include/orcus/sax_parser.hpp 2017-08-12 09:46:06.884259216 +0200
@@ -20,7 +20,7 @@
* parsing regardless of whether or not the xml stream begins with a
* <?xml..?> declaration.
*/
- static const bool strict_xml_declaration = true;
+ static const bool strict_xml_declaration = false;
};
/**
external/liborcus/orcus_allow_underscore_in_names.patch.1 deleted 100644 → 0
Dosyayı görüntüle @ 0557a9aa
diff -ur liborcus.org/src/parser/sax_parser_base.cpp liborcus/src/parser/sax_parser_base.cpp
--- liborcus.org/src/parser/sax_parser_base.cpp 2017-08-12 10:39:49.963174114 +0200
+++ liborcus/src/parser/sax_parser_base.cpp 2017-08-12 10:41:32.026899749 +0200
@@ -334,7 +334,7 @@
{
const char* p0 = mp_char;
char c = cur_char();
- if (!is_alpha(c))
+ if (!is_alpha(c) && c != '_')
{
::std::ostringstream os;
os << "name must begin with an alphabet, but got this instead '" << c << "'";
external/liborcus/visibility.patch.0 deleted 100644 → 0
Dosyayı görüntüle @ 0557a9aa
Upstreamed as
<https://gitlab.com/orcus/orcus/commit/05d3e608ce09a9cf34aa085de6180978a03f0f13>
"Allow passed-in CXXFLAGS to override -fvisibility=hidden":
--- configure
+++ configure
@@ -4255,7 +4255,7 @@
fi
-CXXFLAGS="$CXXFLAGS -fvisibility=hidden -Wall -pthread"
+CXXFLAGS="-fvisibility=hidden $CXXFLAGS -Wall -pthread"
# ===========================
# Find required base packages
sc/qa/unit/helper/csv_handler.hxx
Dosyayı görüntüle @ 38c4f463
......@@ -98,7 +98,7 @@ public:
mnCol = 0;
}
void cell(const char* p, size_t n)
void cell(const char* p, size_t n, bool /*transient*/)
{
#if DEBUG_CSV_HANDLER
std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl;
......@@ -194,7 +194,7 @@ public:
mnCol = 0;
}
void cell(const char* p, size_t n)
void cell(const char* p, size_t n, bool /*transient*/)
{
#if DEBUG_CSV_HANDLER
std::cout << "Col: " << mnCol << " Row: " << mnRow << std::endl;
......
sc/source/filter/inc/orcusinterface.hxx
Dosyayı görüntüle @ 38c4f463
......@@ -182,7 +182,8 @@ public:
virtual void set_row_hidden(orcus::spreadsheet::row_t row, bool hidden) override;
virtual void set_merge_cell_range(const char* p_range, size_t n_range) override;
virtual void set_merge_cell_range(const orcus::spreadsheet::range_t& range) override;
};
class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet
......@@ -242,6 +243,8 @@ public:
orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar,
const char* p, size_t n, const char* p_range, size_t n_range) override;
virtual orcus::spreadsheet::range_size_t get_sheet_size() const override;
SCTAB getIndex() const { return mnTab; }
};
......@@ -417,7 +420,7 @@ public:
// border
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,
......@@ -507,7 +510,8 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory
public:
ScOrcusFactory(ScDocument& rDoc);
virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) override;
virtual orcus::spreadsheet::iface::import_sheet* append_sheet(
orcus::spreadsheet::sheet_t sheet_index, const char *sheet_name, size_t sheet_name_length) override;
virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) override;
virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) override;
virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() override;
......
sc/source/filter/orcus/interface.cxx
Dosyayı görüntüle @ 38c4f463
......@@ -84,7 +84,8 @@ ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) :
maStyles(rDoc),
mnProgress(0) {}
orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char* sheet_name, size_t sheet_name_length)
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);
if (!maDoc.appendSheet(aTabName))
......@@ -296,7 +297,7 @@ void ScOrcusSheetProperties::set_row_hidden(os::row_t row, bool hidden)
mrDoc.getDoc().SetRowHidden(row, row, mnTab, hidden);
}
void ScOrcusSheetProperties::set_merge_cell_range(const char* /*p_range*/, size_t /*n_range*/)
void ScOrcusSheetProperties::set_merge_cell_range(const orcus::spreadsheet::range_t& /*range*/)
{
}
......@@ -574,6 +575,9 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
case orcus::spreadsheet::formula_grammar_t::gnumeric:
eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
break;
case orcus::spreadsheet::formula_grammar_t::xls_xml:
eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
break;
case orcus::spreadsheet::formula_grammar_t::unknown:
break;
}
......@@ -689,6 +693,15 @@ void ScOrcusSheet::set_array_formula(
{
}
orcus::spreadsheet::range_size_t ScOrcusSheet::get_sheet_size() const
{
orcus::spreadsheet::range_size_t ret;
ret.rows = MAXROWCOUNT;
ret.columns = MAXCOLCOUNT;
return ret;
}
ScOrcusSharedStrings::ScOrcusSharedStrings(ScOrcusFactory& rFactory) :
mrFactory(rFactory) {}
......@@ -1279,11 +1292,6 @@ void ScOrcusStyles::set_border_count(size_t /*n*/)
// needed at all?
}
void ScOrcusStyles::set_border_style(orcus::spreadsheet::border_direction_t /*dir*/, const char* /*s*/, size_t /*n*/)
{
// implement later
}
void ScOrcusStyles::set_border_style(
orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::border_style_t style)
{
......
sc/source/ui/dataprovider/csvdataprovider.cxx
Dosyayı görüntüle @ 38c4f463
......@@ -41,7 +41,7 @@ public:
mnCol = 0;
}
void cell(const char* p, size_t n)
void cell(const char* p, size_t n, bool /*transient*/)
{
if (mnCol > MAXCOL)
return;
......
sc/source/ui/docshell/datastream.cxx
Dosyayı görüntüle @ 38c4f463
......@@ -71,7 +71,7 @@ public:
static void begin_row() {}
static void end_row() {}
void cell(const char* p, size_t n)
void cell(const char* p, size_t n, bool /*transient*/)
{
if (mnCols >= mnColCount)
return;
......
sfx2/source/control/emojiview.cxx
Dosyayı görüntüle @ 38c4f463
......@@ -104,12 +104,12 @@ void EmojiView::Populate()
}
// Populate view using the orcus json parser
using node = orcus::json_document_tree::node;
using node = orcus::json::node;
// default json config
orcus::json_config config;
orcus::json_document_tree aEmojiInfo;
orcus::json::document_tree aEmojiInfo;
// Load JSON string into a document tree.
aEmojiInfo.load(msJSONData, config);
......@@ -122,7 +122,7 @@ void EmojiView::Populate()
orcus::pstring key = *it;
node value = root.child(key);
if(value.type() == orcus::json_node_t::object)
if(value.type() == orcus::json::node_t::object)
{
// iterate each element to get the keys
std::vector<orcus::pstring> aEmojiParams = value.keys();
......
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