summaryrefslogtreecommitdiff
path: root/formula/source
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-04-14 16:57:52 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-04-14 17:00:40 -0400
commitb09426b83c12b0cd27cd909602251cb076ffa4ba (patch)
tree1accd4e5214b123084c0bb9e2a3dd639b52232bf /formula/source
parent2da75ceaca3907694b4021d3d63a63375ce37ac6 (diff)
fdo#76294: Properly intern string literals in formula on xls import.
Change-Id: Ib3a442cbb68c23294762561f2911101a087a795e
Diffstat (limited to 'formula/source')
-rw-r--r--formula/source/core/api/token.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index da98d0e5da4d..ecfb02aa52bb 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -801,7 +801,7 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
}
}
-FormulaToken* FormulaTokenArray::AddString( const OUString& rStr )
+FormulaToken* FormulaTokenArray::AddString( const svl::SharedString& rStr )
{
return Add( new FormulaStringToken( rStr ) );
}
@@ -1369,7 +1369,10 @@ bool FormulaDoubleToken::operator==( const FormulaToken& r ) const
}
FormulaStringToken::FormulaStringToken( const svl::SharedString& r ) :
- FormulaToken( svString ), maString( r ) {}
+ FormulaToken( svString ), maString( r )
+{
+}
+
FormulaStringToken::FormulaStringToken( const FormulaStringToken& r ) :
FormulaToken( r ), maString( r.maString ) {}