diff options
Diffstat (limited to 'connectivity/source/drivers/postgresql/pq_driver.cxx')
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_driver.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 82dd2d3db1a8..28fe28482ebe 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -36,8 +36,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/compbase1.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> @@ -45,8 +44,6 @@ using osl::MutexGuard; -using cppu::WeakComponentImplHelper2; - using com::sun::star::lang::XSingleComponentFactory; using com::sun::star::lang::XServiceInfo; using com::sun::star::lang::XComponent; @@ -184,7 +181,7 @@ Reference< XInterface > DriverCreateInstance( const Reference < XComponentContex class OOneInstanceComponentFactory : public MutexHolder, - public WeakComponentImplHelper2< XSingleComponentFactory, XServiceInfo > + public cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo > { public: OOneInstanceComponentFactory( @@ -192,7 +189,7 @@ public: cppu::ComponentFactoryFunc fptr, const Sequence< OUString > & serviceNames, const Reference< XComponentContext > & defaultContext) : - WeakComponentImplHelper2< XSingleComponentFactory, XServiceInfo >( this->m_mutex ), + cppu::WeakComponentImplHelper< XSingleComponentFactory, XServiceInfo >( this->m_mutex ), m_create( fptr ), m_serviceNames( serviceNames ), m_implName( rImplementationName_ ), |