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

use rtl::Reference in SfxInstanceCloseGuard_Impl

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

Change-Id: Ib0197985523b10039a5abea7cab1de3fab4c72c1
This commit is contained in:
Noel Grandin
2017-01-18 14:13:39 +02:00
parent 0bab51d8ad
commit e3c1c65b39
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sfx2/source/doc/objserv.cxx
View File

@@ -172,14 +172,11 @@ void SAL_CALL SfxClosePreventer_Impl::disposing( const lang::EventObject& ) thro
class SfxInstanceCloseGuard_Impl class SfxInstanceCloseGuard_Impl
{ {
SfxClosePreventer_Impl* m_pPreventer; rtl::Reference<SfxClosePreventer_Impl> m_xPreventer;
uno::Reference< util::XCloseListener > m_xPreventer;
uno::Reference< util::XCloseable > m_xCloseable; uno::Reference< util::XCloseable > m_xCloseable;
public: public:
SfxInstanceCloseGuard_Impl() SfxInstanceCloseGuard_Impl() {}
: m_pPreventer( nullptr )
{}
~SfxInstanceCloseGuard_Impl(); ~SfxInstanceCloseGuard_Impl();
@@ -195,9 +192,8 @@ bool SfxInstanceCloseGuard_Impl::Init_Impl( const uno::Reference< util::XCloseab
{ {
try try
{ {
m_pPreventer = new SfxClosePreventer_Impl(); m_xPreventer = new SfxClosePreventer_Impl();
m_xPreventer.set( m_pPreventer ); xCloseable->addCloseListener( m_xPreventer.get() );
xCloseable->addCloseListener( m_xPreventer );
m_xCloseable = xCloseable; m_xCloseable = xCloseable;
bResult = true; bResult = true;
} }
@@ -216,7 +212,7 @@ SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl()
{ {
try try
{ {
m_xCloseable->removeCloseListener( m_xPreventer ); m_xCloseable->removeCloseListener( m_xPreventer.get() );
} }
catch( uno::Exception& ) catch( uno::Exception& )
{ {
@@ -224,11 +220,11 @@ SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl()
try try
{ {
if ( m_pPreventer ) if ( m_xPreventer.is() )
{ {
m_pPreventer->SetPreventClose( false ); m_xPreventer->SetPreventClose( false );
if ( m_pPreventer->HasOwnership() ) if ( m_xPreventer->HasOwnership() )
m_xCloseable->close( true ); // TODO: do it asynchronously m_xCloseable->close( true ); // TODO: do it asynchronously
} }
} }