From 0e7cd653ea90da388820220bf6a3eb140b57bbd6 Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Mon, 25 Jan 2016 01:09:03 +0200
Subject: tdf#86567 Dropdown for conditional formatting

Change-Id: I1ba12a8b7501065e3cd52e17b7c0c83a0f58f9cf
---
 .../data/org/openoffice/Office/UI/Controller.xcu   | 25 ++++++++++++++++++++++
 sc/UIConfig_scalc.mk                               |  1 +
 sc/inc/sc.hrc                                      |  1 +
 sc/sdi/cellsh.sdi                                  |  1 +
 sc/sdi/scalc.sdi                                   | 20 +++++++++++++++++
 sc/uiconfig/scalc/menubar/menubar.xml              | 12 +----------
 sc/uiconfig/scalc/popupmenu/conditional.xml        | 18 ++++++++++++++++
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml      |  6 +-----
 8 files changed, 68 insertions(+), 16 deletions(-)
 create mode 100644 sc/uiconfig/scalc/popupmenu/conditional.xml

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 31c9e4c47288..4df10e21867b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -291,6 +291,20 @@
           <value>flowchartshapes</value>
         </prop>
       </node>
+      <node oor:name="c25" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ConditionalFormatMenu</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.sheet.SpreadsheetDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.ResourceMenuController</value>
+        </prop>
+        <prop oor:name="Value">
+          <value>conditional</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="ToolBar">
       <node oor:name="ZoomToolBox" oor:op="replace">
@@ -1062,6 +1076,17 @@
           <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
         </prop>
       </node>
+      <node oor:name="ConditionalFormatControl" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ConditionalFormatMenu</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.sheet.SpreadsheetDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="StatusBar">
       <node oor:name="c5" oor:op="replace">
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 760cc5ba133d..968323bff070 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
 	sc/uiconfig/scalc/popupmenu/celledit \
 	sc/uiconfig/scalc/popupmenu/chart \
 	sc/uiconfig/scalc/popupmenu/colheader \
+	sc/uiconfig/scalc/popupmenu/conditional \
 	sc/uiconfig/scalc/popupmenu/draw \
 	sc/uiconfig/scalc/popupmenu/drawtext \
 	sc/uiconfig/scalc/popupmenu/form \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index dc049a5016ee..52e34cebcc67 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -254,6 +254,7 @@
 #define SID_OPENDLG_OPTSOLVER       (SC_MESSAGE_START + 60)
 #define SID_VALIDITY_REFERENCE      (SC_MESSAGE_START + 61)
 #define SID_OPENDLG_CONDFRMT_MANAGER (SC_MESSAGE_START + 62)
+#define SID_POPUP_CONDFRMT          (SC_MESSAGE_START + 63)
 #define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
 #define SID_OPENDLG_COLORSCALE      (SC_MESSAGE_START + 66)
 #define SID_OPENDLG_DATABAR         (SC_MESSAGE_START + 67)
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 346baa69b75c..297c5c61643a 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -206,6 +206,7 @@ interface CellSelection
     FID_USE_NAME    [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
     SID_CANCEL      [ ExecMethod = Execute; ]
     SID_TOGGLE_REL  [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
+    SID_POPUP_CONDFRMT []
     SID_OPENDLG_CONDFRMT    [ ExecMethod = ExecuteEdit; StateMethod = GetState; ]
     SID_OPENDLG_COLORSCALE  [ ExecMethod = ExecuteEdit; ]
     SID_OPENDLG_DATABAR     [ ExecMethod = ExecuteEdit; ]
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 75f0233ded38..fda341a07840 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -1060,6 +1060,26 @@ SfxVoidItem CommentChange FID_CHG_COMMENT
 ]
 
 
+SfxVoidItem ConditionalFormatMenu SID_POPUP_CONDFRMT
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    ReadOnlyDoc = FALSE,
+    Toggle = FALSE,
+    Container = FALSE,
+    NoRecord;
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_FORMAT;
+]
+
+
 SfxVoidItem ConditionalFormatDialog SID_OPENDLG_CONDFRMT
 ()
 [
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 13fa14047d1b..0a7101626ff1 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -334,17 +334,7 @@
                 </menu:menupopup>
             </menu:menu>
             <menu:menuseparator/>
-            <menu:menu menu:id=".uno:ConditionalFormatMenu">
-              <menu:menupopup>
-                <menu:menuitem menu:id=".uno:ConditionalFormatDialog"/>
-                <menu:menuitem menu:id=".uno:ColorScaleFormatDialog"/>
-                <menu:menuitem menu:id=".uno:DataBarFormatDialog"/>
-                <menu:menuitem menu:id=".uno:IconSetFormatDialog"/>
-                <menu:menuitem menu:id=".uno:CondDateFormatDialog"/>
-                <menu:menuseparator/>
-                <menu:menuitem menu:id=".uno:ConditionalFormatManagerDialog"/>
-              </menu:menupopup>
-            </menu:menu>
+            <menu:menuitem menu:id=".uno:ConditionalFormatMenu"/>
             <menu:menuitem menu:id=".uno:AutoFormat"/>
             <menu:menuseparator/>
             <menu:menu menu:id=".uno:FormatImageMenu">
diff --git a/sc/uiconfig/scalc/popupmenu/conditional.xml b/sc/uiconfig/scalc/popupmenu/conditional.xml
new file mode 100644
index 000000000000..69309cf310c5
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/conditional.xml
@@ -0,0 +1,18 @@
+<?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:ConditionalFormatDialog"/>
+  <menu:menuitem menu:id=".uno:ColorScaleFormatDialog"/>
+  <menu:menuitem menu:id=".uno:DataBarFormatDialog"/>
+  <menu:menuitem menu:id=".uno:IconSetFormatDialog"/>
+  <menu:menuitem menu:id=".uno:CondDateFormatDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ConditionalFormatManagerDialog"/>
+</menu:menupopup>
diff --git a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
index 644a79ca6a35..6c2deea4b218 100644
--- a/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/formatobjectbar.xml
@@ -67,11 +67,7 @@
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:FrameLineColor"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:ConditionalFormatDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:ColorScaleFormatDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:DataBarFormatDialog"/>
- <toolbar:toolbaritem xlink:href=".uno:IconSetFormatDialog"/>
- <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ConditionalFormatMenu"/>
  <toolbar:toolbaritem xlink:href=".uno:ToggleSheetGrid" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ParaLeftToRight"/>
-- 
cgit v1.2.3