diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-08-25 12:12:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-08-25 12:12:48 +0000 |
| commit | d7c95f538dda0e6d6c60a5890e06049f0a3ca5ec (patch) | |
| tree | 48f015ca0128ffe6bfd26278566134feed1a9240 | |
| parent | 8eeb6cecbabea55fde6440462b83dbefd9b60755 (diff) | |
INTEGRATION: CWS localedata6 (1.30.26); FILE MERGED
2005/08/22 16:47:55 er 1.30.26.1: #i53550# scanCurrFormatImpl: don't detect 'free flow' currency symbol when in square bracketed section
| -rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index d34dbfb3ffc3..cd7203c85144 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: localedatawrapper.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2005-06-09 14:31:46 $ + * last change: $Author: kz $ $Date: 2005-08-25 13:12:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -844,7 +844,7 @@ void LocaleDataWrapper::scanCurrFormatImpl( const String& rCode, p = pStop; break; default: - if ( nSym == STRING_NOTFOUND && rCode.Equals( aCurrSymbol, p-pStr, aCurrSymbol.Len() ) ) + if ( !nInSection && nSym == STRING_NOTFOUND && rCode.Equals( aCurrSymbol, p-pStr, aCurrSymbol.Len() ) ) { // currency symbol not surrounded by [$...] nSym = p - pStr; if ( nBlank == STRING_NOTFOUND && pStr < p && *(p-1) == ' ' ) |