summaryrefslogtreecommitdiff
path: root/sc/uiconfig
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-01-25 01:09:03 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2016-01-25 02:03:27 +0200
commit0e7cd653ea90da388820220bf6a3eb140b57bbd6 (patch)
treec66149b5eeea0954a656aebdf7aa5aaca93c9404 /sc/uiconfig
parentc37e66fac7d23989c1fb9c46372e2efe96036514 (diff)
tdf#86567 Dropdown for conditional formatting
Change-Id: I1ba12a8b7501065e3cd52e17b7c0c83a0f58f9cf
Diffstat (limited to 'sc/uiconfig')
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml12
-rw-r--r--sc/uiconfig/scalc/popupmenu/conditional.xml18
-rw-r--r--sc/uiconfig/scalc/toolbar/formatobjectbar.xml6
3 files changed, 20 insertions, 16 deletions
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"/>