diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-28 15:27:32 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-28 18:52:22 +0100 |
| commit | ba8413d2629352b1e5defaf154498856580e4651 (patch) | |
| tree | 1fe88fed9227b84da0d44ee840cdd56b3418fc56 /desktop | |
| parent | b2c89e7236d71d92a96430db0a7eca14b41c227a (diff) | |
Introduce com.sun.star.frame.theUICommandDescription singleton.
Change-Id: Ic88cca3722d555ba48d7da8c176556fa1ff90650
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/migration/migration.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index c48f9f8e42fd..3715e72d0cba 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -68,7 +68,7 @@ #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/ui/UIElementFactoryManager.hpp> #include <com/sun/star/ui/WindowStateConfiguration.hpp> #include <com/sun/star/frame/XUIControllerRegistration.hpp> @@ -2092,7 +2092,7 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) void Desktop::PreloadConfigurationData() { Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - Reference< XNameAccess > xNameAccess = css::frame::UICommandDescription::create(xContext); + Reference< XNameAccess > xNameAccess = css::frame::theUICommandDescription::get(xContext); OUString aWriterDoc( "com.sun.star.text.TextDocument" ); OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" ); diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index ff516601e47f..c6e046670900 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -54,7 +54,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/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/ui/UIConfigurationManager.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationStorage.hpp> @@ -83,7 +83,7 @@ OUString retrieveLabelFromCommand(const OUString& sCommand, const OUString& sMod uno::Reference< container::XNameAccess > xUICommands; uno::Reference< container::XNameAccess > const xNameAccess( - frame::UICommandDescription::create( + frame::theUICommandDescription::get( ::comphelper::getProcessComponentContext()) ); xNameAccess->getByName( sModuleIdentifier ) >>= xUICommands; if (xUICommands.is()) |