diff options
| -rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 78e59dc07895..b548b140332a 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -1,5 +1,4 @@ merge (anonymous namespace)::Data with cppu::PropertySetMixinImpl::Impl -merge (anonymous namespace)::VCLXToolkit_Impl with (anonymous namespace)::VCLXToolkit merge AbstractMailMergeWizard with AbstractMailMergeWizard_Impl merge AbstractSearchProgress with AbstractSearchProgress_Impl merge AbstractSwInsertDBColAutoPilot with AbstractSwInsertDBColAutoPilot_Impl diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 09751da5e772..7b65fe0dfa74 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -140,13 +140,13 @@ extern "C" typedef vcl::Window* (SAL_CALL *FN_SvtCreateWindow)( vcl::Window* pParent, WinBits nWinBits ); -class VCLXToolkit_Impl +class VCLXToolkitMutexHelper { protected: ::osl::Mutex maMutex; }; -class VCLXToolkit : public VCLXToolkit_Impl, +class VCLXToolkit : public VCLXToolkitMutexHelper, public cppu::WeakComponentImplHelper< css::awt::XToolkitExperimental, css::lang::XServiceInfo > |