update to liborcus 0.9.0

Includes a lot of help from Norbert for finding the boost MSVC problem.

Change-Id: I5184bc40e2c3861883b8587784117b1c4558fa5f
Reviewed-on: https://gerrit.libreoffice.org/15453Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

RepositoryExternal.mk

@@ -3188,7 +3188,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT) \
+	$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.10$(gb_StaticLibrary_PLAINEXT) \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3205,7 +3205,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT) \
+	$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.10$(gb_StaticLibrary_PLAINEXT) \
 )
 
 endef

download.lst

@@ -117,7 +117,7 @@ export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef
 export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz
-export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
+export ORCUS_TARBALL := 3f64f27b9fd59e55ca4c5ba95cd32da0-liborcus-0.9.0.tar.xz
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2

external/liborcus/UnpackedTarball_liborcus.mk

@@ -18,18 +18,11 @@ liborcus_patches :=
 # make config.sub recognize arm-linux-androideabi
 # liborcus_patches += liborcus_0.1.0-configure.patch
 
-# don't use dllimport
-liborcus_patches += liborcus_0.1.0-dllimport.patch
+liborcus_patches += liborcus-mdds-configure.patch.1
 
-# Any -fvisibility= etc. settings are passed into liborcus' CXXFLAGS via
-# gb_VISIBILITY_FLAGS[_CXX]:
-liborcus_patches += visibility.patch
+liborcus_patches += liborcus-boost-msvc.patch.1
 
-# <https://gitorious.org/orcus/orcus/merge_requests/2#
-# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
-# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
-
-liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
+liborcus_patches += liborcus-fix-win-build.patch.1
 
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
 	$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \

external/liborcus/liborcus-boost-msvc.patch.1

+Only in liborcus: build.log
+Only in liborcus: config.log
+diff -ur liborcus.org/configure liborcus/configure
+--- liborcus.org/configure	2015-04-25 20:24:21.650666000 -0500
++++ liborcus/configure	2015-04-25 20:25:44.689795700 -0500
+@@ -17021,6 +17021,7 @@
+   grep -v '#' |
+   tr -d '\r' |
+   tr -s '\n' ' ' |
++  $SED "s/^conftest.$ac_ext //" |
+   $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
+   boost_cv_lib_version=`cat conftest.i`
+ fi
+Only in liborcus: vc120.pdb

external/liborcus/liborcus-mdds-configure.patch.1

+Only in liborcus: build.log
+Only in liborcus: config.h
+Only in liborcus: config.log
+Only in liborcus: config.status
+diff -ur liborcus.org/configure liborcus/configure
+--- liborcus.org/configure	2015-04-24 00:27:45.989048698 +0200
++++ liborcus/configure	2015-04-24 00:28:16.978301439 +0200
+@@ -19323,7 +19323,7 @@
+ $as_echo "yes" >&6; }
+ 
+ fi
+-CXXFLAGS="$CXXFLAGS -DMDDS_HASH_CONTAINER_BOOST"
++CXXFLAGS="$CXXFLAGS -DMDDS_HASH_CONTAINER_BOOST $MDDS_CFLAGS"
+ 
+ # =================
+ # Spreadsheet model
+Only in liborcus/include: Makefile
+Only in liborcus/include/orcus: Makefile
+Only in liborcus/include/orcus/mso: Makefile
+Only in liborcus/include/orcus/spreadsheet: Makefile
+Only in liborcus: liborcus-0.10.pc
+Only in liborcus: liborcus-spreadsheet-model-0.10.pc
+Only in liborcus: libtool
+Only in liborcus: Makefile
+Only in liborcus/parser_handlers: .deps
+Only in liborcus/parser_handlers: Makefile
+Only in liborcus/src: .deps
+Only in liborcus/src/liborcus: .deps
+Only in liborcus/src/liborcus: Makefile
+Only in liborcus/src: Makefile
+Only in liborcus/src/mso: .deps
+Only in liborcus/src/mso: Makefile
+Only in liborcus/src/parser: base64.lo
+Only in liborcus/src/parser: base64.o
+Only in liborcus/src/parser: cell_buffer.lo
+Only in liborcus/src/parser: cell_buffer.o
+Only in liborcus/src/parser: css_parser_base.lo
+Only in liborcus/src/parser: css_parser_base.o
+Only in liborcus/src/parser: csv_parser_base.lo
+Only in liborcus/src/parser: csv_parser_base.o
+Only in liborcus/src/parser: .deps
+Only in liborcus/src/parser: exception.lo
+Only in liborcus/src/parser: exception.o
+Only in liborcus/src/parser: Makefile
+Only in liborcus/src/parser: parser_global.lo
+Only in liborcus/src/parser: parser_global.o
+Only in liborcus/src/parser: pstring.lo
+Only in liborcus/src/parser: pstring.o
+Only in liborcus/src/parser: sax_parser_base.lo
+Only in liborcus/src/parser: sax_parser_base.o
+Only in liborcus/src/parser: sax_token_parser.lo
+Only in liborcus/src/parser: sax_token_parser.o
+Only in liborcus/src/parser: stream.lo
+Only in liborcus/src/parser: stream.o
+Only in liborcus/src/parser: string_pool.lo
+Only in liborcus/src/parser: string_pool.o
+Only in liborcus/src/parser: tokens.lo
+Only in liborcus/src/parser: tokens.o
+Only in liborcus/src/parser: types.lo
+Only in liborcus/src/parser: types.o
+Only in liborcus/src/parser: xml_namespace.lo
+Only in liborcus/src/parser: xml_namespace.o
+Only in liborcus/src/parser: zip_archive.lo
+Only in liborcus/src/parser: zip_archive.o
+Only in liborcus/src/parser: zip_archive_stream.lo
+Only in liborcus/src/parser: zip_archive_stream.o
+Only in liborcus/src/spreadsheet: .deps
+Only in liborcus/src/spreadsheet: Makefile
+Only in liborcus: stamp-h1
+Only in liborcus: VERSION

external/liborcus/liborcus_0.1.0-dllimport.patch

---- include/orcus/env.hpp
-+++ include/orcus/env.hpp
-@@ -35,19 +35,13 @@
-     #else
-       #define ORCUS_DLLPUBLIC __declspec(dllexport)
-     #endif
--  #elif defined __ORCUS_STATIC_LIB
-+  #else
-       #define ORCUS_DLLPUBLIC
--  #else
--    #ifdef __GNUC__
--      #define ORCUS_DLLPUBLIC __attribute__ ((dllimport))
--    #else
--      #define ORCUS_DLLPUBLIC __declspec(dllimport)
--    #endif
-   #endif
-   #define ORCUS_DLLLOCAL
- #else
-   #if __GNUC__ >= 4
--    #define ORCUS_DLLPUBLIC __attribute__ ((visibility ("default")))
-+    #define ORCUS_DLLPUBLIC __attribute__ ((visibility ("hidden")))
-     #define ORCUS_DLLLOCAL  __attribute__ ((visibility ("hidden")))
-   #else
-     #define ORCUS_DLLPUBLIC

external/liborcus/visibility.patch

---- configure
-+++ configure
-@@ -3211,7 +3211,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--CXXFLAGS="$CXXFLAGS -O2 -fvisibility=hidden -Wall"
-+CXXFLAGS="$CXXFLAGS -O2 -Wall"
- 
- # ===========================
- # Find required base packages

sc/source/filter/html/htmlpars.cxx

@@ -3170,6 +3170,34 @@ public:
         maPropName = MemStr();
         maPropValue = MemStr();
     }
+
+    // new members
+    void simple_selector_type(const char* /*p*/, size_t /*n*/) {}
+
+    void simple_selector_class(const char* /*p*/, size_t /*n*/) {}
+
+    void simple_selector_pseudo_element(orcus::css::pseudo_element_t /*pe*/) {}
+
+    void simple_selector_pseudo_class(orcus::css::pseudo_class_t /*pc*/) {}
+
+    void simple_selector_id(const char* /*p*/, size_t /*n*/) {}
+
+    void end_simple_selector() {}
+
+    void end_selector() {}
+
+    void combinator(orcus::css::combinator_t /*combinator*/) {}
+
+    void rgb(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ ) {}
+
+    void rgba(uint8_t /*red*/ , uint8_t /*green*/ , uint8_t /*blue*/ , double /*alpha*/ ) {}
+
+    void hsl(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ ) {}
+
+    void hsla(uint8_t /*hue*/ , uint8_t /*sat*/ , uint8_t /*light*/ , double /*alpha*/ ) {}
+
+    void url(const char* /*p*/, size_t /*n*/) {}
+
 };
 
 }
@@ -3183,7 +3211,7 @@ void ScHTMLQueryParser::ParseStyle(const OUString& rStrm)
     {
         aParser.parse();
     }
