diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-24 16:43:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-25 08:13:51 +0200 |
| commit | 2384be536466bba9d05f0546336c52c5b66bd9dc (patch) | |
| tree | c158a954c5fa36ca4ccaa8e699553e879f7b85fd | |
| parent | d7cd7e89e36fc371b6a81d9065b3fa0b65eb822f (diff) | |
convert some XubString to OUString in Application
Change-Id: Ieed48339e9fc01796674691d5b0580a36df6e63e
| -rw-r--r-- | include/vcl/svapp.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index c5a6707bc296..886a41401be7 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -232,8 +232,8 @@ public: static Window* GetTopWindow( long nIndex ); static Window* GetActiveTopWindow(); - static void SetAppName( const String& rUniqueName ); - static String GetAppName(); + static void SetAppName( const OUString& rUniqueName ); + static OUString GetAppName(); static bool LoadBrandBitmap (const char* pName, BitmapEx &rBitmap); // default name of the application for message dialogs and printing diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index e0560316d453..a7db1f7e77c8 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -116,7 +116,7 @@ struct ImplSVAppData VclEventListeners* mpEventListeners; // listeners for vcl events (eg, extended toolkit) VclEventListeners* mpKeyListeners; // listeners for key events only (eg, extended toolkit) ImplAccelManager* mpAccelMgr; // Accelerator Manager - XubString* mpAppName; // Application name + OUString* mpAppName; // Application name OUString* mpAppFileName; // Abs. Application FileName OUString* mpDisplayName; // Application Display Name String* mpFontPath; // Additional Fontpath diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 8fd30f4f0c7a..913a95c46f6f 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1225,20 +1225,20 @@ Window* Application::GetActiveTopWindow() // ----------------------------------------------------------------------- -void Application::SetAppName( const XubString& rUniqueName ) +void Application::SetAppName( const OUString& rUniqueName ) { ImplSVData* pSVData = ImplGetSVData(); // create if does not exist if ( !pSVData->maAppData.mpAppName ) - pSVData->maAppData.mpAppName = new XubString( rUniqueName ); + pSVData->maAppData.mpAppName = new OUString( rUniqueName ); else *(pSVData->maAppData.mpAppName) = rUniqueName; } // ----------------------------------------------------------------------- -XubString Application::GetAppName() +OUString Application::GetAppName() { ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maAppData.mpAppName ) @@ -1270,7 +1270,7 @@ OUString Application::GetDisplayName() else if ( pSVData->maWinData.mpAppWin ) return pSVData->maWinData.mpAppWin->GetText(); else - return ImplGetSVEmptyStr(); + return OUString(""); } // ----------------------------------------------------------------------- |