diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 10:11:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 14:01:23 +0200 |
| commit | 252e403213bf2a1c1b1f7b07f1dd647b450cb312 (patch) | |
| tree | 05405a140a1e00cd3d49388c678a9bfb5763d59c /framework | |
| parent | 2c0b84dc65739bfc47dca684e819717eb9cce387 (diff) | |
use officecfg to retrieve DisableUICustomization
Change-Id: I87b3019c8e10eb2453746340beea4c4623dc65e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119400
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmodemenucontroller.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarsmenucontroller.cxx | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index e85de886b442..00bf67de463b 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -729,7 +729,7 @@ void ToolBarManager::RefreshImages() void ToolBarManager::UpdateControllers() { - if( SvtMiscOptions().DisableUICustomization() ) + if( officecfg::Office::Common::Misc::DisableUICustomization::get() ) { Any a; Reference< XLayoutManager > xLayoutManager; @@ -1947,7 +1947,7 @@ void ToolBarManager::AddCustomizeMenuItems(ToolBox const * pToolBar) else pMenu->EnableItem(MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false); - if (SvtMiscOptions().DisableUICustomization()) + if (officecfg::Office::Common::Misc::DisableUICustomization::get()) { pMenu->EnableItem(MENUITEM_TOOLBAR_VISIBLEBUTTON, false); pMenu->EnableItem(MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false); diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index cd6f2716a23a..dfe2e4ff4378 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -84,7 +84,7 @@ ToolbarModeMenuController::~ToolbarModeMenuController() void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu ) { - if ( SvtMiscOptions().DisableUICustomization() ) + if ( officecfg::Office::Common::Misc::DisableUICustomization::get() ) return; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 83816bc64bdb..c67dab5f2856 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/theWindowStateConfiguration.hpp> +#include <officecfg/Office/Common.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/image.hxx> @@ -300,7 +301,7 @@ Sequence< Sequence< css::beans::PropertyValue > > ToolbarsMenuController::getLay void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu ) { - if( SvtMiscOptions().DisableUICustomization() ) + if( officecfg::Office::Common::Misc::DisableUICustomization::get() ) return; SolarMutexGuard aSolarMutexGuard; |