4 files changed, 12 insertions, 8 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 957eb381670f..8ed9d6c09381 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -56,7 +56,7 @@
 #include <com/sun/star/form/XReset.hpp>
 #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/ui/UICommandDescription.hpp>
+#include <com/sun/star/frame/UICommandDescription.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
@@ -852,7 +852,8 @@ void SfxAcceleratorConfigPage::InitAccCfg()
         // no - initialize this instance
         m_xSMGR = ::comphelper::getProcessServiceFactory();
 
-        m_xUICmdDescription = css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xSMGR).getUNOContext());
+        m_xUICmdDescription = css::frame::UICommandDescription::create(
+                comphelper::ComponentContext(m_xSMGR).getUNOContext());
 
         // get the current active frame, which should be our "parent"
         // for this session
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0a0e70611516..626a25dd6828 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -75,7 +75,7 @@
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/ui/UICommandDescription.hpp>
+#include <com/sun/star/frame/UICommandDescription.hpp>
 #include <com/sun/star/ui/XUIConfiguration.hpp>
 #include <com/sun/star/ui/XUIConfigurationListener.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
@@ -914,7 +914,8 @@ SaveInData::SaveInData(
         ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
 
     uno::Reference< container::XNameAccess > xNameAccess(
-        css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xServiceManager).getUNOContext()) );
+        css::frame::UICommandDescription::create(
+            comphelper::ComponentContext(m_xServiceManager).getUNOContext()) );
 
     xNameAccess->getByName( aModuleId ) >>= m_xCommandToLabelMap;
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 44cd36bebcbf..0f08675ec4da 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/document/XDocumentInfoSupplier.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/ui/UICommandDescription.hpp>
+#include <com/sun/star/frame/UICommandDescription.hpp>
 
 #include "acccfg.hrc"
 #include "helpid.hrc"
@@ -586,7 +586,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
 
         m_xGlobalCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xSMGR->createInstance(SERVICE_UICATEGORYDESCRIPTION), css::uno::UNO_QUERY_THROW);
         m_xModuleCategoryInfo = css::uno::Reference< css::container::XNameAccess >(m_xGlobalCategoryInfo->getByName(m_sModuleLongName)   , css::uno::UNO_QUERY_THROW);
-        m_xUICmdDescription   = css::ui::UICommandDescription::create(::comphelper::ComponentContext(m_xSMGR).getUNOContext());
+        m_xUICmdDescription   = css::frame::UICommandDescription::create(
+                ::comphelper::ComponentContext(m_xSMGR).getUNOContext());
 
         InitModule();
         InitBasic();
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 8ccafd287706..280393a6486f 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -62,7 +62,7 @@
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <com/sun/star/frame/DispatchInformation.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/ui/UICommandDescription.hpp>
+#include <com/sun/star/frame/UICommandDescription.hpp>
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -425,7 +425,8 @@ void SvxConfigGroupListBox_Impl::Init()
         }catch(const uno::Exception&)
             { aModuleId = ::rtl::OUString(); }
 
-        Reference< container::XNameAccess > xNameAccess( ui::UICommandDescription::create(xContext) );
+        Reference< container::XNameAccess > const xNameAccess(
+                frame::UICommandDescription::create(xContext) );
         xNameAccess->getByName( aModuleId ) >>= m_xModuleCommands;
 
         Reference< container::XNameAccess > xAllCategories(