We now only need one bit of information here

whether there *is* an id, or whether there is not an id.  An id of 0 seems to
be used as a flag that an interface is some sort of superclass which can be
subclassed by something else and have its toolbars etc reused.

Convert this to a bool so we don't need an a resource id for each one and just
drop the third arg for the normal "final" case and use a different define for
the inheritable case

Change-Id: I98380f03d73d57bf8cba02d339097e384518abaa

77 files changed, 96 insertions, 93 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index aa78bea3b8f6..3dd04bf07279 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -39,7 +39,7 @@ TYPEINIT1(DocShell, SfxObjectShell);
 
 SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, "sbasic" )
 
-SFX_IMPL_INTERFACE(basctl_DocShell, SfxObjectShell, IDEResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(basctl_DocShell, SfxObjectShell)
 
 void basctl_DocShell::InitInterface_Impl()
 {
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index aeb2acb22451..efb602f919d5 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -136,7 +136,7 @@ SFX_IMPL_NAMED_VIEWFACTORY( Shell, "Default" )
     SFX_VIEW_REGISTRATION( DocShell );
 }
 
-SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell, IDEResId(RID_STR_IDENAME))
+SFX_IMPL_INTERFACE(basctl_Shell, SfxViewShell)
 
 void basctl_Shell::InitInterface_Impl()
 {
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index db88e6fd7d13..c4a4206f2c82 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -40,14 +40,14 @@ friend class SfxSlotPool;
     SfxSlot*                pSlots;         // SlotMap
     sal_uInt16              nCount;         // number of slots in SlotMap
     SfxInterfaceId          nClassId;       // Id of interface
-    ResId                   aNameResId;     // ResId of external interface name
+    bool                    bSuperClass;    // Whether children inherit its toolbars etc
     SfxInterface_Impl*      pImpData;
 
     SfxSlot*                operator[]( sal_uInt16 nPos ) const;
 
 public:
                             SfxInterface( const char *pClass,
-                                          const ResId& rResId,
+                                          bool bSuperClass,
                                           SfxInterfaceId nClassId,
                                           const SfxInterface* pGeno,
                                           SfxSlot &rMessages, sal_uInt16 nMsgCount );
@@ -62,7 +62,7 @@ public:
     const SfxSlot*          GetSlot( const OUString& rCommand ) const;
 
     const char*             GetClassName() const { return pName; }
-    bool                    HasName() const { return 0 != aNameResId.GetId(); }
+    bool                    UseAsSuperClass() const { return bSuperClass; }
 
     const SfxInterface*     GetGenoType() const { return pGenoType; }
 
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 6e4ef36e9daa..2baa19f13a44 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -570,16 +570,16 @@ inline void SfxShell::SetPool
             static void                         RegisterInterface(SfxModule* pMod=NULL); \
             virtual SfxInterface*       GetInterface() const SAL_OVERRIDE;
 
-#define SFX_IMPL_INTERFACE(Class,SuperClass,NameResId)                      \
+#define SFX_TMPL_INTERFACE(Class,SuperClass,Abstract)                       \
                                                                             \
     SfxInterface* Class::pInterface = 0;                                    \
-    SfxInterface* Class::GetStaticInterface()                      \
+    SfxInterface* Class::GetStaticInterface()                               \
     {                                                                       \
         if ( !pInterface )                                                  \
         {                                                                   \
             pInterface =                                                    \
                 new SfxInterface(                                           \
-            #Class, NameResId, GetInterfaceId(),                            \
+            #Class, Abstract, GetInterfaceId(),                             \
             SuperClass::GetStaticInterface(),                               \
             a##Class##Slots_Impl[0],                                        \
             (sal_uInt16) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) );   \
@@ -598,6 +598,12 @@ inline void SfxShell::SetPool
         GetStaticInterface()->Register(pMod);                               \
     }
 
+#define SFX_IMPL_INTERFACE(Class,SuperClass)                                \
+SFX_TMPL_INTERFACE(Class,SuperClass,false)                                  \
+
+#define SFX_IMPL_SUPERCLASS_INTERFACE(Class,SuperClass)                     \
+SFX_TMPL_INTERFACE(Class,SuperClass,true)                                   \
+
 #define SFX_POSITION_MASK               0x000F
 #define SFX_VISIBILITY_MASK             0xFFF0
 #define SFX_VISIBILITY_UNVISIBLE        0x0000  // Never visible
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 1f45e96818b6..947264423957 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -119,7 +119,7 @@
 
 static sal_uInt16 nIdleCount = 0;
 
-SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_SC_NAME))
+SFX_IMPL_INTERFACE(ScModule, SfxShell)
 
 void ScModule::InitInterface_Impl()
 {
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 84fd54c89d6f..1dd391c16efb 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -169,7 +169,7 @@ static const sal_Char pFilterRtf[]      = "Rich Text Format (StarCalc)";
 #define ScDocShell
 #include "scslots.hxx"
 
-SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL))
+SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell)
 
 void ScDocShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index e222a0b6423f..84a26ce49fd5 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -45,7 +45,7 @@ using namespace css::uno;
 
 namespace drawing = com::sun::star::drawing;
 
-SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL))
+SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell)
 
 void ScChartShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 1bae28dbd4c3..9fb1f24c923b 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -62,7 +62,7 @@
 
 TYPEINIT1( ScDrawShell, SfxShell );
 
-SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL))
+SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
 
 void ScDrawShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index b3d1383f164d..5ecefc4a9a8a 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -40,7 +40,7 @@
 #define ScDrawFormShell
 #include "scslots.hxx"
 
-SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL))
+SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell)
 
 void ScDrawFormShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index a8410a44796a..06f5d7bfc2a0 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -81,7 +81,7 @@
 
 using namespace ::com::sun::star;
 
-SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL))
+SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell)
 
 void ScDrawTextObjectBar::InitInterface_Impl()
 {
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 6ee703e02772..5284efb5f59b 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -64,7 +64,7 @@ public:
     }
 };
 
-SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL))
+SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell)
 
 void ScGraphicShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 66e969abf062..13cd9597749e 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -35,7 +35,7 @@
 #define ScMediaShell
 #include "scslots.hxx"
 
-SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL))
+SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell)
 
 void ScMediaShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 7b084853e999..5fc452e15b63 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -40,7 +40,7 @@
 #define ScOleObjectShell
 #include "scslots.hxx"
 
-SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL))
+SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell)
 
 void ScOleObjectShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 80ccc5f3acc5..d341175635df 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -36,7 +36,7 @@
 
 TYPEINIT1( ScAuditingShell, SfxShell );
 
-SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL))
+SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell)
 
 void ScAuditingShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index f670fd348954..8c4ba99eaffb 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -64,7 +64,7 @@
 
 TYPEINIT1( ScCellShell, ScFormatShell );
 
-SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell, ScResId(SCSTR_CELLSHELL))
+SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell)
 
 void ScCellShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 0703589af626..cb4c17a14fe1 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -82,7 +82,7 @@ using namespace ::com::sun::star;
 
 TYPEINIT1( ScEditShell, SfxShell );
 
-SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL))
+SFX_IMPL_INTERFACE(ScEditShell, SfxShell)
 
 void ScEditShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 9a556ec90958..a026d38e5064 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -119,7 +119,7 @@ SvxCellVerJustify lclConvertSlotToVAlign( sal_uInt16 nSlot )
 
 TYPEINIT1( ScFormatShell, SfxShell );
 
-SFX_IMPL_INTERFACE(ScFormatShell, SfxShell, ScResId(SCSTR_FORMATSHELL))
+SFX_IMPL_INTERFACE(ScFormatShell, SfxShell)
 
 void ScFormatShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 8f2e7da70792..89b3222c9906 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -36,7 +36,7 @@
 
 TYPEINIT1( ScPageBreakShell, SfxShell );
 
-SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL))
+SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell)
 
 void ScPageBreakShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 3e425ccb5a53..613484adea69 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -45,7 +45,7 @@
 
 TYPEINIT1( ScPivotShell, SfxShell );
 
-SFX_IMPL_INTERFACE(ScPivotShell, SfxShell, ScResId(SCSTR_PIVOTSHELL))
+SFX_IMPL_INTERFACE(ScPivotShell, SfxShell)
 
 void ScPivotShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 5d362248cc83..8582b5614ead 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -85,7 +85,7 @@ using namespace com::sun::star;
 
 TYPEINIT1( ScPreviewShell, SfxViewShell );
 
-SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL))
+SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell)
 
 void ScPreviewShell::InitInterface_Impl()
 {
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index c7070da7573a..c22278bebbbe 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -46,7 +46,7 @@
 
 TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener);
 
-SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell, ScResId(SCSTR_TABVIEWSHELL))
+SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell)
 
 void ScTabViewShell::InitInterface_Impl()
 {
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index facf4e48c93c..909213a6939d 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -59,7 +59,7 @@ TYPEINIT1( SdModule, SfxModule );
 #define SdModule
 #include "sdslots.hxx"
 
-SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(RID_SD_NAME))
+SFX_IMPL_INTERFACE(SdModule, SfxModule)
 
 void SdModule::InitInterface_Impl()
 {
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 48fd31afb4fb..59f066d0758a 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -36,7 +36,7 @@ SFX_SLOTMAP(LeftImpressPaneShell)
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell, SdResId(STR_LEFT_IMPRESS_PANE_SHELL))
+SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell)
 
 void LeftImpressPaneShell::InitInterface_Impl()
 {
@@ -62,7 +62,7 @@ SFX_SLOTMAP(LeftDrawPaneShell)
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell, SdResId(STR_LEFT_DRAW_PANE_SHELL))
+SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell)
 
 void LeftDrawPaneShell::InitInterface_Impl()
 {
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index a46ec7c0a2e9..b20911cc0697 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -72,7 +72,7 @@ using namespace sd;
 #define DrawDocShell
 #include "sdslots.hxx"
 
-SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(DrawDocShell, SfxObjectShell);
 
 void DrawDocShell::InitInterface_Impl()
 {
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index 21c49d9e26c0..a2fb7cf9d650 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -43,7 +43,7 @@ namespace sd
 {
 TYPEINIT1(GraphicDocShell, DrawDocShell);
 
-SFX_IMPL_INTERFACE(GraphicDocShell, SfxObjectShell, SdResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(GraphicDocShell, SfxObjectShell)
 
 void GraphicDocShell::InitInterface_Impl()
 {
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 708bbb82a256..b63c3ffe4b87 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -81,7 +81,7 @@ using ::sfx2::sidebar::EnumContext;
 
 namespace sd { namespace slidesorter {
 
-SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell, SdResId(STR_SLIDESORTERVIEWSHELL))
+SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell)
 
 void SlideSorterViewShell::InitInterface_Impl()
 {
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 942a0cade075..71df3dffe6eb 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -76,7 +76,7 @@ void RegisterInterfaces(SfxModule* pMod)
 
 TYPEINIT1( TableObjectBar, SfxShell );
 
-SFX_IMPL_INTERFACE(TableObjectBar, SfxShell, SdResId(STR_TABLEOBJECTBARSHELL))
+SFX_IMPL_INTERFACE(TableObjectBar, SfxShell)
 
 void TableObjectBar::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index b4c77a5cbd3c..3de3a18959f6 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -54,7 +54,7 @@ namespace sd {
 
 // - GraphicObjectBar -
 
-SFX_IMPL_INTERFACE(GraphicObjectBar, SfxShell, SdResId(STR_GRAFOBJECTBARSHELL))
+SFX_IMPL_INTERFACE(GraphicObjectBar, SfxShell)
 
 void GraphicObjectBar::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 5d904cefba0b..b688312f5277 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -52,7 +52,7 @@ namespace sd {
 
 TYPEINIT1( MediaObjectBar, SfxShell );
 
-SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell, SdResId(STR_MEDIAOBJECTBARSHELL))
+SFX_IMPL_INTERFACE(MediaObjectBar, SfxShell)
 
 void MediaObjectBar::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index f2b51b9a9920..d79b2569fdc9 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -221,7 +221,7 @@ TYPEINIT1(ViewShellBase, SfxViewShell);
 
 SfxViewFactory* ViewShellBase::pFactory;
 
-SFX_IMPL_INTERFACE(ViewShellBase, SfxViewShell, SdResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(ViewShellBase, SfxViewShell)
 
 void ViewShellBase::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 4a263d720a58..a52dd5786ea0 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -54,8 +54,7 @@ namespace sd {
 /**
  * Declare default interface (Slotmap must not be empty)
  */
-
-SFX_IMPL_INTERFACE(BezierObjectBar, ::SfxShell, SdResId(STR_BEZIEROBJECTBARSHELL))
+SFX_IMPL_INTERFACE(BezierObjectBar, ::SfxShell)
 
 void BezierObjectBar::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 2c8e7a09bf85..ee31d49c401d 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -76,8 +76,7 @@ namespace sd {
  * Declare default interface (Slotmap must not be empty, therefore enter
  * something that (hopefully) never occurs.
  */
-
-SFX_IMPL_INTERFACE(TextObjectBar, SfxShell, SdResId(STR_TEXTOBJECTBARSHELL))
+SFX_IMPL_INTERFACE(TextObjectBar, SfxShell)
 
 void TextObjectBar::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index b4fe5def493b..75d0c1781a48 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -59,7 +59,7 @@ namespace sd {
  * Declare SFX-Slotmap and Standardinterface
  */
 
-SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL))
+SFX_IMPL_INTERFACE(DrawViewShell, SfxShell)
 
 void DrawViewShell::InitInterface_Impl()
 {
@@ -84,8 +84,7 @@ void DrawViewShell::InitInterface_Impl()
 TYPEINIT1( DrawViewShell, ViewShell );
 
 // SdGraphicViewShell
-
-SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH...
+SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell)
 
 void GraphicViewShell::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 328db0537c2b..76628fa70d35 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -106,7 +106,7 @@ namespace sd {
 /**
  * Declare SFX-Slotmap and standard interface
  */
-SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL))
+SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell)
 
 void OutlineViewShell::InitInterface_Impl()
 {
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index a36d3a0aa0b7..34b0c57ca6b3 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::presentation;
 
 namespace sd {
 
-SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) )
+SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell)
 
 void PresentationViewShell::InitInterface_Impl()
 {
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 73d38e3e754a..fa87870cf690 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -89,7 +89,7 @@ using namespace ::com::sun::star::container;
 
 #define SFX_ITEMTYPE_STATBAR             4
 
-SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP))
+SFX_IMPL_INTERFACE(SfxApplication,SfxShell)
 
 void SfxApplication::InitInterface_Impl()
 {
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 424880e0d042..c58c2d8128f3 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -134,7 +134,7 @@ ImageList* SfxModule_Impl::GetImageList( ResMgr* pResMgr, bool bBig )
 
 TYPEINIT1(SfxModule, SfxShell);
 
-SFX_IMPL_INTERFACE(SfxModule, SfxShell, SfxResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SfxModule, SfxShell)
 
 void SfxModule::InitInterface_Impl()
 {
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 706258fd06f4..6e261e483124 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -104,14 +104,14 @@ static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nRes
 
 // constuctor, registeres a new unit
 SfxInterface::SfxInterface( const char *pClassName,
-                            const ResId& rNameResId,
+                            bool bUsableSuperClass,
                             SfxInterfaceId nId,
                             const SfxInterface* pParent,
                             SfxSlot &rSlotMap, sal_uInt16 nSlotCount ):
     pName(pClassName),
     pGenoType(pParent),
     nClassId(nId),
-    aNameResId(rNameResId.GetId(),*rNameResId.GetResMgr()),
+    bSuperClass(bUsableSuperClass),
     pImpData(0)
 {
     pImpData = new SfxInterface_Impl;
@@ -394,7 +394,7 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nResId, sal
 
 sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const
 {
-    bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
@@ -413,7 +413,7 @@ sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const
 
 sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
 {
-    bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
@@ -432,7 +432,7 @@ sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
 
 sal_uInt16 SfxInterface::GetObjectBarCount() const
 {
-    if (pGenoType && ! pGenoType->HasName())
+    if (pGenoType && pGenoType->UseAsSuperClass())
         return pImpData->aObjectBars.size() + pGenoType->GetObjectBarCount();
     else
         return pImpData->aObjectBars.size();
@@ -520,7 +520,7 @@ const ResId& SfxInterface::GetStatusBarResId() const
 
 sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
 {
-    bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
@@ -539,7 +539,7 @@ sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
 
 bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) const
 {
-    bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+    bool bGenoType = (pGenoType != 0 && pGenoType->UseAsSuperClass());
     if ( bGenoType )
     {
         // Are there toolbars in the super class?
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index f3bb54701344..30e91648d882 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -116,7 +116,7 @@ using namespace ::com::sun::star::task;
 #define SfxObjectShell
 #include "sfxslots.hxx"
 
-SFX_IMPL_INTERFACE(SfxObjectShell, SfxShell, SfxResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SfxObjectShell, SfxShell)
 
 void SfxObjectShell::InitInterface_Impl()
 {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b2a1b28c36a0..e84c617994f3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -145,7 +145,7 @@ using ::com::sun::star::container::XIndexContainer;
 #include "sfxslots.hxx"
 #undef SfxViewFrame
 
-SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewFrame,SfxShell)
 
 void SfxViewFrame::InitInterface_Impl()
 {
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index a5f04e05458b..be8f9fa3400c 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -293,7 +293,7 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const nFlags)
 ,   m_pController(0)
 {}
 
-SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SfxViewShell,SfxShell)
 
 void SfxViewShell::InitInterface_Impl()
 {
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 0282214c8b32..4b460aee957b 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -107,7 +107,7 @@ using namespace ::com::sun::star::uno;
 
 TYPEINIT1( SmDocShell, SfxObjectShell );
 
-SFX_IMPL_INTERFACE(SmDocShell, SfxObjectShell, SmResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SmDocShell, SfxObjectShell)
 
 void SmDocShell::InitInterface_Impl()
 {
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index a214af390cb3..7373ae6089d5 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -155,7 +155,7 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU
     return aRes;
 }
 
-SFX_IMPL_INTERFACE(SmModule, SfxModule, SmResId(RID_APPLICATION))
+SFX_IMPL_INTERFACE(SmModule, SfxModule)
 
 void SmModule::InitInterface_Impl()
 {
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d4fe21ec1442..12e67f9b25da 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -929,7 +929,7 @@ struct SmViewShell_Impl
 
 TYPEINIT1( SmViewShell, SfxViewShell );
 
-SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SmViewShell, SfxViewShell)
 
 void SmViewShell::InitInterface_Impl()
 {
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 91fb513eab35..914b81b9fd4f 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -166,7 +166,7 @@ const sal_uInt32 FM_UI_FEATURE_TB_MORECONTROLS          = 0x00000100;
 const sal_uInt32 FM_UI_FEATURE_TB_FORMDESIGN            = 0x00000200;
 const sal_uInt32 FM_UI_FEATURE_SHOW_DATANAVIGATOR       = 0x00000400;
 
-SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL))
+SFX_IMPL_INTERFACE(FmFormShell, SfxShell)
 
 void FmFormShell::InitInterface_Impl()
 {
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 814acfdc1e69..45cb1404d77e 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -54,7 +54,7 @@ SFX_SLOTMAP(ExtrusionBar)
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell, SVX_RES(RID_SVX_EXTRUSION_BAR))
+SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell)
 
 void ExtrusionBar::InitInterface_Impl()
 {
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 1f3a89e04005..6dfbfa010e1b 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -172,7 +172,7 @@ SFX_SLOTMAP(FontworkBar)
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-SFX_IMPL_INTERFACE(FontworkBar, SfxShell, SVX_RES(RID_SVX_FONTWORK_BAR))
+SFX_IMPL_INTERFACE(FontworkBar, SfxShell)
 
 void FontworkBar::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 6db25aea7dd3..3f9d862da737 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -115,7 +115,7 @@ using namespace ::com::sun::star;
 
 #include <shells.hrc>
 
-SFX_IMPL_INTERFACE(SwModule, SfxModule, SW_RES(RID_SW_NAME) )
+SFX_IMPL_INTERFACE(SwModule, SfxModule)
 
 void SwModule::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 23e315555c50..29670f3d091a 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -126,7 +126,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::container;
 
-SFX_IMPL_INTERFACE(SwDocShell, SfxObjectShell, SW_RES(0) )
+SFX_IMPL_SUPERCLASS_INTERFACE(SwDocShell, SfxObjectShell)
 
 void SwDocShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 07214372c9d9..31905b260106 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -56,13 +56,13 @@
 
 using namespace ::com::sun::star;
 
-SFX_IMPL_INTERFACE(SwGlosDocShell, SwDocShell, SW_RES(0) )
+SFX_IMPL_SUPERCLASS_INTERFACE(SwGlosDocShell, SwDocShell)
 
 void SwGlosDocShell::InitInterface_Impl()
 {
 }
 
-SFX_IMPL_INTERFACE(SwWebGlosDocShell, SwWebDocShell, SW_RES(0) )
+SFX_IMPL_SUPERCLASS_INTERFACE(SwWebGlosDocShell, SwWebDocShell)
 
 void SwWebGlosDocShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index b746f48f4e5b..8c38710ab2bb 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -136,7 +136,7 @@ using namespace ::com::sun::star::i18n;
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
-SFX_IMPL_INTERFACE(SwAnnotationShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT))
+SFX_IMPL_INTERFACE(SwAnnotationShell, SfxShell)
 
 void SwAnnotationShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 16b666ef46fb..c2cfbea258cf 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -144,7 +144,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 
-SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SwBaseShell, SfxShell)
 
 void SwBaseShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index a9d59035609d..f272e32d9998 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -43,7 +43,7 @@
 
 #include <unomid.h>
 
-SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell, SW_RES(STR_SHELLNAME_BEZIER))
+SFX_IMPL_INTERFACE(SwBezierShell, SwBaseShell)
 
 void SwBezierShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 6ee669d8ecef..2b0aab006f03 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -75,7 +75,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAW))
+SFX_IMPL_INTERFACE(SwDrawShell, SwDrawBaseShell)
 
 void SwDrawShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 2c04eb52d245..9d2916dd53d4 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -57,7 +57,7 @@
 
 using namespace ::com::sun::star;
 
-SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell, SW_RES(STR_SHELLNAME_DRAWFORM))
+SFX_IMPL_INTERFACE(SwDrawFormShell, SwDrawBaseShell)
 
 void SwDrawFormShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 991a46ba88ed..a2a6c72c930a 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -66,7 +66,7 @@
 
 using namespace ::com::sun::star;
 
-SFX_IMPL_INTERFACE(SwDrawBaseShell, SwBaseShell, SW_RES(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SwDrawBaseShell, SwBaseShell)
 
 void SwDrawBaseShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index a3807e81996c..92a20bc8b45c 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -81,7 +81,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::i18n;
 
-SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT))
+SFX_IMPL_INTERFACE(SwDrawTextShell, SfxShell)
 
 void SwDrawTextShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index dcea1310aa3b..678d5f724852 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -108,7 +108,7 @@ static const SwFrmFmt* lcl_GetFrmFmtByName(SwWrtShell& rSh, const OUString& rNam
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell, SW_RES(STR_SHELLNAME_FRAME))
+SFX_IMPL_INTERFACE(SwFrameShell, SwBaseShell)
 
 void SwFrameShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 4fb574449078..140ed1d2146d 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -97,7 +97,7 @@ namespace
     };
 }
 
-SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell, SW_RES(STR_SHELLNAME_GRAPHIC))
+SFX_IMPL_INTERFACE(SwGrfShell, SwBaseShell)
 
 void SwGrfShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 5d3ab97078a6..ad16286fe139 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -51,7 +51,7 @@
 
 #include <IDocumentOutlineNodes.hxx>
 
-SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST))
+SFX_IMPL_INTERFACE(SwListShell, SwBaseShell)
 
 void SwListShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index feafe2c5a518..404778bde475 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -69,7 +69,7 @@
 #include "swabstdlg.hxx"
 #include <boost/scoped_ptr.hpp>
 
-SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA))
+SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell)
 
 void SwMediaShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx
index 4073dca09855..0043e21c940c 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -29,7 +29,7 @@
 #include <unomid.h>
 #include "navmgr.hxx"
 
-SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell, SW_RES(STR_SHELLNAME_NAVIGATION))
+SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell)
 
 void SwNavigationShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index 2bb5d9769686..f0e3fe68d7d2 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/msg.hxx>
 #include <swslots.hxx>
 
-SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell, SW_RES(STR_SHELLNAME_OBJECT))
+SFX_IMPL_INTERFACE(SwOleShell, SwFrameShell)
 
 void SwOleShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index d4fe26b330ee..e7962dde182b 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -91,7 +91,7 @@
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 
-SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE))
+SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell)
 
 void SwTableShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 3d7bf34209e7..ffe5dd381c77 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -116,7 +116,7 @@ using namespace ::com::sun::star;
 #include <unomid.h>
 #include <boost/scoped_ptr.hpp>
 
-SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_TEXT))
+SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell)
 
 void SwTextShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index f97978286f9e..a397bb9dadc8 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -89,7 +89,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview")
     SFX_VIEW_REGISTRATION(SwGlobalDocShell);
 }
 
-SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX))
+SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell)
 
 void SwPagePreview::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 15e7c05a3ed6..b54333dad3be 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -115,7 +115,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView")
     SFX_VIEW_REGISTRATION(SwWebDocShell);
 }
 
