Skip to content

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

convert sfx2 UNO services to WeakImplHelper 

...removing the SFX_ UNO-related macros as a result.

Change-Id: I56542885847ff0adc604f309ed7e2582b7529f3f
üst 376d5a6a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 78 deletions
include/sfx2/appuno.hxx
Dosyayı görüntüle @ 61eed5f1
...@@ -39,21 +39,20 @@ ...@@ -39,21 +39,20 @@
#include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase5.hxx>
#include <tools/errcode.hxx> #include <tools/errcode.hxx>
#include <sfx2/sfxuno.hxx> #include <sfx2/sfxuno.hxx>
class SfxObjectShell; class SfxObjectShell;
class SfxMacroLoader : public ::com::sun::star::frame::XDispatchProvider, class SfxMacroLoader : public ::cppu::WeakImplHelper5<
public ::com::sun::star::frame::XNotifyingDispatch, css::frame::XDispatchProvider,
public ::com::sun::star::frame::XSynchronousDispatch, css::frame::XNotifyingDispatch,
public ::com::sun::star::lang::XTypeProvider, css::frame::XSynchronousDispatch,
public ::com::sun::star::lang::XServiceInfo, css::lang::XServiceInfo,
public ::com::sun::star::lang::XInitialization, css::lang::XInitialization >
public ::cppu::OWeakObject
{ {
::com::sun::star::uno::WeakReference < ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::WeakReference < ::com::sun::star::frame::XFrame > m_xFrame;
...@@ -61,7 +60,7 @@ class SfxMacroLoader : public ::com::sun::star::frame::XDispatchProvider, ...@@ -61,7 +60,7 @@ class SfxMacroLoader : public ::com::sun::star::frame::XDispatchProvider,
public: public:
// XInterface, XTypeProvider, XServiceInfo // XInterface, XTypeProvider, XServiceInfo
SFX_DECL_XINTERFACE_XTYPEPROVIDER_XSERVICEINFO SFX_DECL_XSERVICEINFO
SfxMacroLoader( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ) SfxMacroLoader( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
{} {}
......
include/sfx2/sfxstatuslistener.hxx
Dosyayı görüntüle @ 61eed5f1
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XStatusListener.hpp>
#include <sfx2/sfxuno.hxx> #include <cppuhelper/implbase2.hxx>
// Interface for implementations which needs to get notifications about state changes // Interface for implementations which needs to get notifications about state changes
class SfxStatusListenerInterface class SfxStatusListenerInterface
...@@ -42,14 +42,11 @@ class SfxStatusListenerInterface ...@@ -42,14 +42,11 @@ class SfxStatusListenerInterface
~SfxStatusListenerInterface() {} ~SfxStatusListenerInterface() {}
}; };
class SFX2_DLLPUBLIC SfxStatusListener : class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
public ::com::sun::star::frame::XStatusListener , css::frame::XStatusListener,
public ::com::sun::star::lang::XTypeProvider , css::lang::XComponent>
public ::com::sun::star::lang::XComponent ,
public ::cppu::OWeakObject
{ {
public: public:
SFX_DECL_XINTERFACE_XTYPEPROVIDER
SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
virtual ~SfxStatusListener(); virtual ~SfxStatusListener();
......
include/sfx2/sfxuno.hxx
Dosyayı görüntüle @ 61eed5f1
This diff is collapsed.
include/sfx2/unoctitm.hxx
Dosyayı görüntüle @ 61eed5f1
...@@ -33,10 +33,9 @@ ...@@ -33,10 +33,9 @@
#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrame.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase1.hxx>
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/ctrlitem.hxx> #include <sfx2/ctrlitem.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
...@@ -44,9 +43,7 @@ class SfxBindings; ...@@ -44,9 +43,7 @@ class SfxBindings;
class SfxFrame; class SfxFrame;
class SfxDispatcher; class SfxDispatcher;
class SfxUnoControllerItem : public ::com::sun::star::frame::XStatusListener , class SfxUnoControllerItem : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
public ::com::sun::star::lang::XTypeProvider ,
public ::cppu::OWeakObject
{ {
::com::sun::star::util::URL aCommand; ::com::sun::star::util::URL aCommand;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
...@@ -56,8 +53,6 @@ class SfxUnoControllerItem : public ::com::sun::star::frame::XStatusListener ...@@ -56,8 +53,6 @@ class SfxUnoControllerItem : public ::com::sun::star::frame::XStatusListener
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > TryGetDispatch( SfxFrame* pFrame ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > TryGetDispatch( SfxFrame* pFrame );
public: public:
SFX_DECL_XINTERFACE_XTYPEPROVIDER
SfxUnoControllerItem( SfxControllerItem*, SfxBindings&, const String& ); SfxUnoControllerItem( SfxControllerItem*, SfxBindings&, const String& );
~SfxUnoControllerItem(); ~SfxUnoControllerItem();
...@@ -84,15 +79,12 @@ struct SfxStatusDispatcher_Impl_hashType ...@@ -84,15 +79,12 @@ struct SfxStatusDispatcher_Impl_hashType
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, SfxStatusDispatcher_Impl_hashType, std::equal_to< OUString > > SfxStatusDispatcher_Impl_ListenerContainer ; typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, SfxStatusDispatcher_Impl_hashType, std::equal_to< OUString > > SfxStatusDispatcher_Impl_ListenerContainer ;
class SfxStatusDispatcher : public ::com::sun::star::frame::XNotifyingDispatch, class SfxStatusDispatcher : public ::cppu::WeakImplHelper1< css::frame::XNotifyingDispatch >
public ::com::sun::star::lang::XTypeProvider,
public ::cppu::OWeakObject
{ {
::osl::Mutex aMutex; ::osl::Mutex aMutex;
SfxStatusDispatcher_Impl_ListenerContainer aListeners; SfxStatusDispatcher_Impl_ListenerContainer aListeners;
public: public:
SFX_DECL_XINTERFACE_XTYPEPROVIDER
SfxStatusDispatcher(); SfxStatusDispatcher();
...@@ -112,8 +104,7 @@ public: ...@@ -112,8 +104,7 @@ public:
class SfxSlotServer; class SfxSlotServer;
class SfxDispatchController_Impl; class SfxDispatchController_Impl;
class SfxOfficeDispatch : public SfxStatusDispatcher class SfxOfficeDispatch : public ::cppu::ImplInheritanceHelper1< SfxStatusDispatcher, css::lang::XUnoTunnel >
, public ::com::sun::star::lang::XUnoTunnel
{ {
friend class SfxDispatchController_Impl; friend class SfxDispatchController_Impl;
SfxDispatchController_Impl* pControllerItem; SfxDispatchController_Impl* pControllerItem;
...@@ -127,8 +118,6 @@ public: ...@@ -127,8 +118,6 @@ public:
const ::com::sun::star::util::URL& rURL ); const ::com::sun::star::util::URL& rURL );
~SfxOfficeDispatch(); ~SfxOfficeDispatch();
SFX_DECL_XINTERFACE_XTYPEPROVIDER
virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL, virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener )
......
sfx2/source/appl/appuno.cxx
Dosyayı görüntüle @ 61eed5f1
...@@ -1714,8 +1714,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b ...@@ -1714,8 +1714,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
rArgs = aSequ; rArgs = aSequ;
} }
SFX_IMPL_XINTERFACE_5( SfxMacroLoader, OWeakObject, frame::XDispatchProvider, frame::XNotifyingDispatch, frame::XDispatch, frame::XSynchronousDispatch,lang::XInitialization )
SFX_IMPL_XTYPEPROVIDER_5( SfxMacroLoader, frame::XDispatchProvider, frame::XNotifyingDispatch, frame::XDispatch, frame::XSynchronousDispatch,lang::XInitialization )
SFX_IMPL_XSERVICEINFO( SfxMacroLoader, PROTOCOLHANDLER_SERVICENAME, "com.sun.star.comp.sfx2.SfxMacroLoader" ) SFX_IMPL_XSERVICEINFO( SfxMacroLoader, PROTOCOLHANDLER_SERVICENAME, "com.sun.star.comp.sfx2.SfxMacroLoader" )
SFX_IMPL_SINGLEFACTORY( SfxMacroLoader ) SFX_IMPL_SINGLEFACTORY( SfxMacroLoader )
......
sfx2/source/appl/workwin.cxx
Dosyayı görüntüle @ 61eed5f1
...@@ -152,9 +152,6 @@ DBG_NAME(SfxWorkWindow) ...@@ -152,9 +152,6 @@ DBG_NAME(SfxWorkWindow)
// Help to make changes to the alignment compatible! // Help to make changes to the alignment compatible!
SFX_IMPL_XINTERFACE_3( LayoutManagerListener, OWeakObject, ::com::sun::star::frame::XLayoutManagerListener, ::com::sun::star::lang::XEventListener, ::com::sun::star::lang::XComponent )
SFX_IMPL_XTYPEPROVIDER_3( LayoutManagerListener, ::com::sun::star::frame::XLayoutManagerListener, ::com::sun::star::lang::XEventListener, ::com::sun::star::lang::XComponent )
LayoutManagerListener::LayoutManagerListener( LayoutManagerListener::LayoutManagerListener(
SfxWorkWindow* pWrkWin ) : SfxWorkWindow* pWrkWin ) :
m_bHasFrame( sal_False ), m_bHasFrame( sal_False ),
......
sfx2/source/control/querystatus.cxx
Dosyayı görüntüle @ 61eed5f1
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <svtools/itemdel.hxx> #include <svtools/itemdel.hxx>
#include <svl/visitem.hxx> #include <svl/visitem.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase1.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
...@@ -42,12 +42,9 @@ using namespace ::com::sun::star::frame::status; ...@@ -42,12 +42,9 @@ using namespace ::com::sun::star::frame::status;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util; using namespace ::com::sun::star::util;
class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener , class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
public ::com::sun::star::lang::XTypeProvider ,
public ::cppu::OWeakObject
{ {
public: public:
SFX_DECL_XINTERFACE_XTYPEPROVIDER
SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
virtual ~SfxQueryStatus_Impl(); virtual ~SfxQueryStatus_Impl();
...@@ -75,11 +72,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener , ...@@ -75,11 +72,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener ,
com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xDispatch; com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xDispatch;
}; };
SFX_IMPL_XINTERFACE_2( SfxQueryStatus_Impl, OWeakObject, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
SFX_IMPL_XTYPEPROVIDER_2( SfxQueryStatus_Impl, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) : SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
cppu::OWeakObject(),
m_bQueryInProgress( sal_False ), m_bQueryInProgress( sal_False ),
m_eState( SFX_ITEM_DISABLED ), m_eState( SFX_ITEM_DISABLED ),
m_pItem( 0 ), m_pItem( 0 ),
......
sfx2/source/control/sfxstatuslistener.cxx
Dosyayı görüntüle @ 61eed5f1
...@@ -48,11 +48,7 @@ using namespace ::com::sun::star::frame::status; ...@@ -48,11 +48,7 @@ using namespace ::com::sun::star::frame::status;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util; using namespace ::com::sun::star::util;
SFX_IMPL_XINTERFACE_3( SfxStatusListener, OWeakObject, ::com::sun::star::lang::XComponent, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
SFX_IMPL_XTYPEPROVIDER_3( SfxStatusListener, ::com::sun::star::lang::XComponent, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) : SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
cppu::OWeakObject(),
m_nSlotID( nSlotId ), m_nSlotID( nSlotId ),
m_xDispatchProvider( rDispatchProvider ) m_xDispatchProvider( rDispatchProvider )
{ {
......
sfx2/source/control/statcach.cxx
Dosyayı görüntüle @ 61eed5f1
...@@ -59,9 +59,6 @@ using namespace ::com::sun::star::util; ...@@ -59,9 +59,6 @@ using namespace ::com::sun::star::util;
DBG_NAME(SfxStateCache) DBG_NAME(SfxStateCache)
DBG_NAME(SfxStateCacheSetState) DBG_NAME(SfxStateCacheSetState)
SFX_IMPL_XINTERFACE_2( BindDispatch_Impl, OWeakObject, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
SFX_IMPL_XTYPEPROVIDER_2( BindDispatch_Impl, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, SfxStateCache *pStateCache, const SfxSlot* pS ) BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, SfxStateCache *pStateCache, const SfxSlot* pS )
: xDisp( rDisp ) : xDisp( rDisp )
......
sfx2/source/control/unoctitm.cxx
Dosyayı görüntüle @ 61eed5f1
...@@ -89,9 +89,6 @@ const char* URLTypeNames[URLType_COUNT] = ...@@ -89,9 +89,6 @@ const char* URLTypeNames[URLType_COUNT] =
"double" "double"
}; };
SFX_IMPL_XINTERFACE_2( SfxUnoControllerItem, OWeakObject, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
SFX_IMPL_XTYPEPROVIDER_2( SfxUnoControllerItem, ::com::sun::star::frame::XStatusListener, ::com::sun::star::lang::XEventListener )
SfxUnoControllerItem::SfxUnoControllerItem( SfxControllerItem *pItem, SfxBindings& rBind, const String& rCmd ) SfxUnoControllerItem::SfxUnoControllerItem( SfxControllerItem *pItem, SfxBindings& rBind, const String& rCmd )
: pCtrlItem( pItem ) : pCtrlItem( pItem )
, pBindings( &rBind ) , pBindings( &rBind )
...@@ -277,10 +274,6 @@ void SAL_CALL SfxStatusDispatcher::dispatchWithNotification( ...@@ -277,10 +274,6 @@ void SAL_CALL SfxStatusDispatcher::dispatchWithNotification(
{ {
} }
SFX_IMPL_XINTERFACE_2( SfxStatusDispatcher, OWeakObject, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::frame::XDispatch )
SFX_IMPL_XTYPEPROVIDER_2( SfxStatusDispatcher, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::frame::XDispatch )
//IMPLNAME "com.sun.star.comp.sfx2.StatusDispatcher",
SfxStatusDispatcher::SfxStatusDispatcher() SfxStatusDispatcher::SfxStatusDispatcher()
: aListeners( aMutex ) : aListeners( aMutex )
{ {
...@@ -305,10 +298,6 @@ void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star: ...@@ -305,10 +298,6 @@ void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star:
aListeners.removeInterface( aURL.Complete, aListener ); aListeners.removeInterface( aURL.Complete, aListener );
} }
SFX_IMPL_XINTERFACE_1( SfxOfficeDispatch, SfxStatusDispatcher, ::com::sun::star::lang::XUnoTunnel )
SFX_IMPL_XTYPEPROVIDER_2( SfxOfficeDispatch, ::com::sun::star::frame::XNotifyingDispatch, ::com::sun::star::lang::XUnoTunnel )
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// XUnoTunnel // XUnoTunnel
sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)
......
sfx2/source/inc/statcach.hxx
Dosyayı görüntüle @ 61eed5f1
...@@ -28,19 +28,15 @@ ...@@ -28,19 +28,15 @@
#include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp>
#include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase1.hxx>
#include <sfx2/bindings.hxx> #include <sfx2/bindings.hxx>
#include "slotserv.hxx" #include "slotserv.hxx"
#include <sfx2/sfxuno.hxx>
class SfxControllerItem; class SfxControllerItem;
class SfxDispatcher; class SfxDispatcher;
class BindDispatch_Impl : public ::com::sun::star::frame::XStatusListener , class BindDispatch_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
public ::com::sun::star::lang::XTypeProvider ,
public ::cppu::OWeakObject
{ {
friend class SfxStateCache; friend class SfxStateCache;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp;
...@@ -55,8 +51,6 @@ public: ...@@ -55,8 +51,6 @@ public:
const ::com::sun::star::util::URL& rURL, const ::com::sun::star::util::URL& rURL,
SfxStateCache* pStateCache, const SfxSlot* pSlot ); SfxStateCache* pStateCache, const SfxSlot* pSlot );
SFX_DECL_XINTERFACE_XTYPEPROVIDER
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException );
......
sfx2/source/inc/workwin.hxx
Dosyayı görüntüle @ 61eed5f1
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/XUIElement.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/frame/XLayoutManagerListener.hpp> #include <com/sun/star/frame/XLayoutManagerListener.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase2.hxx>
#include <cppuhelper/propshlp.hxx> #include <cppuhelper/propshlp.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
...@@ -172,17 +172,14 @@ struct SfxObjectBarList_Impl ...@@ -172,17 +172,14 @@ struct SfxObjectBarList_Impl
//-------------------------------------------------------------------- //--------------------------------------------------------------------
class LayoutManagerListener : public ::com::sun::star::frame::XLayoutManagerListener, class LayoutManagerListener : public ::cppu::WeakImplHelper2<
public ::com::sun::star::lang::XTypeProvider, css::frame::XLayoutManagerListener,
public ::com::sun::star::lang::XComponent, css::lang::XComponent >
public ::cppu::OWeakObject
{ {
public: public:
LayoutManagerListener( SfxWorkWindow* pWrkWin ); LayoutManagerListener( SfxWorkWindow* pWrkWin );
virtual ~LayoutManagerListener(); virtual ~LayoutManagerListener();
SFX_DECL_XINTERFACE_XTYPEPROVIDER
void setFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); void setFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
//--------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------
......
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