diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-18 11:55:32 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-19 08:07:04 +0000 |
commit | f019ee7cf9e278cd8a27b1c36172ad4c8124080c (patch) | |
tree | 2bd572ff8dc882f5f790165bf54c044af9c37190 /chart2/source | |
parent | 9e54e0708df58b054996d6f6c66852a50d25e742 (diff) |
loplugin:expandablemethodds in basctl..chart2
Change-Id: I96f565a974fe3e316ae2ab04f8731b8bbfb87993
Reviewed-on: https://gerrit.libreoffice.org/29998
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source')
-rw-r--r-- | chart2/source/controller/main/FeatureCommandDispatchBase.cxx | 7 | ||||
-rw-r--r-- | chart2/source/controller/main/FeatureCommandDispatchBase.hxx | 3 | ||||
-rw-r--r-- | chart2/source/inc/LifeTime.hxx | 5 | ||||
-rw-r--r-- | chart2/source/tools/LifeTime.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/inc/AbstractShapeFactory.hxx | 5 | ||||
-rw-r--r-- | chart2/source/view/main/AbstractShapeFactory.cxx | 4 |
6 files changed, 7 insertions, 19 deletions
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index e9721f1d738e..8d02473ed58e 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -40,7 +40,7 @@ FeatureCommandDispatchBase::~FeatureCommandDispatchBase() void FeatureCommandDispatchBase::initialize() { CommandDispatch::initialize(); - fillSupportedFeatures(); + describeSupportedFeatures(); } bool FeatureCommandDispatchBase::isFeatureSupported( const OUString& rCommandURL ) @@ -95,11 +95,6 @@ void FeatureCommandDispatchBase::implDescribeSupportedFeature( const sal_Char* p m_aSupportedFeatures[ aFeature.Command ] = aFeature; } -void FeatureCommandDispatchBase::fillSupportedFeatures() -{ - describeSupportedFeatures(); -} - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index f7b3dce41c35..07679b1d952f 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -95,9 +95,6 @@ protected: mutable SupportedFeatures m_aSupportedFeatures; sal_uInt16 m_nFeatureId; - -private: - void fillSupportedFeatures(); }; } // namespace chart diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index 870dd7c2468c..64f33af83584 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -75,7 +75,7 @@ class CloseableLifeTimeManager : public LifeTimeManager protected: css::util::XCloseable* m_pCloseable; - ::osl::Condition m_aEndTryClosingCondition; + ::osl::Condition m_aEndTryClosingCondition; bool volatile m_bClosed; bool volatile m_bInTryClose; //the ownership between model and controller is not clear at first @@ -100,10 +100,9 @@ OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Referenc protected: virtual bool impl_canStartApiCall() override; - virtual void impl_apiCallCountReachedNull() override; + virtual void impl_apiCallCountReachedNull() override; void impl_setOwnership( bool bDeliverOwnership, bool bMyVeto ); - bool impl_shouldCloseAtNextChance() { return m_bOwnership;} void impl_doClose(); void impl_init() diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 219b71cbc2f8..76810ce2cff1 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -310,7 +310,7 @@ void CloseableLifeTimeManager::impl_apiCallCountReachedNull() { //Mutex needs to be acquired exactly ones //mutex will be released inbetween in impl_doClose() - if( m_pCloseable && impl_shouldCloseAtNextChance() ) + if( m_pCloseable && m_bOwnership ) impl_doClose(); } diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index ff2ac600694c..be0ceb56dbc3 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -58,14 +58,11 @@ class Stripe; class AbstractShapeFactory { protected: + css::uno::Reference< css::lang::XMultiServiceFactory> m_xShapeFactory; - css::uno::Reference< css::lang::XMultiServiceFactory> - m_xShapeFactory; public: enum StackPosition { Top, Bottom }; - void setShapeFactory(css::uno::Reference< css::lang::XMultiServiceFactory> const & xFactory) - { m_xShapeFactory = xFactory; } static AbstractShapeFactory* getOrCreateShapeFactory(const css::uno::Reference< css::lang::XMultiServiceFactory>& xFactory); diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 56953a9cfcbf..d1906716f6da 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -97,14 +97,14 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(const uno::R { pShapeFactory = reinterpret_cast<getOpenglShapeFactory_>(fn)(); - pShapeFactory->setShapeFactory(xFactory); + pShapeFactory->m_xShapeFactory = xFactory; } } #elif defined(IOS) || defined(ANDROID) // Library_chartopengl is not portable enough yet pShapeFactory = NULL; #else pShapeFactory = getOpenglShapeFactory(); - pShapeFactory->setShapeFactory(xFactory); + pShapeFactory->m_xShapeFactory = xFactory; #endif } |