diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-30 13:49:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-30 20:40:15 +0100 |
| commit | 0306e253fef4c25d4fe39ff9b5711c9487adc47b (patch) | |
| tree | 10c71cd44b1d4899bd5b62495d13370df5993b4a /vcl/source/app/svapp.cxx | |
| parent | d70786a761025e7689a39d4026c8965d74962d4d (diff) | |
XubString->OUString
Change-Id: I40ff06facc304630ccedd82d2f20b3573bdc5cb4
Diffstat (limited to 'vcl/source/app/svapp.cxx')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 8fdbfaa79458..0e4d763f0313 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -287,7 +287,7 @@ sal_uInt16 Application::GetCommandLineParamCount() // ----------------------------------------------------------------------- -XubString Application::GetCommandLineParam( sal_uInt16 nParam ) +OUString Application::GetCommandLineParam( sal_uInt16 nParam ) { OUString aParam; osl_getCommandArg( nParam, &aParam.pData ); @@ -296,7 +296,7 @@ XubString Application::GetCommandLineParam( sal_uInt16 nParam ) // ----------------------------------------------------------------------- -const XubString& Application::GetAppFileName() +OUString Application::GetAppFileName() { ImplSVData* pSVData = ImplGetSVData(); DBG_ASSERT( pSVData->maAppData.mpAppFileName, "AppFileName should be set to something after SVMain!" ); @@ -304,20 +304,15 @@ const XubString& Application::GetAppFileName() return *pSVData->maAppData.mpAppFileName; /* - * #91147# provide a fallback for people without initialized - * vcl here (like setup in responsefile mode) + * provide a fallback for people without initialized vcl here (like setup + * in responsefile mode) */ - static String aAppFileName; - if( !aAppFileName.Len() ) - { - OUString aExeFileName; - osl_getExecutableFile( &aExeFileName.pData ); + OUString aAppFileName; + OUString aExeFileName; + osl_getExecutableFile(&aExeFileName.pData); - // convert path to native file format - OUString aNativeFileName; - osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName ); - aAppFileName = aNativeFileName; - } + // convert path to native file format + osl::FileBase::getSystemPathFromFileURL(aExeFileName, aAppFileName); return aAppFileName; } @@ -358,7 +353,7 @@ sal_uInt16 Application::Exception( sal_uInt16 nError ) // ----------------------------------------------------------------------- -void Application::Abort( const XubString& rErrorText ) +void Application::Abort( const OUString& rErrorText ) { //HACK: Dump core iff --norestore command line argument is given (assuming // this process is run by developers who are interested in cores, vs. end @@ -366,7 +361,7 @@ void Application::Abort( const XubString& rErrorText ) bool dumpCore = false; sal_uInt16 n = GetCommandLineParamCount(); for (sal_uInt16 i = 0; i != n; ++i) { - if (GetCommandLineParam(i).EqualsAscii("--norestore")) { + if (GetCommandLineParam(i).equals("--norestore")) { dumpCore = true; break; } |