diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-05 01:39:08 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-18 19:57:21 -0600 |
commit | d35ce2d9be2c67239b74e8f699e1c04558bfc0af (patch) | |
tree | ebdb31ea612df6cce9b25155f8ed9581cdef6d4c /xmloff | |
parent | svl: convert GetQuoteEnd to OUString (diff) | |
download | core-d35ce2d9be2c67239b74e8f699e1c04558bfc0af.tar.gz core-d35ce2d9be2c67239b74e8f699e1c04558bfc0af.zip |
xmloff: convert lcl_FindSymbol to OUString
Change-Id: I6d93cb64126d60c35fda58039989d57b18a44773
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 3005cb476126..a770d207b15b 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -759,16 +759,16 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit, //------------------------------------------------------------------------- // for old (automatic) currency formats: parse currency symbol from text -xub_StrLen lcl_FindSymbol( const String& sUpperStr, const String& sCurString ) +sal_Int32 lcl_FindSymbol( const OUString& sUpperStr, const OUString& sCurString ) { // search for currency symbol // Quoting as in ImpSvNumberformatScan::Symbol_Division - xub_StrLen nCPos = 0; - while (nCPos != STRING_NOTFOUND) + sal_Int32 nCPos = 0; + while (nCPos >= 0) { - nCPos = sUpperStr.Search( sCurString, nCPos ); - if (nCPos != STRING_NOTFOUND) + nCPos = sUpperStr.indexOf( sCurString, nCPos ); + if (nCPos >= 0) { // in Quotes? sal_Int32 nQ = SvNumberformat::GetQuoteEnd( sUpperStr, nCPos ); @@ -777,19 +777,23 @@ xub_StrLen lcl_FindSymbol( const String& sUpperStr, const String& sCurString ) // dm can be escaped as "dm or \d sal_Unicode c; if ( nCPos == 0 || - ((c = sUpperStr.GetChar(xub_StrLen(nCPos-1))) != '"' - && c != '\\') ) + ((c = sUpperStr[nCPos-1]) != '"' + && c != '\\') ) { return nCPos; // found } else + { nCPos++; // continue + } } else + { nCPos = nQ + 1; // continue after quote end + } } } - return STRING_NOTFOUND; // not found + return -1; } sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, @@ -805,9 +809,9 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, pFormatter->GetCompatibilityCurrency( sCurString, sDummy ); pCharClass->setLocale( rLocale ); - String sUpperStr = pCharClass->uppercase(rString); - xub_StrLen nPos = lcl_FindSymbol( sUpperStr, sCurString ); - if ( nPos != STRING_NOTFOUND ) + OUString sUpperStr = pCharClass->uppercase(rString); + sal_Int32 nPos = lcl_FindSymbol( sUpperStr, OUString(sCurString) ); + if ( nPos >= 0 ) { sal_Int32 nLength = rString.getLength(); sal_Int32 nCurLen = sCurString.Len(); @@ -815,8 +819,9 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, // text before currency symbol if ( nPos > 0 ) + { AddToTextElement_Impl( rString.copy( 0, nPos ) ); - + } // currency symbol (empty string -> default) OUString sEmpty; WriteCurrencyElement_Impl( sEmpty, sEmpty ); @@ -824,10 +829,14 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, // text after currency symbol if ( nCont < nLength ) + { AddToTextElement_Impl( rString.copy( nCont, nLength-nCont ) ); + } } else + { AddToTextElement_Impl( rString ); // simple text + } return bRet; // sal_True: currency element written } |