diff options
| author | elixir <prashant3.yishu@gmail.com> | 2013-02-21 03:54:57 +0530 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-02-28 01:25:40 +0000 |
| commit | 9133cc452c9e473164755a2177b7a2285c09cb22 (patch) | |
| tree | 1c4702c283e2af4b1d6043bba8f8c8ad1442376c /vcl | |
| parent | 664a49160c927f1d6ad740455a7e27c7f352cbae (diff) | |
fdo#38838,UniString,String_to_OUString
Change-Id: I024a2de18fe3c22be0860b62a862ede992e12c1e
Reviewed-on: https://gerrit.libreoffice.org/2303
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/vcl/svapp.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b4b59b57bd2a..7f89f9fe0082 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -120,7 +120,7 @@ struct ImplSVAppData ImplAccelManager* mpAccelMgr; // Accelerator Manager XubString* mpAppName; // Application name XubString* mpAppFileName; // Abs. Application FileName - XubString* mpDisplayName; // Application Display Name + OUString* mpDisplayName; // Application Display Name String* mpFontPath; // Additional Fontpath Help* mpHelp; // Application help PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute) diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 364316827bb7..a3eb6b72a14e 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -260,8 +260,8 @@ public: static bool LoadBrandSVG( const char *pName, BitmapEx &rBitmap ); // default name of the application for message dialogs and printing - static void SetDisplayName( const UniString& rDisplayName ); - static UniString GetDisplayName(); + static void SetDisplayName( const OUString& rDisplayName ); + static OUString GetDisplayName(); static unsigned int GetScreenCount(); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 9e67117dc6b0..9182b1c34de5 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1192,20 +1192,20 @@ XubString Application::GetAppName() // ----------------------------------------------------------------------- -void Application::SetDisplayName( const UniString& rName ) +void Application::SetDisplayName( const OUString& rName ) { ImplSVData* pSVData = ImplGetSVData(); // create if not existing if ( !pSVData->maAppData.mpDisplayName ) - pSVData->maAppData.mpDisplayName = new UniString( rName ); + pSVData->maAppData.mpDisplayName = new OUString( rName ); else *(pSVData->maAppData.mpDisplayName) = rName; } // ----------------------------------------------------------------------- -UniString Application::GetDisplayName() +OUString Application::GetDisplayName() { ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maAppData.mpDisplayName ) |