Kaydet (Commit) 2384be53 authored tarafından Noel Grandin's avatar Noel Grandin

convert some XubString to OUString in Application

Change-Id: Ieed48339e9fc01796674691d5b0580a36df6e63e
üst d7cd7e89
......@@ -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
......
......@@ -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
......
......@@ -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("");
}
// -----------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment