Skip to content

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

Convert UIConfigurationManager to WeakImplHelper 

Change-Id: I1e8a498f38e19419d3f8fdc91c0bcaf2cb3f41a5
üst a19e9a5c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 32 deletions
framework/inc/uiconfiguration/uiconfigurationmanager.hxx
Dosyayı görüntüle @ 496a281d
......@@ -45,23 +45,19 @@
#include <com/sun/star/ui/UIElementType.hpp>
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/implbase2.hxx>
#include <rtl/ustring.hxx>
namespace framework
{
class UIConfigurationManager : public com::sun::star::lang::XTypeProvider ,
public com::sun::star::lang::XServiceInfo ,
public com::sun::star::ui::XUIConfigurationManager2 ,
private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::OWeakObject
class UIConfigurationManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::WeakImplHelper2<
com::sun::star::lang::XServiceInfo ,
com::sun::star::ui::XUIConfigurationManager2 >
{
public:
// XInterface, XTypeProvider, XServiceInfo
FWK_DECLARE_XINTERFACE
FWK_DECLARE_XTYPEPROVIDER
DECLARE_XSERVICEINFO
UIConfigurationManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext );
......
framework/source/uiconfiguration/uiconfigurationmanager.cxx
Dosyayı görüntüle @ 496a281d
......@@ -61,29 +61,6 @@ namespace framework
//*****************************************************************************************************************
// XInterface, XTypeProvider, XServiceInfo
//*****************************************************************************************************************
DEFINE_XINTERFACE_8 ( UIConfigurationManager ,
OWeakObject ,
DIRECT_INTERFACE( css::lang::XTypeProvider ),
DIRECT_INTERFACE( css::lang::XServiceInfo ),
DIRECT_INTERFACE( css::lang::XComponent ),
DIRECT_INTERFACE( css::ui::XUIConfiguration ),
DIRECT_INTERFACE( css::ui::XUIConfigurationManager ),
DIRECT_INTERFACE( css::ui::XUIConfigurationManager2 ),
DIRECT_INTERFACE( css::ui::XUIConfigurationPersistence ),
DIRECT_INTERFACE( css::ui::XUIConfigurationStorage )
)
DEFINE_XTYPEPROVIDER_8 ( UIConfigurationManager ,
css::lang::XTypeProvider ,
css::lang::XServiceInfo ,
css::lang::XComponent ,
css::ui::XUIConfiguration ,
css::ui::XUIConfigurationManager ,
css::ui::XUIConfigurationManager2 ,
css::ui::XUIConfigurationPersistence ,
css::ui::XUIConfigurationStorage
)
DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UIConfigurationManager ,
::cppu::OWeakObject ,
OUString("com.sun.star.ui.UIConfigurationManager"),
......
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