offapi: move css.ui.UICommandDescription to css.frame.UICommandDescription:

The service implementation used "com.sun.star.frame.UICommandDescription"
since forever, so the IDL file was essentially wrong documentation.
But since 7a464263cc5c2ca2b7128734ff4860e02d662818 converted the service
to new-style, it cannot be instantated any more and e.g. clicking on
Tools->Customize crashes.
(Adapting the implementation instead would be an incompatible change.)

Change-Id: I564bddaf3836827f5b72360a2bde19d6158b7ba5

3 files changed, 8 insertions, 6 deletions

diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index edb28dc22818..e1b1dad6980b 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/UICommandDescription.hpp>
+#include <com/sun/star/frame/UICommandDescription.hpp>
 
 #include <svl/eitem.hxx>
 #include <svtools/generictoolboxcontroller.hxx>
@@ -63,7 +63,7 @@ static rtl::OUString GetLabelFromCommandURL( const rtl::OUString& rCommandURL, c
     xUICommandDescription = xTmpNameAccess;
     if ( !xUICommandDescription.is() )
     {
-        xUICommandDescription = ui::UICommandDescription::create(xContext);
+        xUICommandDescription = frame::UICommandDescription::create(xContext);
         xTmpNameAccess = xUICommandDescription;
     }
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 7e994dcfd9fb..df3a812d358c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/ui/UICommandDescription.hpp>
+#include <com/sun/star/frame/UICommandDescription.hpp>
 
 #include "sfx2/sfxhelp.hxx"
 #include <sfx2/app.hxx>
@@ -2534,7 +2534,8 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
         //create a popup menu in Writer
         boost::scoped_ptr<PopupMenu> pMenu(new PopupMenu);
         uno::Reference< container::XNameAccess > xNameAccess(
-                    ui::UICommandDescription::create(::comphelper::getProcessComponentContext()) );
+                frame::UICommandDescription::create(
+                    ::comphelper::getProcessComponentContext()) );
         uno::Reference< container::XNameAccess > xUICommands;
         rtl::OUString sTextDoc("com.sun.star.text.TextDocument");
         if(xNameAccess->hasByName(sTextDoc))
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 0a4a0def55e5..9af76d8953a8 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/ui/UICommandDescription.hpp>
+#include <com/sun/star/frame/UICommandDescription.hpp>
 #include <comphelper/componentcontext.hxx>
 #include <cppuhelper/implbase1.hxx>
 
@@ -248,7 +248,8 @@ static ::rtl::OUString RetrieveLabelFromCommand(
         if ( !xNameAccess.is() )
         {
             xNameAccess = css::uno::Reference< css::container::XNameAccess >(
-                css::ui::UICommandDescription::create(comphelper::ComponentContext(xSMGR).getUNOContext()),
+                css::frame::UICommandDescription::create(
+                        comphelper::ComponentContext(xSMGR).getUNOContext()),
                     css::uno::UNO_QUERY_THROW );
             s_xNameAccess = xNameAccess;
         }