tdf#93837 Convert some Calc context menus to xml

TODO:

- Clean the now unused defines/resources.
- Several submenus are duplicated (in the menubar too). Makes
  sense to refactor them to separate popup menu controllers.

Change-Id: I85505eda1c5fb707b1e6064007f27af7b31452bf
Reviewed-on: https://gerrit.libreoffice.org/20704
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>

31 files changed, 749 insertions, 21 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index fb1536974b3b..80f887c4f788 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -86,6 +86,31 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:FillModeTracePredescessor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Trace ~Precedent</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:FillModeRemovePredescessor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Remove Precedent</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:FillModeTraceSuccessor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Trace Dependent</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:FillModeRemoveSuccessor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Remove Dependent</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:FillModeEnd" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Exit Fill Mode</value>
+        </prop>
+      </node>
       <node oor:name=".uno:ClearArrows" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Remove ~All Traces</value>
@@ -180,6 +205,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Pivot Table Filter</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Filter...</value>
+        </prop>
       </node>
       <node oor:name=".uno:NextPage" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -336,6 +364,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Pi~vot Table...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Edit Layout...</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -605,6 +636,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Delete C~ells...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">De~lete...</value>
+        </prop>
       </node>
       <node oor:name=".uno:RepeatSearch" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -872,6 +906,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Comm~ent</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Co~mment</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -977,6 +1014,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Cle~ar Cells...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Cl~ear Contents...</value>
+        </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
         </prop>
@@ -1051,6 +1091,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Insert ~Cells...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Insert...</value>
+        </prop>
       </node>
       <node oor:name=".uno:InsertRowsMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1212,6 +1255,9 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Ce~lls...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Format Cells...</value>
+        </prop>
       </node>
       <node oor:name=".uno:RowHeight" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1327,11 +1373,17 @@
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Page...</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Pa~ge Layout...</value>
+        </prop>
       </node>
       <node oor:name=".uno:StandardTextAttributes" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Standard Text Attributes</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Default</value>
+        </prop>
       </node>
       <node oor:name=".uno:TextAttributes" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -1819,17 +1871,17 @@
       </node>
       <node oor:name=".uno:InsertFieldSheet" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Insert Sheet Name Field</value>
+          <value xml:lang="en-US">Sheet Name</value>
         </prop>
       </node>
       <node oor:name=".uno:InsertFieldDocTitle" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Insert Document Title Field</value>
+          <value xml:lang="en-US">Document Title</value>
         </prop>
       </node>
       <node oor:name=".uno:InsertFieldDateVariable" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Insert Date Field (variable)</value>
+          <value xml:lang="en-US">Date</value>
         </prop>
       </node>
       <node oor:name=".uno:OpenFromCalc" oor:op="replace">
@@ -1850,6 +1902,11 @@
       </node>
     </node>
     <node oor:name="Popups">
+      <node oor:name=".uno:InsertFieldMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Insert Field</value>
+        </prop>
+      </node>
       <node oor:name=".uno:AuditMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Detective</value>
@@ -2019,16 +2076,25 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Paste Only Formula</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Formula</value>
+        </prop>
       </node>
       <node oor:name=".uno:PasteOnlyText" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Paste Only Text</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Text</value>
+        </prop>
       </node>
       <node oor:name=".uno:PasteOnlyValue" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Paste Only Value</value>
         </prop>
+        <prop oor:name="PopupLabel" oor:type="xs:string">
+          <value xml:lang="en-US">~Number</value>
+        </prop>
       </node>
     </node>
   </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 7997881147d2..61ab0b675335 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -20,6 +20,71 @@
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="CalcWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/audit" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Auditing</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/cell" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Cell</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/celledit" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Edit Cell</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/chart" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Chart</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/draw" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/drawtext" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Shape Text</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/form" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Form Control</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Image</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/media" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Media</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/oleobject" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">OLE Object</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/pagebreak" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Page Break</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/pivot" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Pivot Table</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/popupmenu/preview" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Print Preview</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/graffilterbar" oor:op="replace">
         <prop oor:name="Docked" oor:type="xs:boolean">
           <value>false</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 554dd21b40ab..e5bedf6ca52a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1375,11 +1375,6 @@
             <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:OriginalSize" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Original Size</value>
-        </prop>
-      </node>
       <node oor:name=".uno:ChangePicture" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Replace...</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 269f7889bb91..7ae2dddbdba2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -20,6 +20,11 @@
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="GenericCommands" oor:package="org.openoffice.Office.UI">
   <node oor:name="UserInterface">
     <node oor:name="Commands">
