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 /sd | |
| parent | b2c89e7236d71d92a96430db0a7eca14b41c227a (diff) | |
Introduce com.sun.star.frame.theUICommandDescription singleton.
Change-Id: Ic88cca3722d555ba48d7da8c176556fa1ff90650
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 886739120c38..f9365d73fe2f 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -210,7 +210,7 @@ #include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/frame/FrameActionEvent.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XController.hpp> diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 58e5d25e3073..207be8873923 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -50,7 +50,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/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <unotools/historyoptions.hxx> #include <osl/file.hxx> #include <sfx2/filedlghelper.hxx> @@ -1734,7 +1734,7 @@ OUString AssistentDlgImpl::GetUiTextForCommand (const OUString& sCommandURL) break; Reference<container::XNameAccess> const xNameAccess( - frame::UICommandDescription::create(xContext) ); + frame::theUICommandDescription::get(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 c30cda2e1c20..6895ef7cd270 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -23,7 +23,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/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include "ViewShellBase.hxx" #include <algorithm> @@ -1111,7 +1111,7 @@ OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const if( !aModuleIdentifier.isEmpty() ) { Reference< XNameAccess > const xNameAccess( - frame::UICommandDescription::create(xContext) ); + frame::theUICommandDescription::get(xContext) ); Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ), UNO_QUERY_THROW ); Sequence< PropertyValue > aPropSeq; if( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) |