[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Menubar.js |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit b3532ebb828035dc9db8c027472bd050494fce3c
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Feb 6 23:02:32 2019 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Feb 7 15:23:14 2019 +0100

    loleaflet: disable Conditional Formatting
    
    Change-Id: Iad9150b16f56e9460a9277f29813419fc50de90c
    Reviewed-on: https://gerrit.libreoffice.org/67480
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index eb152f82a..882481831 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -362,15 +362,7 @@ L.Control.Menubar = L.Control.extend({
 			{name: _UNO('.uno:FormatMenu', 'spreadsheet'), type: 'menu', menu: [
 				{uno: '.uno:ResetAttributes'},
 				{uno: '.uno:FormatCellDialog'},
-				{uno: '.uno:PageFormatDialog'},
-				{name: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet'), type: 'menu', menu: [
-					{uno: '.uno:ConditionalFormatDialog'},
-					{uno: '.uno:ColorScaleFormatDialog'},
-					{uno: '.uno:DataBarFormatDialog'},
-					{uno: '.uno:IconSetFormatDialog'},
-					{uno: '.uno:CondDateFormatDialog'},
-					{type: 'separator'},
-					{uno: '.uno:ConditionalFormatManagerDialog'}]},
+				{uno: '.uno:PageFormatDialog'}
 			]},
 			{name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [
 				{name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [