diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-16 15:17:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-16 15:17:05 +0100 |
| commit | 619b13f054c56d0ea3c97ff2a4ab52b39447d9f5 (patch) | |
| tree | efbc9f338b491fd1d8e90be44f2ce024258b0abc /cppuhelper | |
| parent | 8b9968a26265facaf5e761485d750ce9cedab3ab (diff) | |
Variadic cppu::WeakComponentImplHelper
Change-Id: I79371b4ad9d29a5ab8fd01244c3f80db92b07f97
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/component_context.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index ece0d64259cb..ed32764e9fa1 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -40,7 +40,7 @@ #include <uno/mapping.hxx> #include <cppuhelper/implbase1.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> @@ -331,8 +331,8 @@ protected: class ComponentContext : private MutexHolder - , public WeakComponentImplHelper2< XComponentContext, - container::XNameContainer > + , public WeakComponentImplHelper< XComponentContext, + container::XNameContainer > { protected: Reference< XComponentContext > m_xDelegate; @@ -752,8 +752,7 @@ void ComponentContext::disposing() ComponentContext::ComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ) - : WeakComponentImplHelper2< XComponentContext, container::XNameContainer >( - m_mutex ), + : WeakComponentImplHelper( m_mutex ), m_xDelegate( xDelegate ) { for ( sal_Int32 nPos = 0; nPos < nEntries; ++nPos ) |