[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

 vcl/source/app/svapp.cxx  |   11 +++++------
 vcl/source/app/svmain.cxx |    6 ++----
 2 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 26793f9761c3108770f1af8a043662a47e420db1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 26 11:38:27 2010 +0100

    make these not leak and safe to use

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index ce401d5..b86477f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -333,9 +333,9 @@ sal_uInt16 Application::GetCommandLineParamCount()
 
 XubString Application::GetCommandLineParam( USHORT nParam )
 {
-    rtl_uString* aParam;
-    osl_getCommandArg( nParam, &aParam );
-    return XubString( rtl_uString_getStr(aParam) );
+    rtl::OUString aParam;
+    osl_getCommandArg( nParam, &aParam.pData );
+    return aParam;
 }
 
 // -----------------------------------------------------------------------
@@ -354,9 +354,8 @@ const XubString& Application::GetAppFileName()
     static String aAppFileName;
     if( !aAppFileName.Len() )
     {
-        rtl_uString* aExeFileName;
-
-        osl_getExecutableFile( &aExeFileName );
+        rtl::OUString aExeFileName;
+        osl_getExecutableFile( &aExeFileName.pData );
 
         // convert path to native file format
         rtl::OUString aNativeFileName;
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 44da94e..4f76193 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -289,9 +289,6 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM
     // Main-Thread-Id merken
     pSVData->mnMainThreadId = ::osl::Thread::getCurrentIdentifier();
 
-    rtl_uString*  aExeFileName;
-
-
     // Sal initialisieren
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ ::CreateSalInstance" );
     pSVData->mpDefInst = CreateSalInstance();
@@ -311,7 +308,8 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM
 
     // Den AppFileName gleich holen und absolut machen, bevor das
     // WorkingDirectory sich aendert...
-    osl_getExecutableFile( &aExeFileName );
+    rtl::OUString aExeFileName;
+    osl_getExecutableFile( &aExeFileName.pData );
 
     // convert path to native file format
     rtl::OUString aNativeFileName;