diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-26 11:38:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-26 11:38:27 +0100 |
| commit | 7fd222927bed8bbd5b0fc006681f583fec66974d (patch) | |
| tree | 477aea175b60932c1b08ba8795543f547e1422f3 | |
| parent | 8e24e5412bf55d682d3db5de8ef196341a71f31b (diff) | |
make these not leak and safe to use
| -rw-r--r-- | vcl/source/app/svapp.cxx | 11 | ||||
| -rw-r--r-- | vcl/source/app/svmain.cxx | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 01bd95e7ae69..f9c21b462ab0 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 44da94e1cd22..4f76193d4b90 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; |