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

9 files changed, 9 insertions, 9 deletions

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