diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-18 14:19:52 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-19 06:31:43 +0000 |
commit | 6f96e86dae6e8fd0861848bbb396278831afc01d (patch) | |
tree | ec5833e3ec3872ab426069f0b72dee69d9734943 /extensions | |
parent | ef637a1c4e16eb9228b6d5e01fc670c4d24afb9b (diff) |
loplugin:expandablemethodds in editeng..extensions
Change-Id: Ibe1929d74ff460955e39f2ccce3056b2051ddf08
Reviewed-on: https://gerrit.libreoffice.org/30013
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/bibliography/datman.cxx | 5 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/logging/loghandler.hxx | 1 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/composeduiupdate.cxx | 5 | ||||
-rw-r--r-- | extensions/source/propctrlr/defaultforminspection.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/defaultforminspection.hxx | 1 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 8 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.hxx | 1 |
10 files changed, 6 insertions, 35 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 6508e542e2af..b0d763bd404c 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -243,9 +243,6 @@ public: MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan); virtual ~MappingDialog_Impl() override; virtual void dispose() override; - - void SetModified() {bModified = true;} - }; static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , @@ -433,7 +430,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) aListBoxe->SelectEntryPos(0); } } - SetModified(); + bModified = true; } IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, Button*, void) diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx index 54d4f7083b55..1f9717c3321c 100644 --- a/extensions/source/logging/loghandler.cxx +++ b/extensions/source/logging/loghandler.cxx @@ -75,7 +75,7 @@ namespace logging { m_rMutex.acquire(); - if ( !getIsInitialized() ) + if ( !m_bInitialized ) throw DisposedException("component not initialized" ); if ( m_rBHelper.bDisposed ) diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx index d41b80b4c69a..8b54c24b46fe 100644 --- a/extensions/source/logging/loghandler.hxx +++ b/extensions/source/logging/loghandler.hxx @@ -56,7 +56,6 @@ namespace logging ); public: - bool getIsInitialized() const { return m_bInitialized; } void setIsInitialized() { m_bInitialized = true; } bool getEncoding( OUString& _out_rEncoding ) const; diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 7036a7b22e8e..b0e723171b52 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -623,12 +623,6 @@ namespace pcr } - void OBrowserListBox::UpdateAll() - { - Resize(); - } - - void OBrowserListBox::DisableUpdate() { m_bUpdate = false; @@ -638,7 +632,7 @@ namespace pcr void OBrowserListBox::EnableUpdate() { m_bUpdate = true; - UpdateAll(); + Resize(); } diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 9ef2c6fe2c54..07f2d4869d1e 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -107,8 +107,6 @@ namespace pcr virtual ~OBrowserListBox() override; virtual void dispose() override; - void UpdateAll(); - void ActivateListBox( bool _bActive ); sal_uInt16 CalcVisibleLines(); diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 2bf17ca2fa02..4d84c4e6b2ae 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -147,9 +147,6 @@ namespace pcr protected: virtual ~CachedInspectorUI() override; - /// determines whether the instance is already disposed - inline bool isDisposed() const { return m_bDisposed; } - /// throws an exception if the component is already disposed void checkDisposed() const; @@ -207,7 +204,7 @@ namespace pcr void CachedInspectorUI::checkDisposed() const { - if ( isDisposed() ) + if (m_bDisposed) throw DisposedException(); } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 5af33e4cbe6d..09a7eecab288 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -206,7 +206,7 @@ namespace pcr StlSyntaxSequence< Any > arguments( _arguments ); if ( arguments.empty() ) { // constructor: "createDefault()" - createDefault(); + m_bConstructed = true; return; } @@ -223,12 +223,6 @@ namespace pcr } - void DefaultFormComponentInspectorModel::createDefault() - { - m_bConstructed = true; - } - - void DefaultFormComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index cf0fa74a76d3..cc7dd7bb18be 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -66,7 +66,6 @@ namespace pcr protected: // Service constructors - void createDefault(); void createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 23cf9720d5d5..43a1e6c089a7 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -320,7 +320,7 @@ namespace pcr StlSyntaxSequence< Any > arguments( _arguments ); if ( arguments.empty() ) { // constructor: "createDefault()" - createDefault(); + m_bConstructed = true; return; } @@ -337,12 +337,6 @@ namespace pcr } - void OPropertyBrowserController::createDefault() - { - m_bConstructed = true; - } - - void OPropertyBrowserController::createWithModel( const Reference< XObjectInspectorModel >& _rxModel ) { osl_atomic_increment( &m_refCount ); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index b771e67471f7..52b8b4ae0fdb 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -388,7 +388,6 @@ namespace pcr private: // constructors - void createDefault(); void createWithModel( const css::uno::Reference< css::inspection::XObjectInspectorModel >& _rxModel ); }; |