[Libreoffice-commits] .: 2 commits - connectivity/source desktop/source

[Caolán McNamara]

 connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx |    2 +-
 desktop/source/app/cmdlineargs.cxx                            |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0f5327324e4d3033bcc48ffc8f2018f6a2572b2d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 12:49:13 2011 +0000

    this is wrong, using a pointer to a temporary

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 75deb7a..4194dc6 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -612,8 +612,8 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
 
     if (bDeprecated)
     {
-        const sal_Char* s = rtl::OUStringToOString(aArg, RTL_TEXTENCODING_UTF8).getStr();
-        fprintf(stderr, "Warning: %s is deprecated.  Use -%s instead.\n", s, s);
+        rtl::OString sArg(rtl::OUStringToOString(aArg, RTL_TEXTENCODING_UTF8));
+        fprintf(stderr, "Warning: %s is deprecated.  Use -%s instead.\n", sArg.getStr(), sArg.getStr());
     }
     return sal_True;
 }
commit 448980f37eb809d1dc3f8b80a14a8e335fd8bdef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 10:11:55 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index a6b9cbf..4ea4daf 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -209,7 +209,7 @@ MQueryHelper::next( )
     index = m_nIndex;
     m_aMutex.release();
 
-    result = getByIndex( m_nIndex + 1) ; // Add 1 as Row is numbered from 1 to N
+    result = getByIndex( index + 1) ; // Add 1 as Row is numbered from 1 to N
 
     if ( result ) {
         m_aMutex.acquire();