i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 4 +++-
scp2/source/ooo/file_library_ooo.scp | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 4b4ddbc7d806de1c847be904ddad653c95f30b60
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Nov 6 15:58:24 2012 +0100
Fix liblangtag name in scp2
Change-Id: I98d90b76dba619b75fd0cdb726678cb98705dc63
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 07a2cd7..9d59cc4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -759,16 +759,16 @@ File gid_File_Lib_Langtag
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef MACOSX
- Name = STRING(CONCAT4(liblangtag,.,0,UNXSUFFIX));
+ Name = STRING(CONCAT4(liblangtag,.,1,UNXSUFFIX));
#elif defined WNT
#if defined _gcc3
- Name = STRING(CONCAT4(liblangtag,-,0,.dll));
+ Name = STRING(CONCAT4(liblangtag,-,1,.dll));
#else
// Nothing, statically linked to libi18nisolang1
#endif
#else
// FIXME: use version vars
- Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,0));
+ Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,1));
#endif
End
commit 524461f1721d0fb7c5bd115d72ca82711e0ff950
Author: Petr Mladek <pmla...@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
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 6dd7053..03663b6 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -88,7 +88,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
