diff options
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/helper/commanddescriptionprovider.cxx | 20 | ||||
-rw-r--r-- | forms/source/helper/commandimageprovider.cxx | 5 | ||||
-rw-r--r-- | forms/source/inc/commanddescriptionprovider.hxx | 5 | ||||
-rw-r--r-- | forms/source/solar/component/navbarcontrol.cxx | 3 |
4 files changed, 18 insertions, 15 deletions
diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx index b0c1b4e32384..2cfe8e7d2687 100644 --- a/forms/source/helper/commanddescriptionprovider.cxx +++ b/forms/source/helper/commanddescriptionprovider.cxx @@ -21,7 +21,7 @@ #include "commanddescriptionprovider.hxx" #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/ui/UICommandDescription.hpp> @@ -45,8 +45,10 @@ namespace frm using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Type; + using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::frame::XModel; using ::com::sun::star::container::XNameAccess; + using ::com::sun::star::frame::ModuleManager; using ::com::sun::star::frame::XModuleManager; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::ui::UICommandDescription; @@ -58,9 +60,9 @@ namespace frm class DefaultCommandDescriptionProvider : public ICommandDescriptionProvider { public: - DefaultCommandDescriptionProvider( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument ) + DefaultCommandDescriptionProvider( const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument ) { - impl_init_nothrow( _rContext, _rxDocument ); + impl_init_nothrow( _rxContext, _rxDocument ); } ~DefaultCommandDescriptionProvider() @@ -71,7 +73,7 @@ namespace frm virtual ::rtl::OUString getCommandDescription( const ::rtl::OUString& _rCommandURL ) const; private: - void impl_init_nothrow( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument ); + void impl_init_nothrow( const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument ); private: Reference< XNameAccess > m_xCommandAccess; @@ -79,7 +81,7 @@ namespace frm //-------------------------------------------------------------------- - void DefaultCommandDescriptionProvider::impl_init_nothrow( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument ) + void DefaultCommandDescriptionProvider::impl_init_nothrow( const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument ) { OSL_ENSURE( _rxDocument.is(), "DefaultCommandDescriptionProvider::impl_init_nothrow: no document => no command descriptions!" ); if ( !_rxDocument.is() ) @@ -87,10 +89,10 @@ namespace frm try { - Reference< XModuleManager > xModuleManager( _rContext.createComponent( "com.sun.star.frame.ModuleManager" ), UNO_QUERY_THROW ); + Reference< XModuleManager > xModuleManager( ModuleManager::create(_rxContext), UNO_QUERY_THROW ); ::rtl::OUString sModuleID = xModuleManager->identify( _rxDocument ); - Reference< XNameAccess > xUICommandDescriptions( UICommandDescription::create(_rContext.getUNOContext()) ); + Reference< XNameAccess > xUICommandDescriptions( UICommandDescription::create(_rxContext) ); m_xCommandAccess.set( xUICommandDescriptions->getByName( sModuleID ), UNO_QUERY_THROW ); } catch( const Exception& ) @@ -120,9 +122,9 @@ namespace frm //-------------------------------------------------------------------- PCommandDescriptionProvider createDocumentCommandDescriptionProvider( - const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument ) + const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument ) { - PCommandDescriptionProvider pDescriptionProvider( new DefaultCommandDescriptionProvider( _rContext, _rxDocument ) ); + PCommandDescriptionProvider pDescriptionProvider( new DefaultCommandDescriptionProvider( _rxContext, _rxDocument ) ); return pDescriptionProvider; } diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx index 23d2023c18c3..7925985c9393 100644 --- a/forms/source/helper/commandimageprovider.cxx +++ b/forms/source/helper/commandimageprovider.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/frame/XModuleManager.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/ui/ImageType.hpp> #include <tools/diagnose_ex.h> @@ -59,6 +59,7 @@ namespace frm using ::com::sun::star::ui::XUIConfigurationManager; using ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier; using ::com::sun::star::ui::ModuleUIConfigurationManagerSupplier; + using ::com::sun::star::frame::ModuleManager; using ::com::sun::star::frame::XModuleManager; using ::com::sun::star::graphic::XGraphic; /** === end UNO using === **/ @@ -111,7 +112,7 @@ namespace frm // obtain the image manager or the module try { - Reference< XModuleManager > xModuleManager( _rContext.createComponent( "com.sun.star.frame.ModuleManager" ), UNO_QUERY_THROW ); + Reference< XModuleManager > xModuleManager( ModuleManager::create(_rContext.getUNOContext()), UNO_QUERY_THROW ); ::rtl::OUString sModuleID = xModuleManager->identify( _rxDocument ); Reference< XModuleUIConfigurationManagerSupplier > xSuppUIConfig( diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx index f319c5edc6e0..fa8d014f965a 100644 --- a/forms/source/inc/commanddescriptionprovider.hxx +++ b/forms/source/inc/commanddescriptionprovider.hxx @@ -21,8 +21,7 @@ #define COMMANDDESCRIPTIONPROVIDER_HXX #include <com/sun/star/frame/XModel.hpp> - -#include <comphelper/componentcontext.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <boost/shared_ptr.hpp> @@ -49,7 +48,7 @@ namespace frm //===================================================================== PCommandDescriptionProvider createDocumentCommandDescriptionProvider( - const ::comphelper::ComponentContext& _rContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index fca8e7b8f0a9..b2ad7ff45c45 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/graphic/XGraphic.hpp> +#include <comphelper/componentcontext.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> @@ -284,7 +285,7 @@ namespace frm _pParentWindow, lcl_getWinBits_nothrow( _rxModel ), createDocumentCommandImageProvider( _rxORB, xContextDocument ), - createDocumentCommandDescriptionProvider( _rxORB, xContextDocument ) + createDocumentCommandDescriptionProvider( comphelper::ComponentContext(_rxORB).getUNOContext(), xContextDocument ) ); // some knittings |