[Libreoffice-commits] core.git: framework/source

[Roman Kuznetsov (via logerrit)]

 framework/source/uielement/toolbarsmenucontroller.cxx |   20 ++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

New commits:
commit 846c68876c214d501bf163eede4288d7a307ec8a
Author:     Roman Kuznetsov <antilibreoffice at gmail.com>
AuthorDate: Fri Jun 14 10:59:43 2019 +0200
Commit:     Roman Kuznetsov <antilibreoffice at gmail.com>
CommitDate: Fri Jun 14 18:07:28 2019 +0200

    tdf#124642 Delete Formula item from View->Toolbars in Writer
    
    Change-Id: I5817ba3c8c758e31641b805083133ce4b8bbb094
    Reviewed-on: https://gerrit.libreoffice.org/74025
    Tested-by: Jenkins
    Reviewed-by: Roman Kuznetsov <antilibreoffice at gmail.com>

diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 945df54659c0..69ddcae67924 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -408,21 +408,11 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co
         }
 
         // Create commands for non-toolbars
-        if ( m_aModuleIdentifier == "com.sun.star.text.TextDocument" ||
-             m_aModuleIdentifier == "com.sun.star.text.WebDocument" ||
-             m_aModuleIdentifier == "com.sun.star.text.GlobalDocument" ||
-             m_aModuleIdentifier == "com.sun.star.drawing.DrawingDocument" ||
-             m_aModuleIdentifier == "com.sun.star.presentation.PresentationDocument" ||
-             m_aModuleIdentifier == "com.sun.star.sheet.SpreadsheetDocument" )
-        {
-            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" )
-                addCommand( m_xPopupMenu, ".uno:InputLineVisible", "" );
-            else
-                addCommand( m_xPopupMenu, ".uno:InsertFormula", "" );
-        }
+        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" )
+             addCommand( m_xPopupMenu, ".uno:InputLineVisible", "" );
 
         bool          bAddCommand( true );
         SvtCommandOptions aCmdOptions;