sfx2: Kill SFX_POPUPMENU_REGISTRATION macro.

Change-Id: Ie68ccbe5874ec7c7e1bb73cb2937e06bb4910cd0

13 files changed, 13 insertions, 13 deletions

diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index e15d279aac2d..396264e3925a 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -50,7 +50,7 @@ SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL) )
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
                                             ScResId(RID_DRAW_OBJECTBAR));
 
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_CHART) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CHART));
 }
 
 TYPEINIT1( ScChartShell, ScDrawShell );
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 06e9185f53a2..49c9b36d991a 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -66,7 +66,7 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) )
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             ScResId(RID_DRAW_OBJECTBAR));
 
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_DRAW) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAW));
 
     SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() );
 }
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 3e871de39424..754b668c9a88 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -46,7 +46,7 @@ SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL) )
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             ScResId(RID_OBJECTBAR_FORMAT));
 
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_DRAWFORM) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWFORM));
 }
 
 TYPEINIT1( ScDrawFormShell, ScDrawShell );
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 3a08f79c7a4c..e9965ff8c6c4 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -85,7 +85,7 @@ SFX_IMPL_INTERFACE( ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL)
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             ScResId(RID_TEXT_TOOLBOX));
 
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_DRAWTEXT) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWTEXT));
 
     SFX_CHILDWINDOW_REGISTRATION( ScGetFontWorkId() );
 }
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 778c90fc2673..bb2d6273a0a4 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -69,7 +69,7 @@ SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) )
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             ScResId(RID_GRAPHIC_OBJECTBAR));
 
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_GRAPHIC) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_GRAPHIC));
 }
 
 TYPEINIT1( ScGraphicShell, ScDrawShell );
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index ec3d7264c98f..d8bb003dead6 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -40,7 +40,7 @@ SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL) )
 {
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR));
 
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_MEDIA) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_MEDIA));
 }
 
 TYPEINIT1( ScMediaShell, ScDrawShell );
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 89f33ddbef36..d3a583c8dd1b 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -46,7 +46,7 @@ SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL)
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             ScResId(RID_DRAW_OBJECTBAR));
 
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_OLE) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_OLE));
 }
 
 TYPEINIT1( ScOleObjectShell, ScDrawShell );
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index fd4e9d1704a5..a150d13d63a6 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -38,7 +38,7 @@ TYPEINIT1( ScAuditingShell, SfxShell );
 
 SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL))
 {
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_AUDIT) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_AUDIT));
 }
 
 
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 3579152d5f5b..1fcc28d8e5a5 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -68,7 +68,7 @@ SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell , ScResId(SCSTR_CELLSHELL) )
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
                                             ScResId(RID_OBJECTBAR_FORMAT));
 
-    SFX_POPUPMENU_REGISTRATION(ScResId(RID_POPUP_CELLS));
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CELLS));
 }
 
 
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index f3131d440021..d5600939721e 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -83,7 +83,7 @@ TYPEINIT1( ScEditShell, SfxShell );
 
 SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL))
 {
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_EDIT) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_EDIT));
 }
 
 
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index d9f55f47c7c2..2b1db9ed0246 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -38,7 +38,7 @@ TYPEINIT1( ScPageBreakShell, SfxShell );
 
 SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL))
 {
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_PAGEBREAK) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PAGEBREAK));
 }
 
 ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 8f2dfdc91513..79b87bd9b915 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -46,7 +46,7 @@ TYPEINIT1( ScPivotShell, SfxShell );
 
 SFX_IMPL_INTERFACE(ScPivotShell, SfxShell, ScResId(SCSTR_PIVOTSHELL))
 {
-    SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_PIVOT) );
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PIVOT));
 }
 
 ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 914cabc14722..016015fd07ba 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -88,7 +88,7 @@ SFX_IMPL_INTERFACE( ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL) )
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER|SFX_VISIBILITY_READONLYDOC,
                                             ScResId(RID_OBJECTBAR_PREVIEW));
 
-    SFX_POPUPMENU_REGISTRATION(ScResId(RID_POPUP_PREVIEW));
+    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PREVIEW));
 }
 
 SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" )