diff options
Diffstat (limited to 'svl/source/numbers')
| -rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 | ||||
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index f4c236827a01..24331b1dbea3 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -1852,7 +1852,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const css::i18n::NumberForma rCode.Index != NF_CURRENCY_1000DEC2_CCC ) { // strip surrounding [$...] on automatic currency if ( aCodeStr.indexOf( "[$" ) >= 0) - aCodeStr = SvNumberformat::StripNewCurrencyDelimiters( aCodeStr, false ); + aCodeStr = SvNumberformat::StripNewCurrencyDelimiters( aCodeStr ); else { if (LocaleDataWrapper::areChecksEnabled() && diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 34121edce041..0a9036193016 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1899,8 +1899,7 @@ bool SvNumberformat::GetNewCurrencySymbol( OUString& rSymbol, } // static -OUString SvNumberformat::StripNewCurrencyDelimiters( const OUString& rStr, - bool bQuoteSymbol ) +OUString SvNumberformat::StripNewCurrencyDelimiters( const OUString& rStr ) { OUString aTmp; sal_Int32 nStartPos, nPos, nLen; @@ -1947,16 +1946,7 @@ OUString SvNumberformat::StripNewCurrencyDelimiters( const OUString& rStr, { nPos = nDash; } - if ( !bQuoteSymbol || rStr[ nStartPos ] == '"' ) - { - aTmp += rStr.copy( nStartPos, nPos - nStartPos ); - } - else - { - aTmp += "\""; - aTmp += rStr.copy( nStartPos, nPos - nStartPos ); - aTmp += "\""; - } + aTmp += rStr.copy( nStartPos, nPos - nStartPos ); nStartPos = nClose + 1; } } |