diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 11:52:15 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 11:52:15 +0000 |
| commit | 1e825007b928acf6c68eb8200d720b5493404f83 (patch) | |
| tree | 241d44a2a906663bf775eb02792633563e0742fc /svtools/source/numbers | |
| parent | 20262eb6faa91d7ba397a1688239b68d21e9af79 (diff) | |
INTEGRATION: CWS os100 (1.13.12); FILE MERGED
2007/07/10 14:03:02 os 1.13.12.1: #i69736# ::addNewConverted(): exception for already inserted formats removed
Diffstat (limited to 'svtools/source/numbers')
| -rw-r--r-- | svtools/source/numbers/numfmuno.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/numbers/numfmuno.cxx b/svtools/source/numbers/numfmuno.cxx index c750e07a2ab9..2196c734e229 100644 --- a/svtools/source/numbers/numfmuno.cxx +++ b/svtools/source/numbers/numfmuno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: numfmuno.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2007-06-27 21:55:54 $ + * last change: $Author: obo $ $Date: 2007-07-18 12:52:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -558,7 +558,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const rtl::OUString& aFo xub_StrLen nCheckPos = 0; short nType = 0; BOOL bOk = pFormatter->PutandConvertEntry( aFormStr, nCheckPos, nType, nKey, eLang, eNewLang ); - if (bOk) + if (bOk || nKey > 0) nRet = nKey; else if (nCheckPos) { |