summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comphelper/source/misc/componentmodule.cxx13
-rw-r--r--include/comphelper/componentmodule.hxx5
-rw-r--r--include/unotools/componentresmodule.hxx1
-rw-r--r--unotools/source/misc/componentresmodule.cxx5
4 files changed, 4 insertions, 20 deletions
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 37d5ae0c25d8..24c9a72c60a6 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -75,22 +75,17 @@ namespace comphelper
void OModule::registerClient( OModule::ClientAccess )
{
- ::osl::MutexGuard aGuard(m_aMutex);
- if ( 1 == osl_atomic_increment( &m_nClients ) )
- onFirstClient();
+ osl_atomic_increment( &m_nClients );
}
void OModule::revokeClient( OModule::ClientAccess )
{
- ::osl::MutexGuard aGuard(m_aMutex);
if ( 0 == osl_atomic_decrement( &m_nClients ) )
+ {
+ ::osl::MutexGuard aGuard(m_aMutex);
onLastClient();
- }
-
-
- void OModule::onFirstClient()
- {
+ }
}
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 2f6bc6812113..9317916ae276 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -142,11 +142,6 @@ namespace comphelper
void revokeClient( ClientAccess );
protected:
- /** called when the first client has been registered
- @precond
- <member>m_aMutex</member> is locked
- */
- virtual void onFirstClient();
/** called when the last client has been revoked
@precond
diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
index bf271db59650..bc35a6cd1a0c 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
@@ -57,7 +57,6 @@ namespace utl
protected:
// OModule overridables
- virtual void onFirstClient() override;
virtual void onLastClient() override;
};
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index ed8a3381ab97..c0b23e179845 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -105,11 +105,6 @@ namespace utl
return m_pImpl->getResManager();
}
- void OComponentResourceModule::onFirstClient()
- {
- BaseClass::onFirstClient();
- }
-
void OComponentResourceModule::onLastClient()
{
m_pImpl->freeResManager();