diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-25 10:12:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-25 14:54:02 +0000 |
| commit | 83078214196b071cf1d8e5796803b6ebc1bc9de4 (patch) | |
| tree | dffa5b67e5ad6c95341c2f6b97dcc6f6de8c7155 /sw/source/uibase/uiview | |
| parent | f676e9a604bed14865e5c9a277fda0d7b564085d (diff) | |
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
Diffstat (limited to 'sw/source/uibase/uiview')
| -rw-r--r-- | sw/source/uibase/uiview/pview.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/srcview.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view0.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
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() { |