tdf#119580 sc: Use the regular object popupmenu for charts

Context menu of a chart is supposed to be the same as for
other ole objects, except the additional .uno:ExportAsGraphic.
Given that .uno:ExportAsGraphic is hidden when non-chart
object is selected, we can just place it in the regular ole
object popupmenu (done already), and use that menu also for
charts.

Discussion is in https://gerrit.libreoffice.org/60128 .

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

4 files changed, 1 insertions, 65 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index b9948964babf..254d52c07e20 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -35,11 +35,6 @@
           <value xml:lang="en-US">Cell Edit</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/colheader" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
           <value xml:lang="en-US">Column Header</value>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8a4100f9e209..d6aabe949204 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -18,7 +18,6 @@ $(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/colheader \
 	sc/uiconfig/scalc/popupmenu/column_operations \
 	sc/uiconfig/scalc/popupmenu/conditional \
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 4e9edfad103b..9ab065d3fa80 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -52,7 +52,7 @@ void ScChartShell::InitInterface_Impl()
                                             SfxVisibilityFlags::Standard | SfxVisibilityFlags::Server,
                                             ToolbarId::Draw_Objectbar);
 
-    GetStaticInterface()->RegisterPopupMenu("chart");
+    GetStaticInterface()->RegisterPopupMenu("oleobject");
 }
 
 
diff --git a/sc/uiconfig/scalc/popupmenu/chart.xml b/sc/uiconfig/scalc/popupmenu/chart.xml
deleted file mode 100644
index e7ddbc87a272..000000000000
--- a/sc/uiconfig/scalc/popupmenu/chart.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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:menuitem menu:id=".uno:FitCellSize"/>
-  <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:menuitem menu:id=".uno:AnchorMenu"/>
-  <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>