connectivity/inc/sdbcx/VCatalog.hxx | 146 +- connectivity/inc/sdbcx/VGroup.hxx | 96 - connectivity/inc/sdbcx/VIndex.hxx | 110 - connectivity/inc/sdbcx/VIndexColumn.hxx | 54 connectivity/inc/sdbcx/VKey.hxx | 126 - connectivity/inc/sdbcx/VKeyColumn.hxx | 58 connectivity/inc/sdbcx/VTypeDef.hxx | 6 connectivity/inc/sdbcx/VUser.hxx | 96 - connectivity/source/drivers/evoab2/NCatalog.hxx | 30 connectivity/source/drivers/evoab2/NColumns.hxx | 26 connectivity/source/drivers/evoab2/NConnection.hxx | 116 - connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 362 ++--- connectivity/source/drivers/evoab2/NDriver.hxx | 58 connectivity/source/drivers/evoab2/NPreparedStatement.hxx | 126 - connectivity/source/drivers/evoab2/NResultSet.hxx | 264 +-- connectivity/source/drivers/evoab2/NStatement.hxx | 438 +++--- connectivity/source/drivers/evoab2/NTable.hxx | 36 connectivity/source/drivers/evoab2/NTables.hxx | 30 connectivity/source/drivers/firebird/Blob.hxx | 148 +- connectivity/source/drivers/firebird/Catalog.hxx | 32 connectivity/source/drivers/firebird/Clob.hxx | 70 - connectivity/source/drivers/firebird/Column.hxx | 28 connectivity/source/drivers/firebird/Columns.hxx | 18 connectivity/source/drivers/firebird/Connection.hxx | 386 ++--- connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 398 +++--- connectivity/source/drivers/firebird/Driver.hxx | 94 - connectivity/source/drivers/firebird/Indexes.hxx | 36 connectivity/source/drivers/firebird/Keys.hxx | 26 connectivity/source/drivers/firebird/PreparedStatement.hxx | 226 +-- connectivity/source/drivers/firebird/ResultSet.hxx | 346 ++--- connectivity/source/drivers/firebird/ResultSetMetaData.hxx | 82 - connectivity/source/drivers/firebird/Statement.hxx | 104 - connectivity/source/drivers/firebird/StatementCommonBase.hxx | 182 +- connectivity/source/drivers/firebird/SubComponent.hxx | 130 - connectivity/source/drivers/firebird/Table.hxx | 106 - connectivity/source/drivers/firebird/Tables.hxx | 74 - connectivity/source/drivers/firebird/User.hxx | 46 connectivity/source/drivers/firebird/Users.hxx | 66 connectivity/source/drivers/firebird/Util.hxx | 190 +- connectivity/source/drivers/hsqldb/HTerminateListener.hxx | 28 connectivity/source/drivers/macab/MacabAddressBook.hxx | 44 connectivity/source/drivers/macab/MacabCatalog.hxx | 34 connectivity/source/drivers/macab/MacabColumns.hxx | 22 connectivity/source/drivers/macab/MacabConnection.hxx | 146 +- connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx | 320 ++-- connectivity/source/drivers/macab/MacabDriver.hxx | 198 +- connectivity/source/drivers/macab/MacabGroup.hxx | 8 connectivity/source/drivers/macab/MacabHeader.hxx | 58 connectivity/source/drivers/macab/MacabPreparedStatement.hxx | 134 +- connectivity/source/drivers/macab/MacabRecord.hxx | 58 connectivity/source/drivers/macab/MacabRecords.hxx | 170 +- connectivity/source/drivers/macab/MacabResultSet.hxx | 348 ++--- connectivity/source/drivers/macab/MacabResultSetMetaData.hxx | 86 - connectivity/source/drivers/macab/MacabStatement.hxx | 262 +-- connectivity/source/drivers/macab/MacabTable.hxx | 50 connectivity/source/drivers/macab/MacabTables.hxx | 34 connectivity/source/drivers/macab/macaborder.hxx | 46 connectivity/source/drivers/macab/macabutilities.hxx | 164 +- connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 72 - connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 76 - connectivity/source/inc/TDatabaseMetaDataBase.hxx | 192 +- connectivity/source/inc/ado/ACallableStatement.hxx | 76 - connectivity/source/inc/ado/ACatalog.hxx | 34 connectivity/source/inc/ado/AColumn.hxx | 42 connectivity/source/inc/ado/AColumns.hxx | 46 connectivity/source/inc/ado/AConnection.hxx | 186 +- connectivity/source/inc/ado/ADatabaseMetaData.hxx | 372 ++--- connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 362 ++--- connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 120 - connectivity/source/inc/ado/ADriver.hxx | 94 - connectivity/source/inc/ado/AGroup.hxx | 58 connectivity/source/inc/ado/AGroups.hxx | 40 connectivity/source/inc/ado/AIndex.hxx | 30 connectivity/source/inc/ado/AIndexes.hxx | 46 connectivity/source/inc/ado/AKey.hxx | 44 connectivity/source/inc/ado/AKeys.hxx | 46 connectivity/source/inc/ado/AResultSet.hxx | 376 ++--- connectivity/source/inc/ado/AResultSetMetaData.hxx | 76 - connectivity/source/inc/ado/AStatement.hxx | 348 ++--- connectivity/source/inc/ado/ATable.hxx | 58 connectivity/source/inc/ado/ATables.hxx | 44 connectivity/source/inc/ado/AUser.hxx | 94 - connectivity/source/inc/ado/AUsers.hxx | 42 connectivity/source/inc/ado/AView.hxx | 34 connectivity/source/inc/ado/AViews.hxx | 36 connectivity/source/inc/ado/Aolevariant.hxx | 168 +- connectivity/source/inc/ado/Aolewrap.hxx | 222 +-- connectivity/source/inc/ado/Awrapado.hxx | 662 +++++----- connectivity/source/inc/ado/WrapCatalog.hxx | 38 connectivity/source/inc/ado/WrapColumn.hxx | 58 connectivity/source/inc/ado/WrapIndex.hxx | 42 connectivity/source/inc/ado/WrapKey.hxx | 46 connectivity/source/inc/ado/WrapTable.hxx | 40 connectivity/source/inc/ado/WrapTypeDefs.hxx | 28 connectivity/source/inc/ado/adoimp.hxx | 82 - connectivity/source/inc/calc/CCatalog.hxx | 16 connectivity/source/inc/calc/CConnection.hxx | 186 +- connectivity/source/inc/calc/CDatabaseMetaData.hxx | 22 connectivity/source/inc/calc/CDriver.hxx | 40 connectivity/source/inc/calc/CTable.hxx | 56 connectivity/source/inc/calc/CTables.hxx | 22 connectivity/source/inc/component/CColumns.hxx | 24 connectivity/source/inc/component/CDatabaseMetaData.hxx | 36 connectivity/source/inc/component/CPreparedStatement.hxx | 20 connectivity/source/inc/component/CResultSet.hxx | 84 - connectivity/source/inc/component/CStatement.hxx | 20 connectivity/source/inc/component/CTable.hxx | 48 connectivity/source/inc/dbase/DCatalog.hxx | 16 connectivity/source/inc/dbase/DColumns.hxx | 30 connectivity/source/inc/dbase/DConnection.hxx | 32 connectivity/source/inc/dbase/DDatabaseMetaData.hxx | 56 connectivity/source/inc/dbase/DDriver.hxx | 26 connectivity/source/inc/dbase/DIndex.hxx | 192 +- connectivity/source/inc/dbase/DIndexColumns.hxx | 32 connectivity/source/inc/dbase/DIndexIter.hxx | 60 connectivity/source/inc/dbase/DIndexes.hxx | 40 connectivity/source/inc/dbase/DPreparedStatement.hxx | 18 connectivity/source/inc/dbase/DResultSet.hxx | 82 - connectivity/source/inc/dbase/DStatement.hxx | 18 connectivity/source/inc/dbase/DTable.hxx | 286 ++-- connectivity/source/inc/dbase/DTables.hxx | 32 connectivity/source/inc/dbase/dindexnode.hxx | 530 ++++---- connectivity/source/inc/file/FCatalog.hxx | 58 connectivity/source/inc/file/FColumns.hxx | 28 connectivity/source/inc/file/FConnection.hxx | 188 +- connectivity/source/inc/file/FDatabaseMetaData.hxx | 298 ++-- connectivity/source/inc/file/FDateFunctions.hxx | 398 +++--- connectivity/source/inc/file/FDriver.hxx | 64 connectivity/source/inc/file/FNumericFunctions.hxx | 642 ++++----- connectivity/source/inc/file/FPreparedStatement.hxx | 176 +- connectivity/source/inc/file/FResultSet.hxx | 496 +++---- connectivity/source/inc/file/FResultSetMetaData.hxx | 80 - connectivity/source/inc/file/FStatement.hxx | 302 ++-- connectivity/source/inc/file/FStringFunctions.hxx | 470 +++---- connectivity/source/inc/file/FTable.hxx | 130 - connectivity/source/inc/file/FTables.hxx | 24 connectivity/source/inc/file/fanalyzer.hxx | 68 - connectivity/source/inc/flat/ECatalog.hxx | 16 connectivity/source/inc/flat/EColumns.hxx | 22 connectivity/source/inc/flat/EConnection.hxx | 66 connectivity/source/inc/flat/EDatabaseMetaData.hxx | 26 connectivity/source/inc/flat/EDriver.hxx | 26 connectivity/source/inc/flat/EPreparedStatement.hxx | 18 connectivity/source/inc/flat/EResultSet.hxx | 70 - connectivity/source/inc/flat/EStatement.hxx | 18 connectivity/source/inc/flat/ETable.hxx | 112 - connectivity/source/inc/hsqldb/HCatalog.hxx | 64 connectivity/source/inc/hsqldb/HColumns.hxx | 48 connectivity/source/inc/hsqldb/HConnection.hxx | 194 +- connectivity/source/inc/hsqldb/HDriver.hxx | 166 +- connectivity/source/inc/hsqldb/HStorageMap.hxx | 94 - connectivity/source/inc/hsqldb/HTable.hxx | 152 +- connectivity/source/inc/hsqldb/HTables.hxx | 40 connectivity/source/inc/hsqldb/HUser.hxx | 76 - connectivity/source/inc/hsqldb/HViews.hxx | 38 connectivity/source/inc/mysql/YCatalog.hxx | 64 connectivity/source/inc/mysql/YColumns.hxx | 48 connectivity/source/inc/mysql/YTable.hxx | 152 +- connectivity/source/inc/mysql/YTables.hxx | 66 connectivity/source/inc/mysql/YUser.hxx | 76 - connectivity/source/inc/mysql/YViews.hxx | 40 connectivity/source/inc/odbc/OBoundParam.hxx | 142 +- connectivity/source/inc/odbc/OConnection.hxx | 170 +- connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 326 ++-- connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 412 +++--- connectivity/source/inc/odbc/ODriver.hxx | 62 connectivity/source/inc/odbc/OPreparedStatement.hxx | 228 +-- connectivity/source/inc/odbc/OResultSet.hxx | 538 ++++---- connectivity/source/inc/odbc/OResultSetMetaData.hxx | 136 +- connectivity/source/inc/odbc/OStatement.hxx | 388 ++--- connectivity/workben/skeleton/SResultSet.hxx | 382 ++--- include/connectivity/PColumn.hxx | 200 +-- include/connectivity/sdbcx/IRefreshable.hxx | 52 include/connectivity/sdbcx/VCollection.hxx | 344 ++--- include/connectivity/sdbcx/VColumn.hxx | 134 +- include/connectivity/sdbcx/VDescriptor.hxx | 58 include/connectivity/sdbcx/VView.hxx | 88 - 177 files changed, 11202 insertions(+), 11202 deletions(-)
New commits: commit f4ba2e1c5a1ee9243a9d5df80d1a7f216653c960 Author: Noel Grandin <[email protected]> AuthorDate: Thu Mar 6 14:22:29 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Mar 7 16:14:01 2025 +0100 trim excessive leading whitespace in connectivity Change-Id: I5629ca3ac7503c1cab848f65fcd25d15a1e3dcaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182580 Reviewed-by: Julien Nabet <[email protected]> Tested-by: Jenkins Reviewed-by: Lionel Mamane <[email protected]> diff --git a/connectivity/inc/sdbcx/VCatalog.hxx b/connectivity/inc/sdbcx/VCatalog.hxx index 3c87a08700b6..bc699d0b8a01 100644 --- a/connectivity/inc/sdbcx/VCatalog.hxx +++ b/connectivity/inc/sdbcx/VCatalog.hxx @@ -36,80 +36,80 @@ namespace com::sun::star::sdbc { class XResultSet; } namespace com::sun::star::sdbc { class XRow; } namespace connectivity::sdbcx - { +{ + + class OCollection; + // OCatalog is a general catalog class + // other drivers can be derived their catalog from this class when they want to support sdbcx + // it holds already tables, views, groups and users + + typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XTablesSupplier, + css::sdbcx::XViewsSupplier, + css::sdbcx::XUsersSupplier, + css::sdbcx::XGroupsSupplier, + css::lang::XServiceInfo> OCatalog_BASE; - class OCollection; - // OCatalog is a general catalog class - // other drivers can be derived their catalog from this class when they want to support sdbcx - // it holds already tables, views, groups and users - - typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XTablesSupplier, - css::sdbcx::XViewsSupplier, - css::sdbcx::XUsersSupplier, - css::sdbcx::XGroupsSupplier, - css::lang::XServiceInfo> OCatalog_BASE; - - - class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog : - public OCatalog_BASE, - public IRefreshableGroups, - public IRefreshableUsers - { - protected: - - ::osl::Mutex m_aMutex; - - // this members are deleted when the dtor is called - // they are hold weak - std::unique_ptr<OCollection> m_pTables; - std::unique_ptr<OCollection> m_pViews; - std::unique_ptr<OCollection> m_pGroups; - std::unique_ptr<OCollection> m_pUsers; - - css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier - - /** builds the name which should be used to access the object later on in the collection. - Will only be called in fillNames. - @param _xRow - The current row from the resultset given to fillNames. - */ - virtual OUString buildName( const css::uno::Reference< css::sdbc::XRow >& _xRow); - - /** fills a vector with the necessary names which can be used in combination with the collections. - For each row buildName will be called. - @param _xResult - The resultset which should be used to fill the names. Will be disposed after return and set to NULL. - @param _rNames - The vector who will be filled. - */ - void fillNames(css::uno::Reference< css::sdbc::XResultSet >& _xResult,::std::vector< OUString>& _rNames); - - public: - OCatalog(const css::uno::Reference< css::sdbc::XConnection> &_xConnection); - virtual ~OCatalog() override; - - DECLARE_SERVICE_INFO(); - - // refreshTables is called when the method getTables had been called - // the member m_pTables has to be created - virtual void refreshTables() = 0; - // refreshViews is called when the method getViews had been called - virtual void refreshViews() = 0; - - // the other refresh methods come from base classes IRefreshableGroups and IRefreshableUsers - - // ::cppu::OComponentHelper - virtual void SAL_CALL disposing() override; - // XTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; - // XViewsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) override; - // XUsersSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) override; - // XGroupsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) override; - - }; + + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog : + public OCatalog_BASE, + public IRefreshableGroups, + public IRefreshableUsers + { + protected: + + ::osl::Mutex m_aMutex; + + // this members are deleted when the dtor is called + // they are hold weak + std::unique_ptr<OCollection> m_pTables; + std::unique_ptr<OCollection> m_pViews; + std::unique_ptr<OCollection> m_pGroups; + std::unique_ptr<OCollection> m_pUsers; + + css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier + + /** builds the name which should be used to access the object later on in the collection. + Will only be called in fillNames. + @param _xRow + The current row from the resultset given to fillNames. + */ + virtual OUString buildName( const css::uno::Reference< css::sdbc::XRow >& _xRow); + + /** fills a vector with the necessary names which can be used in combination with the collections. + For each row buildName will be called. + @param _xResult + The resultset which should be used to fill the names. Will be disposed after return and set to NULL. + @param _rNames + The vector who will be filled. + */ + void fillNames(css::uno::Reference< css::sdbc::XResultSet >& _xResult,::std::vector< OUString>& _rNames); + + public: + OCatalog(const css::uno::Reference< css::sdbc::XConnection> &_xConnection); + virtual ~OCatalog() override; + + DECLARE_SERVICE_INFO(); + + // refreshTables is called when the method getTables had been called + // the member m_pTables has to be created + virtual void refreshTables() = 0; + // refreshViews is called when the method getViews had been called + virtual void refreshViews() = 0; + + // the other refresh methods come from base classes IRefreshableGroups and IRefreshableUsers + + // ::cppu::OComponentHelper + virtual void SAL_CALL disposing() override; + // XTablesSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; + // XViewsSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getViews( ) override; + // XUsersSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) override; + // XGroupsSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) override; + + }; } diff --git a/connectivity/inc/sdbcx/VGroup.hxx b/connectivity/inc/sdbcx/VGroup.hxx index 9c292adc6d02..feb0baae443b 100644 --- a/connectivity/inc/sdbcx/VGroup.hxx +++ b/connectivity/inc/sdbcx/VGroup.hxx @@ -32,62 +32,62 @@ #include <com/sun/star/lang/XServiceInfo.hpp> namespace connectivity::sdbcx - { - typedef OCollection OUsers; +{ + typedef OCollection OUsers; - typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XUsersSupplier, - css::sdbcx::XAuthorizable, - css::container::XNamed, - css::lang::XServiceInfo> OGroup_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XUsersSupplier, + css::sdbcx::XAuthorizable, + css::container::XNamed, + css::lang::XServiceInfo> OGroup_BASE; - class OOO_DLLPUBLIC_DBTOOLS OGroup : - public cppu::BaseMutex, - public OGroup_BASE, - public IRefreshableUsers, - public ::comphelper::OPropertyArrayUsageHelper<OGroup>, - public ODescriptor - { - protected: - // no Reference! see OCollection::acquire - std::unique_ptr<OUsers> m_pUsers; + class OOO_DLLPUBLIC_DBTOOLS OGroup : + public cppu::BaseMutex, + public OGroup_BASE, + public IRefreshableUsers, + public ::comphelper::OPropertyArrayUsageHelper<OGroup>, + public ODescriptor + { + protected: + // no Reference! see OCollection::acquire + std::unique_ptr<OUsers> m_pUsers; - using OGroup_BASE::rBHelper; + using OGroup_BASE::rBHelper; - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - public: - OGroup(bool _bCase); - OGroup( const OUString& Name, bool _bCase); - virtual ~OGroup() override; - DECLARE_SERVICE_INFO(); + // OPropertyArrayUsageHelper + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; + // OPropertySetHelper + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; + public: + OGroup(bool _bCase); + OGroup( const OUString& Name, bool _bCase); + virtual ~OGroup() override; + DECLARE_SERVICE_INFO(); - // XInterface - virtual void SAL_CALL acquire() noexcept override; - virtual void SAL_CALL release() noexcept override; + // XInterface + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; - //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + //XInterface + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + //XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; - // ::cppu::OComponentHelper - virtual void SAL_CALL disposing() override; - // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - // XUsersSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) override; - // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override; - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override; - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + // ::cppu::OComponentHelper + virtual void SAL_CALL disposing() override; + // XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + // XUsersSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getUsers( ) override; + // XAuthorizable + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; - // XNamed - virtual OUString SAL_CALL getName( ) override; - virtual void SAL_CALL setName( const OUString& aName ) override; - }; + // XNamed + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; + }; } diff --git a/connectivity/inc/sdbcx/VIndex.hxx b/connectivity/inc/sdbcx/VIndex.hxx index fd9bebe73ec2..2591ef6efdbd 100644 --- a/connectivity/inc/sdbcx/VIndex.hxx +++ b/connectivity/inc/sdbcx/VIndex.hxx @@ -31,68 +31,68 @@ #include <cppuhelper/implbase1.hxx> namespace connectivity::sdbcx - { - class OCollection; - class OIndex; - typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OIndex_BASE; - typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndex> OIndex_PROP; +{ + class OCollection; + class OIndex; + typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OIndex_BASE; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndex> OIndex_PROP; - class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBTOOLS) OIndex : - public cppu::BaseMutex, - public ODescriptor_BASE, - public IRefreshableColumns, - public OIndex_PROP, - public ODescriptor, - public OIndex_BASE - { - protected: - OUString m_Catalog; - bool m_IsUnique; - bool m_IsPrimaryKeyIndex; - bool m_IsClustered; + class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBTOOLS) OIndex : + public cppu::BaseMutex, + public ODescriptor_BASE, + public IRefreshableColumns, + public OIndex_PROP, + public ODescriptor, + public OIndex_BASE + { + protected: + OUString m_Catalog; + bool m_IsUnique; + bool m_IsPrimaryKeyIndex; + bool m_IsClustered; - // no Reference! see OCollection::acquire - std::unique_ptr<OCollection> m_pColumns; + // no Reference! see OCollection::acquire + std::unique_ptr<OCollection> m_pColumns; - using ODescriptor_BASE::rBHelper; - virtual void refreshColumns() override; - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - public: - OIndex(bool _bCase); - OIndex( const OUString& Name, - OUString Catalog, - bool _isUnique, - bool _isPrimaryKeyIndex, - bool _isClustered, - bool _bCase); + using ODescriptor_BASE::rBHelper; + virtual void refreshColumns() override; + // OPropertyArrayUsageHelper + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + public: + OIndex(bool _bCase); + OIndex( const OUString& Name, + OUString Catalog, + bool _isUnique, + bool _isPrimaryKeyIndex, + bool _isClustered, + bool _bCase); - virtual ~OIndex( ) override; + virtual ~OIndex( ) override; - DECLARE_SERVICE_INFO(); + DECLARE_SERVICE_INFO(); - //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() noexcept override; - virtual void SAL_CALL release() noexcept override; - //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; - // ODescriptor - virtual void construct() override; - // ::cppu::OComponentHelper - virtual void SAL_CALL disposing() override; - // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - // XColumnsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) override; + //XInterface + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; + //XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + // ODescriptor + virtual void construct() override; + // ::cppu::OComponentHelper + virtual void SAL_CALL disposing() override; + // XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + // XColumnsSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) override; - // XNamed - virtual OUString SAL_CALL getName( ) override; - virtual void SAL_CALL setName( const OUString& aName ) override; - // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; - }; + // XNamed + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; + // XDataDescriptorFactory + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; + }; } diff --git a/connectivity/inc/sdbcx/VIndexColumn.hxx b/connectivity/inc/sdbcx/VIndexColumn.hxx index 8b9083c7ec75..d4b6c00e21d3 100644 --- a/connectivity/inc/sdbcx/VIndexColumn.hxx +++ b/connectivity/inc/sdbcx/VIndexColumn.hxx @@ -24,35 +24,35 @@ #include <connectivity/sdbcx/VColumn.hxx> namespace connectivity::sdbcx - { - class OIndexColumn; - typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndexColumn> OIndexColumn_PROP; +{ + class OIndexColumn; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndexColumn> OIndexColumn_PROP; - class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBTOOLS) OIndexColumn : - public OColumn, public OIndexColumn_PROP - { - bool m_IsAscending; - protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - public: - OIndexColumn( bool _bCase); - OIndexColumn( bool IsAscending, - const OUString& Name, - const OUString& TypeName, - const OUString& DefaultValue, - sal_Int32 IsNullable, - sal_Int32 Precision, - sal_Int32 Scale, - sal_Int32 Type, - bool _bCase, - const OUString& CatalogName, - const OUString& SchemaName, - const OUString& TableName); + class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBTOOLS) OIndexColumn : + public OColumn, public OIndexColumn_PROP + { + bool m_IsAscending; + protected: + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + public: + OIndexColumn( bool _bCase); + OIndexColumn( bool IsAscending, + const OUString& Name, + const OUString& TypeName, + const OUString& DefaultValue, + sal_Int32 IsNullable, + sal_Int32 Precision, + sal_Int32 Scale, + sal_Int32 Type, + bool _bCase, + const OUString& CatalogName, + const OUString& SchemaName, + const OUString& TableName); - virtual void construct() override; - DECLARE_SERVICE_INFO(); - }; + virtual void construct() override; + DECLARE_SERVICE_INFO(); + }; } diff --git a/connectivity/inc/sdbcx/VKey.hxx b/connectivity/inc/sdbcx/VKey.hxx index df17eba8729f..7ee7dc563b04 100644 --- a/connectivity/inc/sdbcx/VKey.hxx +++ b/connectivity/inc/sdbcx/VKey.hxx @@ -33,76 +33,76 @@ #include <utility> namespace connectivity::sdbcx - { +{ - struct OOO_DLLPUBLIC_DBTOOLS KeyProperties - { - ::std::vector< OUString> m_aKeyColumnNames; - OUString m_ReferencedTable; - sal_Int32 m_Type; - sal_Int32 m_UpdateRule; - sal_Int32 m_DeleteRule; - KeyProperties(OUString ReferencedTable, - sal_Int32 Type, - sal_Int32 UpdateRule, - sal_Int32 DeleteRule) - :m_ReferencedTable(std::move(ReferencedTable)), - m_Type(Type), - m_UpdateRule(UpdateRule), - m_DeleteRule(DeleteRule) - {} - KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){} - }; - typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OKey_BASE; - class OCollection; + struct OOO_DLLPUBLIC_DBTOOLS KeyProperties + { + ::std::vector< OUString> m_aKeyColumnNames; + OUString m_ReferencedTable; + sal_Int32 m_Type; + sal_Int32 m_UpdateRule; + sal_Int32 m_DeleteRule; + KeyProperties(OUString ReferencedTable, + sal_Int32 Type, + sal_Int32 UpdateRule, + sal_Int32 DeleteRule) + :m_ReferencedTable(std::move(ReferencedTable)), + m_Type(Type), + m_UpdateRule(UpdateRule), + m_DeleteRule(DeleteRule) + {} + KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){} + }; + typedef ::cppu::ImplHelper1< css::sdbcx::XDataDescriptorFactory > OKey_BASE; + class OCollection; - class OOO_DLLPUBLIC_DBTOOLS OKey : - public cppu::BaseMutex, - public ODescriptor_BASE, - public IRefreshableColumns, - public ::comphelper::OIdPropertyArrayUsageHelper<OKey>, - public ODescriptor, - public OKey_BASE - { - protected: - std::shared_ptr<KeyProperties> m_aProps; - // no Reference! see OCollection::acquire - std::unique_ptr<OCollection> m_pColumns; + class OOO_DLLPUBLIC_DBTOOLS OKey : + public cppu::BaseMutex, + public ODescriptor_BASE, + public IRefreshableColumns, + public ::comphelper::OIdPropertyArrayUsageHelper<OKey>, + public ODescriptor, + public OKey_BASE + { + protected: + std::shared_ptr<KeyProperties> m_aProps; + // no Reference! see OCollection::acquire + std::unique_ptr<OCollection> m_pColumns; - using ODescriptor_BASE::rBHelper; - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; - // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - public: - OKey(bool _bCase); - OKey(const OUString& Name,std::shared_ptr<KeyProperties> _xProps,bool _bCase); + using ODescriptor_BASE::rBHelper; + // OPropertyArrayUsageHelper + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; + // OPropertySetHelper + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; + public: + OKey(bool _bCase); + OKey(const OUString& Name,std::shared_ptr<KeyProperties> _xProps,bool _bCase); - virtual ~OKey( ) override; + virtual ~OKey( ) override; - DECLARE_SERVICE_INFO(); - //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() noexcept override; - virtual void SAL_CALL release() noexcept override; - //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; - // ODescriptor - virtual void construct() override; + DECLARE_SERVICE_INFO(); + //XInterface + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; + //XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + // ODescriptor + virtual void construct() override; - // ::cppu::OComponentHelper - virtual void SAL_CALL disposing() override; - // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - // XColumnsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) override; + // ::cppu::OComponentHelper + virtual void SAL_CALL disposing() override; + // XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + // XColumnsSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns( ) override; - // XNamed - virtual OUString SAL_CALL getName( ) override; - virtual void SAL_CALL setName( const OUString& aName ) override; - // XDataDescriptorFactory - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; - }; + // XNamed + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; + // XDataDescriptorFactory + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL createDataDescriptor( ) override; + }; } diff --git a/connectivity/inc/sdbcx/VKeyColumn.hxx b/connectivity/inc/sdbcx/VKeyColumn.hxx index 59b26131db9f..76e9b9062a20 100644 --- a/connectivity/inc/sdbcx/VKeyColumn.hxx +++ b/connectivity/inc/sdbcx/VKeyColumn.hxx @@ -22,37 +22,37 @@ #include <connectivity/sdbcx/VColumn.hxx> namespace connectivity::sdbcx - { - class OKeyColumn; - typedef ::comphelper::OIdPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP; +{ + class OKeyColumn; + typedef ::comphelper::OIdPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP; - class OKeyColumn : - public OColumn, public OKeyColumn_PROP - { - OUString m_ReferencedColumn; - protected: - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - public: - OKeyColumn(bool _bCase); - OKeyColumn( OUString ReferencedColumn, - const OUString& Name, - const OUString& TypeName, - const OUString& DefaultValue, - sal_Int32 IsNullable, - sal_Int32 Precision, - sal_Int32 Scale, - sal_Int32 Type, - bool _bCase, - const OUString& CatalogName, - const OUString& SchemaName, - const OUString& TableName); - // just to make it not inline - virtual ~OKeyColumn() override; + class OKeyColumn : + public OColumn, public OKeyColumn_PROP + { + OUString m_ReferencedColumn; + protected: + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + public: + OKeyColumn(bool _bCase); + OKeyColumn( OUString ReferencedColumn, + const OUString& Name, + const OUString& TypeName, + const OUString& DefaultValue, + sal_Int32 IsNullable, + sal_Int32 Precision, + sal_Int32 Scale, + sal_Int32 Type, + bool _bCase, + const OUString& CatalogName, + const OUString& SchemaName, + const OUString& TableName); + // just to make it not inline + virtual ~OKeyColumn() override; - virtual void construct() override; - DECLARE_SERVICE_INFO(); - }; + virtual void construct() override; + DECLARE_SERVICE_INFO(); + }; } diff --git a/connectivity/inc/sdbcx/VTypeDef.hxx b/connectivity/inc/sdbcx/VTypeDef.hxx index 92a1f3c9c104..02b31da1d4fe 100644 --- a/connectivity/inc/sdbcx/VTypeDef.hxx +++ b/connectivity/inc/sdbcx/VTypeDef.hxx @@ -26,9 +26,9 @@ namespace connectivity::sdbcx { - typedef cppu::WeakComponentImplHelper< css::sdbcx::XColumnsSupplier, - css::container::XNamed, - css::lang::XServiceInfo> ODescriptor_BASE; + typedef cppu::WeakComponentImplHelper< css::sdbcx::XColumnsSupplier, + css::container::XNamed, + css::lang::XServiceInfo> ODescriptor_BASE; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/sdbcx/VUser.hxx b/connectivity/inc/sdbcx/VUser.hxx index 7086cb04f2e3..b63371acb12f 100644 --- a/connectivity/inc/sdbcx/VUser.hxx +++ b/connectivity/inc/sdbcx/VUser.hxx @@ -33,62 +33,62 @@ namespace connectivity::sdbcx { - typedef OCollection OGroups; + typedef OCollection OGroups; - typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XUser, - css::sdbcx::XGroupsSupplier, - css::container::XNamed, - css::lang::XServiceInfo> OUser_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XUser, + css::sdbcx::XGroupsSupplier, + css::container::XNamed, + css::lang::XServiceInfo> OUser_BASE; - class OOO_DLLPUBLIC_DBTOOLS OUser : - public cppu::BaseMutex, - public OUser_BASE, - public IRefreshableGroups, - public ::comphelper::OPropertyArrayUsageHelper<OUser>, - public ODescriptor - { - protected: - // no Reference! see OCollection::acquire - std::unique_ptr<OGroups> m_pGroups; + class OOO_DLLPUBLIC_DBTOOLS OUser : + public cppu::BaseMutex, + public OUser_BASE, + public IRefreshableGroups, + public ::comphelper::OPropertyArrayUsageHelper<OUser>, + public ODescriptor + { + protected: + // no Reference! see OCollection::acquire + std::unique_ptr<OGroups> m_pGroups; - using OUser_BASE::rBHelper; + using OUser_BASE::rBHelper; - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - public: - OUser(bool _bCase); - OUser(const OUString& Name,bool _bCase); + // OPropertyArrayUsageHelper + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; + // OPropertySetHelper + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; + public: + OUser(bool _bCase); + OUser(const OUString& Name,bool _bCase); - virtual ~OUser( ) override; + virtual ~OUser( ) override; - DECLARE_SERVICE_INFO(); + DECLARE_SERVICE_INFO(); - // ::cppu::OComponentHelper - virtual void SAL_CALL disposing() override; - //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() noexcept override; - virtual void SAL_CALL release() noexcept override; - //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; - // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - // XUser - virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) override; - // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override; - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override; - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; - // XGroupsSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) override; + // ::cppu::OComponentHelper + virtual void SAL_CALL disposing() override; + //XInterface + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; + //XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + // XPropertySet + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + // XUser + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) override; + // XAuthorizable + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) override; + // XGroupsSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getGroups( ) override; - // XNamed - virtual OUString SAL_CALL getName( ) override; - virtual void SAL_CALL setName( const OUString& aName ) override; - }; + // XNamed + virtual OUString SAL_CALL getName( ) override; + virtual void SAL_CALL setName( const OUString& aName ) override; + }; } diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index b2bd8084474c..2b794c81202e 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -23,21 +23,21 @@ namespace connectivity::evoab { - class OEvoabConnection; - class OEvoabCatalog : public connectivity::sdbcx::OCatalog - { - OEvoabConnection *m_pConnection; - public: - explicit OEvoabCatalog(OEvoabConnection *_pCon); - OEvoabConnection* getConnection() const { return m_pConnection; } - virtual void refreshTables() override; - virtual void refreshViews() override {} - virtual void refreshGroups() override {} - virtual void refreshUsers() override {} - // XTablesSupplier - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( - ) override; - }; + class OEvoabConnection; + class OEvoabCatalog : public connectivity::sdbcx::OCatalog + { + OEvoabConnection *m_pConnection; + public: + explicit OEvoabCatalog(OEvoabConnection *_pCon); + OEvoabConnection* getConnection() const { return m_pConnection; } + virtual void refreshTables() override; + virtual void refreshViews() override {} + virtual void refreshGroups() override {} + virtual void refreshUsers() override {} +// XTablesSupplier + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( + ) override; + }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index 14ab99f19f42..0f070e5ca8c8 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -24,21 +24,21 @@ namespace connectivity::evoab { - class OEvoabColumns final : public sdbcx::OCollection - { - OEvoabTable* m_pTable; + class OEvoabColumns final : public sdbcx::OCollection + { + OEvoabTable* m_pTable; - virtual css::uno::Reference< css::beans::XPropertySet > createObject(const OUString& _rName) override; - virtual void impl_refresh() override; + virtual css::uno::Reference< css::beans::XPropertySet > createObject(const OUString& _rName) override; + virtual void impl_refresh() override; - public: - OEvoabColumns( OEvoabTable* _pTable, - ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector - ) : sdbcx::OCollection(*_pTable,true,_rMutex,_rVector), - m_pTable(_pTable) - { } - }; + public: + OEvoabColumns( OEvoabTable* _pTable, + ::osl::Mutex& _rMutex, + const ::std::vector< OUString> &_rVector + ) : sdbcx::OCollection(*_pTable,true,_rMutex,_rVector), + m_pTable(_pTable) + { } + }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 8dd8714bc2fe..77e3ea30b335 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -32,74 +32,74 @@ namespace connectivity::evoab { - namespace SDBCAddress { - typedef enum { - Unknown = 0, - EVO_LOCAL = 1, - EVO_LDAP = 2, - EVO_GWISE = 3 - } sdbc_address_type; - } + namespace SDBCAddress { + typedef enum { + Unknown = 0, + EVO_LOCAL = 1, + EVO_LDAP = 2, + EVO_GWISE = 3 + } sdbc_address_type; + } - typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding + typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding - class OEvoabConnection final :public OConnection_BASE - { - private: - const OEvoabDriver& m_rDriver; - SDBCAddress::sdbc_address_type m_eSDBCAddressType; - css::uno::Reference< css::sdbcx::XTablesSupplier > - m_xCatalog; - OString m_aPassword; - ::dbtools::WarningsContainer m_aWarnings; + class OEvoabConnection final :public OConnection_BASE + { + private: + const OEvoabDriver& m_rDriver; + SDBCAddress::sdbc_address_type m_eSDBCAddressType; + css::uno::Reference< css::sdbcx::XTablesSupplier > + m_xCatalog; + OString m_aPassword; + ::dbtools::WarningsContainer m_aWarnings; - virtual ~OEvoabConnection() override; + virtual ~OEvoabConnection() override; - public: - explicit OEvoabConnection( OEvoabDriver const & _rDriver ); - /// @throws css::sdbc::SQLException - void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ); + public: + explicit OEvoabConnection( OEvoabDriver const & _rDriver ); + /// @throws css::sdbc::SQLException + void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ); - void setPassword( OString const & aStr ) { m_aPassword = aStr; } - // own methods - const OEvoabDriver& getDriver() const { return m_rDriver; } + void setPassword( OString const & aStr ) { m_aPassword = aStr; } + // own methods + const OEvoabDriver& getDriver() const { return m_rDriver; } - SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} - void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;} + SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} + void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;} - // OComponentHelper - virtual void SAL_CALL disposing() override; + // OComponentHelper + virtual void SAL_CALL disposing() override; - // XServiceInfo - DECLARE_SERVICE_INFO(); + // XServiceInfo + DECLARE_SERVICE_INFO(); - // XConnection - css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) override; - virtual void SAL_CALL commit( ) override; - virtual void SAL_CALL rollback( ) override; - virtual sal_Bool SAL_CALL isClosed( ) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; - virtual sal_Bool SAL_CALL isReadOnly( ) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) override; - virtual OUString SAL_CALL getCatalog( ) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + // XConnection + css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; - // XCloseable - virtual void SAL_CALL close( ) override; - // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) override; - virtual void SAL_CALL clearWarnings( ) override; - }; + // XCloseable + virtual void SAL_CALL close( ) override; + // XWarningsSupplier + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; + }; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index a64c234e6a52..333594bf3741 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -31,187 +31,187 @@ namespace connectivity::evoab { - //************ Class: OEvoabDatabaseMetaData - - typedef struct{ - gboolean bIsSplittedValue; - GParamSpec *pField; - }ColumnProperty; - - typedef enum { - DEFAULT_ADDR_LINE1=1,DEFAULT_ADDR_LINE2,DEFAULT_CITY,DEFAULT_STATE,DEFAULT_COUNTRY,DEFAULT_ZIP, - WORK_ADDR_LINE1,WORK_ADDR_LINE2,WORK_CITY,WORK_STATE,WORK_COUNTRY,WORK_ZIP, - HOME_ADDR_LINE1,HOME_ADDR_LINE2,HOME_CITY,HOME_STATE,HOME_COUNTRY,HOME_ZIP, - OTHER_ADDR_LINE1,OTHER_ADDR_LINE2,OTHER_CITY,OTHER_STATE,OTHER_COUNTRY,OTHER_ZIP - }ColumnNumber; - - typedef struct { - const gchar *pColumnName; - ColumnNumber value; - }SplitEvoColumns; - - const SplitEvoColumns* get_evo_addr(); - - const ColumnProperty *getField(guint n); - GType getGFieldType(guint nCol) ; - sal_Int32 getFieldType(guint nCol) ; - OUString getFieldTypeName(guint nCol) ; - OUString getFieldName(guint nCol) ; - guint findEvoabField(std::u16string_view aColName); - - void free_column_resources(); - - class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase - { - OEvoabConnection* m_pConnection; - - protected: - virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override; - // cached database information - virtual OUString impl_getIdentifierQuoteString_throw( ) override; - virtual bool impl_isCatalogAtStart_throw( ) override; - virtual OUString impl_getCatalogSeparator_throw( ) override; - virtual bool impl_supportsCatalogsInTableDefinitions_throw( ) override; - virtual bool impl_supportsSchemasInTableDefinitions_throw( ) override ; - virtual bool impl_supportsCatalogsInDataManipulation_throw( ) override; - virtual bool impl_supportsSchemasInDataManipulation_throw( ) override ; - virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) override ; - virtual bool impl_supportsAlterTableWithAddColumn_throw( ) override; - virtual bool impl_supportsAlterTableWithDropColumn_throw( ) override; - virtual sal_Int32 impl_getMaxStatements_throw( ) override; - virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) override; - virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ) override; - - virtual ~OEvoabDatabaseMetaData() override; - public: - explicit OEvoabDatabaseMetaData(OEvoabConnection* _pCon); - - // as I mentioned before this interface is really BIG - // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; - virtual OUString SAL_CALL getURL( ) override; - virtual OUString SAL_CALL getUserName( ) override; - virtual sal_Bool SAL_CALL isReadOnly( ) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; - virtual OUString SAL_CALL getDatabaseProductName( ) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) override; - virtual OUString SAL_CALL getDriverName( ) override; - virtual OUString SAL_CALL getDriverVersion( ) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; - - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; - - virtual OUString SAL_CALL getSQLKeywords( ) override; - virtual OUString SAL_CALL getNumericFunctions( ) override; - virtual OUString SAL_CALL getStringFunctions( ) override; - virtual OUString SAL_CALL getSystemFunctions( ) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) override; - virtual OUString SAL_CALL getSearchStringEscape( ) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; - virtual OUString SAL_CALL getSchemaTerm( ) override; - virtual OUString SAL_CALL getProcedureTerm( ) override; - virtual OUString SAL_CALL getCatalogTerm( ) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; - virtual sal_Bool SAL_CALL supportsUnion( ) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; - }; + //************ Class: OEvoabDatabaseMetaData + + typedef struct{ + gboolean bIsSplittedValue; + GParamSpec *pField; + }ColumnProperty; + + typedef enum { + DEFAULT_ADDR_LINE1=1,DEFAULT_ADDR_LINE2,DEFAULT_CITY,DEFAULT_STATE,DEFAULT_COUNTRY,DEFAULT_ZIP, + WORK_ADDR_LINE1,WORK_ADDR_LINE2,WORK_CITY,WORK_STATE,WORK_COUNTRY,WORK_ZIP, + HOME_ADDR_LINE1,HOME_ADDR_LINE2,HOME_CITY,HOME_STATE,HOME_COUNTRY,HOME_ZIP, + OTHER_ADDR_LINE1,OTHER_ADDR_LINE2,OTHER_CITY,OTHER_STATE,OTHER_COUNTRY,OTHER_ZIP + }ColumnNumber; + + typedef struct { + const gchar *pColumnName; + ColumnNumber value; + }SplitEvoColumns; + + const SplitEvoColumns* get_evo_addr(); + + const ColumnProperty *getField(guint n); + GType getGFieldType(guint nCol) ; + sal_Int32 getFieldType(guint nCol) ; + OUString getFieldTypeName(guint nCol) ; + OUString getFieldName(guint nCol) ; + guint findEvoabField(std::u16string_view aColName); + + void free_column_resources(); + + class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase + { + OEvoabConnection* m_pConnection; + + protected: + virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override; + // cached database information + virtual OUString impl_getIdentifierQuoteString_throw( ) override; + virtual bool impl_isCatalogAtStart_throw( ) override; + virtual OUString impl_getCatalogSeparator_throw( ) override; + virtual bool impl_supportsCatalogsInTableDefinitions_throw( ) override; + virtual bool impl_supportsSchemasInTableDefinitions_throw( ) override ; + virtual bool impl_supportsCatalogsInDataManipulation_throw( ) override; + virtual bool impl_supportsSchemasInDataManipulation_throw( ) override ; + virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) override ; + virtual bool impl_supportsAlterTableWithAddColumn_throw( ) override; + virtual bool impl_supportsAlterTableWithDropColumn_throw( ) override; + virtual sal_Int32 impl_getMaxStatements_throw( ) override; + virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) override; + virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ) override; + + virtual ~OEvoabDatabaseMetaData() override; + public: + explicit OEvoabDatabaseMetaData(OEvoabConnection* _pCon); + + // as I mentioned before this interface is really BIG + // XDatabaseMetaData + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + }; } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 4e4e77e8b476..e144e61d2987 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -32,45 +32,45 @@ inline constexpr OUString EVOAB_DRIVER_IMPL_NAME = u"com.sun.star.comp.sdbc.evoab.OEvoabDriver"_ustr; namespace connectivity::evoab - { - class OEvoabConnection; +{ + class OEvoabConnection; - typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, - css::lang::XServiceInfo > ODriver_BASE; + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, + css::lang::XServiceInfo > ODriver_BASE; - class OEvoabDriver final : public ODriver_BASE - { - ::osl::Mutex m_aMutex; - std::vector<unotools::WeakReference<OEvoabConnection>> m_xConnections; - css::uno::Reference< css::uno::XComponentContext > m_xContext; + class OEvoabDriver final : public ODriver_BASE + { + ::osl::Mutex m_aMutex; + std::vector<unotools::WeakReference<OEvoabConnection>> m_xConnections; + css::uno::Reference< css::uno::XComponentContext > m_xContext; - public: - explicit OEvoabDriver(const css::uno::Reference< css::uno::XComponentContext >& ); - virtual ~OEvoabDriver() override; + public: + explicit OEvoabDriver(const css::uno::Reference< css::uno::XComponentContext >& ); + virtual ~OEvoabDriver() override; - // OComponentHelper - virtual void SAL_CALL disposing() override; + // OComponentHelper + virtual void SAL_CALL disposing() override; - // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; + // XServiceInfo + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; - // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) override; + // XDriver + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; - public: - const css::uno::Reference< css::uno::XComponentContext >& getComponentContext( ) const { return m_xContext; } + public: + const css::uno::Reference< css::uno::XComponentContext >& getComponentContext( ) const { return m_xContext; } - // static methods - static bool acceptsURL_Stat( std::u16string_view url ); - }; + // static methods + static bool acceptsURL_Stat( std::u16string_view url ); + }; } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 076216e0cf42..22463c0ee2d4 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -33,75 +33,75 @@ namespace connectivity::evoab { - typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, - css::sdbc::XParameters, - css::sdbc::XResultSetMetaDataSupplier, - css::sdbc::XMultipleResults, - css::lang::XServiceInfo> OPreparedStatement_BASE; + typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement, + css::sdbc::XParameters, + css::sdbc::XResultSetMetaDataSupplier, + css::sdbc::XMultipleResults, + css::lang::XServiceInfo> OPreparedStatement_BASE; - class OEvoabPreparedStatement final:public OCommonStatement - ,public OPreparedStatement_BASE - { - // our SQL statement - OUString m_sSqlStatement; - // the EBookQuery we're working with - QueryData m_aQueryData; - // our meta data - rtl::Reference<OEvoabResultSetMetaData> m_xMetaData; + class OEvoabPreparedStatement final:public OCommonStatement + ,public OPreparedStatement_BASE + { + // our SQL statement + OUString m_sSqlStatement; + // the EBookQuery we're working with + QueryData m_aQueryData; + // our meta data + rtl::Reference<OEvoabResultSetMetaData> m_xMetaData; - virtual ~OEvoabPreparedStatement() override; + virtual ~OEvoabPreparedStatement() override; - public: - explicit OEvoabPreparedStatement( OEvoabConnection* _pConnection ); + public: + explicit OEvoabPreparedStatement( OEvoabConnection* _pConnection ); - void construct( const OUString& _sql ); + void construct( const OUString& _sql ); - DECLARE_SERVICE_INFO(); - //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() noexcept override; - virtual void SAL_CALL release() noexcept override; - //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + DECLARE_SERVICE_INFO(); + //XInterface + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; + //XTypeProvider + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; - // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) override; - virtual sal_Bool SAL_CALL execute( ) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; - // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; - virtual void SAL_CALL clearParameters( ) override; - // XCloseable - virtual void SAL_CALL close( ) override; - // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; - // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) override; - virtual sal_Bool SAL_CALL getMoreResults( ) override; - }; + // XPreparedStatement + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; + // XParameters + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; + // XCloseable + virtual void SAL_CALL close( ) override; + // XResultSetMetaDataSupplier + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; + // XMultipleResults + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; + }; } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 3eeeab244ab3..659fa4ff4b20 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -43,139 +43,139 @@ namespace connectivity::evoab { - struct ComparisonData; - - class OEvoabVersionHelper - { - public: - virtual EBook* openBook(const char *abname) = 0; - virtual void executeQuery (EBook* pBook, EBookQuery* pQuery) = 0; - virtual void freeContacts() = 0; - virtual bool isLDAP( EBook *pBook ) = 0; - virtual bool isLocal( EBook *pBook ) = 0; - virtual EContact *getContact(sal_Int32 nIndex) = 0; - virtual sal_Int32 getNumContacts() = 0; - virtual bool hasContacts() = 0; - virtual void sortContacts( const ComparisonData& _rCompData ) = 0; - OString getUserName( EBook *pBook ); - virtual ~OEvoabVersionHelper() {} - }; - - typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet - , css::sdbc::XRow - , css::sdbc::XResultSetMetaDataSupplier - , css::util::XCancellable - , css::sdbc::XWarningsSupplier - , css::sdbc::XCloseable - , css::sdbc::XColumnLocate - , css::lang::XServiceInfo - > OResultSet_BASE; - - - class OEvoabResultSet final : public cppu::BaseMutex - ,public OResultSet_BASE - ,public ::comphelper::OPropertyContainer - ,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet> + struct ComparisonData; + + class OEvoabVersionHelper + { + public: + virtual EBook* openBook(const char *abname) = 0; + virtual void executeQuery (EBook* pBook, EBookQuery* pQuery) = 0; + virtual void freeContacts() = 0; + virtual bool isLDAP( EBook *pBook ) = 0; + virtual bool isLocal( EBook *pBook ) = 0; + virtual EContact *getContact(sal_Int32 nIndex) = 0; + virtual sal_Int32 getNumContacts() = 0; + virtual bool hasContacts() = 0; + virtual void sortContacts( const ComparisonData& _rCompData ) = 0; + OString getUserName( EBook *pBook ); + virtual ~OEvoabVersionHelper() {} + }; + + typedef ::cppu::WeakComponentImplHelper< css::sdbc::XResultSet + , css::sdbc::XRow + , css::sdbc::XResultSetMetaDataSupplier + , css::util::XCancellable + , css::sdbc::XWarningsSupplier + , css::sdbc::XCloseable + , css::sdbc::XColumnLocate + , css::lang::XServiceInfo + > OResultSet_BASE; + + + class OEvoabResultSet final : public cppu::BaseMutex + ,public OResultSet_BASE + ,public ::comphelper::OPropertyContainer + ,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet> + { + private: + std::unique_ptr<OEvoabVersionHelper> m_pVersionHelper; + + OCommonStatement* m_pStatement; + OEvoabConnection* m_pConnection; + rtl::Reference<OEvoabResultSetMetaData> m_xMetaData; + ::dbtools::WarningsContainer m_aWarnings; + + bool m_bWasNull; + // <properties> + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; + // </properties> + + // Data & iteration + sal_Int32 m_nIndex; + sal_Int32 m_nLength; + EContact *getCur() { - private: - std::unique_ptr<OEvoabVersionHelper> m_pVersionHelper; - - OCommonStatement* m_pStatement; - OEvoabConnection* m_pConnection; - rtl::Reference<OEvoabResultSetMetaData> m_xMetaData; - ::dbtools::WarningsContainer m_aWarnings; - - bool m_bWasNull; - // <properties> - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; - // </properties> - - // Data & iteration - sal_Int32 m_nIndex; - sal_Int32 m_nLength; - EContact *getCur() - { - return m_pVersionHelper->getContact(m_nIndex); - } - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - - // you can't delete objects of this type - virtual ~OEvoabResultSet() override; - public: - DECLARE_SERVICE_INFO(); - - OEvoabResultSet( OCommonStatement *pStmt, OEvoabConnection *pConnection ); - void construct( const QueryData& _rData ); - - // ::cppu::OComponentHelper - virtual void SAL_CALL disposing() override; - // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() noexcept override; - virtual void SAL_CALL release() noexcept override; - //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; - // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - // XResultSet - virtual sal_Bool SAL_CALL next( ) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) override; - virtual sal_Bool SAL_CALL isAfterLast( ) override; - virtual sal_Bool SAL_CALL isFirst( ) override; - virtual sal_Bool SAL_CALL isLast( ) override; - virtual void SAL_CALL beforeFirst( ) override; - virtual void SAL_CALL afterLast( ) override; - virtual sal_Bool SAL_CALL first( ) override; - virtual sal_Bool SAL_CALL last( ) override; - virtual sal_Int32 SAL_CALL getRow( ) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; - virtual sal_Bool SAL_CALL previous( ) override; - virtual void SAL_CALL refreshRow( ) override; - virtual sal_Bool SAL_CALL rowUpdated( ) override; - virtual sal_Bool SAL_CALL rowInserted( ) override; - virtual sal_Bool SAL_CALL rowDeleted( ) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; - // XRow - virtual sal_Bool SAL_CALL wasNull( ) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; - // XCancellable - virtual void SAL_CALL cancel( ) override; - // XCloseable - virtual void SAL_CALL close( ) override; - // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; - // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) override; - virtual void SAL_CALL clearWarnings( ) override; - // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; - }; + return m_pVersionHelper->getContact(m_nIndex); + } + + // OPropertyArrayUsageHelper + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; + // OPropertySetHelper + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; + -e ... etc. - the rest is truncated
