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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 2 | ||||
| -rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 2 | ||||
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
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() { |