diff options
Diffstat (limited to 'connectivity/source/inc')
33 files changed, 160 insertions, 160 deletions
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index 0e5d5084d10c..5f1074df1bdc 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> -#include <cppuhelper/compbase9.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include <connectivity/CommonTools.hxx> #include <comphelper/propertycontainer.hxx> @@ -46,15 +46,15 @@ namespace connectivity { - typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::lang::XInitialization, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::lang::XInitialization, + ::com::sun::star::lang::XServiceInfo, + ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; // typedef ORefVector<ORowSetValue> ORow; // typedef ORefVector<ORow> ORows; diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 5ecd3fd22f82..b58839b0347f 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_FDATABASEMETADATARESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <vector> #include "FDatabaseMetaDataResultSet.hxx" #include "OColumn.hxx" @@ -33,7 +33,7 @@ namespace connectivity //************ Class: ODatabaseMetaDataResultSetMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx index ab6214edd6be..ecb2c59e3734 100644 --- a/connectivity/source/inc/ParameterSubstitution.hxx +++ b/connectivity/source/inc/ParameterSubstitution.hxx @@ -25,13 +25,13 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { - typedef ::cppu::WeakImplHelper3< ::com::sun::star::util::XStringSubstitution - ,::com::sun::star::lang::XServiceInfo - ,::com::sun::star::lang::XInitialization > ParameterSubstitution_BASE; + typedef ::cppu::WeakImplHelper< ::com::sun::star::util::XStringSubstitution + ,::com::sun::star::lang::XServiceInfo + ,::com::sun::star::lang::XInitialization > ParameterSubstitution_BASE; class ParameterSubstitution : public ParameterSubstitution_BASE { ::osl::Mutex m_aMutex; diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index fcc589f5efb4..cfba2583f65d 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include "propertyids.hxx" #include <connectivity/CommonTools.hxx> #include <connectivity/dbtoolsdllapi.hxx> @@ -33,11 +33,11 @@ namespace connectivity { - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XConnection, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel - > OMetaConnection_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XConnection, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::lang::XServiceInfo, + ::com::sun::star::lang::XUnoTunnel + > OMetaConnection_BASE; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index c05cc3076a12..20cba621c321 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_TDATABASEMETADATABASE_HXX #include <com/sun/star/sdbc/XDatabaseMetaData2.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/broadcasthelper.hxx> #include <com/sun/star/lang/XEventListener.hpp> #include "FDatabaseMetaDataResultSet.hxx" @@ -33,8 +33,8 @@ namespace connectivity typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase : public comphelper::OBaseMutex, - public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDatabaseMetaData2, - ::com::sun::star::lang::XEventListener> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDatabaseMetaData2, + ::com::sun::star::lang::XEventListener> { private: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aConnectionInfo; diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index b9d740eec8f6..715b28beb2db 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> -#include <cppuhelper/compbase7.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include "ado/AStatement.hxx" #include <comphelper/broadcasthelper.hxx> @@ -42,13 +42,13 @@ namespace connectivity /* ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, public ODatabaseMetaDataResultSet_BASE, diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index da55c26a921f..99e5969c9ae9 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATARESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <vector> #include "ado/Awrapado.hxx" #include "ado/ADatabaseMetaDataResultSet.hxx" @@ -34,7 +34,7 @@ namespace connectivity //************ Class: ResultSetMetaData - typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; + typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 3195666e58d2..5a05a922319c 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <connectivity/CommonTools.hxx> namespace com { namespace sun { namespace star { namespace lang { @@ -37,9 +37,9 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::sdbcx::XDataDefinitionSupplier, - ::com::sun::star::lang::XServiceInfo + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, + ::com::sun::star::sdbcx::XDataDefinitionSupplier, + ::com::sun::star::lang::XServiceInfo > ODriver_BASE; class ODriver : public ODriver_BASE { diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index f9d1312f0205..e11ec8ede50a 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbcx/XDeleteRows.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> -#include <cppuhelper/compbase12.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include "ado/AStatement.hxx" #include <comphelper/broadcasthelper.hxx> @@ -44,18 +44,18 @@ namespace connectivity /* ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XResultSetUpdate, + ::com::sun::star::sdbc::XRowUpdate, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate, + ::com::sun::star::sdbcx::XRowLocate, + ::com::sun::star::sdbcx::XDeleteRows, + ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; class OResultSet : public comphelper::OBaseMutex, public OResultSet_BASE, diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx index 630426ca6a2c..d5a32e044388 100644 --- a/connectivity/source/inc/ado/AResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ARESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <vector> #include "ado/Awrapado.hxx" #include "ado/AResultSet.hxx" @@ -35,7 +35,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/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 45798fb5f337..4db83c4aab38 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/util/XCancellable.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> #include <comphelper/broadcasthelper.hxx> @@ -40,11 +40,11 @@ namespace connectivity { namespace ado { - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE; //************ Class: java.sql.Statement diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index 42374972b569..fb554fa35630 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <connectivity/CommonTools.hxx> #include "file/filedllapi.hxx" @@ -31,9 +31,9 @@ namespace connectivity { namespace file { - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::sdbcx::XDataDefinitionSupplier> ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, + ::com::sun::star::lang::XServiceInfo, + ::com::sun::star::sdbcx::XDataDefinitionSupplier> ODriver_BASE; class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OFileDriver : public ODriver_BASE { diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 74d1d195f757..e09e23d12b5d 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> -#include <cppuhelper/compbase12.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include "file/FStatement.hxx" #include <connectivity/CommonTools.hxx> @@ -47,18 +47,18 @@ namespace connectivity { namespace file { - typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XEventListener, - ::com::sun::star::lang::XUnoTunnel> OResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XResultSetUpdate, + ::com::sun::star::sdbc::XRowUpdate, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate, + ::com::sun::star::lang::XServiceInfo, + ::com::sun::star::lang::XEventListener, + ::com::sun::star::lang::XUnoTunnel> OResultSet_BASE; class OOO_DLLPUBLIC_FILE OResultSet : public comphelper::OBaseMutex, diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index 3d62d944812b..0b54b4bc6e42 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FRESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <connectivity/CommonTools.hxx> #include <rtl/ref.hxx> #include "file/filedllapi.hxx" @@ -34,7 +34,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 OOO_DLLPUBLIC_FILE OResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 8f5bf903682a..356a40e997b1 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase2.hxx> #include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> @@ -47,9 +47,9 @@ namespace connectivity { class OResultSet; class OFileTable; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable> OStatement_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XCloseable> OStatement_BASE; //************ Class: java.sql.Statement diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 3fbe63c6b657..d97437b8373b 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/sdb/application/XTableUIProvider.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -47,9 +47,9 @@ namespace connectivity // OHsqlConnection - wraps all methods to the real connection from the driver // but when disposed it doesn't dispose the real connection - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::util::XFlushable - , ::com::sun::star::sdb::application::XTableUIProvider - > OHsqlConnection_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::util::XFlushable + , ::com::sun::star::sdb::application::XTableUIProvider + > OHsqlConnection_BASE; class OHsqlConnection :public ::comphelper::OBaseMutex ,public OHsqlConnection_BASE diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index e7921a484b7f..021e0bf9b396 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <comphelper/broadcasthelper.hxx> #include <connectivity/CommonTools.hxx> @@ -40,7 +40,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XDriver + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver ,::com::sun::star::sdbcx::XDataDefinitionSupplier , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::sdbcx::XCreateCatalog diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx index c13a3db87cf9..7fe257f5e033 100644 --- a/connectivity/source/inc/java/io/InputStream.hxx +++ b/connectivity/source/inc/java/io/InputStream.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_INPUTSTREAM_HXX #include "java/lang/Object.hxx" -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/io/XInputStream.hpp> namespace connectivity @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.io.InputStream class java_io_InputStream : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> + public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream> { protected: // static Data for the Class diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx index 7dec76447f42..91a6a1b66d2f 100644 --- a/connectivity/source/inc/java/io/Reader.hxx +++ b/connectivity/source/inc/java/io/Reader.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_READER_HXX #include "java/lang/Object.hxx" -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <boost/optional.hpp> @@ -31,7 +31,7 @@ namespace connectivity //************ Class: java.io.InputStream class java_io_Reader : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream> + public ::cppu::WeakImplHelper< ::com::sun::star::io::XInputStream> { protected: // static Data for the Class diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx index ed5cb1c3f65c..057dda4c3cad 100644 --- a/connectivity/source/inc/java/sql/Array.hxx +++ b/connectivity/source/inc/java/sql/Array.hxx @@ -21,7 +21,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XArray.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.sql.SQLWarning class java_sql_Array : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XArray> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XArray> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx index de79fbb0fb41..d57e830a25ff 100644 --- a/connectivity/source/inc/java/sql/Blob.hxx +++ b/connectivity/source/inc/java/sql/Blob.hxx @@ -22,7 +22,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XBlob.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -31,7 +31,7 @@ namespace connectivity //************ Class: java.sql.SQLWarning class java_sql_Blob : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XBlob> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx index 25d1cee62a44..d1a0fedbe8bc 100644 --- a/connectivity/source/inc/java/sql/Clob.hxx +++ b/connectivity/source/inc/java/sql/Clob.hxx @@ -22,7 +22,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XClob.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -31,7 +31,7 @@ namespace connectivity //************ Class: java.sql.SQLWarning class java_sql_Clob : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XClob> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index 068a9aefd475..233a83b046a3 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include "java/lang/Object.hxx" -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/logging.hxx> @@ -31,7 +31,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL java_sql_Driver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - class java_sql_Driver : public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDriver,::com::sun::star::lang::XServiceInfo> + class java_sql_Driver : public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDriver,::com::sun::star::lang::XServiceInfo> { css::uno::Reference<css::uno::XComponentContext> m_aContext; ::comphelper::ResourceBasedEventLogger m_aLogger; diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index 716e14d8a15f..18cdc4e8e354 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/sdbc/XGeneratedResultSet.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/OSubComponent.hxx> @@ -41,12 +41,12 @@ namespace connectivity { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XGeneratedResultSet, - ::com::sun::star::sdbc::XMultipleResults> java_sql_Statement_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XGeneratedResultSet, + ::com::sun::star::sdbc::XMultipleResults> java_sql_Statement_BASE; //************ Class: java.sql.Statement diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx index d591bd7cc79f..efde6ee412ff 100644 --- a/connectivity/source/inc/java/sql/Ref.hxx +++ b/connectivity/source/inc/java/sql/Ref.hxx @@ -22,7 +22,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XRef.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace connectivity { @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.sql.Ref class java_sql_Ref : public java_lang_Object, - public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef> + public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XRef> { protected: // Static data for the class diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 56fe7f364951..bde06d229845 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> -#include <cppuhelper/compbase10.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include <connectivity/CommonTools.hxx> #include "java/sql/JStatement.hxx" @@ -42,16 +42,16 @@ namespace connectivity /* ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper10< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> java_sql_ResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XResultSetUpdate, + ::com::sun::star::sdbc::XRowUpdate, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate, + ::com::sun::star::lang::XServiceInfo> java_sql_ResultSet_BASE; class java_sql_Connection; class java_sql_ResultSet : public comphelper::OBaseMutex, diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index c9d8b20c28d7..c29c5779be6e 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx @@ -21,7 +21,7 @@ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "java/sql/ConnectionLog.hxx" namespace connectivity @@ -30,7 +30,7 @@ namespace connectivity //************ Class: java.sql.ResultSetMetaData class java_sql_Connection; - class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData>, + class java_sql_ResultSetMetaData : public ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XResultSetMetaData>, public java_lang_Object { protected: diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 1634092d68fd..ac14cf42f21a 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <comphelper/broadcasthelper.hxx> #include <connectivity/CommonTools.hxx> @@ -44,10 +44,10 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxMSF) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver - , ::com::sun::star::sdbcx::XDataDefinitionSupplier - , ::com::sun::star::lang::XServiceInfo - > ODriverDelegator_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver + , ::com::sun::star::sdbcx::XDataDefinitionSupplier + , ::com::sun::star::lang::XServiceInfo + > ODriverDelegator_BASE; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index c572c3ac869f..1685c248b031 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> -#include <cppuhelper/compbase7.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include "odbc/OStatement.hxx" #include "odbc/ODatabaseMetaData.hxx" @@ -47,13 +47,13 @@ namespace connectivity /* ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index d1709a8cc7dc..a1e0b1f45a54 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <connectivity/odbc.hxx> #include "odbc/odbcbasedllapi.hxx" #include <connectivity/CommonTools.hxx> @@ -34,7 +34,7 @@ namespace connectivity { namespace odbc { - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; class OOO_DLLPUBLIC_ODBCBASE SAL_NO_VTABLE ODBCDriver : public ODriver_BASE { diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index dabc759923bc..89fe749a6bad 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/sdbc/XRowUpdate.hpp> #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbcx/XDeleteRows.hpp> -#include <cppuhelper/compbase12.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/proparrhlp.hxx> #include "odbc/OFunctions.hxx" #include "odbc/OStatement.hxx" @@ -49,18 +49,18 @@ namespace connectivity /* ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, - ::com::sun::star::sdbc::XRow, - ::com::sun::star::sdbc::XResultSetMetaDataSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::sdbc::XResultSetUpdate, - ::com::sun::star::sdbc::XRowUpdate, - ::com::sun::star::sdbcx::XRowLocate, - ::com::sun::star::sdbcx::XDeleteRows, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XColumnLocate, - ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XResultSet, + ::com::sun::star::sdbc::XRow, + ::com::sun::star::sdbc::XResultSetMetaDataSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::sdbc::XResultSetUpdate, + ::com::sun::star::sdbc::XRowUpdate, + ::com::sun::star::sdbcx::XRowLocate, + ::com::sun::star::sdbcx::XDeleteRows, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XColumnLocate, + ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr; diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index f6fc037398d1..e6333e430228 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ORESULTSETMETADATA_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "odbc/OFunctions.hxx" #include "odbc/odbcbasedllapi.hxx" #include <vector> @@ -34,7 +34,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 OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData : public OResultSetMetaData_BASE diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 3f40d2bdc9f4..248a1f2765d5 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XGeneratedResultSet.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <comphelper/proparrhlp.hxx> -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> #include <connectivity/CommonTools.hxx> #include "odbc/OFunctions.hxx" @@ -44,12 +44,12 @@ namespace connectivity namespace odbc { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, - ::com::sun::star::sdbc::XWarningsSupplier, - ::com::sun::star::util::XCancellable, - ::com::sun::star::sdbc::XCloseable, - ::com::sun::star::sdbc::XGeneratedResultSet, - ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XStatement, + ::com::sun::star::sdbc::XWarningsSupplier, + ::com::sun::star::util::XCancellable, + ::com::sun::star::sdbc::XCloseable, + ::com::sun::star::sdbc::XGeneratedResultSet, + ::com::sun::star::sdbc::XMultipleResults> OStatement_BASE; class OResultSet; |