diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-05 22:46:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-06 11:13:42 +0200 |
| commit | 6a1c29d7efd505346d4b43ee2b7080e8d769301e (patch) | |
| tree | daa944f84e80a5d3b88766fc8e4082c281256314 /sd/source | |
| parent | c4380fd9f2e7ebe0687cf979fba3044a5b3df554 (diff) | |
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
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 62373201ae30..c34bb2ed116a 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -64,7 +64,7 @@ #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <unotools/historyoptions.hxx> #include <osl/file.hxx> #include <sfx2/filedlghelper.hxx> @@ -1757,7 +1757,8 @@ String AssistentDlgImpl::GetUiTextForCommand (const ::rtl::OUString& sCommandURL if ( ! xContext.is()) break; - Reference<container::XNameAccess> xNameAccess ( ui::UICommandDescription::create(xContext) ); + Reference<container::XNameAccess> const xNameAccess( + frame::UICommandDescription::create(xContext) ); Any a = xNameAccess->getByName( "com.sun.star.presentation.PresentationDocument"); a >>= xUICommandLabels; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 624c25f62410..764884112fae 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include "ViewShellBase.hxx" #include <algorithm> @@ -1149,7 +1149,8 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB if( !aModuleIdentifier.isEmpty() ) { - Reference< XNameAccess > xNameAccess( ui::UICommandDescription::create(xContext) ); + Reference< XNameAccess > const xNameAccess( + frame::UICommandDescription::create(xContext) ); Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); Sequence< PropertyValue > aPropSeq; if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) |