[Libreoffice-commits] .: extensions/source shell/source

[Julien Nabet]

 extensions/source/nsplugin/source/so_instance.cxx |    3 +--
 shell/source/unix/exec/urltest.cxx                |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a96ae2104df11dab6c7255d733aad67043986109
Author: Julien Nabet <serval2...@yahoo.fr>
Date:   Thu Jan 31 22:54:53 2013 +0100

    Some cppcheck cleaning
    
    Change-Id: I39e1dd985af6029e1fd688ff47350734c85928a6

diff --git a/extensions/source/nsplugin/source/so_instance.cxx 
b/extensions/source/nsplugin/source/so_instance.cxx
index 20f54c1..37a9f52 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -98,11 +98,10 @@ SoPluginInstance::~SoPluginInstance()
 sal_Bool SoPluginInstance::SetURL(char* aURL)
 {
     debug_fprintf(NSP_LOG_APPEND, "SoPluginInstance::SetURL %s\n", aURL);
-    sal_uInt16 encoding = 11;
 
     rtl_Locale* pLocale = NULL;
     osl_getProcessLocale(&pLocale);
-    encoding = osl_getTextEncodingFromLocale(pLocale);
+    sal_uInt16 encoding = osl_getTextEncodingFromLocale(pLocale);
 
     m_sURL = ::rtl::OUString(aURL, strlen(aURL), encoding);
     debug_fprintf(NSP_LOG_APPEND, "SetURL %s\nencoding is: %d\n", 
::rtl::OUStringToOString(m_sURL,
diff --git a/shell/source/unix/exec/urltest.cxx 
b/shell/source/unix/exec/urltest.cxx
index 725a9db..bfdd69e 100644
--- a/shell/source/unix/exec/urltest.cxx
+++ b/shell/source/unix/exec/urltest.cxx
@@ -132,7 +132,7 @@ int main(int argc, const char *argv[])
 
     if( errors )
     {
-        printf( "Number of tests failing: %d\n", errors);
+        printf( "Number of tests failing: %u\n", errors);
         ret = -3;
     }
     else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits