From cc2fe8c763b7050f07968f31bcdb7e45b8c7464d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 20 Sep 2018 07:27:20 +0200 Subject: Replace SAL_OVERRIDE with override in internal code Change-Id: Ifa446647b11fd1f1b0dc6a991b752480545634db Reviewed-on: https://gerrit.libreoffice.org/60788 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- .../source/drivers/mysqlc/mysqlc_connection.hxx | 50 ++-- .../drivers/mysqlc/mysqlc_databasemetadata.hxx | 305 +++++++++++---------- .../source/drivers/mysqlc/mysqlc_driver.hxx | 21 +- .../drivers/mysqlc/mysqlc_prepared_resultset.hxx | 179 ++++++------ .../drivers/mysqlc/mysqlc_preparedstatement.hxx | 81 +++--- .../source/drivers/mysqlc/mysqlc_resultset.hxx | 179 ++++++------ .../drivers/mysqlc/mysqlc_resultsetmetadata.hxx | 42 +-- .../source/drivers/mysqlc/mysqlc_statement.hxx | 63 +++-- 8 files changed, 456 insertions(+), 464 deletions(-) (limited to 'connectivity/source') diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx index f2bca68fff15..6c8632c29492 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx @@ -113,58 +113,58 @@ public: rtl_TextEncoding getConnectionEncoding() const { return m_settings.encoding; } // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE; + virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; // XConnection - css::uno::Reference SAL_CALL createStatement() SAL_OVERRIDE; + css::uno::Reference SAL_CALL createStatement() override; css::uno::Reference - SAL_CALL prepareStatement(const rtl::OUString& sql) SAL_OVERRIDE; + SAL_CALL prepareStatement(const rtl::OUString& sql) override; css::uno::Reference - SAL_CALL prepareCall(const rtl::OUString& sql) SAL_OVERRIDE; + SAL_CALL prepareCall(const rtl::OUString& sql) override; - rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) SAL_OVERRIDE; + rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) override; - void SAL_CALL setAutoCommit(sal_Bool autoCommit) SAL_OVERRIDE; + void SAL_CALL setAutoCommit(sal_Bool autoCommit) override; - sal_Bool SAL_CALL getAutoCommit() SAL_OVERRIDE; + sal_Bool SAL_CALL getAutoCommit() override; - void SAL_CALL commit() SAL_OVERRIDE; + void SAL_CALL commit() override; - void SAL_CALL rollback() SAL_OVERRIDE; + void SAL_CALL rollback() override; - sal_Bool SAL_CALL isClosed() SAL_OVERRIDE; + sal_Bool SAL_CALL isClosed() override; - css::uno::Reference SAL_CALL getMetaData() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getMetaData() override; - void SAL_CALL setReadOnly(sal_Bool readOnly) SAL_OVERRIDE; + void SAL_CALL setReadOnly(sal_Bool readOnly) override; - sal_Bool SAL_CALL isReadOnly() SAL_OVERRIDE; + sal_Bool SAL_CALL isReadOnly() override; - void SAL_CALL setCatalog(const rtl::OUString& catalog) SAL_OVERRIDE; + void SAL_CALL setCatalog(const rtl::OUString& catalog) override; - rtl::OUString SAL_CALL getCatalog() SAL_OVERRIDE; + rtl::OUString SAL_CALL getCatalog() override; - void SAL_CALL setTransactionIsolation(sal_Int32 level) SAL_OVERRIDE; + void SAL_CALL setTransactionIsolation(sal_Int32 level) override; - sal_Int32 SAL_CALL getTransactionIsolation() SAL_OVERRIDE; + sal_Int32 SAL_CALL getTransactionIsolation() override; - my_XNameAccessRef SAL_CALL getTypeMap() SAL_OVERRIDE; + my_XNameAccessRef SAL_CALL getTypeMap() override; - void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) SAL_OVERRIDE; + void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) override; // XCloseable - void SAL_CALL close() SAL_OVERRIDE; + void SAL_CALL close() override; // XWarningsSupplier - css::uno::Any SAL_CALL getWarnings() SAL_OVERRIDE; - void SAL_CALL clearWarnings() SAL_OVERRIDE; + css::uno::Any SAL_CALL getWarnings() override; + void SAL_CALL clearWarnings() override; // TODO: Not used //sal_Int32 sdbcColumnType(rtl::OUString typeName); diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx index 02e72f98c664..68865ae0bf1a 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx @@ -48,193 +48,194 @@ public: // as I mentioned before this interface is really BIG // XDatabaseMetaData - sal_Bool SAL_CALL allProceduresAreCallable() SAL_OVERRIDE; - sal_Bool SAL_CALL allTablesAreSelectable() SAL_OVERRIDE; - rtl::OUString SAL_CALL getURL() SAL_OVERRIDE; - rtl::OUString SAL_CALL getUserName() SAL_OVERRIDE; - sal_Bool SAL_CALL isReadOnly() SAL_OVERRIDE; - sal_Bool SAL_CALL nullsAreSortedHigh() SAL_OVERRIDE; - sal_Bool SAL_CALL nullsAreSortedLow() SAL_OVERRIDE; - sal_Bool SAL_CALL nullsAreSortedAtStart() SAL_OVERRIDE; - sal_Bool SAL_CALL nullsAreSortedAtEnd() SAL_OVERRIDE; - rtl::OUString SAL_CALL getDatabaseProductName() SAL_OVERRIDE; - rtl::OUString SAL_CALL getDatabaseProductVersion() SAL_OVERRIDE; - rtl::OUString SAL_CALL getDriverName() SAL_OVERRIDE; - rtl::OUString SAL_CALL getDriverVersion() SAL_OVERRIDE; - sal_Int32 SAL_CALL getDriverMajorVersion() SAL_OVERRIDE; - sal_Int32 SAL_CALL getDriverMinorVersion() SAL_OVERRIDE; - sal_Bool SAL_CALL usesLocalFiles() SAL_OVERRIDE; - sal_Bool SAL_CALL usesLocalFilePerTable() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsMixedCaseIdentifiers() SAL_OVERRIDE; - sal_Bool SAL_CALL storesUpperCaseIdentifiers() SAL_OVERRIDE; - sal_Bool SAL_CALL storesLowerCaseIdentifiers() SAL_OVERRIDE; - sal_Bool SAL_CALL storesMixedCaseIdentifiers() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() SAL_OVERRIDE; - sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() SAL_OVERRIDE; - sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() SAL_OVERRIDE; - sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() SAL_OVERRIDE; - rtl::OUString SAL_CALL getIdentifierQuoteString() SAL_OVERRIDE; - rtl::OUString SAL_CALL getSQLKeywords() SAL_OVERRIDE; - rtl::OUString SAL_CALL getNumericFunctions() SAL_OVERRIDE; - rtl::OUString SAL_CALL getStringFunctions() SAL_OVERRIDE; - rtl::OUString SAL_CALL getSystemFunctions() SAL_OVERRIDE; - rtl::OUString SAL_CALL getTimeDateFunctions() SAL_OVERRIDE; - rtl::OUString SAL_CALL getSearchStringEscape() SAL_OVERRIDE; - rtl::OUString SAL_CALL getExtraNameCharacters() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsAlterTableWithAddColumn() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsAlterTableWithDropColumn() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsColumnAliasing() SAL_OVERRIDE; - sal_Bool SAL_CALL nullPlusNonNullIsNull() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsTypeConversion() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType) SAL_OVERRIDE; - sal_Bool SAL_CALL supportsTableCorrelationNames() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsExpressionsInOrderBy() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsOrderByUnrelated() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsGroupBy() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsGroupByUnrelated() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsGroupByBeyondSelect() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsLikeEscapeClause() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsMultipleResultSets() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsMultipleTransactions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsNonNullableColumns() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsMinimumSQLGrammar() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsCoreSQLGrammar() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsExtendedSQLGrammar() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsANSI92IntermediateSQL() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsANSI92FullSQL() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsIntegrityEnhancementFacility() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsOuterJoins() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsFullOuterJoins() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsLimitedOuterJoins() SAL_OVERRIDE; - rtl::OUString SAL_CALL getSchemaTerm() SAL_OVERRIDE; - rtl::OUString SAL_CALL getProcedureTerm() SAL_OVERRIDE; - rtl::OUString SAL_CALL getCatalogTerm() SAL_OVERRIDE; - sal_Bool SAL_CALL isCatalogAtStart() SAL_OVERRIDE; - rtl::OUString SAL_CALL getCatalogSeparator() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSchemasInDataManipulation() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSchemasInProcedureCalls() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSchemasInTableDefinitions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsCatalogsInDataManipulation() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsPositionedDelete() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsPositionedUpdate() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSelectForUpdate() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsStoredProcedures() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSubqueriesInComparisons() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSubqueriesInExists() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSubqueriesInIns() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsCorrelatedSubqueries() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsUnion() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsUnionAll() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxBinaryLiteralLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxCharLiteralLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxColumnNameLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxColumnsInGroupBy() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxColumnsInIndex() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxColumnsInOrderBy() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxColumnsInSelect() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxColumnsInTable() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxConnections() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxCursorNameLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxIndexLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxSchemaNameLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxProcedureNameLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxCatalogNameLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxRowSize() SAL_OVERRIDE; - sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxStatementLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxStatements() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxTableNameLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxTablesInSelect() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMaxUserNameLength() SAL_OVERRIDE; - sal_Int32 SAL_CALL getDefaultTransactionIsolation() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsTransactions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level) SAL_OVERRIDE; - sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly() SAL_OVERRIDE; - sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() SAL_OVERRIDE; - sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() SAL_OVERRIDE; + sal_Bool SAL_CALL allProceduresAreCallable() override; + sal_Bool SAL_CALL allTablesAreSelectable() override; + rtl::OUString SAL_CALL getURL() override; + rtl::OUString SAL_CALL getUserName() override; + sal_Bool SAL_CALL isReadOnly() override; + sal_Bool SAL_CALL nullsAreSortedHigh() override; + sal_Bool SAL_CALL nullsAreSortedLow() override; + sal_Bool SAL_CALL nullsAreSortedAtStart() override; + sal_Bool SAL_CALL nullsAreSortedAtEnd() override; + rtl::OUString SAL_CALL getDatabaseProductName() override; + rtl::OUString SAL_CALL getDatabaseProductVersion() override; + rtl::OUString SAL_CALL getDriverName() override; + rtl::OUString SAL_CALL getDriverVersion() override; + sal_Int32 SAL_CALL getDriverMajorVersion() override; + sal_Int32 SAL_CALL getDriverMinorVersion() override; + sal_Bool SAL_CALL usesLocalFiles() override; + sal_Bool SAL_CALL usesLocalFilePerTable() override; + sal_Bool SAL_CALL supportsMixedCaseIdentifiers() override; + sal_Bool SAL_CALL storesUpperCaseIdentifiers() override; + sal_Bool SAL_CALL storesLowerCaseIdentifiers() override; + sal_Bool SAL_CALL storesMixedCaseIdentifiers() override; + sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() override; + sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() override; + sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() override; + sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() override; + rtl::OUString SAL_CALL getIdentifierQuoteString() override; + rtl::OUString SAL_CALL getSQLKeywords() override; + rtl::OUString SAL_CALL getNumericFunctions() override; + rtl::OUString SAL_CALL getStringFunctions() override; + rtl::OUString SAL_CALL getSystemFunctions() override; + rtl::OUString SAL_CALL getTimeDateFunctions() override; + rtl::OUString SAL_CALL getSearchStringEscape() override; + rtl::OUString SAL_CALL getExtraNameCharacters() override; + sal_Bool SAL_CALL supportsAlterTableWithAddColumn() override; + sal_Bool SAL_CALL supportsAlterTableWithDropColumn() override; + sal_Bool SAL_CALL supportsColumnAliasing() override; + sal_Bool SAL_CALL nullPlusNonNullIsNull() override; + sal_Bool SAL_CALL supportsTypeConversion() override; + sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType) override; + sal_Bool SAL_CALL supportsTableCorrelationNames() override; + sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() override; + sal_Bool SAL_CALL supportsExpressionsInOrderBy() override; + sal_Bool SAL_CALL supportsOrderByUnrelated() override; + sal_Bool SAL_CALL supportsGroupBy() override; + sal_Bool SAL_CALL supportsGroupByUnrelated() override; + sal_Bool SAL_CALL supportsGroupByBeyondSelect() override; + sal_Bool SAL_CALL supportsLikeEscapeClause() override; + sal_Bool SAL_CALL supportsMultipleResultSets() override; + sal_Bool SAL_CALL supportsMultipleTransactions() override; + sal_Bool SAL_CALL supportsNonNullableColumns() override; + sal_Bool SAL_CALL supportsMinimumSQLGrammar() override; + sal_Bool SAL_CALL supportsCoreSQLGrammar() override; + sal_Bool SAL_CALL supportsExtendedSQLGrammar() override; + sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() override; + sal_Bool SAL_CALL supportsANSI92IntermediateSQL() override; + sal_Bool SAL_CALL supportsANSI92FullSQL() override; + sal_Bool SAL_CALL supportsIntegrityEnhancementFacility() override; + sal_Bool SAL_CALL supportsOuterJoins() override; + sal_Bool SAL_CALL supportsFullOuterJoins() override; + sal_Bool SAL_CALL supportsLimitedOuterJoins() override; + rtl::OUString SAL_CALL getSchemaTerm() override; + rtl::OUString SAL_CALL getProcedureTerm() override; + rtl::OUString SAL_CALL getCatalogTerm() override; + sal_Bool SAL_CALL isCatalogAtStart() override; + rtl::OUString SAL_CALL getCatalogSeparator() override; + sal_Bool SAL_CALL supportsSchemasInDataManipulation() override; + sal_Bool SAL_CALL supportsSchemasInProcedureCalls() override; + sal_Bool SAL_CALL supportsSchemasInTableDefinitions() override; + sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() override; + sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() override; + sal_Bool SAL_CALL supportsCatalogsInDataManipulation() override; + sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() override; + sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() override; + sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() override; + sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() override; + sal_Bool SAL_CALL supportsPositionedDelete() override; + sal_Bool SAL_CALL supportsPositionedUpdate() override; + sal_Bool SAL_CALL supportsSelectForUpdate() override; + sal_Bool SAL_CALL supportsStoredProcedures() override; + sal_Bool SAL_CALL supportsSubqueriesInComparisons() override; + sal_Bool SAL_CALL supportsSubqueriesInExists() override; + sal_Bool SAL_CALL supportsSubqueriesInIns() override; + sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() override; + sal_Bool SAL_CALL supportsCorrelatedSubqueries() override; + sal_Bool SAL_CALL supportsUnion() override; + sal_Bool SAL_CALL supportsUnionAll() override; + sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() override; + sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() override; + sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() override; + sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() override; + sal_Int32 SAL_CALL getMaxBinaryLiteralLength() override; + sal_Int32 SAL_CALL getMaxCharLiteralLength() override; + sal_Int32 SAL_CALL getMaxColumnNameLength() override; + sal_Int32 SAL_CALL getMaxColumnsInGroupBy() override; + sal_Int32 SAL_CALL getMaxColumnsInIndex() override; + sal_Int32 SAL_CALL getMaxColumnsInOrderBy() override; + sal_Int32 SAL_CALL getMaxColumnsInSelect() override; + sal_Int32 SAL_CALL getMaxColumnsInTable() override; + sal_Int32 SAL_CALL getMaxConnections() override; + sal_Int32 SAL_CALL getMaxCursorNameLength() override; + sal_Int32 SAL_CALL getMaxIndexLength() override; + sal_Int32 SAL_CALL getMaxSchemaNameLength() override; + sal_Int32 SAL_CALL getMaxProcedureNameLength() override; + sal_Int32 SAL_CALL getMaxCatalogNameLength() override; + sal_Int32 SAL_CALL getMaxRowSize() override; + sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() override; + sal_Int32 SAL_CALL getMaxStatementLength() override; + sal_Int32 SAL_CALL getMaxStatements() override; + sal_Int32 SAL_CALL getMaxTableNameLength() override; + sal_Int32 SAL_CALL getMaxTablesInSelect() override; + sal_Int32 SAL_CALL getMaxUserNameLength() override; + sal_Int32 SAL_CALL getDefaultTransactionIsolation() override; + sal_Bool SAL_CALL supportsTransactions() override; + sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level) override; + sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions() override; + sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly() override; + sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() override; + sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() override; css::uno::Reference SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& procedureNamePattern) SAL_OVERRIDE; + const rtl::OUString& procedureNamePattern) override; css::uno::Reference SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, - const rtl::OUString& columnNamePattern) SAL_OVERRIDE; + const rtl::OUString& columnNamePattern) override; css::uno::Reference SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, - const css::uno::Sequence& types) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getSchemas() SAL_OVERRIDE; - css::uno::Reference SAL_CALL getCatalogs() SAL_OVERRIDE; - css::uno::Reference SAL_CALL getTableTypes() SAL_OVERRIDE; + const css::uno::Sequence& types) override; + css::uno::Reference SAL_CALL getSchemas() override; + css::uno::Reference SAL_CALL getCatalogs() override; + css::uno::Reference SAL_CALL getTableTypes() override; css::uno::Reference SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, - const rtl::OUString& columnNamePattern) SAL_OVERRIDE; + const rtl::OUString& columnNamePattern) override; css::uno::Reference SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, - const rtl::OUString& columnNamePattern) SAL_OVERRIDE; + const rtl::OUString& columnNamePattern) override; css::uno::Reference SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern) SAL_OVERRIDE; + const rtl::OUString& tableNamePattern) override; css::uno::Reference SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, - sal_Bool nullable) SAL_OVERRIDE; + sal_Bool nullable) override; css::uno::Reference SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, - const rtl::OUString& foreignTable) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getTypeInfo() SAL_OVERRIDE; - css::uno::Reference - SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table, sal_Bool unique, - sal_Bool approximate) SAL_OVERRIDE; - sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) SAL_OVERRIDE; + const rtl::OUString& foreignTable) override; + css::uno::Reference SAL_CALL getTypeInfo() override; + css::uno::Reference SAL_CALL getIndexInfo(const Any& catalog, + const rtl::OUString& schema, + const rtl::OUString& table, + sal_Bool unique, + sal_Bool approximate) override; + sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) override; sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, - sal_Int32 concurrency) SAL_OVERRIDE; - sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) SAL_OVERRIDE; - sal_Bool SAL_CALL supportsBatchUpdates() SAL_OVERRIDE; + sal_Int32 concurrency) override; + sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) override; + sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) override; + sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) override; + sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType) override; + sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType) override; + sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType) override; + sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) override; + sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) override; + sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) override; + sal_Bool SAL_CALL supportsBatchUpdates() override; css::uno::Reference SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, - const css::uno::Sequence& types) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getConnection() SAL_OVERRIDE; + const css::uno::Sequence& types) override; + css::uno::Reference SAL_CALL getConnection() override; }; } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx index 9e810ee0748a..6a8a492f68b6 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx @@ -62,27 +62,26 @@ public: explicit MysqlCDriver(const Reference& _rxFactory); // OComponentHelper - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; // XInterface static OUString getImplementationName_Static(); static Sequence getSupportedServiceNames_Static(); // XServiceInfo - OUString SAL_CALL getImplementationName() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) SAL_OVERRIDE; - Sequence SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + Sequence SAL_CALL getSupportedServiceNames() override; // XDriver Reference SAL_CALL - connect(const OUString& url, const Sequence& info) SAL_OVERRIDE; + connect(const OUString& url, const Sequence& info) override; - sal_Bool SAL_CALL acceptsURL(const OUString& url) SAL_OVERRIDE; - Sequence - SAL_CALL getPropertyInfo(const OUString& url, - const Sequence& info) SAL_OVERRIDE; + sal_Bool SAL_CALL acceptsURL(const OUString& url) override; + Sequence SAL_CALL + getPropertyInfo(const OUString& url, const Sequence& info) override; - sal_Int32 SAL_CALL getMajorVersion() SAL_OVERRIDE; - sal_Int32 SAL_CALL getMinorVersion() SAL_OVERRIDE; + sal_Int32 SAL_CALL getMajorVersion() override; + sal_Int32 SAL_CALL getMinorVersion() override; const Reference& getFactory() const { return m_xFactory; } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx index a164bceedb8c..7f5d6852c539 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -80,162 +80,159 @@ class OPreparedResultSet final : public OBase_Mutex, bool m_bWasNull = false; // OPropertyArrayUsageHelper - ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // OPropertySetHelper - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; sal_Bool SAL_CALL convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, - sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE; + sal_Int32 nHandle, const Any& rValue) override; - void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const Any& rValue) SAL_OVERRIDE; + void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) override; - void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const override; // you can't delete objects of this type virtual ~OPreparedResultSet() override = default; public: - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE; + virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; OPreparedResultSet(OConnection& rConn, OPreparedStatement* pStmt, MYSQL_STMT* pMyStmt); // ::cppu::OComponentHelper - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; // XInterface - Any SAL_CALL queryInterface(const css::uno::Type& rType) SAL_OVERRIDE; + Any SAL_CALL queryInterface(const css::uno::Type& rType) override; - void SAL_CALL acquire() throw() SAL_OVERRIDE; - void SAL_CALL release() throw() SAL_OVERRIDE; + void SAL_CALL acquire() throw() override; + void SAL_CALL release() throw() override; //XTypeProvider - css::uno::Sequence SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence SAL_CALL getTypes() override; // XPropertySet - css::uno::Reference SAL_CALL getPropertySetInfo() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getPropertySetInfo() override; // XResultSet - sal_Bool SAL_CALL next() SAL_OVERRIDE; - sal_Bool SAL_CALL isBeforeFirst() SAL_OVERRIDE; - sal_Bool SAL_CALL isAfterLast() SAL_OVERRIDE; - sal_Bool SAL_CALL isFirst() SAL_OVERRIDE; - sal_Bool SAL_CALL isLast() SAL_OVERRIDE; + sal_Bool SAL_CALL next() override; + sal_Bool SAL_CALL isBeforeFirst() override; + sal_Bool SAL_CALL isAfterLast() override; + sal_Bool SAL_CALL isFirst() override; + sal_Bool SAL_CALL isLast() override; - void SAL_CALL beforeFirst() SAL_OVERRIDE; - void SAL_CALL afterLast() SAL_OVERRIDE; + void SAL_CALL beforeFirst() override; + void SAL_CALL afterLast() override; - sal_Bool SAL_CALL first() SAL_OVERRIDE; - sal_Bool SAL_CALL last() SAL_OVERRIDE; + sal_Bool SAL_CALL first() override; + sal_Bool SAL_CALL last() override; - sal_Int32 SAL_CALL getRow() SAL_OVERRIDE; + sal_Int32 SAL_CALL getRow() override; - sal_Bool SAL_CALL absolute(sal_Int32 row) SAL_OVERRIDE; - sal_Bool SAL_CALL relative(sal_Int32 rows) SAL_OVERRIDE; - sal_Bool SAL_CALL previous() SAL_OVERRIDE; + sal_Bool SAL_CALL absolute(sal_Int32 row) override; + sal_Bool SAL_CALL relative(sal_Int32 rows) override; + sal_Bool SAL_CALL previous() override; - void SAL_CALL refreshRow() SAL_OVERRIDE; + void SAL_CALL refreshRow() override; - sal_Bool SAL_CALL rowUpdated() SAL_OVERRIDE; - sal_Bool SAL_CALL rowInserted() SAL_OVERRIDE; - sal_Bool SAL_CALL rowDeleted() SAL_OVERRIDE; + sal_Bool SAL_CALL rowUpdated() override; + sal_Bool SAL_CALL rowInserted() override; + sal_Bool SAL_CALL rowDeleted() override; - css::uno::Reference SAL_CALL getStatement() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getStatement() override; // XRow - sal_Bool SAL_CALL wasNull() SAL_OVERRIDE; + sal_Bool SAL_CALL wasNull() override; - rtl::OUString SAL_CALL getString(sal_Int32 column) SAL_OVERRIDE; + rtl::OUString SAL_CALL getString(sal_Int32 column) override; - sal_Bool SAL_CALL getBoolean(sal_Int32 column) SAL_OVERRIDE; - sal_Int8 SAL_CALL getByte(sal_Int32 column) SAL_OVERRIDE; - sal_Int16 SAL_CALL getShort(sal_Int32 column) SAL_OVERRIDE; - sal_Int32 SAL_CALL getInt(sal_Int32 column) SAL_OVERRIDE; - sal_Int64 SAL_CALL getLong(sal_Int32 column) SAL_OVERRIDE; + sal_Bool SAL_CALL getBoolean(sal_Int32 column) override; + sal_Int8 SAL_CALL getByte(sal_Int32 column) override; + sal_Int16 SAL_CALL getShort(sal_Int32 column) override; + sal_Int32 SAL_CALL getInt(sal_Int32 column) override; + sal_Int64 SAL_CALL getLong(sal_Int32 column) override; - float SAL_CALL getFloat(sal_Int32 column) SAL_OVERRIDE; - double SAL_CALL getDouble(sal_Int32 column) SAL_OVERRIDE; + float SAL_CALL getFloat(sal_Int32 column) override; + double SAL_CALL getDouble(sal_Int32 column) override; - css::uno::Sequence SAL_CALL getBytes(sal_Int32 column) SAL_OVERRIDE; - css::util::Date SAL_CALL getDate(sal_Int32 column) SAL_OVERRIDE; - css::util::Time SAL_CALL getTime(sal_Int32 column) SAL_OVERRIDE; - css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) SAL_OVERRIDE; + css::uno::Sequence SAL_CALL getBytes(sal_Int32 column) override; + css::util::Date SAL_CALL getDate(sal_Int32 column) override; + css::util::Time SAL_CALL getTime(sal_Int32 column) override; + css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) override; + css::uno::Reference SAL_CALL getBinaryStream(sal_Int32 column) override; css::uno::Reference - SAL_CALL getBinaryStream(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference - SAL_CALL getCharacterStream(sal_Int32 column) SAL_OVERRIDE; + SAL_CALL getCharacterStream(sal_Int32 column) override; - Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) SAL_OVERRIDE; + Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override; - css::uno::Reference SAL_CALL getRef(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getBlob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getClob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getArray(sal_Int32 column) SAL_OVERRIDE; + css::uno::Reference SAL_CALL getRef(sal_Int32 column) override; + css::uno::Reference SAL_CALL getBlob(sal_Int32 column) override; + css::uno::Reference SAL_CALL getClob(sal_Int32 column) override; + css::uno::Reference SAL_CALL getArray(sal_Int32 column) override; // XResultSetMetaDataSupplier - css::uno::Reference SAL_CALL getMetaData() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getMetaData() override; // XCancellable - void SAL_CALL cancel() SAL_OVERRIDE; + void SAL_CALL cancel() override; // XCloseable - void SAL_CALL close() SAL_OVERRIDE; + void SAL_CALL close() override; // XWarningsSupplier - Any SAL_CALL getWarnings() SAL_OVERRIDE; + Any SAL_CALL getWarnings() override; - void SAL_CALL clearWarnings() SAL_OVERRIDE; + void SAL_CALL clearWarnings() override; // XResultSetUpdate - void SAL_CALL insertRow() SAL_OVERRIDE; - void SAL_CALL updateRow() SAL_OVERRIDE; - void SAL_CALL deleteRow() SAL_OVERRIDE; - void SAL_CALL cancelRowUpdates() SAL_OVERRIDE; - void SAL_CALL moveToInsertRow() SAL_OVERRIDE; - void SAL_CALL moveToCurrentRow() SAL_OVERRIDE; + void SAL_CALL insertRow() override; + void SAL_CALL updateRow() override; + void SAL_CALL deleteRow() override; + void SAL_CALL cancelRowUpdates() override; + void SAL_CALL moveToInsertRow() override; + void SAL_CALL moveToCurrentRow() override; // XRowUpdate - void SAL_CALL updateNull(sal_Int32 column) SAL_OVERRIDE; - void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) SAL_OVERRIDE; - void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) SAL_OVERRIDE; - void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) SAL_OVERRIDE; - void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) SAL_OVERRIDE; - void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) SAL_OVERRIDE; - void SAL_CALL updateFloat(sal_Int32 column, float x) SAL_OVERRIDE; - void SAL_CALL updateDouble(sal_Int32 column, double x) SAL_OVERRIDE; - void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) SAL_OVERRIDE; - void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence& x) SAL_OVERRIDE; - void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) SAL_OVERRIDE; - void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) SAL_OVERRIDE; - void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x) SAL_OVERRIDE; + void SAL_CALL updateNull(sal_Int32 column) override; + void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) override; + void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) override; + void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) override; + void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) override; + void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) override; + void SAL_CALL updateFloat(sal_Int32 column, float x) override; + void SAL_CALL updateDouble(sal_Int32 column, double x) override; + void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) override; + void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence& x) override; + void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) override; + void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) override; + void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x) override; void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference& x, - sal_Int32 length) SAL_OVERRIDE; + sal_Int32 length) override; void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference& x, - sal_Int32 length) SAL_OVERRIDE; - void SAL_CALL updateObject(sal_Int32 column, const Any& x) SAL_OVERRIDE; - void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) SAL_OVERRIDE; + sal_Int32 length) override; + void SAL_CALL updateObject(sal_Int32 column, const Any& x) override; + void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override; // XColumnLocate - sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) SAL_OVERRIDE; + sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override; // XRowLocate - Any SAL_CALL getBookmark() SAL_OVERRIDE; + Any SAL_CALL getBookmark() override; - sal_Bool SAL_CALL moveToBookmark(const Any& bookmark) SAL_OVERRIDE; - sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) SAL_OVERRIDE; - sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second) SAL_OVERRIDE; - sal_Bool SAL_CALL hasOrderedBookmarks() SAL_OVERRIDE; - sal_Int32 SAL_CALL hashBookmark(const Any& bookmark) SAL_OVERRIDE; + sal_Bool SAL_CALL moveToBookmark(const Any& bookmark) override; + sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) override; + sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second) override; + sal_Bool SAL_CALL hasOrderedBookmarks() override; + sal_Int32 SAL_CALL hashBookmark(const Any& bookmark) override; // XDeleteRows - css::uno::Sequence - SAL_CALL deleteRows(const css::uno::Sequence& rows) SAL_OVERRIDE; + css::uno::Sequence SAL_CALL deleteRows(const css::uno::Sequence& rows) override; /// @throws SQLException /// @throws RuntimeException diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx index d8179e0ee43d..5d985de72e4b 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx @@ -61,32 +61,31 @@ class OPreparedStatement final : public OCommonStatement, public OPreparedStatem void checkParameterIndex(sal_Int32 parameter); - void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const Any& rValue) SAL_OVERRIDE; + void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) override; virtual ~OPreparedStatement() override; public: - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE; + virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; OPreparedStatement(OConnection* _pConnection, MYSQL_STMT* pStmt); //XInterface - Any SAL_CALL queryInterface(const Type& rType) SAL_OVERRIDE; - void SAL_CALL acquire() throw() SAL_OVERRIDE; - void SAL_CALL release() throw() SAL_OVERRIDE; + Any SAL_CALL queryInterface(const Type& rType) override; + void SAL_CALL acquire() throw() override; + void SAL_CALL release() throw() override; //XTypeProvider - css::uno::Sequence SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence SAL_CALL getTypes() override; // XPreparedStatement - Reference SAL_CALL executeQuery() SAL_OVERRIDE; - sal_Int32 SAL_CALL executeUpdate() SAL_OVERRIDE; - sal_Bool SAL_CALL execute() SAL_OVERRIDE; - Reference SAL_CALL getConnection() SAL_OVERRIDE; + Reference SAL_CALL executeQuery() override; + sal_Int32 SAL_CALL executeUpdate() override; + sal_Bool SAL_CALL execute() override; + Reference SAL_CALL getConnection() override; // XStatement using OCommonStatement::execute; @@ -94,65 +93,65 @@ public: using OCommonStatement::executeUpdate; // XParameters - void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) SAL_OVERRIDE; + void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) override; void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, - const rtl::OUString& typeName) SAL_OVERRIDE; + const rtl::OUString& typeName) override; - void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) SAL_OVERRIDE; + void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) override; - void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x) SAL_OVERRIDE; + void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x) override; - void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x) SAL_OVERRIDE; + void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x) override; - void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x) SAL_OVERRIDE; + void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x) override; - void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x) SAL_OVERRIDE; + void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x) override; - void SAL_CALL setFloat(sal_Int32 parameter, float x) SAL_OVERRIDE; + void SAL_CALL setFloat(sal_Int32 parameter, float x) override; - void SAL_CALL setDouble(sal_Int32 parameter, double x) SAL_OVERRIDE; + void SAL_CALL setDouble(sal_Int32 parameter, double x) override; - void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) SAL_OVERRIDE; + void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) override; - void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence& x) SAL_OVERRIDE; + void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence& x) override; - void SAL_CALL setDate(sal_Int32 parameter, const css::util::Date& x) SAL_OVERRIDE; + void SAL_CALL setDate(sal_Int32 parameter, const css::util::Date& x) override; - void SAL_CALL setTime(sal_Int32 parameter, const css::util::Time& x) SAL_OVERRIDE; - void SAL_CALL setTimestamp(sal_Int32 parameter, const css::util::DateTime& x) SAL_OVERRIDE; + void SAL_CALL setTime(sal_Int32 parameter, const css::util::Time& x) override; + void SAL_CALL setTimestamp(sal_Int32 parameter, const css::util::DateTime& x) override; void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference& x, - sal_Int32 length) SAL_OVERRIDE; + sal_Int32 length) override; void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference& x, - sal_Int32 length) SAL_OVERRIDE; + sal_Int32 length) override; - void SAL_CALL setObject(sal_Int32 parameter, const Any& x) SAL_OVERRIDE; + void SAL_CALL setObject(sal_Int32 parameter, const Any& x) override; void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, - sal_Int32 scale) SAL_OVERRIDE; + sal_Int32 scale) override; - void SAL_CALL setRef(sal_Int32 parameter, const Reference& x) SAL_OVERRIDE; + void SAL_CALL setRef(sal_Int32 parameter, const Reference& x) override; - void SAL_CALL setBlob(sal_Int32 parameter, const Reference& x) SAL_OVERRIDE; + void SAL_CALL setBlob(sal_Int32 parameter, const Reference& x) override; - void SAL_CALL setClob(sal_Int32 parameter, const Reference& x) SAL_OVERRIDE; + void SAL_CALL setClob(sal_Int32 parameter, const Reference& x) override; - void SAL_CALL setArray(sal_Int32 parameter, const Reference& x) SAL_OVERRIDE; + void SAL_CALL setArray(sal_Int32 parameter, const Reference& x) override; - void SAL_CALL clearParameters() SAL_OVERRIDE; + void SAL_CALL clearParameters() override; // XPreparedBatchExecution - void SAL_CALL addBatch() SAL_OVERRIDE; - void SAL_CALL clearBatch() SAL_OVERRIDE; - css::uno::Sequence SAL_CALL executeBatch() SAL_OVERRIDE; + void SAL_CALL addBatch() override; + void SAL_CALL clearBatch() override; + css::uno::Sequence SAL_CALL executeBatch() override; // XCloseable - void SAL_CALL close() SAL_OVERRIDE; + void SAL_CALL close() override; // XResultSetMetaDataSupplier - Reference SAL_CALL getMetaData() SAL_OVERRIDE; + Reference SAL_CALL getMetaData() override; }; } /* mysqlc */ } /* connectivity */ diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx index 7bf7912220ba..59b956850487 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx @@ -76,163 +76,160 @@ class OResultSet final : public OBase_Mutex, sal_Int32 m_nRowCount = 0; // OPropertyArrayUsageHelper - ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // OPropertySetHelper - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; sal_Bool SAL_CALL convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, - sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE; + sal_Int32 nHandle, const Any& rValue) override; - void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const Any& rValue) SAL_OVERRIDE; + void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) override; - void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const override; // you can't delete objects of this type virtual ~OResultSet() override = default; public: - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE; + virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; OResultSet(OConnection& rConn, OCommonStatement* pStmt, MYSQL_RES* pResult, rtl_TextEncoding _encoding); // ::cppu::OComponentHelper - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; // XInterface - Any SAL_CALL queryInterface(const css::uno::Type& rType) SAL_OVERRIDE; + Any SAL_CALL queryInterface(const css::uno::Type& rType) override; - void SAL_CALL acquire() throw() SAL_OVERRIDE; - void SAL_CALL release() throw() SAL_OVERRIDE; + void SAL_CALL acquire() throw() override; + void SAL_CALL release() throw() override; //XTypeProvider - css::uno::Sequence SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence SAL_CALL getTypes() override; // XPropertySet - css::uno::Reference SAL_CALL getPropertySetInfo() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getPropertySetInfo() override; // XResultSet - sal_Bool SAL_CALL next() SAL_OVERRIDE; - sal_Bool SAL_CALL isBeforeFirst() SAL_OVERRIDE; - sal_Bool SAL_CALL isAfterLast() SAL_OVERRIDE; - sal_Bool SAL_CALL isFirst() SAL_OVERRIDE; - sal_Bool SAL_CALL isLast() SAL_OVERRIDE; + sal_Bool SAL_CALL next() override; + sal_Bool SAL_CALL isBeforeFirst() override; + sal_Bool SAL_CALL isAfterLast() override; + sal_Bool SAL_CALL isFirst() override; + sal_Bool SAL_CALL isLast() override; - void SAL_CALL beforeFirst() SAL_OVERRIDE; - void SAL_CALL afterLast() SAL_OVERRIDE; + void SAL_CALL beforeFirst() override; + void SAL_CALL afterLast() override; - sal_Bool SAL_CALL first() SAL_OVERRIDE; - sal_Bool SAL_CALL last() SAL_OVERRIDE; + sal_Bool SAL_CALL first() override; + sal_Bool SAL_CALL last() override; - sal_Int32 SAL_CALL getRow() SAL_OVERRIDE; + sal_Int32 SAL_CALL getRow() override; - sal_Bool SAL_CALL absolute(sal_Int32 row) SAL_OVERRIDE; - sal_Bool SAL_CALL relative(sal_Int32 rows) SAL_OVERRIDE; - sal_Bool SAL_CALL previous() SAL_OVERRIDE; + sal_Bool SAL_CALL absolute(sal_Int32 row) override; + sal_Bool SAL_CALL relative(sal_Int32 rows) override; + sal_Bool SAL_CALL previous() override; - void SAL_CALL refreshRow() SAL_OVERRIDE; + void SAL_CALL refreshRow() override; - sal_Bool SAL_CALL rowUpdated() SAL_OVERRIDE; - sal_Bool SAL_CALL rowInserted() SAL_OVERRIDE; - sal_Bool SAL_CALL rowDeleted() SAL_OVERRIDE; + sal_Bool SAL_CALL rowUpdated() override; + sal_Bool SAL_CALL rowInserted() override; + sal_Bool SAL_CALL rowDeleted() override; - css::uno::Reference SAL_CALL getStatement() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getStatement() override; // XRow - sal_Bool SAL_CALL wasNull() SAL_OVERRIDE; + sal_Bool SAL_CALL wasNull() override; - rtl::OUString SAL_CALL getString(sal_Int32 column) SAL_OVERRIDE; + rtl::OUString SAL_CALL getString(sal_Int32 column) override; - sal_Bool SAL_CALL getBoolean(sal_Int32 column) SAL_OVERRIDE; - sal_Int8 SAL_CALL getByte(sal_Int32 column) SAL_OVERRIDE; - sal_Int16 SAL_CALL getShort(sal_Int32 column) SAL_OVERRIDE; - sal_Int32 SAL_CALL getInt(sal_Int32 column) SAL_OVERRIDE; - sal_Int64 SAL_CALL getLong(sal_Int32 column) SAL_OVERRIDE; + sal_Bool SAL_CALL getBoolean(sal_Int32 column) override; + sal_Int8 SAL_CALL getByte(sal_Int32 column) override; + sal_Int16 SAL_CALL getShort(sal_Int32 column) override; + sal_Int32 SAL_CALL getInt(sal_Int32 column) override; + sal_Int64 SAL_CALL getLong(sal_Int32 column) override; - float SAL_CALL getFloat(sal_Int32 column) SAL_OVERRIDE; - double SAL_CALL getDouble(sal_Int32 column) SAL_OVERRIDE; + float SAL_CALL getFloat(sal_Int32 column) override; + double SAL_CALL getDouble(sal_Int32 column) override; - css::uno::Sequence SAL_CALL getBytes(sal_Int32 column) SAL_OVERRIDE; - css::util::Date SAL_CALL getDate(sal_Int32 column) SAL_OVERRIDE; - css::util::Time SAL_CALL getTime(sal_Int32 column) SAL_OVERRIDE; - css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) SAL_OVERRIDE; + css::uno::Sequence SAL_CALL getBytes(sal_Int32 column) override; + css::util::Date SAL_CALL getDate(sal_Int32 column) override; + css::util::Time SAL_CALL getTime(sal_Int32 column) override; + css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) override; + css::uno::Reference SAL_CALL getBinaryStream(sal_Int32 column) override; css::uno::Reference - SAL_CALL getBinaryStream(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference - SAL_CALL getCharacterStream(sal_Int32 column) SAL_OVERRIDE; + SAL_CALL getCharacterStream(sal_Int32 column) override; - Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) SAL_OVERRIDE; + Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override; - css::uno::Reference SAL_CALL getRef(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getBlob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getClob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference SAL_CALL getArray(sal_Int32 column) SAL_OVERRIDE; + css::uno::Reference SAL_CALL getRef(sal_Int32 column) override; + css::uno::Reference SAL_CALL getBlob(sal_Int32 column) override; + css::uno::Reference SAL_CALL getClob(sal_Int32 column) override; + css::uno::Reference SAL_CALL getArray(sal_Int32 column) override; // XResultSetMetaDataSupplier - css::uno::Reference SAL_CALL getMetaData() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getMetaData() override; // XCancellable - void SAL_CALL cancel() SAL_OVERRIDE; + void SAL_CALL cancel() override; // XCloseable - void SAL_CALL close() SAL_OVERRIDE; + void SAL_CALL close() override; // XWarningsSupplier - Any SAL_CALL getWarnings() SAL_OVERRIDE; + Any SAL_CALL getWarnings() override; - void SAL_CALL clearWarnings() SAL_OVERRIDE; + void SAL_CALL clearWarnings() override; // XResultSetUpdate - void SAL_CALL insertRow() SAL_OVERRIDE; - void SAL_CALL updateRow() SAL_OVERRIDE; - void SAL_CALL deleteRow() SAL_OVERRIDE; - void SAL_CALL cancelRowUpdates() SAL_OVERRIDE; - void SAL_CALL moveToInsertRow() SAL_OVERRIDE; - void SAL_CALL moveToCurrentRow() SAL_OVERRIDE; + void SAL_CALL insertRow() override; + void SAL_CALL updateRow() override; + void SAL_CALL deleteRow() override; + void SAL_CALL cancelRowUpdates() override; + void SAL_CALL moveToInsertRow() override; + void SAL_CALL moveToCurrentRow() override; // XRowUpdate - void SAL_CALL updateNull(sal_Int32 column) SAL_OVERRIDE; - void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) SAL_OVERRIDE; - void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) SAL_OVERRIDE; - void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) SAL_OVERRIDE; - void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) SAL_OVERRIDE; - void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) SAL_OVERRIDE; - void SAL_CALL updateFloat(sal_Int32 column, float x) SAL_OVERRIDE; - void SAL_CALL updateDouble(sal_Int32 column, double x) SAL_OVERRIDE; - void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) SAL_OVERRIDE; - void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence& x) SAL_OVERRIDE; - void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) SAL_OVERRIDE; - void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) SAL_OVERRIDE; - void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x) SAL_OVERRIDE; + void SAL_CALL updateNull(sal_Int32 column) override; + void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) override; + void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) override; + void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) override; + void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) override; + void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) override; + void SAL_CALL updateFloat(sal_Int32 column, float x) override; + void SAL_CALL updateDouble(sal_Int32 column, double x) override; + void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) override; + void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence& x) override; + void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) override; + void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) override; + void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x) override; void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference& x, - sal_Int32 length) SAL_OVERRIDE; + sal_Int32 length) override; void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference& x, - sal_Int32 length) SAL_OVERRIDE; - void SAL_CALL updateObject(sal_Int32 column, const Any& x) SAL_OVERRIDE; - void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) SAL_OVERRIDE; + sal_Int32 length) override; + void SAL_CALL updateObject(sal_Int32 column, const Any& x) override; + void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override; // XColumnLocate - sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) SAL_OVERRIDE; + sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override; // XRowLocate - Any SAL_CALL getBookmark() SAL_OVERRIDE; + Any SAL_CALL getBookmark() override; - sal_Bool SAL_CALL moveToBookmark(const Any& bookmark) SAL_OVERRIDE; - sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) SAL_OVERRIDE; - sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second) SAL_OVERRIDE; - sal_Bool SAL_CALL hasOrderedBookmarks() SAL_OVERRIDE; - sal_Int32 SAL_CALL hashBookmark(const Any& bookmark) SAL_OVERRIDE; + sal_Bool SAL_CALL moveToBookmark(const Any& bookmark) override; + sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) override; + sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second) override; + sal_Bool SAL_CALL hasOrderedBookmarks() override; + sal_Int32 SAL_CALL hashBookmark(const Any& bookmark) override; // XDeleteRows - css::uno::Sequence - SAL_CALL deleteRows(const css::uno::Sequence& rows) SAL_OVERRIDE; + css::uno::Sequence SAL_CALL deleteRows(const css::uno::Sequence& rows) override; void checkColumnIndex(sal_Int32 index); void checkRowIndex(); diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx index d139f8d0021b..56ca55c7b025 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx @@ -57,38 +57,38 @@ public: { } - sal_Int32 SAL_CALL getColumnCount() SAL_OVERRIDE; + sal_Int32 SAL_CALL getColumnCount() override; - sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) SAL_OVERRIDE; - sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) SAL_OVERRIDE; - sal_Bool SAL_CALL isSearchable(sal_Int32 column) SAL_OVERRIDE; - sal_Bool SAL_CALL isCurrency(sal_Int32 column) SAL_OVERRIDE; + sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) override; + sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) override; + sal_Bool SAL_CALL isSearchable(sal_Int32 column) override; + sal_Bool SAL_CALL isCurrency(sal_Int32 column) override; - sal_Int32 SAL_CALL isNullable(sal_Int32 column) SAL_OVERRIDE; + sal_Int32 SAL_CALL isNullable(sal_Int32 column) override; - sal_Bool SAL_CALL isSigned(sal_Int32 column) SAL_OVERRIDE; + sal_Bool SAL_CALL isSigned(sal_Int32 column) override; - sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) SAL_OVERRIDE; + sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) SAL_OVERRIDE; - rtl::OUString SAL_CALL getColumnName(sal_Int32 column) SAL_OVERRIDE; - rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) SAL_OVERRIDE; + rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override; + rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override; + rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override; - sal_Int32 SAL_CALL getPrecision(sal_Int32 column) SAL_OVERRIDE; - sal_Int32 SAL_CALL getScale(sal_Int32 column) SAL_OVERRIDE; + sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override; + sal_Int32 SAL_CALL getScale(sal_Int32 column) override; - rtl::OUString SAL_CALL getTableName(sal_Int32 column) SAL_OVERRIDE; - rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) SAL_OVERRIDE; + rtl::OUString SAL_CALL getTableName(sal_Int32 column) override; + rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override; - sal_Int32 SAL_CALL getColumnType(sal_Int32 column) SAL_OVERRIDE; + sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) SAL_OVERRIDE; + rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; - sal_Bool SAL_CALL isReadOnly(sal_Int32 column) SAL_OVERRIDE; - sal_Bool SAL_CALL isWritable(sal_Int32 column) SAL_OVERRIDE; - sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) SAL_OVERRIDE; + sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override; + sal_Bool SAL_CALL isWritable(sal_Int32 column) override; + sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) SAL_OVERRIDE; + rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; /// @throws SQLException /// @throws RuntimeException diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx index 154b104beea3..a9e00f915789 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx @@ -74,17 +74,16 @@ protected: void disposeResultSet(); // OPropertyArrayUsageHelper - ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // OPropertySetHelper - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; sal_Bool SAL_CALL convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, - sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE; + sal_Int32 nHandle, const Any& rValue) override; - void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const Any& rValue) SAL_OVERRIDE; + void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) override; - void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const override; virtual ~OCommonStatement() override; protected: @@ -95,49 +94,49 @@ public: using OCommonStatement_IBase::operator css::uno::Reference; // OComponentHelper - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; // XInterface - void SAL_CALL release() throw() SAL_OVERRIDE; + void SAL_CALL release() throw() override; - void SAL_CALL acquire() throw() SAL_OVERRIDE; + void SAL_CALL acquire() throw() override; // XInterface - Any SAL_CALL queryInterface(const css::uno::Type& rType) SAL_OVERRIDE; + Any SAL_CALL queryInterface(const css::uno::Type& rType) override; //XTypeProvider - css::uno::Sequence SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence SAL_CALL getTypes() override; // XPropertySet - css::uno::Reference SAL_CALL getPropertySetInfo() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getPropertySetInfo() override; // XStatement css::uno::Reference - SAL_CALL executeQuery(const rtl::OUString& sql) SAL_OVERRIDE; + SAL_CALL executeQuery(const rtl::OUString& sql) override; - sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) SAL_OVERRIDE; + sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) override; - sal_Bool SAL_CALL execute(const rtl::OUString& sql) SAL_OVERRIDE; + sal_Bool SAL_CALL execute(const rtl::OUString& sql) override; - css::uno::Reference SAL_CALL getConnection() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getConnection() override; // XWarningsSupplier - Any SAL_CALL getWarnings() SAL_OVERRIDE; + Any SAL_CALL getWarnings() override; - void SAL_CALL clearWarnings() SAL_OVERRIDE; + void SAL_CALL clearWarnings() override; // XCancellable - void SAL_CALL cancel() SAL_OVERRIDE; + void SAL_CALL cancel() override; // XCloseable - void SAL_CALL close() SAL_OVERRIDE; + void SAL_CALL close() override; // XMultipleResults - css::uno::Reference SAL_CALL getResultSet() SAL_OVERRIDE; + css::uno::Reference SAL_CALL getResultSet() override; - sal_Int32 SAL_CALL getUpdateCount() SAL_OVERRIDE; + sal_Int32 SAL_CALL getUpdateCount() override; - sal_Bool SAL_CALL getMoreResults() SAL_OVERRIDE; + sal_Bool SAL_CALL getMoreResults() override; // other methods OConnection* getOwnConnection() const { return m_xConnection.get(); } @@ -160,23 +159,23 @@ public: { } - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE; + virtual rtl::OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; - Any SAL_CALL queryInterface(const css::uno::Type& rType) SAL_OVERRIDE; + Any SAL_CALL queryInterface(const css::uno::Type& rType) override; - void SAL_CALL acquire() throw() SAL_OVERRIDE; - void SAL_CALL release() throw() SAL_OVERRIDE; + void SAL_CALL acquire() throw() override; + void SAL_CALL release() throw() override; // XBatchExecution - void SAL_CALL addBatch(const rtl::OUString& sql) SAL_OVERRIDE; + void SAL_CALL addBatch(const rtl::OUString& sql) override; - void SAL_CALL clearBatch() SAL_OVERRIDE; + void SAL_CALL clearBatch() override; - css::uno::Sequence SAL_CALL executeBatch() SAL_OVERRIDE; + css::uno::Sequence SAL_CALL executeBatch() override; }; } } -- cgit