summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
-rw-r--r--framework/source/uielement/toolbarmanager.cxx4
2 files changed, 2 insertions, 5 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 5cf5e9b77cd5..0357eb0a6be0 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -43,7 +43,6 @@
#include <comphelper/propertysequence.hxx>
#include <officecfg/Office/Common.hxx>
-#include <svtools/menuoptions.hxx>
#include <svtools/javainteractionhandler.hxx>
#include <uno/current_context.hxx>
#include <unotools/cmdoptions.hxx>
@@ -571,7 +570,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
css::uno::getCurrentContext()));
// set/unset hiding disabled menu entries
- bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
+ bool bDontHide = officecfg::Office::Common::View::Menu::DontHideDisabledEntry::get();
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
bool bShowMenuImages = rSettings.GetUseImagesInMenus();
bool bShowShortcuts = m_bHasMenuBar || rSettings.GetContextMenuShortcuts();
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 00bf67de463b..c7e6d8c79ec8 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -73,8 +73,6 @@
#include <vcl/weldutils.hxx>
#include <tools/debug.hxx>
-#include <svtools/menuoptions.hxx>
-
// namespaces
using namespace ::com::sun::star::awt;
@@ -1887,7 +1885,7 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox const * pToolBar)
}
// popup menu for quick customization
- bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
+ bool bHideDisabledEntries = !officecfg::Office::Common::View::Menu::DontHideDisabledEntry::get();
::PopupMenu *pMenu = pToolBar->GetMenu();