framework/source/uielement/toolbarsmenucontroller.cxx | 5 +----
sd/uiconfig/sdraw/menubar/menubar.xml | 1 +
sd/uiconfig/simpress/menubar/menubar.xml | 1 +
3 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 837f748ce61145b90068ed8c0a630f1cf15fa080
Author: Roman Kuznetsov <antilibreoff...@gmail.com>
AuthorDate: Fri Jun 14 10:47:12 2019 +0200
Commit: Roman Kuznetsov <antilibreoff...@gmail.com>
CommitDate: Sun Jun 16 12:18:41 2019 +0200
tdf#92083 Move Color bar item from View->Toolbars
to View menu in Draw/Impress
Change-Id: Ie25d34b07d381775274a79e4a0b71e7a96eb6119
Reviewed-on: https://gerrit.libreoffice.org/74024
Reviewed-by: Roman Kuznetsov <antilibreoff...@gmail.com>
Tested-by: Roman Kuznetsov <antilibreoff...@gmail.com>
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx
b/framework/source/uielement/toolbarsmenucontroller.cxx
index 69ddcae67924..7a66796a9b84 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -408,10 +408,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu > co
}
// Create commands for non-toolbars
- if ( m_aModuleIdentifier == "com.sun.star.drawing.DrawingDocument" ||
- m_aModuleIdentifier ==
"com.sun.star.presentation.PresentationDocument" )
- addCommand( m_xPopupMenu, ".uno:ColorControl", "" );
- else if ( m_aModuleIdentifier ==
"com.sun.star.sheet.SpreadsheetDocument" )
+ if ( m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" )
addCommand( m_xPopupMenu, ".uno:InputLineVisible", "" );
bool bAddCommand( true );
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index f59c6d510849..0e96f5bbf7c0 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -155,6 +155,7 @@
<menu:menuitem menu:id=".uno:ViewSidebarStyles"/>
<menu:menuitem menu:id=".uno:Gallery"/>
<menu:menuitem menu:id=".uno:Navigator"/>
+ <menu:menuitem menu:id=".uno:ColorControl"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ZoomPanning"/>
<menu:menu menu:id=".uno:ZoomMenu">
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index 1aaa09786d0c..bbca62cc1808 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -164,6 +164,7 @@
<menu:menuitem menu:id=".uno:ViewSidebarStyles"/>
<menu:menuitem menu:id=".uno:Gallery" menu:style="text"/>
<menu:menuitem menu:id=".uno:Navigator" menu:style="text"/>
+ <menu:menuitem menu:id=".uno:ColorControl"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ZoomPanning"/>
<menu:menu menu:id=".uno:ZoomMenu">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
