diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-20 07:27:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-20 08:37:20 +0200 |
| commit | cc2fe8c763b7050f07968f31bcdb7e45b8c7464d (patch) | |
| tree | 499b8644a21d45f1317cfb9fc891e2f6d683802b | |
| parent | 475ea37809b5bec369d02a5ab500fac46ab40f0a (diff) | |
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 <sbergman@redhat.com>
34 files changed, 563 insertions, 571 deletions
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index faa3b5d3aff9..08568f25316a 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -55,7 +55,7 @@ public: protected: // ____ XEventListener (base of all listeners) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) SAL_OVERRIDE + const css::lang::EventObject& Source ) override { css::uno::Reference< css::lang::XEventListener > xEventListener( css::uno::Reference< Listener >( m_xListener), css::uno::UNO_QUERY ); 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<rtl::OUString> SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; // XConnection - css::uno::Reference<css::sdbc::XStatement> SAL_CALL createStatement() SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XStatement> SAL_CALL createStatement() override; css::uno::Reference<css::sdbc::XPreparedStatement> - SAL_CALL prepareStatement(const rtl::OUString& sql) SAL_OVERRIDE; + SAL_CALL prepareStatement(const rtl::OUString& sql) override; css::uno::Reference<css::sdbc::XPreparedStatement> - 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<css::sdbc::XDatabaseMetaData> SAL_CALL getMetaData() SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XDatabaseMetaData> 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<css::sdbc::XResultSet> SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& procedureNamePattern) SAL_OVERRIDE; + const rtl::OUString& procedureNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> 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<css::sdbc::XResultSet> SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, - const css::uno::Sequence<rtl::OUString>& types) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getSchemas() SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getCatalogs() SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getTableTypes() SAL_OVERRIDE; + const css::uno::Sequence<rtl::OUString>& types) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getSchemas() override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getCatalogs() override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getTableTypes() override; css::uno::Reference<css::sdbc::XResultSet> 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<css::sdbc::XResultSet> 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<css::sdbc::XResultSet> SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern) SAL_OVERRIDE; + const rtl::OUString& tableNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> 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<css::sdbc::XResultSet> SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference<css::sdbc::XResultSet> SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, - const rtl::OUString& table) SAL_OVERRIDE; + const rtl::OUString& table) override; css::uno::Reference<css::sdbc::XResultSet> 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<css::sdbc::XResultSet> SAL_CALL getTypeInfo() SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XResultSet> - 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<css::sdbc::XResultSet> SAL_CALL getTypeInfo() override; + css::uno::Reference<css::sdbc::XResultSet> 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<css::sdbc::XResultSet> SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, - const css::uno::Sequence<sal_Int32>& types) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XConnection> SAL_CALL getConnection() SAL_OVERRIDE; + const css::uno::Sequence<sal_Int32>& types) override; + css::uno::Reference<css::sdbc::XConnection> 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<css::lang::XMultiServiceFactory>& _rxFactory); // OComponentHelper - void SAL_CALL disposing() SAL_OVERRIDE; + void SAL_CALL disposing() override; // XInterface static OUString getImplementationName_Static(); static Sequence<OUString> getSupportedServiceNames_Static(); // XServiceInfo - OUString SAL_CALL getImplementationName() SAL_OVERRIDE; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) SAL_OVERRIDE; - Sequence<OUString> SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XDriver Reference<css::sdbc::XConnection> SAL_CALL - connect(const OUString& url, const Sequence<css::beans::PropertyValue>& info) SAL_OVERRIDE; + connect(const OUString& url, const Sequence<css::beans::PropertyValue>& info) override; - sal_Bool SAL_CALL acceptsURL(const OUString& url) SAL_OVERRIDE; - Sequence<css::sdbc::DriverPropertyInfo> - SAL_CALL getPropertyInfo(const OUString& url, - const Sequence<css::beans::PropertyValue>& info) SAL_OVERRIDE; + sal_Bool SAL_CALL acceptsURL(const OUString& url) override; + Sequence<css::sdbc::DriverPropertyInfo> SAL_CALL + getPropertyInfo(const OUString& url, const Sequence<css::beans::PropertyValue>& 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<css::lang::XMultiServiceFactory>& 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<rtl::OUString> SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence<rtl::OUString> 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<css::uno::Type> SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; // XPropertySet - css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() SAL_OVERRIDE; + css::uno::Reference<css::beans::XPropertySetInfo> 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<css::uno::XInterface> SAL_CALL getStatement() SAL_OVERRIDE; + css::uno::Reference<css::uno::XInterface> 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_Int8> 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_Int8> 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<css::io::XInputStream> SAL_CALL getBinaryStream(sal_Int32 column) override; css::uno::Reference<css::io::XInputStream> - SAL_CALL getBinaryStream(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::io::XInputStream> - 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<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XClob> SAL_CALL getClob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XArray> SAL_CALL getArray(sal_Int32 column) SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override; + css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override; + css::uno::Reference<css::sdbc::XClob> SAL_CALL getClob(sal_Int32 column) override; + css::uno::Reference<css::sdbc::XArray> SAL_CALL getArray(sal_Int32 column) override; // XResultSetMetaDataSupplier - css::uno::Reference<css::sdbc::XResultSetMetaData> SAL_CALL getMetaData() SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XResultSetMetaData> 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<sal_Int8>& 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<sal_Int8>& 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<css::io::XInputStream>& x, - sal_Int32 length) SAL_OVERRIDE; + sal_Int32 length) override; void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference<css::io::XInputStream>& 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_Int32> - SAL_CALL deleteRows(const css::uno::Sequence<Any>& rows) SAL_OVERRIDE; + css::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const css::uno::Sequence<Any>& 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<rtl::OUString> SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence<rtl::OUString> 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<Type> SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence<Type> SAL_CALL getTypes() override; // XPreparedStatement - Reference<css::sdbc::XResultSet> SAL_CALL executeQuery() SAL_OVERRIDE; - sal_Int32 SAL_CALL executeUpdate() SAL_OVERRIDE; - sal_Bool SAL_CALL execute() SAL_OVERRIDE; - Reference<css::sdbc::XConnection> SAL_CALL getConnection() SAL_OVERRIDE; + Reference<css::sdbc::XResultSet> SAL_CALL executeQuery() override; + sal_Int32 SAL_CALL executeUpdate() override; + sal_Bool SAL_CALL execute() override; + Reference<css::sdbc::XConnection> 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<sal_Int8>& x) SAL_OVERRIDE; + void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence<sal_Int8>& 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<css::io::XInputStream>& x, - sal_Int32 length) SAL_OVERRIDE; + sal_Int32 length) override; void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference<css::io::XInputStream>& 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<css::sdbc::XRef>& x) SAL_OVERRIDE; + void SAL_CALL setRef(sal_Int32 parameter, const Reference<css::sdbc::XRef>& x) override; - void SAL_CALL setBlob(sal_Int32 parameter, const Reference<css::sdbc::XBlob>& x) SAL_OVERRIDE; + void SAL_CALL setBlob(sal_Int32 parameter, const Reference<css::sdbc::XBlob>& x) override; - void SAL_CALL setClob(sal_Int32 parameter, const Reference<css::sdbc::XClob>& x) SAL_OVERRIDE; + void SAL_CALL setClob(sal_Int32 parameter, const Reference<css::sdbc::XClob>& x) override; - void SAL_CALL setArray(sal_Int32 parameter, const Reference<css::sdbc::XArray>& x) SAL_OVERRIDE; + void SAL_CALL setArray(sal_Int32 parameter, const Reference<css::sdbc::XArray>& 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_Int32> SAL_CALL executeBatch() SAL_OVERRIDE; + void SAL_CALL addBatch() override; + void SAL_CALL clearBatch() override; + css::uno::Sequence<sal_Int32> SAL_CALL executeBatch() override; // XCloseable - void SAL_CALL close() SAL_OVERRIDE; + void SAL_CALL close() override; // XResultSetMetaDataSupplier - Reference<css::sdbc::XResultSetMetaData> SAL_CALL getMetaData() SAL_OVERRIDE; + Reference<css::sdbc::XResultSetMetaData> 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<rtl::OUString> SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence<rtl::OUString> 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<css::uno::Type> SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; // XPropertySet - css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() SAL_OVERRIDE; + css::uno::Reference<css::beans::XPropertySetInfo> 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<css::uno::XInterface> SAL_CALL getStatement() SAL_OVERRIDE; + css::uno::Reference<css::uno::XInterface> 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_Int8> 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_Int8> 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<css::io::XInputStream> SAL_CALL getBinaryStream(sal_Int32 column) override; css::uno::Reference<css::io::XInputStream> - SAL_CALL getBinaryStream(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::io::XInputStream> - 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<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XClob> SAL_CALL getClob(sal_Int32 column) SAL_OVERRIDE; - css::uno::Reference<css::sdbc::XArray> SAL_CALL getArray(sal_Int32 column) SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override; + css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override; + css::uno::Reference<css::sdbc::XClob> SAL_CALL getClob(sal_Int32 column) override; + css::uno::Reference<css::sdbc::XArray> SAL_CALL getArray(sal_Int32 column) override; // XResultSetMetaDataSupplier - css::uno::Reference<css::sdbc::XResultSetMetaData> SAL_CALL getMetaData() SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XResultSetMetaData> 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<sal_Int8>& 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<sal_Int8>& 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<css::io::XInputStream>& x, - sal_Int32 length) SAL_OVERRIDE; + sal_Int32 length) override; void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference<css::io::XInputStream>& 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_Int32> - SAL_CALL deleteRows(const css::uno::Sequence<Any>& rows) SAL_OVERRIDE; + css::uno::Sequence<sal_Int32> SAL_CALL deleteRows(const css::uno::Sequence<Any>& 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<css::uno::XInterface>; // 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<css::uno::Type> SAL_CALL getTypes() SAL_OVERRIDE; + css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; // XPropertySet - css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() SAL_OVERRIDE; + css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; // XStatement css::uno::Reference<css::sdbc::XResultSet> - 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<css::sdbc::XConnection> SAL_CALL getConnection() SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XConnection> 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<css::sdbc::XResultSet> SAL_CALL getResultSet() SAL_OVERRIDE; + css::uno::Reference<css::sdbc::XResultSet> 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<rtl::OUString> SAL_CALL getSupportedServiceNames() SAL_OVERRIDE; + virtual css::uno::Sequence<rtl::OUString> 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_Int32> SAL_CALL executeBatch() SAL_OVERRIDE; + css::uno::Sequence<sal_Int32> SAL_CALL executeBatch() override; }; } } diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index cf8226ab34bd..0f12544b6a6b 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -81,22 +81,22 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) SAL_OVERRIDE; + css::util::URL const &, rtl::OUString const &, sal_Int32) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) SAL_OVERRIDE; + css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) override; css::uno::Reference< css::uno::XComponentContext > context_; }; @@ -169,28 +169,28 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual void SAL_CALL dispatch( css::util::URL const &, - css::uno::Sequence< css::beans::PropertyValue > const &) SAL_OVERRIDE; + css::uno::Sequence< css::beans::PropertyValue > const &) override; virtual void SAL_CALL addStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} virtual void SAL_CALL removeStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} css::uno::Reference< css::uno::XComponentContext > context_; diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index aadd8793ab90..83b955a00313 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -78,22 +78,22 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) SAL_OVERRIDE; + css::util::URL const &, rtl::OUString const &, sal_Int32) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) SAL_OVERRIDE; + css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) override; css::uno::Reference< css::uno::XComponentContext > context_; }; @@ -166,28 +166,28 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual void SAL_CALL dispatch( css::util::URL const &, - css::uno::Sequence< css::beans::PropertyValue > const &) SAL_OVERRIDE; + css::uno::Sequence< css::beans::PropertyValue > const &) override; virtual void SAL_CALL addStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} virtual void SAL_CALL removeStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} css::uno::Reference< css::uno::XComponentContext > context_; diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index ee00452e5b94..fe1db2618442 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -231,11 +231,11 @@ namespace xforms protected: // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // XPropertySet - virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; }; class OBooleanType; diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index bce078a487c3..1758d708c455 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -254,11 +254,11 @@ public: explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit ) : SingleControlWrapper< MetricField, ValueT >( rField ), meUnit( eUnit ) {} - virtual bool IsControlDontKnow() const SAL_OVERRIDE; - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; + virtual bool IsControlDontKnow() const override; + virtual void SetControlDontKnow( bool bSet ) override; - virtual ValueT GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; + virtual ValueT GetControlValue() const override; + virtual void SetControlValue( ValueT nValue ) override; private: FieldUnit meUnit; @@ -288,13 +288,13 @@ public: explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap ) : SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {} - virtual bool IsControlDontKnow() const SAL_OVERRIDE + virtual bool IsControlDontKnow() const override { return this->GetControl().GetSelectedEntryCount() == 0; } - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE + virtual void SetControlDontKnow( bool bSet ) override { if( bSet ) this->GetControl().SetNoSelection(); } - virtual ValueT GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; + virtual ValueT GetControlValue() const override; + virtual void SetControlValue( ValueT nValue ) override; }; @@ -321,13 +321,13 @@ public: explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap ) : SingleControlWrapper< ValueSet, ValueT >( rValueSet ), MapperType( WRAPPER_VALUESET_ITEM_NOTFOUND, pMap ) {} - virtual bool IsControlDontKnow() const SAL_OVERRIDE + virtual bool IsControlDontKnow() const override { return this->GetControl().IsNoSelection(); } - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE + virtual void SetControlDontKnow( bool bSet ) override { if( bSet ) this->GetControl().SetNoSelection(); } - virtual ValueT GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; + virtual ValueT GetControlValue() const override; + virtual void SetControlValue( ValueT nValue ) override; }; diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 3f1bf7c5eb9f..7907da7ad6af 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -133,9 +133,9 @@ public: explicit ValueItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, ValueT >( nSlot ) {} - virtual ValueT GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE + virtual ValueT GetItemValue( const ItemT& rItem ) const override { return static_cast< ValueT >( rItem.GetValue() ); } - virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const SAL_OVERRIDE + virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const override { rItem.SetValue( static_cast< InternalValueT >( aValue ) ); } }; diff --git a/include/svtools/iconview.hxx b/include/svtools/iconview.hxx index 2865f6c54bc4..0bc974051f0d 100644 --- a/include/svtools/iconview.hxx +++ b/include/svtools/iconview.hxx @@ -28,9 +28,9 @@ class IconView : public SvTreeListBox public: IconView( vcl::Window* pParent, WinBits nBits ); - virtual void Resize() SAL_OVERRIDE; + virtual void Resize() override; - virtual tools::Rectangle GetFocusRect( SvTreeListEntry*, long nEntryPos ) SAL_OVERRIDE; + virtual tools::Rectangle GetFocusRect( SvTreeListEntry*, long nEntryPos ) override; void ClearAll(); diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index d05d2983598f..667a259d02e4 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -30,8 +30,8 @@ public: virtual ~SvxFmMSFactory() {} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; }; #endif // INCLUDED_SVX_FMDMOD_HXX diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx index 47d74bc51530..8a500ff24f94 100644 --- a/include/vbahelper/vbareturntypes.hxx +++ b/include/vbahelper/vbareturntypes.hxx @@ -37,9 +37,9 @@ namespace ooo T1 mnValue; public: DefaultReturnHelper( const T1& nValue ) : mnValue( nValue ) {} - virtual void SAL_CALL setValue( T1 nValue ) SAL_OVERRIDE { mnValue = nValue; } - virtual T1 SAL_CALL getValue() SAL_OVERRIDE { return mnValue; } - OUString SAL_CALL getDefaultPropertyName( ) SAL_OVERRIDE { return OUString("Value"); } + virtual void SAL_CALL setValue( T1 nValue ) override { mnValue = nValue; } + virtual T1 SAL_CALL getValue() override { return mnValue; } + OUString SAL_CALL getDefaultPropertyName( ) override { return OUString("Value"); } }; typedef DefaultReturnHelper< sal_Int32, ov::msforms::XReturnInteger > ReturnInteger_BASE; diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx index 535f157e7810..1e9ab288d9b4 100644 --- a/include/vcl/notebookbar.hxx +++ b/include/vcl/notebookbar.hxx @@ -26,11 +26,11 @@ friend class NotebookBarContextChangeEventListener; public: NotebookBar(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame); virtual ~NotebookBar() override; - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; + virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; virtual void Resize() override; void SetSystemWindow(SystemWindow* pSystemWindow); diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx index 8c926457179d..a95b3506a5f1 100644 --- a/include/xmloff/fasttokenhandler.hxx +++ b/include/xmloff/fasttokenhandler.hxx @@ -68,11 +68,11 @@ public: virtual ~FastTokenHandler() override; // XFastTokenHandler - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) override; + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) override; // Much faster direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const SAL_OVERRIDE; + virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override; private: TokenMap& mrTokenMap; diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 829fb379cff1..2bbb71a1ec8a 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -63,8 +63,8 @@ class ScTiledRenderingTest : public test::BootstrapFixture, public unotest::Macr { public: ScTiledRenderingTest(); - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; void testRowColumnSelections(); void testSortAscendingDescending(); diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx index bedd0424f161..7757eb5d06b5 100644 --- a/sc/source/ui/vba/vbacondition.hxx +++ b/sc/source/ui/vba/vbacondition.hxx @@ -36,13 +36,13 @@ public: /// @throws css::script::BasicErrorException static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator); - virtual OUString SAL_CALL Formula1( ) SAL_OVERRIDE; - virtual OUString SAL_CALL Formula2( ) SAL_OVERRIDE; + virtual OUString SAL_CALL Formula1( ) override; + virtual OUString SAL_CALL Formula2( ) override; /// @throws css::script::BasicErrorException virtual void setFormula1( const css::uno::Any& _aFormula1); /// @throws css::script::BasicErrorException virtual sal_Int32 Operator(bool _bIncludeFormulaValue); - virtual sal_Int32 SAL_CALL Operator() SAL_OVERRIDE = 0; + virtual sal_Int32 SAL_CALL Operator() override = 0; }; #endif diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index 4d6f847a0491..c85fd303db0e 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -42,11 +42,11 @@ public: css::uno::Reference< css::beans::XPropertySet >& xProps, css::sheet::TablePageBreakData aTablePageBreakData); - virtual sal_Int32 SAL_CALL getType( ) SAL_OVERRIDE; - virtual void SAL_CALL setType(sal_Int32 type) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getType( ) override; + virtual void SAL_CALL setType(sal_Int32 type) override; - virtual void SAL_CALL Delete() SAL_OVERRIDE; - virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() SAL_OVERRIDE; + virtual void SAL_CALL Delete() override; + virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() override; }; typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index 06078ef66f55..228c57553c72 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -50,7 +50,7 @@ public: xShapePropertySet.set( xTitleShape, css::uno::UNO_QUERY_THROW ); oShapeHelper.reset( new ov::ShapeHelper(xTitleShape) ); } - css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) SAL_OVERRIDE + css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) override { // #TODO find out what the proper parent should be // leaving as set by the helperapi for the moment @@ -58,14 +58,14 @@ public: // otherwise attempts to access the palette will fail return new ScVbaInterior( BaseClass::mxParent, BaseClass::mxContext, xShapePropertySet ); } - css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) SAL_OVERRIDE + css::uno::Reference< ov::excel::XFont > SAL_CALL Font( ) override { // #TODO find out what the proper parent should be // leaving as set by the helperapi for the moment return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet ); } - void SAL_CALL setText( const OUString& Text ) SAL_OVERRIDE + void SAL_CALL setText( const OUString& Text ) override { try { @@ -76,7 +76,7 @@ public: throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() ); } } - OUString SAL_CALL getText( ) SAL_OVERRIDE + OUString SAL_CALL getText( ) override { OUString sText; try @@ -90,23 +90,23 @@ public: return sText; } - void SAL_CALL setTop( double Top ) SAL_OVERRIDE + void SAL_CALL setTop( double Top ) override { oShapeHelper->setTop( Top ); } - double SAL_CALL getTop( ) SAL_OVERRIDE + double SAL_CALL getTop( ) override { return oShapeHelper->getTop(); } - void SAL_CALL setLeft( double Left ) SAL_OVERRIDE + void SAL_CALL setLeft( double Left ) override { oShapeHelper->setLeft( Left ); } - double SAL_CALL getLeft( ) SAL_OVERRIDE + double SAL_CALL getLeft( ) override { return oShapeHelper->getLeft(); } - void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) SAL_OVERRIDE + void SAL_CALL setOrientation( ::sal_Int32 _nOrientation ) override { try { @@ -117,7 +117,7 @@ public: throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), sal_uInt32(ERRCODE_BASIC_METHOD_FAILED), OUString() ); } } - ::sal_Int32 SAL_CALL getOrientation( ) SAL_OVERRIDE + ::sal_Int32 SAL_CALL getOrientation( ) override { sal_Int32 nSOOrientation = 0; try @@ -131,11 +131,11 @@ public: return static_cast< sal_Int32 >(nSOOrientation / 100) ; } // XHelperInterface - OUString getServiceImplName() SAL_OVERRIDE + OUString getServiceImplName() override { return OUString("TitleImpl"); } - css::uno::Sequence< OUString > getServiceNames() SAL_OVERRIDE + css::uno::Sequence< OUString > getServiceNames() override { static css::uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) diff --git a/sd/source/ui/animations/CategoryListBox.hxx b/sd/source/ui/animations/CategoryListBox.hxx index 535e27f1651c..bf8ef932f117 100644 --- a/sd/source/ui/animations/CategoryListBox.hxx +++ b/sd/source/ui/animations/CategoryListBox.hxx @@ -31,14 +31,14 @@ public: explicit CategoryListBox( vcl::Window* pParent ); virtual ~CategoryListBox() override; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; void InsertCategory( const OUString& rStr ); DECL_LINK(implDoubleClickHdl, ListBox&, void); private: - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; }; } diff --git a/starmath/qa/cppunit/test_node.cxx b/starmath/qa/cppunit/test_node.cxx index ebf0682f531e..cb24bbdff78b 100644 --- a/starmath/qa/cppunit/test_node.cxx +++ b/starmath/qa/cppunit/test_node.cxx @@ -29,8 +29,8 @@ typedef tools::SvRef<SmDocShell> SmDocShellRef; class NodeTest : public test::BootstrapFixture { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: void testTdf47813(); diff --git a/starmath/qa/cppunit/test_parse.cxx b/starmath/qa/cppunit/test_parse.cxx index ff5a12e72425..ccc0f5478c2c 100644 --- a/starmath/qa/cppunit/test_parse.cxx +++ b/starmath/qa/cppunit/test_parse.cxx @@ -28,8 +28,8 @@ typedef tools::SvRef<SmDocShell> SmDocShellRef; class ParseTest : public test::BootstrapFixture { public: - virtual void setUp() SAL_OVERRIDE; - virtual void tearDown() SAL_OVERRIDE; + virtual void setUp() override; + virtual void tearDown() override; private: void testMinus(); diff --git a/svtools/source/inc/iconviewimpl.hxx b/svtools/source/inc/iconviewimpl.hxx index dec441b6ce1c..516923f3f40c 100644 --- a/svtools/source/inc/iconviewimpl.hxx +++ b/svtools/source/inc/iconviewimpl.hxx @@ -30,37 +30,37 @@ class IconViewImpl : public SvImpLBox public: IconViewImpl( SvTreeListBox* pTreeListBox, SvTreeList* pTreeList, WinBits nWinStyle ); - void KeyDown( bool bPageDown ) SAL_OVERRIDE; + void KeyDown( bool bPageDown ) override; - void KeyUp( bool bPageUp ) SAL_OVERRIDE; + void KeyUp( bool bPageUp ) override; - Point GetEntryPosition( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + Point GetEntryPosition( SvTreeListEntry* pEntry ) const override; - SvTreeListEntry* GetClickedEntry( const Point& rPoint ) const SAL_OVERRIDE; + SvTreeListEntry* GetClickedEntry( const Point& rPoint ) const override; - bool IsEntryInView( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + bool IsEntryInView( SvTreeListEntry* pEntry ) const override; - void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) SAL_OVERRIDE; + void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; // returns 0 if position is just past the last entry - SvTreeListEntry* GetEntry( const Point& rPoint ) const SAL_OVERRIDE; + SvTreeListEntry* GetEntry( const Point& rPoint ) const override; - void UpdateAll( bool bInvalidateCompleteView ) SAL_OVERRIDE; + void UpdateAll( bool bInvalidateCompleteView ) override; - bool KeyInput( const KeyEvent& ) SAL_OVERRIDE; + bool KeyInput( const KeyEvent& ) override; - void InvalidateEntry( long nId ) const SAL_OVERRIDE; + void InvalidateEntry( long nId ) const override; protected: - long GetEntryLine( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + long GetEntryLine( SvTreeListEntry* pEntry ) const override; - void CursorUp() SAL_OVERRIDE; - void CursorDown() SAL_OVERRIDE; - void PageDown( sal_uInt16 nDelta ) SAL_OVERRIDE; - void PageUp( sal_uInt16 nDelta ) SAL_OVERRIDE; + void CursorUp() override; + void CursorDown() override; + void PageDown( sal_uInt16 nDelta ) override; + void PageUp( sal_uInt16 nDelta ) override; - void SyncVerThumb() SAL_OVERRIDE; - void AdjustScrollBars( Size& rSize ) SAL_OVERRIDE; + void SyncVerThumb() override; + void AdjustScrollBars( Size& rSize ) override; }; #endif // INCLUDED_SVTOOLS_SOURCE_INC_ICONVIEWIMPL_HXX diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 326db11d2a30..bd77ab2cff3d 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -177,7 +177,7 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; - virtual void SetName( const OUString& rNewName, bool bBroadcast=false ) SAL_OVERRIDE; + virtual void SetName( const OUString& rNewName, bool bBroadcast=false ) override; }; // The FlyFrame-Format diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 7f647ed52973..66c1dc5b52c1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -267,7 +267,7 @@ public: virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = nullptr ) override; // preserve DOCX page vertical alignment - virtual void TextVerticalAdjustment( const css::drawing::TextVerticalAdjust ) SAL_OVERRIDE; + virtual void TextVerticalAdjustment( const css::drawing::TextVerticalAdjust ) override; /// Start of the section properties. virtual void StartSection() override; diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index d42c97511303..254b52722be3 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -149,7 +149,7 @@ public: virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = nullptr ) override; // preserve DOC page vertical alignment - virtual void TextVerticalAdjustment( const css::drawing::TextVerticalAdjust ) SAL_OVERRIDE; + virtual void TextVerticalAdjustment( const css::drawing::TextVerticalAdjust ) override; /// Start of the section properties. virtual void StartSection() override; diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index 8ed649b63a69..9d3caeb4c26a 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -131,7 +131,7 @@ public: SwJumpToSpecificPageControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SwJumpToSpecificPageControl() override; - virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; + virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; }; #endif diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 1dd1190915a2..c9955176cd12 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -604,7 +604,7 @@ public: protected: void Select(); - virtual bool EventNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot) diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 42e01cc61b51..0cc1f63406bc 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -89,7 +89,7 @@ public: virtual void OPTIONS( const OUString & inPath, DAVOptions& rOptions, // contains the name+values - const DAVRequestEnvironment & rEnv ) SAL_OVERRIDE; + const DAVRequestEnvironment & rEnv ) override; // allprop & named virtual void diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 8b5497f7a578..e6fc367ca29f 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -574,13 +574,13 @@ namespace xmloff // SvXMLImportContext overridables virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, - const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) SAL_OVERRIDE; - virtual void EndElement() SAL_OVERRIDE; + const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; + virtual void EndElement() override; protected: // OElementImport overridables virtual css::uno::Reference< css::beans::XPropertySet > - createElement() SAL_OVERRIDE; + createElement() override; // create the child context for the given control type virtual SvXMLImportContext* implCreateControlWrapper( @@ -608,7 +608,7 @@ namespace xmloff protected: // OElementImport overridables virtual css::uno::Reference< css::beans::XPropertySet > - createElement() SAL_OVERRIDE; + createElement() override; }; //= OColumnWrapperImport |