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/source/core/data/conditio.cxx | |
| parent | ee8fad644e28d1e298afb7c6eed4d454617e7dc7 (diff) | |
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/source/core/data/conditio.cxx')
| -rw-r--r-- | sc/source/core/data/conditio.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 6cc4f1bb022b..418b30379e78 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -40,6 +40,7 @@ #include "editutil.hxx" #include "tokenarray.hxx" #include "refupdatecontext.hxx" +#include "svl/sharedstring.hxx" using namespace formula; //------------------------------------------------------------------------ @@ -723,7 +724,7 @@ static bool lcl_GetCellContent( ScRefCellValue& rCell, bool bIsStr1, double& rAr case CELLTYPE_EDIT: bVal = false; if (rCell.meType == CELLTYPE_STRING) - rArgStr = *rCell.mpString; + rArgStr = rCell.mpString->getString(); else if (rCell.mpEditText) rArgStr = ScEditUtil::GetString(*rCell.mpEditText, pDoc); break; |