mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use rtl::Reference in OComponentEventThread

Browse Source 
instead of storing both a raw pointer and an uno::Reference

Change-Id: I8cd4d04ffb9f40a48d48ade2b171a9a9942cf87f
This commit is contained in:
Noel Grandin
2017-01-19 12:35:35 +02:00
parent 6944b82d6d
commit afb60a273f
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
forms/source/component/EventThread.cxx
View File

@@ -32,17 +32,11 @@ using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
OComponentEventThread::OComponentEventThread( ::cppu::OComponentHelper* pCompImpl ) : OComponentEventThread::OComponentEventThread( ::cppu::OComponentHelper* pCompImpl ) :
m_pCompImpl( pCompImpl ) m_xComp( pCompImpl )
{ {
osl_atomic_increment(&m_refCount); osl_atomic_increment(&m_refCount);
// Hold a reference of the Control
{
css::uno::Reference<css::uno::XInterface> xIFace(static_cast<XWeak*>(pCompImpl));
m_xComp.set(xIFace, css::uno::UNO_QUERY);
}
// and add us at the Control // and add us at the Control
{ {
Reference<XEventListener> xEvtLstnr = static_cast<XEventListener*>(this); Reference<XEventListener> xEvtLstnr = static_cast<XEventListener*>(this);
@@ -88,7 +82,7 @@ void OComponentEventThread::impl_clearEventQueue()
void OComponentEventThread::disposing( const EventObject& evt ) throw ( css::uno::RuntimeException, std::exception) void OComponentEventThread::disposing( const EventObject& evt ) throw ( css::uno::RuntimeException, std::exception)
{ {
if( evt.Source == m_xComp ) if( evt.Source == static_cast<XWeak*>(m_xComp.get()) )
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
@@ -101,8 +95,7 @@ void OComponentEventThread::disposing( const EventObject& evt ) throw ( css::uno
// Free the Control and set pCompImpl to 0, // Free the Control and set pCompImpl to 0,
// so that the thread knows, that it should terminate. // so that the thread knows, that it should terminate.
m_xComp = nullptr; m_xComp.clear();
m_pCompImpl = nullptr;
// Wake up the thread and terminate // Wake up the thread and terminate
m_aCond.set(); m_aCond.set();
@@ -158,8 +151,7 @@ void OComponentEventThread::run()
while( m_aEvents.size() > 0 ) while( m_aEvents.size() > 0 )
{ {
// Get the Control and hold on to it so that it cannot be deleted during actionPerformed // Get the Control and hold on to it so that it cannot be deleted during actionPerformed
Reference<XComponent> xComp = m_xComp; rtl::Reference<::cppu::OComponentHelper> xComp = m_xComp;
::cppu::OComponentHelper *pCompImpl = m_pCompImpl;
ThreadEvents::iterator firstEvent( m_aEvents.begin() ); ThreadEvents::iterator firstEvent( m_aEvents.begin() );
std::unique_ptr<EventObject> pEvt(*firstEvent); std::unique_ptr<EventObject> pEvt(*firstEvent);
@@ -183,7 +175,7 @@ void OComponentEventThread::run()
xControlAdapter->queryAdapted(), css::uno::UNO_QUERY); xControlAdapter->queryAdapted(), css::uno::UNO_QUERY);
if( xComp.is() ) if( xComp.is() )
processEvent( pCompImpl, pEvt.get(), xControl, bFlag ); processEvent( xComp.get(), pEvt.get(), xControl, bFlag );
} }
} }

8
forms/source/component/EventThread.hxx
View File

@@ -29,11 +29,12 @@
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XControl.hpp>
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include <cppuhelper/component.hxx> #include <cppuhelper/component.hxx>
#include <comphelper/uno3.hxx> #include <comphelper/uno3.hxx>
#include <rtl/ref.hxx>
using namespace comphelper; using namespace comphelper;
@@ -57,8 +58,7 @@ class OComponentEventThread
ThreadObjects m_aControls; // Control for Submit ThreadObjects m_aControls; // Control for Submit
ThreadBools m_aFlags; // Flags for Submit/Reset ThreadBools m_aFlags; // Flags for Submit/Reset
::cppu::OComponentHelper* m_pCompImpl; // Implementation of the Control rtl::Reference<::cppu::OComponentHelper> m_xComp; // Implementation of the Control
css::uno::Reference< css::lang::XComponent> m_xComp; // css::lang::XComponent of the Control
protected: protected: