diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-08 10:43:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-09 06:43:57 +0000 |
| commit | 10aaf339862776c9906e195d34c238187f0ea6ac (patch) | |
| tree | 67f0703ce9a0f465f22b839ae731c6c8c09f870a /dbaccess/source/ui/browser/brwctrlr.cxx | |
| parent | 4599858e21925f2f5febed8eebf4f5bd0fa97163 (diff) | |
convert some manual ref-counting in dbaccess
Change-Id: I2df7b6b79bff4a5c7358288518c5518b6a7032bf
Reviewed-on: https://gerrit.libreoffice.org/26051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess/source/ui/browser/brwctrlr.cxx')
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 5dd5e6ae5c08..38077829752c 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -533,7 +533,6 @@ Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno::XComponentContext >& _rM) :SbaXDataBrowserController_Base(_rM) ,m_nRowSetPrivileges(0) - ,m_pClipbordNotifier( nullptr ) ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus)) ,m_aAsyncDisplayError( LINK( this, SbaXDataBrowserController, OnAsyncDisplayError ) ) ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD)) @@ -784,9 +783,8 @@ bool SbaXDataBrowserController::Construct(vcl::Window* pParent) m_aSystemClipboard = TransferableDataHelper::CreateFromSystemClipboard( getView() ); m_aSystemClipboard.StartClipboardListening( ); - m_pClipbordNotifier = new TransferableClipboardListener( LINK( this, SbaXDataBrowserController, OnClipboardChanged ) ); - m_pClipbordNotifier->acquire(); - m_pClipbordNotifier->AddListener( getView() ); + m_pClipboardNotifier = new TransferableClipboardListener( LINK( this, SbaXDataBrowserController, OnClipboardChanged ) ); + m_pClipboardNotifier->AddListener( getView() ); // this call create the toolbox SbaXDataBrowserController_Base::Construct(pParent); @@ -1194,12 +1192,11 @@ void SbaXDataBrowserController::disposing() removeModelListeners(getControlModel()); - if ( getView() && m_pClipbordNotifier ) + if ( getView() && m_pClipboardNotifier.is() ) { - m_pClipbordNotifier->ClearCallbackLink(); - m_pClipbordNotifier->RemoveListener( getView() ); - m_pClipbordNotifier->release(); - m_pClipbordNotifier = nullptr; + m_pClipboardNotifier->ClearCallbackLink(); + m_pClipboardNotifier->RemoveListener( getView() ); + m_pClipboardNotifier.clear(); } if (getBrowserView()) |