[Libreoffice-commits] .: Branch 'libreoffice-3-6' - i18npool/source

[Libreoffice Gerrit user]

 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 837aed5235fcf0468f13f12f29a0f498b92ab850
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 6 15:57:07 2012 +0100

    fix build with icu-4.0
    
    use functions already provided by icu-4.0
    
    Change-Id: I238a499ae1bc2a7efeb4d61fbe780e24d7d36a7a
    (cherry picked from commit 524461f1721d0fb7c5bd115d72ca82711e0ff950)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index a0760a0..3d7f560 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -97,7 +97,9 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
         return retValue;
 
     icu::UnicodeString sFormatWithNoOrdinal;
-    xNumberFormat->format((int32_t)nNumber, sFormatWithNoOrdinal, NULL, nCode);
+    icu::Formattable ftmNumber((int32_t)nNumber);
+    icu::FieldPosition icuPos;
+    xNumberFormat->format(ftmNumber, sFormatWithNoOrdinal, icuPos, nCode);
     if (!U_SUCCESS(nCode))
         return retValue;