diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-02-19 15:53:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-20 11:38:55 +0100 |
| commit | d8ed3bda462b351d2b98ec57cfdb879e0eec0010 (patch) | |
| tree | 10d3696813b853e6b90cf045d89b9203206004b9 /svx/source/tbxctrls/tbcontrl.cxx | |
| parent | a87fa0206bbcbcf9aa13ee17f6f41d34e176775e (diff) | |
loplugin:refcounting in svx
Change-Id: I79afd219a29ad176ce72020579d2b29a0b3ec09d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/tbxctrls/tbcontrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 82d12985486a..c2765155c3b8 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2646,7 +2646,6 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl() { for (sal_uInt16 i = 0; i < MAX_FAMILIES; ++i) { - pBoundItems[i] = nullptr; m_xBoundItems[i].clear(); pFamilyState[i] = nullptr; } @@ -2669,11 +2668,10 @@ void SAL_CALL SvxStyleToolBoxControl::initialize(const Sequence<Any>& rArguments Reference< XDispatchProvider > xDispatchProvider( m_xFrame->getController(), UNO_QUERY ); for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ ) { - pBoundItems[i] = new SfxStyleControllerItem_Impl( xDispatchProvider, + m_xBoundItems[i] = new SfxStyleControllerItem_Impl( xDispatchProvider, SID_STYLE_FAMILY_START + i, OUString::createFromAscii( StyleSlotToStyleCommand[i] ), *this ); - m_xBoundItems[i].set( static_cast< OWeakObject* >( pBoundItems[i] ), UNO_QUERY ); pFamilyState[i] = nullptr; } } @@ -2688,7 +2686,7 @@ void SAL_CALL SvxStyleToolBoxControl::dispose() pImpl->m_xWeldBox.reset(); pImpl->m_pBox = nullptr; - for (SfxStyleControllerItem_Impl* pBoundItem : pBoundItems) + for (rtl::Reference<SfxStyleControllerItem_Impl>& pBoundItem : m_xBoundItems) { if (!pBoundItem) continue; @@ -2709,7 +2707,6 @@ void SAL_CALL SvxStyleToolBoxControl::dispose() } m_xBoundItems[i].clear(); - pBoundItems[i] = nullptr; } pFamilyState[i].reset(); } @@ -2742,7 +2739,7 @@ com_sun_star_comp_svx_StyleToolBoxControl_get_implementation( void SAL_CALL SvxStyleToolBoxControl::update() { - for (SfxStyleControllerItem_Impl* pBoundItem : pBoundItems) + for (rtl::Reference<SfxStyleControllerItem_Impl>& pBoundItem : m_xBoundItems) pBoundItem->ReBind(); bindListener(); } |