diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-09-16 15:07:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-09-16 15:59:35 +0200 |
| commit | 0d90da9ea0a23c9c4afac62025208559b1496a0e (patch) | |
| tree | b7eecbc0f468c50967b2ac8084a7e191c5b904df | |
| parent | b89187aad86e2be000d2f4c9c380a95bf8430c2e (diff) | |
Get rid of two impl_init functions, each called from a single place
Change-Id: I00a981de8a58a83e517144296a05ae8c726f53f0
Reviewed-on: https://gerrit.libreoffice.org/79006
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | chart2/source/inc/LifeTime.hxx | 10 | ||||
| -rw-r--r-- | chart2/source/tools/LifeTime.cxx | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index f30d184b058e..4406b5cd70b9 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -55,8 +55,6 @@ protected: SAL_DLLPRIVATE void impl_registerApiCall(bool bLongLastingCall); SAL_DLLPRIVATE void impl_unregisterApiCall(bool bLongLastingCall); - SAL_DLLPRIVATE void impl_init(); - protected: css::lang::XComponent* m_pComponent; @@ -103,14 +101,6 @@ private: void impl_setOwnership( bool bDeliverOwnership, bool bMyVeto ); void impl_doClose(); - - void impl_init() - { - m_bClosed = false; - m_bInTryClose = false; - m_bOwnership = false; - m_aEndTryClosingCondition.set(); - } }; /* diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 716670409167..5a7a10b37307 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -35,11 +35,6 @@ LifeTimeManager::LifeTimeManager( lang::XComponent* pComponent ) : m_aListenerContainer( m_aAccessMutex ) , m_pComponent(pComponent) { - impl_init(); -} - -void LifeTimeManager::impl_init() -{ m_bDisposed = false; m_bInDispose = false; m_nAccessCount = 0; @@ -164,7 +159,10 @@ CloseableLifeTimeManager::CloseableLifeTimeManager( css::util::XCloseable* pClos : LifeTimeManager( pComponent ) , m_pCloseable(pCloseable) { - impl_init(); + m_bClosed = false; + m_bInTryClose = false; + m_bOwnership = false; + m_aEndTryClosingCondition.set(); } CloseableLifeTimeManager::~CloseableLifeTimeManager() |