diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/recfloat.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/sidebar/CommandInfoProvider.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 1c8c73b01026..f2e871335f10 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -254,7 +254,7 @@ #include <com/sun/star/frame/LayoutManagerEvents.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/ToolbarControllerFactory.hpp> -#include <com/sun/star/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/frame/UntitledNumbersConst.hpp> #include <com/sun/star/frame/XBorderResizeListener.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index df34bb029b0b..d943ddc51972 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/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <svl/eitem.hxx> #include <svtools/generictoolboxcontroller.hxx> @@ -63,7 +63,7 @@ static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno:: xUICommandDescription = xTmpNameAccess; if ( !xUICommandDescription.is() ) { - xUICommandDescription = frame::UICommandDescription::create(xContext); + xUICommandDescription = frame::theUICommandDescription::get(xContext); xTmpNameAccess = xUICommandDescription; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 46f32380debf..5af668194f45 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/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <sfx2/sfxhelp.hxx> #include <sfx2/app.hxx> @@ -2781,7 +2781,7 @@ 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( - frame::UICommandDescription::create( + frame::theUICommandDescription::get( ::comphelper::getProcessComponentContext()) ); uno::Reference< container::XNameAccess > xUICommands; OUString sTextDoc("com.sun.star.text.TextDocument"); diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index 6753692384b7..61d1b62fcaea 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -25,7 +25,7 @@ #include <cppuhelper/basemutex.hxx> #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/ui/GlobalAcceleratorConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> @@ -305,7 +305,7 @@ Sequence<beans::PropertyValue> CommandInfoProvider::GetCommandProperties (const const OUString sModuleIdentifier (GetModuleIdentifier()); if (sModuleIdentifier.getLength() > 0) { - Reference<container::XNameAccess> xNameAccess = frame::UICommandDescription::create(mxContext); + Reference<container::XNameAccess> xNameAccess = frame::theUICommandDescription::get(mxContext); Reference<container::XNameAccess> xUICommandLabels; if (xNameAccess->getByName(sModuleIdentifier) >>= xUICommandLabels) xUICommandLabels->getByName(rsCommandName) >>= aProperties; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 3d5199df34e3..cdababa4893b 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/frame/UICommandDescription.hpp> +#include <com/sun/star/frame/theUICommandDescription.hpp> #include <cppuhelper/implbase1.hxx> #include <osl/file.hxx> @@ -242,7 +242,7 @@ static OUString RetrieveLabelFromCommand( if ( !xNameAccess.is() ) { xNameAccess = css::uno::Reference< css::container::XNameAccess >( - css::frame::UICommandDescription::create(xContext), + css::frame::theUICommandDescription::get(xContext), css::uno::UNO_QUERY_THROW ); s_xNameAccess = xNameAccess; } |