diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-05 08:03:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-05 11:29:54 +0000 |
commit | 9866efe3e5a670bab54d931be31e1989aeb382a7 (patch) | |
tree | 64b1365a7f1e38b8babdfccee8db100af922ab73 /extensions | |
parent | 4b4c9184279c2cb5998348b09e084b295de1c8aa (diff) |
loplugin:constantparam
Change-Id: I821ed77a6c6014c9a82d31a4b117ed6f1b4abf18
Reviewed-on: https://gerrit.libreoffice.org/23832
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/bibliography/loadlisteneradapter.cxx | 11 | ||||
-rw-r--r-- | extensions/source/bibliography/loadlisteneradapter.hxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserpage.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserpage.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserview.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserview.hxx | 2 |
6 files changed, 11 insertions, 16 deletions
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx index bb452bfcb52a..bb81feb8d53a 100644 --- a/extensions/source/bibliography/loadlisteneradapter.cxx +++ b/extensions/source/bibliography/loadlisteneradapter.cxx @@ -59,12 +59,11 @@ namespace bib } } - OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp, bool _bAutoRelease ) + OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp ) :m_xComponent( _rxComp ) ,m_pListener( nullptr ) ,m_nLockCount( 0 ) ,m_bListening( false ) - ,m_bAutoRelease( _bAutoRelease ) { OSL_ENSURE( m_xComponent.is(), "OComponentAdapterBase::OComponentAdapterBase: invalid component!" ); } @@ -102,8 +101,7 @@ namespace bib m_pListener = nullptr; m_bListening = false; - if (m_bAutoRelease) - m_xComponent = nullptr; + m_xComponent = nullptr; } } @@ -122,12 +120,11 @@ namespace bib m_pListener = nullptr; m_bListening = false; - if ( m_bAutoRelease ) - m_xComponent = nullptr; + m_xComponent = nullptr; } OLoadListenerAdapter::OLoadListenerAdapter( const Reference< XLoadable >& _rxLoadable ) - :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ), true/*_bAutoRelease*/ ) + :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ) ) { } diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index 28e3e39ec999..1ef0432cf47b 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.hxx @@ -61,7 +61,6 @@ namespace bib OComponentListener* m_pListener; sal_Int32 m_nLockCount; bool m_bListening : 1; - bool m_bAutoRelease : 1; // impl method for dispose - virtual, 'cause you at least need to remove the listener from the broadcaster virtual void disposing() = 0; @@ -79,8 +78,7 @@ namespace bib public: OComponentAdapterBase( - const css::uno::Reference< css::lang::XComponent >& _rxComp, - bool _bAutoRelease = true + const css::uno::Reference< css::lang::XComponent >& _rxComp ); // late construction diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index 6aaf03f9b633..81caba5b3839 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -26,8 +26,8 @@ namespace pcr #define LAYOUT_BORDER_RIGHT 3 #define LAYOUT_BORDER_BOTTOM 3 - OBrowserPage::OBrowserPage(vcl::Window* pParent,WinBits nWinStyle) - :TabPage(pParent,nWinStyle) + OBrowserPage::OBrowserPage(vcl::Window* pParent) + :TabPage(pParent,0) ,m_aListBox(VclPtr<OBrowserListBox>::Create(this)) { m_aListBox->SetBackground(GetBackground()); diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 9653fe6b8a0f..01677a2d9092 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -37,7 +37,7 @@ namespace pcr virtual void StateChanged(StateChangedType nType) override; public: - OBrowserPage(vcl::Window* pParent, WinBits nWinStyle = 0); + OBrowserPage(vcl::Window* pParent); virtual ~OBrowserPage(); virtual void dispose() override; diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index aff7994f70af..276c5248c65e 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -28,8 +28,8 @@ namespace pcr using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - OPropertyBrowserView::OPropertyBrowserView(vcl::Window* _pParent, WinBits nBits) - :Window(_pParent, nBits | WB_3DLOOK) + OPropertyBrowserView::OPropertyBrowserView(vcl::Window* _pParent) + :Window(_pParent, WB_3DLOOK) ,m_nActivePage(0) { m_pPropBox = VclPtr<OPropertyEditor>::Create( this ); diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 5be841cc2faa..b8cd2aa10cf2 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -44,7 +44,7 @@ namespace pcr virtual bool Notify( NotifyEvent& _rNEvt ) override; public: - OPropertyBrowserView( vcl::Window* pParent, WinBits nBits = 0); + OPropertyBrowserView( vcl::Window* pParent); virtual ~OPropertyBrowserView(); virtual void dispose() override; |