[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Nov 13 02:05:29 PST 2012
i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bf26b6dd3a05eb3f6423fab5a815bbaf205f1649
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 6 15:13:46 2012 +0000
WaE: duplicated variable name
Change-Id: Id42116f2ddfe679b1a995590e35a619ff8d82d7e
(cherry picked from commit fdc76a03f50e1291a90035befac67b8205c7e770)
Signed-off-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 3d7f560..4124c92 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -98,8 +98,8 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
icu::UnicodeString sFormatWithNoOrdinal;
icu::Formattable ftmNumber((int32_t)nNumber);
- icu::FieldPosition icuPos;
- xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPos, nCode);
+ icu::FieldPosition icuPosA;
+ xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPosA, nCode);
if (!U_SUCCESS(nCode))
return retValue;
@@ -114,8 +114,8 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
// format the string
icu::UnicodeString sFormatWithOrdinal;
- icu::FieldPosition icuPos;
- formatter.format( (int32_t)nNumber, ruleSet, sFormatWithOrdinal, icuPos, nCode );
+ icu::FieldPosition icuPosB;
+ formatter.format((int32_t)nNumber, ruleSet, sFormatWithOrdinal, icuPosB, nCode);
if (!U_SUCCESS(nCode))
continue;
More information about the Libreoffice-commits
mailing list