diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 13:09:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 16:35:58 +0000 |
| commit | 80a60371b3fbdfff01a0e59a56a53da9587f9b14 (patch) | |
| tree | 3bbf463ca5ea8279d338eaf1079a65cf77adf3f4 /desktop | |
| parent | 47f891c567ecd54add9763506c48f42afaf6863b (diff) | |
move RID_APPTITLE to desktop where its used
rename the other ones and remove the unused ones
Change-Id: I0e636cd5d1799e0f9cb815a4bfa20b16039ecb3f
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/app/desktop.hrc | 2 | ||||
| -rw-r--r-- | desktop/source/app/desktop.src | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 1158142a4f52..f5722e4c5a72 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1419,9 +1419,8 @@ int Desktop::Main() // create title string LanguageTag aLocale( LANGUAGE_SYSTEM); - ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "ofa", aLocale ); + ResMgr* pLabelResMgr = GetDesktopResManager(); OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString(); - delete pLabelResMgr; #ifdef DBG_UTIL //include buildid in non product builds diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index e3059443b88a..4ed5c9f81e37 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -64,6 +64,8 @@ #define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206) #define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207) +#define RID_APPTITLE (RID_DESKTOP_STRING_START+208) + #endif // _DESKTOP_HRC_ diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index e2e0416ccadd..19962c277ba8 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -169,4 +169,9 @@ String STR_BOOSTRAP_ERR_NOACCESSRIGHTS Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n"; }; +String RID_APPTITLE +{ + Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |