Kaydet (Commit) 80a60371 authored tarafından Caolán McNamara's avatar Caolán McNamara

move RID_APPTITLE to desktop where its used

rename the other ones and remove the unused ones

Change-Id: I0e636cd5d1799e0f9cb815a4bfa20b16039ecb3f
üst 47f891c5
...@@ -1419,9 +1419,8 @@ int Desktop::Main() ...@@ -1419,9 +1419,8 @@ int Desktop::Main()
// create title string // create title string
LanguageTag aLocale( LANGUAGE_SYSTEM); LanguageTag aLocale( LANGUAGE_SYSTEM);
ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "ofa", aLocale ); ResMgr* pLabelResMgr = GetDesktopResManager();
OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString(); OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString();
delete pLabelResMgr;
#ifdef DBG_UTIL #ifdef DBG_UTIL
//include buildid in non product builds //include buildid in non product builds
......
...@@ -64,6 +64,8 @@ ...@@ -64,6 +64,8 @@
#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206) #define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206)
#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207) #define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207)
#define RID_APPTITLE (RID_DESKTOP_STRING_START+208)
#endif // _DESKTOP_HRC_ #endif // _DESKTOP_HRC_
......
...@@ -169,4 +169,9 @@ String STR_BOOSTRAP_ERR_NOACCESSRIGHTS ...@@ -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"; 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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -114,8 +114,6 @@ ...@@ -114,8 +114,6 @@
#define RID_DEFAULTABOUT (RID_SFX_START+0) #define RID_DEFAULTABOUT (RID_SFX_START+0)
#define RID_APPTITLE (RID_SFX_START+4)
#define DLG_STYLE_DESIGNER (RID_SFX_START+8) #define DLG_STYLE_DESIGNER (RID_SFX_START+8)
#define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+216) #define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+216)
......
...@@ -1006,7 +1006,8 @@ ...@@ -1006,7 +1006,8 @@
#define STR_TITLE_AUTHOR (STR_START + 442) #define STR_TITLE_AUTHOR (STR_START + 442)
#define STR_TITLE_DATE (STR_START + 443) #define STR_TITLE_DATE (STR_START + 443)
#define STR_UNKNOWN_USER_CONFLICT (STR_START + 444) #define STR_UNKNOWN_USER_CONFLICT (STR_START + 444)
#define STR_END (STR_UNKNOWN_USER_CONFLICT) #define RID_SC_NAME (STR_START + 445)
#define STR_END (RID_SC_NAME)
#define BMP_START (STR_END) #define BMP_START (STR_END)
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
static sal_uInt16 nIdleCount = 0; static sal_uInt16 nIdleCount = 0;
SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_APPTITLE)) SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_SC_NAME))
void ScModule::InitInterface_Impl() void ScModule::InitInterface_Impl()
{ {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
// App-Titel------------------------------------------------------ // App-Titel------------------------------------------------------
String RID_APPTITLE String RID_SC_NAME
{ {
Text [ en-US ] = "%PRODUCTNAME Calc" ; Text [ en-US ] = "%PRODUCTNAME Calc" ;
}; };
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#define STR_TEXTOBJECTBARSHELL RID_GLOB_START+23 #define STR_TEXTOBJECTBARSHELL RID_GLOB_START+23
#define STR_STDOBJECTBARSHELL RID_GLOB_START+24 #define STR_STDOBJECTBARSHELL RID_GLOB_START+24
#define STR_BEZIEROBJECTBARSHELL RID_GLOB_START+25 #define STR_BEZIEROBJECTBARSHELL RID_GLOB_START+25
#define STR_APPLICATIONOBJECTBAR RID_GLOB_START+26 #define RID_SD_NAME RID_GLOB_START+26
#define STR_LAYOUT_TITLE RID_GLOB_START+27 #define STR_LAYOUT_TITLE RID_GLOB_START+27
#define STR_LAYOUT_OUTLINE RID_GLOB_START+28 #define STR_LAYOUT_OUTLINE RID_GLOB_START+28
#define STR_LAYOUT_BACKGROUNDOBJECTS RID_GLOB_START+29 #define STR_LAYOUT_BACKGROUNDOBJECTS RID_GLOB_START+29
......
...@@ -179,9 +179,9 @@ String STR_BEZIEROBJECTBARSHELL ...@@ -179,9 +179,9 @@ String STR_BEZIEROBJECTBARSHELL
{ {
Text [ en-US ] = "Bézier mode" ; Text [ en-US ] = "Bézier mode" ;
}; };
String STR_APPLICATIONOBJECTBAR String RID_SD_NAME
{ {
Text [ en-US ] = "StarImpress 4.0" ; Text [ en-US ] = "%PRODUCTNAME Impress" ;
}; };
String STR_GLUEPOINTSOBJECTBARSHELL String STR_GLUEPOINTSOBJECTBARSHELL
{ {
......
...@@ -59,7 +59,7 @@ TYPEINIT1( SdModule, SfxModule ); ...@@ -59,7 +59,7 @@ TYPEINIT1( SdModule, SfxModule );
#define SdModule #define SdModule
#include "sdslots.hxx" #include "sdslots.hxx"
SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR)) SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(RID_SD_NAME))
void SdModule::InitInterface_Impl() void SdModule::InitInterface_Impl()
{ {
......
...@@ -19,11 +19,6 @@ ...@@ -19,11 +19,6 @@
#include <svx/svxids.hrc> #include <svx/svxids.hrc>
String RID_APPTITLE
{
Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ;
};
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
#define IMAGE_ID_LIST\ #define IMAGE_ID_LIST\
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
String RID_SW_NAME String RID_SW_NAME
{ {
Text = "StarWriter" ; Text = "%PRODUCTNAME Writer" ;
}; };
String STR_PRINT_MERGE_MACRO String STR_PRINT_MERGE_MACRO
......
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