-    catch (const orcus::css_parse_error&)
+    catch (const orcus::css::parse_error&)
     {
         // TODO: Parsing of CSS failed.  Do nothing for now.
     }

sc/source/filter/inc/orcusinterface.hxx

@@ -43,6 +43,9 @@ public:
     ScOrcusGlobalSettings(ScDocumentImport& rDoc);
 
     virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE;
+
+    virtual void set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t grammar) SAL_OVERRIDE;
+    virtual orcus::spreadsheet::formula_grammar_t get_default_formula_grammar() const SAL_OVERRIDE;
 };
 
 class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings
@@ -120,9 +123,12 @@ public:
         orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) SAL_OVERRIDE;
 
     virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE;
+    virtual void set_format(orcus::spreadsheet::row_t row_start, orcus::spreadsheet::col_t col_start,
+            orcus::spreadsheet::row_t row_end, orcus::spreadsheet::col_t col_end, size_t xf_index) SAL_OVERRIDE;
 
     virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) SAL_OVERRIDE;
     virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE;
+    virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double val) SAL_OVERRIDE;
 
     virtual void set_shared_formula(
         orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex,
@@ -203,6 +209,10 @@ public:
     virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE;
     virtual size_t commit_cell_xf() SAL_OVERRIDE;
 
+    // dxf
+    virtual void set_dxf_count(size_t count) SAL_OVERRIDE;
+    virtual size_t commit_dxf() SAL_OVERRIDE;
+
     // xf (cell format) - used both by cell xf and cell style xf.
 
     virtual void set_xf_number_format(size_t index) SAL_OVERRIDE;

sc/source/filter/orcus/interface.cxx

@@ -35,6 +35,15 @@ void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day)
     mrDoc.setOriginDate(year, month, day);
 }
 
+void ScOrcusGlobalSettings::set_default_formula_grammar(orcus::spreadsheet::formula_grammar_t /*grammar*/)
+{
+}
+
+orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const
+{
+    return orcus::spreadsheet::formula_grammar_unknown;
+}
+
 ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) :
     maPos(rPos), mnIndex(nIndex) {}
 
@@ -263,6 +272,11 @@ void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, size_t /*xf_
 {
 }
 
+void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/,
+        os::row_t /*row_end*/, os::col_t /*col_end*/, size_t /*xf_index*/)
+{
+}
+
 namespace {
 
 formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t grammar )
@@ -270,16 +284,18 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
     formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_ODFF;
     switch(grammar)
     {
-        case orcus::spreadsheet::ods:
+        case orcus::spreadsheet::formula_grammar_ods:
             eGrammar = formula::FormulaGrammar::GRAM_ODFF;
             break;
-        case orcus::spreadsheet::xlsx_2007:
-        case orcus::spreadsheet::xlsx_2010:
+        case orcus::spreadsheet::formula_grammar_xlsx_2007:
+        case orcus::spreadsheet::formula_grammar_xlsx_2010:
             eGrammar = formula::FormulaGrammar::GRAM_OOXML;
             break;
-        case orcus::spreadsheet::gnumeric:
+        case orcus::spreadsheet::formula_grammar_gnumeric:
             eGrammar = formula::FormulaGrammar::GRAM_ENGLISH_XL_A1;
             break;
+        case orcus::spreadsheet::formula_grammar_unknown:
+            break;
     }
 
     return eGrammar;
@@ -309,6 +325,19 @@ void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, const char*
     pCell->SetHybridString(mrDoc.getDoc().GetSharedStringPool().intern(aResult));
 }
 
+void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, double /*val*/)
+{
+    ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab));
+    if (!pCell)
+    {
+        SAL_WARN("sc", "trying to set formula result for non formula \
+                cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab);
+        return;
+    }
+
+    // TODO: FIXME
+}
+
 void ScOrcusSheet::set_shared_formula(
     os::row_t row, os::col_t col, os::formula_grammar_t grammar, size_t sindex,
     const char* p_formula, size_t n_formula)
@@ -577,6 +606,17 @@ size_t ScOrcusStyles::commit_cell_xf()
     return 0;
 }
 
+// dxf
+
+void ScOrcusStyles::set_dxf_count(size_t /*n*/)
+{
+}
+
+size_t ScOrcusStyles::commit_dxf()
+{
+    return 0;
+}
+
 // xf (cell format) - used both by cell xf and cell style xf.
 
 void ScOrcusStyles::set_xf_number_format(size_t /*index*/)