diff options
Diffstat (limited to 'connectivity/source/drivers/firebird')
7 files changed, 31 insertions, 31 deletions
diff --git a/connectivity/source/drivers/firebird/Blob.hxx b/connectivity/source/drivers/firebird/Blob.hxx index bf8c2cfedf40..03c3a129a70f 100644 --- a/connectivity/source/drivers/firebird/Blob.hxx +++ b/connectivity/source/drivers/firebird/Blob.hxx @@ -12,7 +12,7 @@ #include <ibase.h> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/sdbc/XBlob.hpp> @@ -21,8 +21,8 @@ namespace connectivity { namespace firebird { - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XBlob, - ::com::sun::star::io::XInputStream > + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XBlob, + ::com::sun::star::io::XInputStream > Blob_BASE; class Blob : diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 1e90581ba755..47f0ad7bf026 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -28,7 +28,7 @@ #include <boost/scoped_ptr.hpp> #include <connectivity/CommonTools.hxx> #include <connectivity/OSubComponent.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/weakref.hxx> #include <map> #include <OTypeInfo.hxx> @@ -52,11 +52,11 @@ namespace connectivity namespace firebird { - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::document::XDocumentEventListener, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::sdbc::XConnection, - ::com::sun::star::sdbc::XWarningsSupplier - > Connection_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::document::XDocumentEventListener, + ::com::sun::star::lang::XServiceInfo, + ::com::sun::star::sdbc::XConnection, + ::com::sun::star::sdbc::XWarningsSupplier + > Connection_BASE; class OStatementCommonBase; class FirebirdDriver; diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index fb43242bb9d0..5a25bdc1603d 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -23,7 +23,7 @@ #include "Connection.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -33,7 +33,7 @@ namespace connectivity //************ Class: ODatabaseMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; + typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData> ODatabaseMetaData_BASE; class ODatabaseMetaData : public ODatabaseMetaData_BASE { diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index d01707df8865..e1600c584ad1 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <unotools/tempfile.hxx> namespace connectivity @@ -40,9 +40,9 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception, std::exception ); - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::sdbcx::XDataDefinitionSupplier, - ::com::sun::star::lang::XServiceInfo > ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, + ::com::sun::star::sdbcx::XDataDefinitionSupplier, + ::com::sun::star::lang::XServiceInfo > ODriver_BASE; class FirebirdDriver : public ODriver_BASE { diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index be3d9ad2bc40..4c7b878fea04 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -26,7 +26,7 @@ #include <connectivity/FValue.hxx> #include <connectivity/OSubComponent.hxx> -#include <cppuhelper/compbase7.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> @@ -50,16 +50,16 @@ namespace connectivity /* ** OResultSet */ - typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, #if 0 - ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XWarningsSupplier, #endif - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate, + ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; /** * This ResultSet does not deal with the management of the SQLDA diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx index d8ad5697d0aa..fc2412854227 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx @@ -24,7 +24,7 @@ #include <ibase.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> @@ -32,7 +32,7 @@ namespace connectivity { namespace firebird { - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> + typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index 29c4b2860427..7c86df68eb42 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -25,7 +25,7 @@ #include <ibase.h> #include <connectivity/OSubComponent.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <list> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -42,10 +42,10 @@ namespace connectivity namespace firebird { - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XMultipleResults> OStatementCommonBase_Base; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XMultipleResults> OStatementCommonBase_Base; class OStatementCommonBase : public OStatementCommonBase_Base, public ::cppu::OPropertySetHelper, |