summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-27 13:07:42 +0200
committerNoel Grandin <noel@peralex.com>2015-09-08 09:20:31 +0200
commit751c771adc45cb150fa42bc70397e2571b28a60b (patch)
treebe54e28005ac5c4d00a0c01dca2119f80d7f8119 /basic
parentf36f17f691903a389a7d98e85af12e08b75f6876 (diff)
loplugin:mergeclass, merge BiNode with NameNode, Obj0Type with ObjkType
Change-Id: Icbc0dfc6096a6e2c651dad4fe9f78d176f389390
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/sbunoobj.cxx16
1 files changed, 4 insertions, 12 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index da07e3bdc47a..c7a95f1bb4be 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4311,18 +4311,9 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
-namespace {
-class OMutexBasis
-{
-protected:
- // this mutex is necessary for OInterfaceContainerHelper
- ::osl::Mutex m_aMutex;
-};
-} // namespace
-
-class ModuleInvocationProxy : public OMutexBasis,
- public WeakImplHelper< XInvocation, XComponent >
+class ModuleInvocationProxy : public WeakImplHelper< XInvocation, XComponent >
{
+ ::osl::Mutex m_aMutex;
OUString m_aPrefix;
SbxObjectRef m_xScopeObj;
bool m_bProxyIsClassModuleObject;
@@ -4357,7 +4348,8 @@ public:
};
ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj )
- : m_aPrefix( aPrefix + "_" )
+ : m_aMutex()
+ , m_aPrefix( aPrefix + "_" )
, m_xScopeObj( xScopeObj )
, m_aListeners( m_aMutex )
{