XubString->OUString

Change-Id: I40ff06facc304630ccedd82d2f20b3573bdc5cb4

4 files changed, 17 insertions, 22 deletions

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a929165901a6..e0560316d453 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -117,7 +117,7 @@ struct ImplSVAppData
     VclEventListeners*      mpKeyListeners;     // listeners for key events only (eg, extended toolkit)
     ImplAccelManager*       mpAccelMgr;         // Accelerator Manager
     XubString*              mpAppName;          // Application name
-    XubString*              mpAppFileName;      // Abs. Application FileName
+    OUString*               mpAppFileName;      // Abs. Application FileName
     OUString*               mpDisplayName;      // Application Display Name
     String*                 mpFontPath;         // Additional Fontpath
     Help*                   mpHelp;             // Application help
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;
         }
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 9104be93aaa9..e2766b0c924a 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -289,7 +289,7 @@ bool InitVCL()
     // convert path to native file format
     OUString aNativeFileName;
     osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
-    pSVData->maAppData.mpAppFileName = new String( aNativeFileName );
+    pSVData->maAppData.mpAppFileName = new OUString( aNativeFileName );
 
     // Initialize global data
     pSVData->maGDIData.mpScreenFontList     = new ImplDevFontList;
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 5d96964706aa..02e338f236b5 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -262,7 +262,7 @@ void ButtonDialog::Click()
         maClickHdl.Call( this );
 }
 
-void ButtonDialog::AddButton( const XubString& rText, sal_uInt16 nId,
+void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
                               sal_uInt16 nBtnFlags, long nSepPixel )
 {
     // PageItem anlegen
@@ -272,7 +272,7 @@ void ButtonDialog::AddButton( const XubString& rText, sal_uInt16 nId,
     pItem->mnSepSize        = nSepPixel;
     pItem->mpPushButton     = ImplCreatePushButton( nBtnFlags );
 
-    if ( rText.Len() )
+    if (!rText.isEmpty())
         pItem->mpPushButton->SetText( rText );
 
     maItemList.push_back(pItem);
@@ -370,7 +370,7 @@ PushButton* ButtonDialog::GetPushButton( sal_uInt16 nId ) const
         return NULL;
 }
 
-void ButtonDialog::SetButtonText( sal_uInt16 nId, const XubString& rText )
+void ButtonDialog::SetButtonText( sal_uInt16 nId, const OUString& rText )
 {
     ImplBtnDlgItem* pItem = ImplGetItem( nId );
 
@@ -381,7 +381,7 @@ void ButtonDialog::SetButtonText( sal_uInt16 nId, const XubString& rText )
     }
 }
 
-void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const XubString& rText )
+void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const OUString& rText )
 {
     ImplBtnDlgItem* pItem = ImplGetItem( nId );