diff options
| -rw-r--r-- | cppuhelper/source/macro_expander.cxx | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index 93f758becc12..0cf2fe99d268 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -24,7 +24,7 @@ #include <uno/mapping.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/compbase.hxx> +#include <compbase2.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -83,22 +83,13 @@ Sequence< OUString > const & s_get_service_names() return IMPL_NAMES; } -typedef cppu::WeakComponentImplHelper< +typedef cppuhelper::WeakComponentImplHelper2< util::XMacroExpander, lang::XServiceInfo > t_uno_impl; -struct mutex_holder +class Bootstrap_MacroExpander : public t_uno_impl { - Mutex m_mutex; -}; - -class Bootstrap_MacroExpander : public mutex_holder, public t_uno_impl -{ -protected: - virtual void SAL_CALL disposing() override; - public: Bootstrap_MacroExpander() - : t_uno_impl( m_mutex ) {} // XMacroExpander impl @@ -110,9 +101,6 @@ public: }; -void Bootstrap_MacroExpander::disposing() -{} - // XServiceInfo impl OUString Bootstrap_MacroExpander::getImplementationName() |