summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2016-05-11 21:45:56 -0400
committerKohei Yoshida <libreoffice@kohei.us>2016-05-13 00:35:20 +0000
commitdb729f3b685fd832a3ec7387b339cf2bbeb4bd4d (patch)
tree035b7b9510f9bde6f069eae0add535626e2cc3dc /svl
parent0876e5a20ac9873dd111eb2a30a76488b642614f (diff)
Update mdds to 1.2.0. Note that the API version is also up.
liborcus-0.11.2 is out only to make it buildable with mdds-1.2. Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70 Reviewed-on: https://gerrit.libreoffice.org/24944 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'svl')
-rw-r--r--svl/source/misc/gridprinter.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index 4044b3ed9902..70e7439db299 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -26,12 +26,10 @@ const mdds::mtv::element_t element_type_string = mdds::mtv::element_type_user_st
// String block
typedef mdds::mtv::default_element_block<element_type_string, OUString> string_block;
-struct custom_string_trait
+struct matrix_trait
{
- typedef OUString string_type;
typedef string_block string_element_block;
-
- static const mdds::mtv::element_t string_type_identifier = element_type_string;
+ typedef mdds::mtv::ushort_element_block integer_element_block;
typedef mdds::mtv::custom_block_func1<string_block> element_block_func;
};
@@ -48,7 +46,7 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, svl::element_type_string, OUString()
namespace svl {
-typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType;
+typedef mdds::multi_type_matrix<matrix_trait> MatrixImplType;
struct GridPrinter::Impl
{