diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 15:17:25 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:49:27 +0200 |
| commit | 7acb27081c6da9fc0ae64f4d145d8744c81d4b0a (patch) | |
| tree | 93d32031ef3a32153b9917600e4ea862321c3ff1 /sd | |
| parent | 2be92a9d4e5255963af5261c7511003626831be9 (diff) | |
sfx2: Kill SFX_OBJECTBAR_REGISTRATION macro.
Change-Id: Ic80e9bebba8c7e76a0400769a2f9d75301227194
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/view/presvish.cxx | 24 |
2 files changed, 14 insertions, 21 deletions
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index c2a5fa7099ee..163418b8ee83 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -112,11 +112,12 @@ namespace sd { SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL)) { SFX_POPUPMENU_REGISTRATION( SdResId(RID_OUTLINE_POPUP) ); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | - SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, - SdResId(RID_OUTLINE_TOOLBOX) ); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, - SdResId(RID_DRAW_VIEWER_TOOLBOX) ); + + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, + SdResId(RID_OUTLINE_TOOLBOX)); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, + SdResId(RID_DRAW_VIEWER_TOOLBOX)); + SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SfxInfoBarContainerChild::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 94988d8ff4cb..53cb9a70f20b 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -61,26 +61,18 @@ using namespace ::com::sun::star::presentation; namespace sd { - -// - PresentationViewShell - - - SFX_IMPL_INTERFACE( PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) ) { - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | - SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, - SdResId(RID_DRAW_TOOLBOX)); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, - SdResId(RID_DRAW_VIEWER_TOOLBOX) ); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OPTIONS | SFX_VISIBILITY_STANDARD | - SFX_VISIBILITY_SERVER, - SdResId(RID_DRAW_OPTIONS_TOOLBOX)); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_COMMONTASK | SFX_VISIBILITY_STANDARD | - SFX_VISIBILITY_SERVER, - SdResId(RID_DRAW_COMMONTASK_TOOLBOX)); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, + SdResId(RID_DRAW_TOOLBOX)); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC, + SdResId(RID_DRAW_VIEWER_TOOLBOX) ); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OPTIONS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, + SdResId(RID_DRAW_OPTIONS_TOOLBOX)); + GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_COMMONTASK | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER, + SdResId(RID_DRAW_COMMONTASK_TOOLBOX)); } - TYPEINIT1( PresentationViewShell, DrawViewShell ); PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView) |