Bin a couple of pointless macros only used once

Change-Id: I7d0c812afbbeeb4ea9835f957024b6bf86dfdaaf
This commit is contained in:
Tor Lillqvist
2013-08-08 14:36:52 +03:00
parent 68277c3249
commit c34fabe9ea
3 changed files with 2 additions and 7 deletions

View File

@@ -25,9 +25,6 @@
#define OWN_ATTR_VALUE_START 3900 #define OWN_ATTR_VALUE_START 3900
#define OWN_ATTR_VALUE_END 3990 #define OWN_ATTR_VALUE_END 3990
#define CREATERESMGR_NAME( Name ) #Name
#define CREATERESMGR( Name ) ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) )
#define RID_SFX_START 260 #define RID_SFX_START 260
// RID_SFX_END 9999 // RID_SFX_END 9999

View File

@@ -3121,7 +3121,7 @@ bool HtmlExport::checkForExistingFiles()
if( bFound ) if( bFound )
{ {
ResMgr *pResMgr = CREATERESMGR( dbw ); ResMgr *pResMgr = ResMgr::CreateResMgr( "dbw" );
if( pResMgr ) if( pResMgr )
{ {
ResId aResId( 4077, *pResMgr ); ResId aResId( 4077, *pResMgr );

View File

@@ -167,15 +167,13 @@ Window* ImplGetDefaultWindow()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#define VCL_CREATERESMGR_NAME( Name ) #Name
ResMgr* ImplGetResMgr() ResMgr* ImplGetResMgr()
{ {
ImplSVData* pSVData = ImplGetSVData(); ImplSVData* pSVData = ImplGetSVData();
if ( !pSVData->mpResMgr ) if ( !pSVData->mpResMgr )
{ {
LanguageTag aLocale( Application::GetSettings().GetUILanguageTag()); LanguageTag aLocale( Application::GetSettings().GetUILanguageTag());
pSVData->mpResMgr = ResMgr::SearchCreateResMgr( VCL_CREATERESMGR_NAME( vcl ), aLocale ); pSVData->mpResMgr = ResMgr::SearchCreateResMgr( "vcl", aLocale );
static bool bMessageOnce = false; static bool bMessageOnce = false;
if( !pSVData->mpResMgr && ! bMessageOnce ) if( !pSVData->mpResMgr && ! bMessageOnce )