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 /desktop/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 'desktop/source')
| -rw-r--r-- | desktop/source/app/app.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/migration/migration.cxx | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d6e3cd7a0d52..7208345650d3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -67,7 +67,7 @@ #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/ui/UICommandDescription.hpp> +#include <com/sun/star/frame/UICommandDescription.hpp> #include <com/sun/star/ui/XUIElementFactoryRegistration.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> @@ -2092,7 +2092,8 @@ void Desktop::PreloadConfigurationData() { Reference< XMultiServiceFactory > rFactory = ::comphelper::getProcessServiceFactory(); Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XNameAccess > xNameAccess( css::ui::UICommandDescription::create(xContext) ); + Reference< XNameAccess > xNameAccess( + css::frame::UICommandDescription::create(xContext) ); rtl::OUString aWriterDoc( "com.sun.star.text.TextDocument" ); rtl::OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" ); diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 57e93aba893f..fe98ad01036f 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -61,7 +61,7 @@ #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.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/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XUIConfigurationPersistence.hpp> @@ -92,7 +92,9 @@ static const char XDG_CONFIG_PART[] = "/.config"; ::rtl::OUString sLabel; uno::Reference< container::XNameAccess > xUICommands; - uno::Reference< container::XNameAccess > xNameAccess( ui::UICommandDescription::create(::comphelper::getProcessComponentContext()) ); + uno::Reference< container::XNameAccess > const xNameAccess( + frame::UICommandDescription::create( + ::comphelper::getProcessComponentContext()) ); xNameAccess->getByName( sModuleIdentifier ) >>= xUICommands; if (xUICommands.is()) { |