diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-07 17:27:02 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-08 15:48:10 -0400 |
commit | 658fc68d574bd49b8b233ad5ed886758e290b3aa (patch) | |
tree | b1acc482e6b8a8aac78e729b1ea0419aea4df607 /sc/inc/mtvelements.hxx | |
parent | ContentInfo to store svl::SharedString instead of OUString. (diff) | |
download | core-658fc68d574bd49b8b233ad5ed886758e290b3aa.tar.gz core-658fc68d574bd49b8b233ad5ed886758e290b3aa.zip |
Store svl::SharedString in document cell storage instead of OUString.
With this, both ScColumn and ScMatrix store svl::SharedString as their
string values, instead of OUString.
Change-Id: I3faece94d98f774881fd72b3ed5f6143504cd350
Diffstat (limited to 'sc/inc/mtvelements.hxx')
-rw-r--r-- | sc/inc/mtvelements.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx index f0e5fff7dc9d..6279efaa03c0 100644 --- a/sc/inc/mtvelements.hxx +++ b/sc/inc/mtvelements.hxx @@ -13,6 +13,7 @@ #include "address.hxx" #include "formulacell.hxx" #include "svl/broadcast.hxx" +#include "svl/sharedstring.hxx" #include "editeng/editobj.hxx" #include "calcmacros.hxx" @@ -62,7 +63,7 @@ const mdds::mtv::element_t element_type_empty = mdds::mtv::element_type_empty; typedef mdds::mtv::noncopyable_managed_element_block<element_type_broadcaster, SvtBroadcaster> broadcaster_block; typedef mdds::mtv::default_element_block<element_type_celltextattr, CellTextAttr> celltextattr_block; -typedef mdds::mtv::default_element_block<element_type_string, rtl::OUString> string_block; +typedef mdds::mtv::default_element_block<element_type_string, svl::SharedString> string_block; typedef mdds::mtv::noncopyable_managed_element_block<element_type_edittext, EditTextObject> edittext_block; typedef mdds::mtv::noncopyable_managed_element_block<element_type_formula, ScFormulaCell> formula_block; @@ -79,9 +80,9 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(SvtBroadcaster, sc::element_type_broadcast MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(ScFormulaCell, sc::element_type_formula, NULL, sc::formula_block) MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(EditTextObject, sc::element_type_edittext, NULL, sc::edittext_block) -namespace rtl { +namespace svl { -MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(OUString, sc::element_type_string, OUString(), sc::string_block) +MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(SharedString, sc::element_type_string, SharedString(), sc::string_block) } |