diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-07 12:46:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-10 08:01:47 +0200 |
| commit | 89e0a3e05dc00339b1d7b4e14443bdf26f9d09c1 (patch) | |
| tree | f5766efca297786858691a83713e5691ecfff778 /cppuhelper | |
| parent | 8809b57da900c0fa8e7aa9d05021fe9a00114ecd (diff) | |
use WeakComponentImplHelper2 in Bootstrap_MacroExpander
Change-Id: I49f051d9c9da46ec877e4f611836c7a3548f9f10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151581
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper')
| -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() |