[Libreoffice-commits] core.git: include/svl sd/source vcl/source

[Tor Lillqvist]

 include/svl/solar.hrc            |    3 ---
 sd/source/filter/html/htmlex.cxx |    2 +-
 vcl/source/app/svdata.cxx        |    4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit c34fabe9eaf1a02512bafc3c4e2cf9c3abba023c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 8 14:36:52 2013 +0300

    Bin a couple of pointless macros only used once
    
    Change-Id: I7d0c812afbbeeb4ea9835f957024b6bf86dfdaaf

diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index 05d2ced..a761c7d 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 60daba3..a51ef5a 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 2a7bc93..c3920db 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 )