summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-04-18 15:28:44 +0200
committerJan Holesovsky <kendy@collabora.com>2014-04-18 22:49:27 +0200
commit9f83ea4bc61c051473aeaed9849cba4627aceadb (patch)
treea74b93ca66a9c46c1376283f45767938106d72a8 /sd/source
parent7acb27081c6da9fc0ae64f4d145d8744c81d4b0a (diff)
sfx2: Kill SFX_POPUPMENU_REGISTRATION macro.
Change-Id: Ie68ccbe5874ec7c7e1bb73cb2937e06bb4910cd0
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/view/drvwshrg.cxx6
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
2 files changed, 5 insertions, 3 deletions
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index bb2037008874..0f267ccf95e6 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -65,7 +65,8 @@ namespace sd {
SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL))
{
- SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) );
+ GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP));
+
SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR );
SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SfxInfoBarContainerChild::GetChildWindowId() );
@@ -92,7 +93,8 @@ TYPEINIT1( DrawViewShell, ViewShell );
SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH...
{
- SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) );
+ GetStaticInterface()->RegisterPopupMenu(SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP));
+
SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR );
SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 163418b8ee83..4203b985e4b0 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -111,7 +111,7 @@ namespace sd {
*/
SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL))
{
- SFX_POPUPMENU_REGISTRATION( SdResId(RID_OUTLINE_POPUP) );
+ GetStaticInterface()->RegisterPopupMenu(SdResId(RID_OUTLINE_POPUP));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
SdResId(RID_OUTLINE_TOOLBOX));