diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-12-07 08:59:42 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 13:25:50 +0000 |
| commit | 61b00192cd4682cb592d880be1f4d57925ca03c7 (patch) | |
| tree | 6003d3d8d81c7f7564c0bf7b780bc403399ef18c /cppuhelper/source/servicemanager.cxx | |
| parent | 81f7824a9839d3230b4e58424a64a393e8ee0223 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* in cppuhelper
Change-Id: I3130a3fe28c00bd83cade9667a6e3b3abcb719f7
Reviewed-on: https://gerrit.libreoffice.org/31714
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper/source/servicemanager.cxx')
| -rw-r--r-- | cppuhelper/source/servicemanager.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 22411286a2b7..57925af29bf6 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -29,8 +29,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component_context.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/shlib.hxx> @@ -439,7 +438,7 @@ rtl::OUString Parser::getNameAttribute() { } class ContentEnumeration: - public cppu::WeakImplHelper1< css::container::XEnumeration > + public cppu::WeakImplHelper< css::container::XEnumeration > { public: explicit ContentEnumeration(std::vector< css::uno::Any > const & factories): @@ -493,7 +492,7 @@ css::beans::Property getDefaultContextProperty() { } class SingletonFactory: - public cppu::WeakImplHelper1<css::lang::XSingleComponentFactory> + public cppu::WeakImplHelper<css::lang::XSingleComponentFactory> { public: SingletonFactory( @@ -547,7 +546,7 @@ SingletonFactory::createInstanceWithArgumentsAndContext( } class ImplementationWrapper: - public cppu::WeakImplHelper3< + public cppu::WeakImplHelper< css::lang::XSingleComponentFactory, css::lang::XSingleServiceFactory, css::lang::XServiceInfo > { |