diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-07 12:15:28 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-10-08 15:44:33 -0400 |
| commit | f4bda54cdaf13cf96ff7c9327036568825c8c323 (patch) | |
| tree | 8fa25fe11fdc329e3a8a9b6a2750b75a7dd63577 /sc | |
| parent | 6ddcbf4b2fddbb1bad2da05fc6ced1046493d058 (diff) | |
Re-implement interning in order to return both string arrays.
One is for the cased string and the other one for the non-cased one.
Change-Id: I798687f2efecaaea73a09e0b3348f85a9d9e8c07
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/column2.cxx | 8 | ||||
| -rw-r--r-- | sc/source/core/data/column3.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/documentimport.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 96015833f31b..2b7d52248ea0 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -2174,7 +2174,7 @@ bool appendStrings( getBlockIterators<sc::string_block>(it, nLenRemain, itData, itDataEnd); for (; itData != itDataEnd; ++itData) - rArray.push_back(rCxt.maStrPool.intern(*itData)); + rArray.push_back(rCxt.maStrPool.intern(*itData).getData()); } break; case sc::element_type_edittext: @@ -2185,7 +2185,7 @@ bool appendStrings( for (; itData != itDataEnd; ++itData) { OUString aStr = ScEditUtil::GetString(**itData, pDoc); - rArray.push_back(rCxt.maStrPool.intern(aStr)); + rArray.push_back(rCxt.maStrPool.intern(aStr).getData()); } } break; @@ -2210,7 +2210,7 @@ bool appendStrings( return false; } - rArray.push_back(rCxt.maStrPool.intern(aStr)); + rArray.push_back(rCxt.maStrPool.intern(aStr).getData()); } } break; @@ -2250,7 +2250,7 @@ void copyFirstBlock( sc::FormulaGroupContext& rCxt, size_t nLen, const sc::CellS const OUString* p = &sc::string_block::at(*rPos.first->data, rPos.second); const OUString* pEnd = p + nLen; for (; p != pEnd; ++p) - rArray.push_back(rCxt.maStrPool.intern(*p)); + rArray.push_back(rCxt.maStrPool.intern(*p).getData()); } } diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index b01ff8f2df29..f9f21d521387 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2188,7 +2188,7 @@ void ScColumn::SetRawString( SCROW nRow, const OUString& rStr, bool bBroadcast ) if (!ValidRow(nRow)) return; - rtl_uString* pStr = pDocument->GetCellStringPool().intern(rStr); + rtl_uString* pStr = pDocument->GetCellStringPool().intern(rStr).getData(); if (!pStr) return; @@ -2207,7 +2207,7 @@ void ScColumn::SetRawString( if (!ValidRow(nRow)) return; - rtl_uString* pStr = pDocument->GetCellStringPool().intern(rStr); + rtl_uString* pStr = pDocument->GetCellStringPool().intern(rStr).getData(); if (!pStr) return; diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx index 4822557794f5..95ae3cfd5f66 100644 --- a/sc/source/core/data/documentimport.cxx +++ b/sc/source/core/data/documentimport.cxx @@ -150,7 +150,7 @@ void ScDocumentImport::setStringCell(const ScAddress& rPos, const OUString& rStr if (!pBlockPos) return; - rtl_uString* pStr = mpImpl->mrDoc.GetCellStringPool().intern(rStr); + rtl_uString* pStr = mpImpl->mrDoc.GetCellStringPool().intern(rStr).getData(); if (!pStr) return; |