[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - extensions/source i18npool/source

[Libreoffice Gerrit user]

 extensions/source/nsplugin/source/npshell.cxx   |    2 +-
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f87d1103e40739afb65cf19ac2004aa2cb74316b
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Nov 12 21:07:13 2012 +0000

    WaE: fix windows build of npshell.
    (cherry picked from commit 655ef3e507d1bc41e67cd7529f827ac58fb9bab0)
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 52e85b6..ae2cf91 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -99,7 +99,7 @@
  ***********************************************************************/
 
 static NSP_Mute_Obj send_lock = NSP_New_Mute_Obj();
-static NSP_PIPE_FD write_fd = -1;
+static NSP_PIPE_FD write_fd = (NSP_PIPE_FD)-1;
 
 
 long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len)
commit 51f2005c530e258b791c215a11c2a64bf8830137
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;