duplicate SwDialogsResMgr definition and unused macros

Change-Id: Ib7188a98230345557187b00826f33a2ad39a4f83

3 files changed, 1 insertions, 15 deletions

diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 23384128592e..75100f14be1f 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -588,11 +588,6 @@ public:
 
 };
 
-struct SwDialogsResMgr
-{
-    static ResMgr*      GetResMgr();
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index 2115ad9690a9..051d1bfc87e8 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -31,6 +31,7 @@
 #endif
 
 #include "swdlgfact.hxx"
+#include "dialmgr.hxx"
 
 namespace swui
 {
diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/ui/inc/dialmgr.hxx
index f4533a51ddc6..562b1da70d7d 100644
--- a/sw/source/ui/inc/dialmgr.hxx
+++ b/sw/source/ui/inc/dialmgr.hxx
@@ -28,23 +28,13 @@
 #ifndef _SW_DIALMGR_HXX
 #define _SW_DIALMGR_HXX
 
-// include ---------------------------------------------------------------
-
 #include <tools/resid.hxx>
 
-// forward ---------------------------------------------------------------
-
-class ResMgr;
-
 struct SwDialogsResMgr
 {
     static ResMgr*      GetResMgr();
 };
 
-#define SWDIALOG_MGR()  SwDialogsResMgr::GetResMgr()
-#define SW_RES(i)       ResId(i,SWDIALOG_MGR())
-#define SW_RESSTR(i)    ResId::toString(SW_RES(i))
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */