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

14 files changed, 16 insertions, 19 deletions

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()
 {