-SFX_IMPL_INTERFACE(SwSrcView, SfxViewShell, SW_RES(0) )
+SFX_IMPL_SUPERCLASS_INTERFACE(SwSrcView, SfxViewShell)
 
 void SwSrcView::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 4777d66d01df..45f10c6205dc 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -88,7 +88,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
     }
 }
 
-SFX_IMPL_INTERFACE(SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
+SFX_IMPL_INTERFACE(SwView, SfxViewShell)
 
 void SwView::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index 85101332066e..afe87184981f 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -38,7 +38,7 @@
 
 #include <unomid.h>
 
-SFX_IMPL_INTERFACE(SwWebDocShell, SfxObjectShell, SW_RES(0) )
+SFX_IMPL_SUPERCLASS_INTERFACE(SwWebDocShell, SfxObjectShell)
 
 void SwWebDocShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index f83196549454..2d1c24f2aa7e 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -36,7 +36,7 @@
 #define SwWebDrawFormShell
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwWebDrawFormShell, SwDrawFormShell, SW_RES(0))
+SFX_IMPL_SUPERCLASS_INTERFACE(SwWebDrawFormShell, SwDrawFormShell)
 
 void SwWebDrawFormShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index 07572f72ca15..cb49a405a11f 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -35,7 +35,7 @@
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell, SW_RES(STR_SHELLNAME_WEBFRAME))
+SFX_IMPL_INTERFACE(SwWebFrameShell, SwFrameShell)
 
 void SwWebFrameShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 54f59a1b85dc..24e83a5a7cff 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -38,7 +38,7 @@
 #define SwWebGrfShell
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell, SW_RES(STR_SHELLNAME_GRAPHIC))
+SFX_IMPL_INTERFACE(SwWebGrfShell, SwGrfShell)
 
 void SwWebGrfShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index efda0b9afbdb..ad487d4c5c27 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -34,7 +34,7 @@
 #define SwWebListShell
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwWebListShell, SwListShell, SW_RES(STR_SHELLNAME_LIST))
+SFX_IMPL_INTERFACE(SwWebListShell, SwListShell)
 
 void SwWebListShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index e10f0824555b..01c03a1c7255 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -35,7 +35,7 @@
 #define SwWebOleShell
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell, SW_RES(STR_SHELLNAME_OBJECT))
+SFX_IMPL_INTERFACE(SwWebOleShell, SwOleShell)
 
 void SwWebOleShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index 0d3c20c97409..c42fab259d00 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -38,7 +38,7 @@
 #include "svx/svxids.hrc"
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwWebTableShell, SwTableShell, SW_RES(STR_SHELLNAME_TABLE))
+SFX_IMPL_INTERFACE(SwWebTableShell, SwTableShell)
 
 void SwWebTableShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 077e9425b33e..b45bdc17e395 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -41,7 +41,7 @@
 #include <sfx2/msg.hxx>
 #include "swslots.hxx"
 
-SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell, SW_RES(STR_SHELLNAME_WEBTEXT))
+SFX_IMPL_INTERFACE(SwWebTextShell, SwBaseShell)
 
 void SwWebTextShell::InitInterface_Impl()
 {
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 027fa051219a..c8dffd7261a2 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -72,7 +72,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwWebView, "Default")
     SFX_VIEW_REGISTRATION(SwWebDocShell);
 }
 
-SFX_IMPL_INTERFACE(SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) )
+SFX_IMPL_INTERFACE(SwWebView, SwView)
 
 void SwWebView::InitInterface_Impl()
 {