diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 15:32:53 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:49:27 +0200 |
| commit | 1a1daff34e23e6b6c25975675a1f1a5a4db6ff08 (patch) | |
| tree | 5b49f9119357ca179e5d7c9fcd47fdedf2aec93d | |
| parent | 9f83ea4bc61c051473aeaed9849cba4627aceadb (diff) | |
sfx2: Kill SFX_FEATURED_OBJECTBAR_REGISTRATION macro.
Change-Id: I7a364b74a9223a6256f004ee2367aaaff80e7f2e
| -rw-r--r-- | include/sfx2/shell.hxx | 3 | ||||
| -rw-r--r-- | svx/source/form/fmshell.cxx | 38 |
2 files changed, 18 insertions, 23 deletions
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 97055b25ffe2..79c593c7c8cd 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -352,9 +352,6 @@ inline void SfxShell::SetPool #define SFX_VISIBILITY_SERVER 0x8000 #define SFX_VISIBILITY_NOCONTEXT 0xFFFF // Always visable -#define SFX_FEATURED_OBJECTBAR_REGISTRATION(nPos,rResId,nFeature) \ - GetStaticInterface()->RegisterObjectBar( nPos, rResId, nFeature ) - #define SFX_CHILDWINDOW_REGISTRATION(nId) \ GetStaticInterface()->RegisterChildWindow( nId, false ) diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 3cfc42c4d196..208f6879e34c 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -176,17 +176,17 @@ const sal_uInt32 FM_UI_FEATURE_SHOW_DATANAVIGATOR = 0x00000400; SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL)) { - SFX_FEATURED_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC, - SVX_RES(RID_SVXTBX_FORM_NAVIGATION), - FM_UI_FEATURE_SHOW_DATABASEBAR ); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC, + SVX_RES(RID_SVXTBX_FORM_NAVIGATION), + FM_UI_FEATURE_SHOW_DATABASEBAR); - SFX_FEATURED_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC, - SVX_RES(RID_SVXTBX_FORM_FILTER), - FM_UI_FEATURE_SHOW_FILTERBAR ); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC, + SVX_RES(RID_SVXTBX_FORM_FILTER), + FM_UI_FEATURE_SHOW_FILTERBAR); - SFX_FEATURED_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_READONLYDOC, - SVX_RES( RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES ), - FM_UI_FEATURE_SHOW_TEXT_CONTROL_BAR ); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_READONLYDOC, + SVX_RES(RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES), + FM_UI_FEATURE_SHOW_TEXT_CONTROL_BAR); SFX_FEATURED_CHILDWINDOW_REGISTRATION(SID_FM_ADD_FIELD, FM_UI_FEATURE_SHOW_FIELD); SFX_FEATURED_CHILDWINDOW_REGISTRATION(SID_FM_SHOW_PROPERTIES, FM_UI_FEATURE_SHOW_PROPERTIES); @@ -194,23 +194,21 @@ SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL)) SFX_FEATURED_CHILDWINDOW_REGISTRATION(SID_FM_FILTER_NAVIGATOR, FM_UI_FEATURE_SHOW_FILTERNAVIGATOR); SFX_FEATURED_CHILDWINDOW_REGISTRATION(SID_FM_SHOW_DATANAVIGATOR, FM_UI_FEATURE_SHOW_DATANAVIGATOR); - SFX_FEATURED_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD, - SVX_RES( RID_SVXTBX_CONTROLS ), - FM_UI_FEATURE_TB_CONTROLS ); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD, + SVX_RES(RID_SVXTBX_CONTROLS), + FM_UI_FEATURE_TB_CONTROLS); - SFX_FEATURED_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD, - SVX_RES( RID_SVXTBX_MORECONTROLS ), - FM_UI_FEATURE_TB_MORECONTROLS ); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD, + SVX_RES(RID_SVXTBX_MORECONTROLS), + FM_UI_FEATURE_TB_MORECONTROLS); - SFX_FEATURED_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD, - SVX_RES( RID_SVXTBX_FORMDESIGN ), - FM_UI_FEATURE_TB_FORMDESIGN ); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD, + SVX_RES(RID_SVXTBX_FORMDESIGN), + FM_UI_FEATURE_TB_FORMDESIGN); } - TYPEINIT1(FmFormShell,SfxShell) - FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) :SfxShell(_pParent) ,m_pImpl(new FmXFormShell(*this, _pParent->GetViewFrame())) |