summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-12-15 17:44:30 +0100
committerEike Rathke <erack@redhat.com>2015-12-15 17:50:21 +0100
commitdad412e07f805a53ad73ce2e80d187a70c77e8de (patch)
treed8c03dfea6ff07a8c0928e2449bdfea9141a2060 /formula
parent07004a7e9cd8b44f8cb4ff8f30180b06d9c325c3 (diff)
Resolves: tdf#95440 SharedString are interned per document, re-intern
... if literal strings are copied with formula expression tokens. Change-Id: I13526907bb6c2c605c6ed9584fa6e3f2b18623b8
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/token.cxx30
1 files changed, 30 insertions, 0 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index d46b02ded07a..339e927742fa 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -204,6 +204,11 @@ svl::SharedString FormulaToken::GetString() const
return svl::SharedString(); // invalid string
}
+void FormulaToken::SetString( const svl::SharedString& )
+{
+ SAL_WARN( "formula.core", "FormulaToken::SetString: virtual dummy called" );
+}
+
sal_uInt16 FormulaToken::GetIndex() const
{
SAL_WARN( "formula.core", "FormulaToken::GetIndex: virtual dummy called" );
@@ -1523,6 +1528,21 @@ FormulaToken* FormulaTokenArray::AddOpCode( OpCode eOp )
return AddToken( *pRet );
}
+void FormulaTokenArray::ReinternStrings( svl::SharedStringPool& rPool )
+{
+ for (sal_uInt16 i=0; i < nLen; ++i)
+ {
+ switch (pCode[i]->GetType())
+ {
+ case svString:
+ pCode[i]->SetString( rPool.intern( pCode[i]->GetString().getString()));
+ break;
+ default:
+ ; // nothing
+ }
+ }
+}
+
/*----------------------------------------------------------------------*/
@@ -1651,6 +1671,11 @@ svl::SharedString FormulaStringToken::GetString() const
return maString;
}
+void FormulaStringToken::SetString( const svl::SharedString& rStr )
+{
+ maString = rStr;
+}
+
bool FormulaStringToken::operator==( const FormulaToken& r ) const
{
return FormulaToken::operator==( r ) && maString == r.GetString();
@@ -1672,6 +1697,11 @@ svl::SharedString FormulaStringOpToken::GetString() const
return maString;
}
+void FormulaStringOpToken::SetString( const svl::SharedString& rStr )
+{
+ maString = rStr;
+}
+
bool FormulaStringOpToken::operator==( const FormulaToken& r ) const
{
return FormulaByteToken::operator==( r ) && maString == r.GetString();