+      <node oor:name=".uno:ChangeControlType" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Replace with</value>
+        </prop>
+      </node>
       <node oor:name=".uno:InsertFormMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Fo~rm Control</value>
@@ -1994,6 +1999,11 @@
             <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:OriginalSize" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Original Size</value>
+        </prop>
+      </node>
       <node oor:name=".uno:GridMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Gr~id and Helplines</value>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 051e2bf15270..c1246659d7f1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -19,6 +19,22 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/scalc,\
 ))
 endif
 
+$(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
+	sc/uiconfig/scalc/popupmenu/audit \
+	sc/uiconfig/scalc/popupmenu/cell \
+	sc/uiconfig/scalc/popupmenu/celledit \
+	sc/uiconfig/scalc/popupmenu/chart \
+	sc/uiconfig/scalc/popupmenu/draw \
+	sc/uiconfig/scalc/popupmenu/drawtext \
+	sc/uiconfig/scalc/popupmenu/form \
+	sc/uiconfig/scalc/popupmenu/graphic \
+	sc/uiconfig/scalc/popupmenu/media \
+	sc/uiconfig/scalc/popupmenu/oleobject \
+	sc/uiconfig/scalc/popupmenu/pagebreak \
+	sc/uiconfig/scalc/popupmenu/pivot \
+	sc/uiconfig/scalc/popupmenu/preview \
+))
+
 $(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\
 	sc/uiconfig/scalc/statusbar/statusbar \
 ))
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 47482cf0ff29..56cdadb10ff9 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -52,7 +52,7 @@ void ScChartShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
                                             RID_DRAW_OBJECTBAR);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CHART));
+    GetStaticInterface()->RegisterPopupMenu("chart");
 }
 
 
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index d9c5c331a00e..971936555d7d 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -68,7 +68,7 @@ void ScDrawShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             RID_DRAW_OBJECTBAR);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAW));
+    GetStaticInterface()->RegisterPopupMenu("draw");
 
     GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
 }
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 1054f6811204..bea35a866d7b 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -47,7 +47,7 @@ void ScDrawFormShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             RID_OBJECTBAR_FORMAT);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWFORM));
+    GetStaticInterface()->RegisterPopupMenu("form");
 }
 
 
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 35184b74ebff..ad25cd7ea48d 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -90,7 +90,7 @@ void ScDrawTextObjectBar::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             RID_TEXT_TOOLBOX);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWTEXT));
+    GetStaticInterface()->RegisterPopupMenu("drawtext");
 
     GetStaticInterface()->RegisterChildWindow(ScGetFontWorkId());
 }
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index fef6ec8d22fb..b8032fb07474 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -48,7 +48,7 @@ void ScGraphicShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             RID_GRAPHIC_OBJECTBAR);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_GRAPHIC));
+    GetStaticInterface()->RegisterPopupMenu("graphic");
 }
 
 
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index db0f5e7dd3c2..e89733a84701 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -41,7 +41,7 @@ void ScMediaShell::InitInterface_Impl()
 {
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_MEDIA_OBJECTBAR);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_MEDIA));
+    GetStaticInterface()->RegisterPopupMenu("media");
 }
 
 
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 120fa65878ed..6c2ff3d34bff 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -47,7 +47,7 @@ void ScOleObjectShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
                                             RID_DRAW_OBJECTBAR);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_OLE));
+    GetStaticInterface()->RegisterPopupMenu("oleobject");
 }
 
 
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index a61d4a064439..bba0b46db499 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -39,7 +39,7 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell)
 
 void ScAuditingShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_AUDIT));
+    GetStaticInterface()->RegisterPopupMenu("audit");
 }
 
 ScAuditingShell::ScAuditingShell(ScViewData* pData) :
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 877f38822640..60a92b6b7b16 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -70,7 +70,7 @@ void ScCellShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
                                             RID_OBJECTBAR_FORMAT);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CELLS));
+    GetStaticInterface()->RegisterPopupMenu("cell");
 }
 
 ScCellShell::ScCellShell(ScViewData* pData) :
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index d0e1b4d369e8..109376b75a1f 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -87,7 +87,7 @@ SFX_IMPL_INTERFACE(ScEditShell, SfxShell)
 
 void ScEditShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_EDIT));
