diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-08 14:36:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-08 14:36:52 +0300 |
| commit | c34fabe9eaf1a02512bafc3c4e2cf9c3abba023c (patch) | |
| tree | e56988b0261e8f81301e25026e65d5e6f797fc30 | |
| parent | 68277c3249489c4e4364275eb5c5920f44fe40b1 (diff) | |
Bin a couple of pointless macros only used once
Change-Id: I7d0c812afbbeeb4ea9835f957024b6bf86dfdaaf
| -rw-r--r-- | include/svl/solar.hrc | 3 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svdata.cxx | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc index 05d2cedc533a..a761c7d070b9 100644 --- a/include/svl/solar.hrc +++ b/include/svl/solar.hrc @@ -25,9 +25,6 @@ #define OWN_ATTR_VALUE_START 3900 #define OWN_ATTR_VALUE_END 3990 -#define CREATERESMGR_NAME( Name ) #Name -#define CREATERESMGR( Name ) ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) ) - #define RID_SFX_START 260 // RID_SFX_END 9999 diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 60daba3e7e0e..a51ef5a6a714 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3121,7 +3121,7 @@ bool HtmlExport::checkForExistingFiles() if( bFound ) { - ResMgr *pResMgr = CREATERESMGR( dbw ); + ResMgr *pResMgr = ResMgr::CreateResMgr( "dbw" ); if( pResMgr ) { ResId aResId( 4077, *pResMgr ); diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 2a7bc93916dc..c3920db77901 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -167,15 +167,13 @@ Window* ImplGetDefaultWindow() // ----------------------------------------------------------------------- -#define VCL_CREATERESMGR_NAME( Name ) #Name - ResMgr* ImplGetResMgr() { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->mpResMgr ) { LanguageTag aLocale( Application::GetSettings().GetUILanguageTag()); - pSVData->mpResMgr = ResMgr::SearchCreateResMgr( VCL_CREATERESMGR_NAME( vcl ), aLocale ); + pSVData->mpResMgr = ResMgr::SearchCreateResMgr( "vcl", aLocale ); static bool bMessageOnce = false; if( !pSVData->mpResMgr && ! bMessageOnce ) |