diff options
| author | Kohei Yoshida <kohei@libreoffice.org> | 2019-08-12 13:57:34 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei@libreoffice.org> | 2019-08-15 06:09:52 +0200 |
| commit | 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4 (patch) | |
| tree | f8e30f9c60c10377b3ed81fbb20d6ffb672dad8a /sc/inc | |
| parent | 43cce4ef2cf865b2bb637e17b70102a4260295b0 (diff) | |
Switch mdds to 1.5.0 and liborcus to 0.15.0.
Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265
Reviewed-on: https://gerrit.libreoffice.org/77482
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida <kohei@libreoffice.org>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/mtvelements.hxx | 8 | ||||
| -rw-r--r-- | sc/inc/orcusxml.hxx | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx index 407f0392c4cd..382fb4d2b688 100644 --- a/sc/inc/mtvelements.hxx +++ b/sc/inc/mtvelements.hxx @@ -52,9 +52,9 @@ const mdds::mtv::element_t element_type_formula = mdds::mtv::element_type_user_s const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_start + 5; /// Mapped standard element types (for convenience). -const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric; +const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_double; const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty; -const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort; +const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_uint16; /// Custom element blocks. @@ -66,8 +66,8 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, Edit typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block; /// Mapped standard element blocks (for convenience). -typedef mdds::mtv::numeric_element_block numeric_block; -typedef mdds::mtv::ushort_element_block uint16_block; +typedef mdds::mtv::double_element_block numeric_block; +typedef mdds::mtv::uint16_element_block uint16_block; /// This needs to be in the same namespace as CellTextAttr. MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block) diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx index ced991e51ded..5db292c29d54 100644 --- a/sc/inc/orcusxml.hxx +++ b/sc/inc/orcusxml.hxx @@ -69,6 +69,7 @@ struct ScOrcusImportXMLParam { ScAddress maPos; std::vector<OString> maFieldPaths; + std::vector<OString> maRowGroups; }; typedef std::vector<CellLink> CellLinksType; |