summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-01-09 14:58:51 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-01-09 14:58:51 +0000
commit02a066e960f331cc121a78b80707c5d5d5bde7b7 (patch)
tree1f93e8ca10926f12d685f4d29bcd4acfc3c0120c /formula
parent7a0f18cb256b468ba85acb41445b3f09d2e7ce8a (diff)
#i10000#: resolve merge conflicts from CWS frmdlg
Diffstat (limited to 'formula')
-rw-r--r--formula/inc/formula/tokenarray.hxx1
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx7
2 files changed, 2 insertions, 6 deletions
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 2b84fced2687..b61cec5ad946 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -138,6 +138,7 @@ public:
USHORT GetCodeError() const { return nError; }
void SetCodeError( USHORT n ) { nError = n; }
short GetRefs() const { return nRefs; }
+ void IncrementRefs() { ++nRefs; }
void SetHyperLink( BOOL bVal ) { bHyperLink = bVal; }
BOOL IsHyperLink() const { return bHyperLink; }
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index bd70a2f1c9bb..e4382e349afe 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1673,12 +1673,7 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
else
{
String aStr( rStr );
- xub_StrLen nPos = 0;
- while ( (nPos = aStr.Search( '"', nPos)) != STRING_NOTFOUND )
- {
- aStr.Insert( '"', nPos );
- nPos += 2;
- }
+ aStr.SearchAndReplaceAll( '"', String( RTL_CONSTASCII_USTRINGPARAM( "\"\"")));
rBuffer.append(aStr);
}
rBuffer.append(sal_Unicode('"'));