diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-13 16:17:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-03 06:37:16 +0000 |
| commit | 2660d24a07866e083c5135ea263030f3e3a2e729 (patch) | |
| tree | 0089d6018d4fc33a7fde955e585e77191cdd258b /UnoControls | |
| parent | baba1d14766282bd2c592bffd79ed69f9078cfe1 (diff) | |
new loplugin: refcounting
This was a feature requested by mmeeks, as a result of
tdf#92611.
It validates that things that extend XInterface are not
directly heap/stack-allocated, but have their lifecycle managed
via css::uno::Reference or rtl::Reference.
Change-Id: I28e3b8b236f6a4a56d0a6d6f26ad54e44b36e692
Reviewed-on: https://gerrit.libreoffice.org/16924
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'UnoControls')
| -rw-r--r-- | UnoControls/source/controls/framecontrol.cxx | 18 | ||||
| -rw-r--r-- | UnoControls/source/inc/framecontrol.hxx | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index 3b34a9fe4d29..e4fcd6d78ed6 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -47,11 +47,11 @@ namespace unocontrols{ // construct/destruct FrameControl::FrameControl( const Reference< XComponentContext >& rxContext) - : BaseControl ( rxContext ) - , OBroadcastHelper ( m_aMutex ) - , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) ) - , m_aInterfaceContainer ( m_aMutex ) - , m_aConnectionPointContainer ( m_aMutex ) + : BaseControl ( rxContext ) + , OBroadcastHelper ( m_aMutex ) + , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) ) + , m_aInterfaceContainer ( m_aMutex ) + , m_aConnectionPointContainer ( new OConnectionPointContainerHelper(m_aMutex) ) { } @@ -233,7 +233,7 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException, std::exception ) { // Forwarded to helper class - return m_aConnectionPointContainer.getConnectionPointTypes(); + return m_aConnectionPointContainer->getConnectionPointTypes(); } // XConnectionPointContainer @@ -241,7 +241,7 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) { // Forwarded to helper class - return m_aConnectionPointContainer.queryConnectionPoint( aType ); + return m_aConnectionPointContainer->queryConnectionPoint( aType ); } // XConnectionPointContainer @@ -250,7 +250,7 @@ void SAL_CALL FrameControl::advise( const Type& aType const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Forwarded to helper class - m_aConnectionPointContainer.advise( aType, xListener ); + m_aConnectionPointContainer->advise( aType, xListener ); } // XConnectionPointContainer @@ -259,7 +259,7 @@ void SAL_CALL FrameControl::unadvise( const Type& aTyp const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Forwarded to helper class - m_aConnectionPointContainer.unadvise( aType, xListener ); + m_aConnectionPointContainer->unadvise( aType, xListener ); } // impl but public method to register service diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index e1b48b7f96db..257edecfc55f 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -211,10 +211,10 @@ private: private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame; - OUString m_sComponentURL; + OUString m_sComponentURL; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_seqLoaderArguments; - ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer; - OConnectionPointContainerHelper m_aConnectionPointContainer; + ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer; + css::uno::Reference<OConnectionPointContainerHelper> m_aConnectionPointContainer; }; // class FrameControl |