+    GetStaticInterface()->RegisterPopupMenu("celledit");
 }
 
 ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) :
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index 0a0766bd10ee..57254d7cce1a 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -39,7 +39,7 @@ SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell)
 
 void ScPageBreakShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PAGEBREAK));
+    GetStaticInterface()->RegisterPopupMenu("pagebreak");
 }
 
 ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index a25cad370ad2..b5c13839438a 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -48,7 +48,7 @@ SFX_IMPL_INTERFACE(ScPivotShell, SfxShell)
 
 void ScPivotShell::InitInterface_Impl()
 {
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PIVOT));
+    GetStaticInterface()->RegisterPopupMenu("pivot");
 }
 
 ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 8d0f7150d848..641fca377d3e 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -91,7 +91,7 @@ void ScPreviewShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER|SFX_VISIBILITY_READONLYDOC,
                                             RID_OBJECTBAR_PREVIEW);
 
-    GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PREVIEW));
+    GetStaticInterface()->RegisterPopupMenu("preview");
 }
 
 SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" )
diff --git a/sc/uiconfig/scalc/popupmenu/audit.xml b/sc/uiconfig/scalc/popupmenu/audit.xml
new file mode 100644
index 000000000000..8ef73ae2b845
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/audit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:FillModeTracePredescessor"/>
+  <menu:menuitem menu:id=".uno:FillModeRemovePredescessor"/>
+  <menu:menuitem menu:id=".uno:FillModeTraceSuccessor"/>
+  <menu:menuitem menu:id=".uno:FillModeRemoveSuccessor"/>
+  <menu:menuitem menu:id=".uno:ClearArrows"/>
+  <menu:menuitem menu:id=".uno:FillModeEnd"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml
new file mode 100644
index 000000000000..57ecd2864069
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/cell.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteSpecial"/>
+  <menu:menu menu:id=".uno:PasteOnly">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteOnlyText"/>
+      <menu:menuitem menu:id=".uno:PasteOnlyValue"/>
+      <menu:menuitem menu:id=".uno:PasteOnlyFormula"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ResetAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatCellDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertCell"/>
+  <menu:menuitem menu:id=".uno:DeleteCell"/>
+  <menu:menuitem menu:id=".uno:Delete"/>
+  <menu:menuitem menu:id=".uno:MergeCells"/>
+  <menu:menuitem menu:id=".uno:SplitCell"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertAnnotation"/>
+  <menu:menuitem menu:id=".uno:EditAnnotation"/>
+  <menu:menuitem menu:id=".uno:DeleteNote"/>
+  <menu:menuitem menu:id=".uno:ShowNote"/>
+  <menu:menuitem menu:id=".uno:HideNote"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DataSelect"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/celledit.xml b/sc/uiconfig/scalc/popupmenu/celledit.xml
new file mode 100644
index 000000000000..b5fbca76ad07
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/celledit.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ResetAttributes"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:InsertFieldMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:InsertFieldDateVariable"/>
+      <menu:menuitem menu:id=".uno:InsertFieldSheet"/>
+      <menu:menuitem menu:id=".uno:InsertFieldDocTitle"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/chart.xml b/sc/uiconfig/scalc/popupmenu/chart.xml
new file mode 100644
index 000000000000..8fa72359f0e6
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/chart.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:OriginalSize"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:ExportAsGraphic"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/draw.xml b/sc/uiconfig/scalc/popupmenu/draw.xml
new file mode 100644
index 000000000000..92b7e7163644
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/draw.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:FlipMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectMirrorVertical"/>
+      <menu:menuitem menu:id=".uno:ObjectMirrorHorizontal"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:AssignMacro"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ToggleObjectBezierMode"/>
+  <menu:menuitem menu:id=".uno:FontWork"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditShapeHyperlink"/>
+  <menu:menuitem menu:id=".uno:DeleteShapeHyperlink"/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/drawtext.xml b/sc/uiconfig/scalc/popupmenu/drawtext.xml
new file mode 100644
index 000000000000..5c8e678d8692
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/drawtext.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:StandardTextAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FontDialog"/>
+  <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/form.xml b/sc/uiconfig/scalc/popupmenu/form.xml
new file mode 100644
index 000000000000..89ce01826b49
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/form.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ControlProperties"/>
+  <menu:menuitem menu:id=".uno:FormProperties"/>
+  <menu:menuitem menu:id=".uno:ChangeControlType"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/graphic.xml b/sc/uiconfig/scalc/popupmenu/graphic.xml
new file mode 100644
index 000000000000..98735c894002
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/graphic.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:OriginalSize"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:FlipMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectMirrorVertical"/>
+      <menu:menuitem menu:id=".uno:ObjectMirrorHorizontal"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuitem menu:id=".uno:AssignMacro"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:EditShapeHyperlink"/>
+  <menu:menuitem menu:id=".uno:DeleteShapeHyperlink"/>
+  <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menu menu:id=".uno:FormatImageMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ChangePicture"/>
+      <menu:menuitem menu:id=".uno:SaveGraphic"/>
+      <menu:menuitem menu:id=".uno:CompressGraphic"/>
+      <menu:menuitem menu:id=".uno:ExternalEdit"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:Crop"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/media.xml b/sc/uiconfig/scalc/popupmenu/media.xml
new file mode 100644
index 000000000000..c6c1b4b89d8d
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/media.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:FlipMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectMirrorVertical"/>
+      <menu:menuitem menu:id=".uno:ObjectMirrorHorizontal"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/oleobject.xml b/sc/uiconfig/scalc/popupmenu/oleobject.xml
new file mode 100644
index 000000000000..13b4caff965f
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/oleobject.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatLine"/>
+  <menu:menuitem menu:id=".uno:FormatArea"/>
+  <menu:menuitem menu:id=".uno:TextAttributes"/>
+  <menu:menuitem menu:id=".uno:TransformDialog"/>
+  <menu:menuitem menu:id=".uno:OriginalSize"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:ArrangeMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:BringToFront"/>
+      <menu:menuitem menu:id=".uno:ObjectForwardOne"/>
+      <menu:menuitem menu:id=".uno:ObjectBackOne"/>
+      <menu:menuitem menu:id=".uno:SendToBack"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetObjectToForeground"/>
+      <menu:menuitem menu:id=".uno:SetObjectToBackground"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:ObjectAlign">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ObjectAlignLeft"/>
+      <menu:menuitem menu:id=".uno:AlignCenter"/>
+      <menu:menuitem menu:id=".uno:ObjectAlignRight"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:AlignUp"/>
+      <menu:menuitem menu:id=".uno:AlignMiddle"/>
+      <menu:menuitem menu:id=".uno:AlignDown"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menu menu:id=".uno:AnchorMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
+      <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+    </menu:menupopup>
+  </menu:menu>
+  <menu:menuseparator/>
+  <menu:menu menu:id=".uno:GroupMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:FormatGroup"/>
+      <menu:menuitem menu:id=".uno:FormatUngroup"/>
+      <menu:menuitem menu:id=".uno:EnterGroup"/>
+      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+    </menu:menupopup>
+  </menu:menu>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/pagebreak.xml b/sc/uiconfig/scalc/popupmenu/pagebreak.xml
new file mode 100644
index 000000000000..a7f23197934b
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/pagebreak.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:Cut"/>
+  <menu:menuitem menu:id=".uno:Copy"/>
+  <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ResetAttributes"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:FormatCellDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:InsertRowBreak"/>
+  <menu:menuitem menu:id=".uno:InsertColumnBreak"/>
+  <menu:menuitem menu:id=".uno:DeleteAllBreaks"/>
+  <menu:menuitem menu:id=".uno:ResetPrintZoom"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:DefinePrintArea"/>
+  <menu:menuitem menu:id=".uno:AddPrintArea"/>
+  <menu:menuitem menu:id=".uno:DeletePrintArea"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:PageFormatDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ShowNote"/>
+  <menu:menuitem menu:id=".uno:HideNote"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/pivot.xml b/sc/uiconfig/scalc/popupmenu/pivot.xml
new file mode 100644
index 000000000000..290b62b50462
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/pivot.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:DataDataPilotRun"/>
+  <menu:menuitem menu:id=".uno:RecalcPivotTable"/>
+  <menu:menuitem menu:id=".uno:DataPilotFilter"/>
+  <menu:menuitem menu:id=".uno:DeletePivotTable"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/preview.xml b/sc/uiconfig/scalc/popupmenu/preview.xml
new file mode 100644
index 000000000000..e5e84550f714
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/preview.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
+  <menu:menuitem menu:id=".uno:PreviousPage"/>
+  <menu:menuitem menu:id=".uno:NextPage"/>
+  <menu:menuitem menu:id=".uno:PageFormatDialog"/>
+  <menu:menuitem menu:id=".uno:CloseWin"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ClosePreview"/>
+</menu:menupopup>