3 files changed, 9 insertions, 13 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index c7efdb92053d..b5608310188c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -563,7 +563,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
     bool bShowMenuImages     = rSettings.GetUseImagesInMenus();
     bool bShowShortcuts      = m_bHasMenuBar || rSettings.GetContextMenuShortcuts();
-    bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED );
+    bool bHasDisabledEntries = SvtCommandOptions().HasEntriesDisabled();
 
     SolarMutexGuard g;
 
@@ -657,7 +657,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
 
                 if ( bHasDisabledEntries )
                 {
-                    if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aTargetURL.Path ))
+                    if ( aCmdOptions.LookupDisabled( aTargetURL.Path ))
                         pMenu->HideItem( menuItemHandler->nItemId );
                 }
 
@@ -840,7 +840,7 @@ bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLT
                 aTargetURL.Complete = pPopupMenu->GetItemCommand( nId );
                 rTransformer->parseStrict( aTargetURL );
 
-                if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aTargetURL.Path ))
+                if ( aCmdOptions.LookupDisabled( aTargetURL.Path ))
                     ++nHideCount;
             }
         }
@@ -1241,7 +1241,7 @@ void MenuBarManager::FillMenuWithConfiguration(
                                      AddonsOptions().GetMergeMenuInstructions(),
                                      rModuleIdentifier );
 
-    bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED );
+    bool bHasDisabledEntries = SvtCommandOptions().HasEntriesDisabled();
     if ( !bHasDisabledEntries )
         return;
 
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 85fad251be05..5278906f8eae 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -594,7 +594,7 @@ void ToolBarManager::Init()
     // enables a menu for clipped items and customization
     SvtCommandOptions aCmdOptions;
     ToolBoxMenuType nMenuType = ToolBoxMenuType::ClippedItems;
-    if ( !aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, "CreateDialog"))
+    if ( !aCmdOptions.LookupDisabled( "CreateDialog"))
          nMenuType |= ToolBoxMenuType::Customize;
 
     m_pImpl->SetMenuType( nMenuType );
@@ -1032,7 +1032,7 @@ void ToolBarManager::CreateControllers()
     Reference< XWindow > xToolbarWindow = m_pImpl->GetInterface();
 
     css::util::URL      aURL;
-    bool                bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED );
+    bool                bHasDisabledEntries = SvtCommandOptions().HasEntriesDisabled();
     SvtCommandOptions   aCmdOptions;
 
     for ( ToolBox::ImplToolItems::size_type i = 0; i < m_pImpl->GetItemCount(); i++ )
@@ -1056,7 +1056,7 @@ void ToolBarManager::CreateControllers()
         {
             aURL.Complete = aCommandURL;
             m_xURLTransformer->parseStrict( aURL );
-            if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, aURL.Path ))
+            if ( aCmdOptions.LookupDisabled( aURL.Path ))
             {
                 m_aControllerMap[ nId ] = xController;
                 m_pImpl->HideItem( nId, aCommandURL );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index c4c8c3f73e1f..1378645ce07e 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -410,12 +410,8 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > co
     bool          bAddCommand( true );
     SvtCommandOptions aCmdOptions;
 
-    if ( aCmdOptions.HasEntries( SvtCommandOptions::CMDOPTION_DISABLED ))
-    {
-        if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
-                                 "ConfigureDialog"))
-            bAddCommand = false;
-    }
+    if ( aCmdOptions.HasEntriesDisabled() && aCmdOptions.LookupDisabled("ConfigureDialog"))
+        bAddCommand = false;
 
     if ( bAddCommand )
     {