]>
Commit | Line | Data |
---|---|---|
343e4b00 JR |
1 | From db729f3b685fd832a3ec7387b339cf2bbeb4bd4d Mon Sep 17 00:00:00 2001 |
2 | From: Kohei Yoshida <kohei.yoshida@gmail.com> | |
3 | Date: Wed, 11 May 2016 21:45:56 -0400 | |
4 | Subject: Update mdds to 1.2.0. Note that the API version is also up. | |
5 | ||
6 | liborcus-0.11.2 is out only to make it buildable with mdds-1.2. | |
7 | ||
8 | Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70 | |
9 | Reviewed-on: https://gerrit.libreoffice.org/24944 | |
10 | Tested-by: Jenkins <ci@libreoffice.org> | |
11 | Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> | |
12 | ||
13 | diff --git a/configure.ac b/configure.ac | |
14 | index 3f1b7f0..6dea282 100644 | |
15 | --- a/configure.ac | |
16 | +++ b/configure.ac | |
17 | @@ -8832,7 +8832,7 @@ AC_SUBST(SYSTEM_BOOST) | |
18 | dnl =================================================================== | |
19 | dnl Check for system mdds | |
20 | dnl =================================================================== | |
21 | -libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) | |
22 | +libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"]) | |
23 | ||
24 | dnl =================================================================== | |
25 | dnl Check for system glm | |
26 | diff --git a/download.lst b/download.lst | |
27 | index a2483c2..ddd6edc 100644 | |
28 | --- a/download.lst | |
29 | +++ b/download.lst | |
30 | @@ -94,8 +94,8 @@ | |
31 | export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz | |
32 | export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz | |
33 | export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz | |
34 | -export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe | |
35 | -export MDDS_TARBALL := mdds_0.12.1.tar.bz2 | |
36 | +export MDDS_MD5SUM := 9f3383fb7bae825eab69f3a6ec1d74b2 | |
37 | +export MDDS_TARBALL := mdds-1.2.0.tar.bz2 | |
38 | export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 | |
39 | export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 | |
40 | export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb | |
41 | diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx | |
42 | index 0bc5162..18edafc 100644 | |
43 | --- a/sc/inc/mtvelements.hxx | |
44 | +++ b/sc/inc/mtvelements.hxx | |
45 | @@ -53,6 +53,7 @@ const mdds::mtv::element_t element_type_cellnote = mdds::mtv::element_type_user_ | |
46 | /// Mapped standard element types (for convenience). | |
47 | const mdds::mtv::element_t element_type_numeric = mdds::mtv::element_type_numeric; | |
48 | const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty; | |
49 | +const mdds::mtv::element_t element_type_uint16 = mdds::mtv::element_type_ushort; | |
50 | ||
51 | /// Custom element blocks. | |
52 | ||
53 | @@ -65,6 +66,7 @@ typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFor | |
54 | ||
55 | /// Mapped standard element blocks (for convenience). | |
56 | typedef mdds::mtv::numeric_element_block numeric_block; | |
57 | +typedef mdds::mtv::ushort_element_block uint16_block; | |
58 | ||
59 | /// This needs to be in the same namespace as CellTextAttr. | |
60 | MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellTextAttr(), celltextattr_block) | |
61 | diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx | |
62 | index f1ce9a5..1689809 100644 | |
63 | --- a/sc/source/core/tool/scmatrix.cxx | |
64 | +++ b/sc/source/core/tool/scmatrix.cxx | |
65 | @@ -57,17 +57,15 @@ using ::std::unary_function; | |
66 | * Custom string trait struct to tell mdds::multi_type_matrix about the | |
67 | * custom string type and how to handle blocks storing them. | |
68 | */ | |
69 | -struct custom_string_trait | |
70 | +struct matrix_trait | |
71 | { | |
72 | - typedef svl::SharedString string_type; | |
73 | typedef sc::string_block string_element_block; | |
74 | - | |
75 | - static const mdds::mtv::element_t string_type_identifier = sc::element_type_string; | |
76 | + typedef sc::uint16_block integer_element_block; | |
77 | ||
78 | typedef mdds::mtv::custom_block_func1<sc::string_block> element_block_func; | |
79 | }; | |
80 | ||
81 | -typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType; | |
82 | +typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType; | |
83 | ||
84 | namespace { | |
85 | ||
86 | @@ -2304,6 +2302,7 @@ public: | |
87 | } | |
88 | } | |
89 | break; | |
90 | + case mdds::mtm::element_integer: | |
91 | case mdds::mtm::element_string: | |
92 | case mdds::mtm::element_empty: | |
93 | default: | |
94 | diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx | |
95 | index 4044b3e..70e7439 100644 | |
96 | --- a/svl/source/misc/gridprinter.cxx | |
97 | +++ b/svl/source/misc/gridprinter.cxx | |
98 | @@ -26,12 +26,10 @@ const mdds::mtv::element_t element_type_string = mdds::mtv::element_type_user_st | |
99 | // String block | |
100 | typedef mdds::mtv::default_element_block<element_type_string, OUString> string_block; | |
101 | ||
102 | -struct custom_string_trait | |
103 | +struct matrix_trait | |
104 | { | |
105 | - typedef OUString string_type; | |
106 | typedef string_block string_element_block; | |
107 | - | |
108 | - static const mdds::mtv::element_t string_type_identifier = element_type_string; | |
109 | + typedef mdds::mtv::ushort_element_block integer_element_block; | |
110 | ||
111 | typedef mdds::mtv::custom_block_func1<string_block> element_block_func; | |
112 | }; | |
113 | @@ -48,7 +46,7 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, svl::element_type_string, OUString() | |
114 | ||
115 | namespace svl { | |
116 | ||
117 | -typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType; | |
118 | +typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType; | |
119 | ||
120 | struct GridPrinter::Impl | |
121 | { | |
122 | -- | |
123 | cgit v0.10.2 | |
124 |