diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-09 15:14:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-10 06:51:53 +0000 |
commit | 5c2c2d8dc4449c9d4ac9d645f634772ba93373af (patch) | |
tree | 9aaa3ab74dcc23b8a5d188c1b7b5d1c7cac3a024 /include | |
parent | 76c8336eec82862732d3a26be84b5e8a52efe022 (diff) |
loplugin:expandablemethods in comphelper..cppuhelper
Change-Id: I9d5487af4729bd3ee4f6450092e4b77f74a12e6d
Reviewed-on: https://gerrit.libreoffice.org/30717
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/accessiblecontexthelper.hxx | 10 | ||||
-rw-r--r-- | include/comphelper/componentbase.hxx | 10 | ||||
-rw-r--r-- | include/comphelper/proxyaggregation.hxx | 4 | ||||
-rw-r--r-- | include/connectivity/DriversConfig.hxx | 3 | ||||
-rw-r--r-- | include/connectivity/formattedcolumnvalue.hxx | 5 | ||||
-rw-r--r-- | include/connectivity/sqliterator.hxx | 6 |
6 files changed, 3 insertions, 35 deletions
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 44ca2824f041..1074d1e7138a 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -140,16 +140,6 @@ namespace comphelper css::uno::Reference< css::accessibility::XAccessible > getAccessibleCreator( ) const; - private: - /** forgets the reference to the external lock, if present. - - <p>This means any further locking will not be guard the external lock anymore, never.</p> - - <p>To be used in derived classes which do not supply the external lock themself, but instead get - them passed from own derivees (or clients).</p> - */ - void forgetExternalLock(); - public: // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index b5cce3d17292..079c40d8f7bb 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -73,9 +73,9 @@ namespace comphelper /// retrieves the component's mutex inline ::osl::Mutex& getMutex( GuardAccess ) { return getMutex(); } /// checks whether the component is already disposed, throws a DisposedException if so. - inline void checkDisposed( GuardAccess ) const { impl_checkDisposed_throw(); } + void checkDisposed( GuardAccess ) const; /// checks whether the component is already initialized, throws a NotInitializedException if not. - inline void checkInitialized( GuardAccess ) const { impl_checkInitialized_throw(); } + void checkInitialized( GuardAccess ) const; protected: /// retrieves the component's broadcast helper @@ -85,12 +85,6 @@ namespace comphelper /// determines whether the instance is already disposed inline bool impl_isDisposed() const { return m_rBHelper.bDisposed; } - /// checks whether the component is already disposed. Throws a DisposedException if so. - void impl_checkDisposed_throw() const; - - /// checks whether the component is already initialized. Throws a NotInitializedException if not. - void impl_checkInitialized_throw() const; - /// determines whether the component is already initialized inline bool impl_isInitialized_nothrow() const { return m_bInitialized; } diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 756004234be7..2af3737e415a 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -202,10 +202,6 @@ namespace comphelper // XComponent/OComponentProxyAggregationHelper virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; - protected: - // be called from within the dtor of derived classes - void implEnsureDisposeInDtor( ); - private: OComponentProxyAggregation( const OComponentProxyAggregation& ) = delete; OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) = delete; diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx index 4a40d9c338c6..342742597f58 100644 --- a/include/connectivity/DriversConfig.hxx +++ b/include/connectivity/DriversConfig.hxx @@ -46,11 +46,10 @@ namespace connectivity { mutable ::utl::OConfigurationTreeRoot m_aInstalled; mutable TInstalledDrivers m_aDrivers; - void Load(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const; public: DriversConfigImpl(); - const TInstalledDrivers& getInstalledDrivers(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const { Load(_rxORB); return m_aDrivers; } + const TInstalledDrivers& getInstalledDrivers(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) const; }; // Allows to access all driver which are located in the configuration diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index d7f7d8ac75a9..c8976a83d124 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -71,13 +71,8 @@ namespace dbtools const css::uno::Reference< css::beans::XPropertySet >& i_rColumn ); - // note that all methods of this class need to be virtual, since it's - // used in a load-on-demand context in module SVX - ~FormattedColumnValue(); - void clear(); - // access to the details of the formatting we determined sal_Int16 getKeyType() const; const css::uno::Reference< css::sdb::XColumn >& diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index 456300421062..1d72ee553302 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -350,12 +350,6 @@ namespace connectivity */ void impl_appendError( const css::sdbc::SQLException& _rError ); - /** resets our errors - */ - inline void impl_resetErrors() - { - m_aErrors = css::sdbc::SQLException(); - } void impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition); }; } |