Skip to content

C
core
Kaydet (Commit) 0abf81ca authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

Convert ModuleUIConfigurationManagerSupplier to WeakImplHelper 

Change-Id: I526eb65bb00808c85caa8fcba3359321e7cec2da
üst 496a281d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 24 deletions
framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
Dosyayı görüntüle @ 0abf81ca
...@@ -45,24 +45,20 @@ ...@@ -45,24 +45,20 @@
#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XTransactedObject.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
namespace framework namespace framework
{ {
class ModuleUIConfigurationManagerSupplier : public com::sun::star::lang::XTypeProvider , class ModuleUIConfigurationManagerSupplier : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
public com::sun::star::lang::XServiceInfo , public cppu::WeakImplHelper3<
public com::sun::star::lang::XComponent , com::sun::star::lang::XServiceInfo ,
public ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier , com::sun::star::lang::XComponent ,
private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. com::sun::star::ui::XModuleUIConfigurationManagerSupplier >
public ::cppu::OWeakObject
{ {
public: public:
// XInterface, XTypeProvider, XServiceInfo // XInterface, XTypeProvider, XServiceInfo
FWK_DECLARE_XINTERFACE
FWK_DECLARE_XTYPEPROVIDER
DECLARE_XSERVICEINFO DECLARE_XSERVICEINFO
ModuleUIConfigurationManagerSupplier( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); ModuleUIConfigurationManagerSupplier( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
......
framework/source/uiconfiguration/moduleuicfgsupplier.cxx
Dosyayı görüntüle @ 0abf81ca
...@@ -73,20 +73,6 @@ class RootStorageWrapper : public ::cppu::WeakImplHelper1< com::sun::star::embe ...@@ -73,20 +73,6 @@ class RootStorageWrapper : public ::cppu::WeakImplHelper1< com::sun::star::embe
//***************************************************************************************************************** //*****************************************************************************************************************
// XInterface, XTypeProvider, XServiceInfo // XInterface, XTypeProvider, XServiceInfo
//***************************************************************************************************************** //*****************************************************************************************************************
DEFINE_XINTERFACE_4 ( ModuleUIConfigurationManagerSupplier ,
OWeakObject ,
DIRECT_INTERFACE( css::lang::XTypeProvider ),
DIRECT_INTERFACE( css::lang::XServiceInfo ),
DIRECT_INTERFACE( css::lang::XComponent ),
DIRECT_INTERFACE( ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier )
)
DEFINE_XTYPEPROVIDER_4 ( ModuleUIConfigurationManagerSupplier ,
css::lang::XTypeProvider ,
css::lang::XServiceInfo ,
css::lang::XComponent ,
::com::sun::star::ui::XModuleUIConfigurationManagerSupplier
)
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( ModuleUIConfigurationManagerSupplier , DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( ModuleUIConfigurationManagerSupplier ,
::cppu::OWeakObject , ::cppu::OWeakObject ,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment