diff options
| -rw-r--r-- | mysqlc/source/mysqlc_connection.hxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_databasemetadata.hxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_driver.hxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_resultset.hxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_resultsetmetadata.hxx | 4 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_statement.hxx | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index aeb968693f7e..2700c6728c3b 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -38,7 +38,7 @@ #include <cppconn/driver.h> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/string.hxx> @@ -65,7 +65,7 @@ namespace connectivity typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XConnection, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::lang::XServiceInfo > OMetaConnection_BASE; diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 3dd311f275d4..e29e356855d8 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -23,7 +23,7 @@ #include "mysqlc_connection.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppconn/metadata.h> @@ -40,7 +40,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/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index f95e914729dc..9f87386f69f3 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppconn/driver.h> #include <osl/module.h> @@ -50,7 +50,7 @@ namespace connectivity using ::com::sun::star::uno::Sequence; Reference< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception); - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx index 003ca0331b46..567c721117e9 100644 --- a/mysqlc/source/mysqlc_resultset.hxx +++ b/mysqlc/source/mysqlc_resultset.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/util/XCancellable.hpp> -#include <cppuhelper/compbase12.hxx> +#include <cppuhelper/compbase.hxx> namespace connectivity @@ -52,7 +52,7 @@ namespace connectivity /* ** OResultSet */ - typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::util::XCancellable, diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index ef4c53efd60d..85280568529e 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppconn/resultset_metadata.h> namespace connectivity @@ -36,7 +36,7 @@ namespace connectivity //************ Class: ResultSetMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OResultSetMetaData : public OResultSetMetaData_BASE { diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index f9eb191d0f98..0736ccc51f2b 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/util/XCancellable.hpp> #include <cppconn/statement.h> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <list> namespace connectivity @@ -45,7 +45,7 @@ namespace connectivity using ::com::sun::star::uno::Any; using ::com::sun::star::uno::RuntimeException; - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable, |