From 5280121732324eff5a30087a36a50c58524b8ef3 Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Sat, 18 Feb 2017 21:18:03 +0200
Subject: Convert RID_MENU_REPORT to xml

The change in PopupMenu::ImplExecute is needed because
MenuBarManager dispatches commands synchronously, and a
command can try to dispose the parent window of the
MenuFloatingWindow (e.g. right clicking inside the report
header, and choosing "Delete Header"), which will lead to
Application::Abort in a debug build. So we must get rid of
the MenuFloatingWindow before handling menu selection.

Change-Id: I1657cd16a005207abc31f4b65595ab78ed235e37
Reviewed-on: https://gerrit.libreoffice.org/34407
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
---
 .../data/org/openoffice/Office/UI/DbReportWindowState.xcu      |  5 +++++
 .../registry/data/org/openoffice/Office/UI/ReportCommands.xcu  | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
index dc8c6b9378f4..1260627ca26a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
@@ -19,6 +19,11 @@
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DbReportWindowState" oor:package="org.openoffice.Office.UI">
   <node oor:name="UIElements">
     <node oor:name="States">
+      <node oor:name="private:resource/popupmenu/report" oor:op="replace">
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Report</value>
+        </prop>
+      </node>
       <node oor:name="private:resource/toolbar/toolbar" oor:op="replace">
         <prop oor:name="DockPos" oor:type="xs:string">
           <value>0,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index f3c0e37e4251..a3b1378a1993 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -308,6 +308,11 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:DBBackgroundColor" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Background Color...</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="Popups">
       <node oor:name=".uno:ExportReportTo" oor:op="replace">
@@ -325,11 +330,6 @@
           <value xml:lang="en-US">Object Resizing</value>
         </prop>
       </node>
-      <node oor:name=".uno:ArrangeMenu" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">A~rrange</value>
-        </prop>
-      </node>
     </node>
   </node>
 </oor:component-data>
-- 
cgit