diff options
Diffstat (limited to 'connectivity/source')
38 files changed, 507 insertions, 524 deletions
diff --git a/connectivity/source/drivers/firebird/Clob.hxx b/connectivity/source/drivers/firebird/Clob.hxx index 738b0ce86c64..626b284d3785 100644 --- a/connectivity/source/drivers/firebird/Clob.hxx +++ b/connectivity/source/drivers/firebird/Clob.hxx @@ -48,12 +48,12 @@ namespace connectivity // ---- XClob ---------------------------------------------------- virtual sal_Int64 SAL_CALL length() override; - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getSubString(sal_Int64 aPosition, sal_Int32 aLength) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream() override; virtual sal_Int64 SAL_CALL - position(const ::rtl::OUString& rPattern, + position(const OUString& rPattern, sal_Int32 aStart) override; virtual sal_Int64 SAL_CALL positionOfClob(const ::css::uno::Reference< ::css::sdbc::XClob >& rPattern, diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 04c4cb821daa..b7f1276a8d4f 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -123,7 +123,7 @@ struct ConnectionGuard } }; -void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) +void Connection::construct(const OUString& url, const Sequence< PropertyValue >& info) { ConnectionGuard aGuard(m_refCount); diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 6992a5dedd1f..f1d4f7dd8003 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -75,13 +75,13 @@ namespace connectivity // DatabaseMetaData.getTypeInfo. /** The URL passed to us when opening, i.e. of the form sdbc:* */ - ::rtl::OUString m_sConnectionURL; + OUString m_sConnectionURL; /** * The URL passed to firebird, i.e. either a local file (for a * temporary .fdb extracted from a .odb or a normal local file) or * a remote url. */ - ::rtl::OUString m_sFirebirdURL; + OUString m_sFirebirdURL; /* EMBEDDED MODE DATA */ /** Denotes that we have a database stored within a .odb file. */ @@ -117,7 +117,7 @@ namespace connectivity * * (The temporary .fdb is our m_sFirebirdURL.) */ - ::rtl::OUString m_sFBKPath; + OUString m_sFBKPath; void loadDatabaseFile(const OUString& pSrcLocation, const OUString& pTmpLocation); @@ -169,7 +169,7 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void construct( const ::rtl::OUString& url, + void construct( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info); const OUString& getConnectionURL() const {return m_sConnectionURL;} @@ -217,9 +217,9 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) override; - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; virtual sal_Bool SAL_CALL getAutoCommit( ) override; virtual void SAL_CALL commit( ) override; @@ -228,8 +228,8 @@ namespace connectivity virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; virtual sal_Bool SAL_CALL isReadOnly( ) override; - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) override; - virtual ::rtl::OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index aeb7acab00d9..dc55940fcfe5 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -47,17 +47,17 @@ namespace connectivity // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; - virtual ::rtl::OUString SAL_CALL getURL( ) override; - virtual ::rtl::OUString SAL_CALL getUserName( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; virtual sal_Bool SAL_CALL isReadOnly( ) override; virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) override; - virtual ::rtl::OUString SAL_CALL getDriverName( ) override; - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; virtual sal_Bool SAL_CALL usesLocalFiles( ) override; @@ -70,14 +70,14 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) override; - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) override; - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) override; - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) override; - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; @@ -105,11 +105,11 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) override; - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) override; - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; @@ -163,23 +163,23 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; @@ -192,7 +192,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 87dd693efc88..199529016995 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -136,9 +136,9 @@ void FirebirdDriver::disposing() } //----- static ServiceInfo --------------------------------------------------- -rtl::OUString FirebirdDriver::getImplementationName_Static() +OUString FirebirdDriver::getImplementationName_Static() { - return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver"); + return OUString("com.sun.star.comp.sdbc.firebird.Driver"); } Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index 7394f6ad238f..8fcf17fa2665 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -68,19 +68,19 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface /// @throws css::uno::RuntimeException - static ::rtl::OUString getImplementationName_Static( ); + static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; virtual sal_Int32 SAL_CALL getMajorVersion( ) override; virtual sal_Int32 SAL_CALL getMinorVersion( ) override; diff --git a/connectivity/source/drivers/firebird/Indexes.hxx b/connectivity/source/drivers/firebird/Indexes.hxx index 236a0ff064ae..364b36b04278 100644 --- a/connectivity/source/drivers/firebird/Indexes.hxx +++ b/connectivity/source/drivers/firebird/Indexes.hxx @@ -30,11 +30,11 @@ namespace connectivity protected: // XDrop virtual void dropObject(sal_Int32 nPosition, - const ::rtl::OUString& sIndexName) override; + const OUString& sIndexName) override; public: Indexes(Table* pTable, ::osl::Mutex& rMutex, - const std::vector< ::rtl::OUString>& rVector); + const std::vector< OUString>& rVector); }; } // namespace firebird diff --git a/connectivity/source/drivers/firebird/Keys.hxx b/connectivity/source/drivers/firebird/Keys.hxx index b712ab4122f7..143dbbf5486b 100644 --- a/connectivity/source/drivers/firebird/Keys.hxx +++ b/connectivity/source/drivers/firebird/Keys.hxx @@ -31,7 +31,7 @@ namespace connectivity const ::std::vector< OUString>& rNames); // OKeysHelper / XDrop - void dropObject(sal_Int32 nPosition, const ::rtl::OUString& sName) override; + void dropObject(sal_Int32 nPosition, const OUString& sName) override; }; } diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index acb99c8abb99..bec7fdfe02a8 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -766,7 +766,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 nIndex, sal_Int32, const ::rtl::OUString& ) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 nIndex, sal_Int32, const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index 19f19d423c7b..63800ac09e01 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -48,7 +48,7 @@ namespace connectivity public OPreparedStatement_Base { protected: - ::rtl::OUString m_sSqlStatement; + OUString m_sSqlStatement; css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; XSQLDA* m_pOutSqlda; @@ -88,7 +88,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // a constructor, which is required for returning objects: OPreparedStatement( Connection* _pConnection, - const ::rtl::OUString& sql); + const OUString& sql); //XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; @@ -109,7 +109,7 @@ namespace connectivity // XParameters virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) override; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) override; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) override; virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) override; virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) override; @@ -117,7 +117,7 @@ namespace connectivity virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) override; virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index f6aac2e1dc1f..008bc5b55263 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -155,7 +155,7 @@ namespace connectivity virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow virtual sal_Bool SAL_CALL wasNull( ) override; - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; @@ -183,7 +183,7 @@ namespace connectivity // XWarningsSupplier // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) override; + virtual sal_Int32 SAL_CALL findColumn(const OUString& columnName) override; }; @@ -208,7 +208,7 @@ namespace connectivity OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); - template <> ::rtl::OUString + template <> OUString OResultSet::retrieveValue( const sal_Int32 nColumnIndex, const ISC_SHORT nType); diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx index 1b134a0628fd..1c6d1ca22fc1 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx @@ -62,19 +62,19 @@ namespace connectivity virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) override; virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnLabel(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnName(sal_Int32 column) override; + virtual OUString SAL_CALL getSchemaName(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override; + virtual OUString SAL_CALL getTableName(sal_Int32 column) override; + virtual OUString SAL_CALL getCatalogName(sal_Int32 column) override; virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override; virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) override; virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override; - virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; + virtual OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; }; } } diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 023a41dff18b..69b05e471263 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -24,7 +24,6 @@ #include <sal/types.h> using namespace connectivity::firebird; -using ::rtl::OUString; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::lang::XSingleServiceFactory; diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index 248a2a65fb1a..56b1ae7edde5 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -58,15 +58,15 @@ namespace connectivity // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - executeQuery(const ::rtl::OUString& sql) override; - virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) override; + executeQuery(const OUString& sql) override; + virtual sal_Int32 SAL_CALL executeUpdate(const OUString& sqlIn) override; virtual sal_Bool SAL_CALL - execute(const ::rtl::OUString& sql) override; + execute(const OUString& sql) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() override; // XBatchExecution - UNSUPPORTED - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) override; + virtual void SAL_CALL addBatch( const OUString& sql ) override; virtual void SAL_CALL clearBatch( ) override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) override; diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx index e0000f6f6e53..586152ecce10 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -33,7 +33,7 @@ namespace connectivity * Get the ALTER TABLE [TABLE] ALTER [COLUMN] String. * Includes a trailing space. */ - ::rtl::OUString getAlterTableColumn(const ::rtl::OUString& rColumn); + OUString getAlterTableColumn(const OUString& rColumn); protected: void construct() override; @@ -45,9 +45,9 @@ namespace connectivity Table(Tables* pTables, ::osl::Mutex& rMutex, const css::uno::Reference< css::sdbc::XConnection >& _xConnection, - const ::rtl::OUString& rName, - const ::rtl::OUString& rType, - const ::rtl::OUString& rDescription); + const OUString& rName, + const OUString& rType, + const OUString& rDescription); // OTableHelper virtual ::connectivity::sdbcx::OCollection* createColumns( @@ -63,11 +63,11 @@ namespace connectivity * rDescriptor. */ virtual void SAL_CALL alterColumnByName( - const ::rtl::OUString& rColName, + const OUString& rColName, const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override; // XRename -- UNSUPPORTED - virtual void SAL_CALL rename(const ::rtl::OUString& sName) override; + virtual void SAL_CALL rename(const OUString& sName) override; //XInterface virtual css::uno::Any diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index 5c2742659ce5..58b31a373468 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -34,7 +34,7 @@ namespace connectivity // OCollection virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( - const ::rtl::OUString& rName) override; + const OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; virtual ::connectivity::sdbcx::ObjectType appendObject( @@ -51,7 +51,7 @@ namespace connectivity // XAppend, etc., but all are optional. // XDrop - virtual void dropObject(sal_Int32 nPosition, const ::rtl::OUString& rName) override; + virtual void dropObject(sal_Int32 nPosition, const OUString& rName) override; }; diff --git a/connectivity/source/drivers/firebird/User.hxx b/connectivity/source/drivers/firebird/User.hxx index 8ff9155a14af..d2cc091000b9 100644 --- a/connectivity/source/drivers/firebird/User.hxx +++ b/connectivity/source/drivers/firebird/User.hxx @@ -31,7 +31,7 @@ namespace connectivity /** * For a user that already exists in the db. */ - User(const ::rtl::OUString& rName); + User(const OUString& rName); // IRefreshableGroups:: virtual void refreshGroups() override; diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx index 8b307b5d1578..69cf571154cb 100644 --- a/connectivity/source/drivers/firebird/Users.hxx +++ b/connectivity/source/drivers/firebird/Users.hxx @@ -31,7 +31,7 @@ namespace connectivity // OCollection virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( - const ::rtl::OUString& rName) override; + const OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; virtual ::connectivity::sdbcx::ObjectType appendObject( @@ -48,7 +48,7 @@ namespace connectivity // XAppend, etc., but all are optional. // XDrop - virtual void dropObject(sal_Int32 nPosition, const ::rtl::OUString& rName) override; + virtual void dropObject(sal_Int32 nPosition, const OUString& rName) override; }; diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index dbff25356205..26929a9de162 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -66,7 +66,7 @@ public: OUString const & getCharacterSet() const { return m_sCharsetName; } sal_Int32 getSdbcType() const; - ::rtl::OUString getColumnTypeName() const; + OUString getColumnTypeName() const; }; @@ -96,7 +96,7 @@ public: * @throws css::sdbc::SQLException */ void evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector, - const ::rtl::OUString& aCause, + const OUString& aCause, const css::uno::Reference< css::uno::XInterface >& _rxContext); /** diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx index e6149975be9c..cb1b06261042 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx @@ -55,7 +55,7 @@ using ::osl::MutexGuard; namespace { -void lcl_executeUpdate(MYSQL* pMySql, const rtl::OString& sql) +void lcl_executeUpdate(MYSQL* pMySql, const OString& sql) { mysql_real_query(pMySql, sql.getStr(), sql.getLength()); // TODO handle error @@ -78,7 +78,7 @@ OConnection::~OConnection() } } -void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyValue>& info) +void OConnection::construct(const OUString& url, const Sequence<PropertyValue>& info) { MutexGuard aGuard(m_aMutex); @@ -90,10 +90,10 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal mysql_options(&m_mysql, MYSQL_OPT_PROTOCOL, &protocol); sal_Int32 nIndex; - rtl::OUString token; - rtl::OUString aHostName("localhost"); + OUString token; + OUString aHostName("localhost"); sal_Int32 nPort = 3306; - rtl::OUString aDbName; + OUString aDbName; m_settings.encoding = MysqlCDriver::getDefaultEncoding(); @@ -114,7 +114,7 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal if (!token.isEmpty()) { sal_Int32 nIndex1 = 0; - rtl::OUString hostandport = token.getToken(0, ':', nIndex1); + OUString hostandport = token.getToken(0, ':', nIndex1); if (!hostandport.isEmpty()) { aHostName = hostandport; @@ -134,7 +134,7 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal // get user and password for mysql connection const PropertyValue* pIter = info.getConstArray(); const PropertyValue* pEnd = pIter + info.getLength(); - rtl::OUString aUser, aPass, sUnixSocket, sNamedPipe; + OUString aUser, aPass, sUnixSocket, sNamedPipe; bool unixSocketPassed = false; bool namedPipePassed = false; @@ -169,18 +169,18 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal } } - rtl::OString host_str = rtl::OUStringToOString(aHostName, m_settings.encoding); - rtl::OString user_str = rtl::OUStringToOString(aUser, m_settings.encoding); - rtl::OString pass_str = rtl::OUStringToOString(aPass, m_settings.encoding); - rtl::OString schema_str = rtl::OUStringToOString(aDbName, m_settings.encoding); - rtl::OString socket_str; + OString host_str = OUStringToOString(aHostName, m_settings.encoding); + OString user_str = OUStringToOString(aUser, m_settings.encoding); + OString pass_str = OUStringToOString(aPass, m_settings.encoding); + OString schema_str = OUStringToOString(aDbName, m_settings.encoding); + OString socket_str; if (unixSocketPassed) { - socket_str = rtl::OUStringToOString(sUnixSocket, m_settings.encoding); + socket_str = OUStringToOString(sUnixSocket, m_settings.encoding); } else if (namedPipePassed) { - socket_str = rtl::OUStringToOString(sNamedPipe, m_settings.encoding); + socket_str = OUStringToOString(sNamedPipe, m_settings.encoding); } // flags can also be passed as last parameter @@ -195,26 +195,26 @@ void OConnection::construct(const rtl::OUString& url, const Sequence<PropertyVal if (getMysqlVersion() < 40100) { throw SQLException("MariaDB LibreOffice Connector requires MySQL Server 4.1 or above", - *this, rtl::OUString(), 0, Any()); + *this, OUString(), 0, Any()); } - lcl_executeUpdate(&m_mysql, rtl::OString{ "SET session sql_mode='ANSI_QUOTES'" }); - lcl_executeUpdate(&m_mysql, rtl::OString{ "SET NAMES utf8" }); + lcl_executeUpdate(&m_mysql, OString{ "SET session sql_mode='ANSI_QUOTES'" }); + lcl_executeUpdate(&m_mysql, OString{ "SET NAMES utf8" }); } -rtl::OUString OConnection::getImplementationName() +OUString OConnection::getImplementationName() { - return rtl::OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection"); + return OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection"); } -css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames() +css::uno::Sequence<OUString> OConnection::getSupportedServiceNames() { - css::uno::Sequence<rtl::OUString> s(1); + css::uno::Sequence<OUString> s(1); s[0] = "com.sun.star.sdbc.Connection"; return s; } -sal_Bool OConnection::supportsService(rtl::OUString const& ServiceName) +sal_Bool OConnection::supportsService(OUString const& ServiceName) { return cppu::supportsService(this, ServiceName); } @@ -233,12 +233,12 @@ Reference<XStatement> SAL_CALL OConnection::createStatement() return xReturn; } -Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const rtl::OUString& _sSql) +Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const OUString& _sSql) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); - const rtl::OString sSqlStatement - = rtl::OUStringToOString(_sSql, getConnectionEncoding()); // FIXME transform statement ? + const OString sSqlStatement + = OUStringToOString(_sSql, getConnectionEncoding()); // FIXME transform statement ? MYSQL_STMT* pStmt = mysql_stmt_init(&m_mysql); mysql_stmt_prepare(pStmt, sSqlStatement.getStr(), sSqlStatement.getLength()); @@ -254,7 +254,7 @@ Reference<XPreparedStatement> SAL_CALL OConnection::prepareStatement(const rtl:: return xStatement; } -Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const rtl::OUString& /*_sSql*/) +Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const OUString& /*_sSql*/) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -263,12 +263,12 @@ Reference<XPreparedStatement> SAL_CALL OConnection::prepareCall(const rtl::OUStr return Reference<XPreparedStatement>(); } -rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& /*_sSql*/) +OUString SAL_CALL OConnection::nativeSQL(const OUString& /*_sSql*/) { MutexGuard aGuard(m_aMutex); - // const rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql ); - rtl::OUString sNativeSQL; + // const OUString sSqlStatement = transFormPreparedStatement( _sSql ); + OUString sNativeSQL; // TODO return sNativeSQL; } @@ -355,7 +355,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly() return m_settings.readOnly; } -void SAL_CALL OConnection::setCatalog(const rtl::OUString& /*catalog*/) +void SAL_CALL OConnection::setCatalog(const OUString& /*catalog*/) { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -363,7 +363,7 @@ void SAL_CALL OConnection::setCatalog(const rtl::OUString& /*catalog*/) // TODO How? } -rtl::OUString SAL_CALL OConnection::getCatalog() +OUString SAL_CALL OConnection::getCatalog() { MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -464,9 +464,9 @@ sal_Int32 OConnection::getMysqlVersion() return static_cast<sal_Int32>(version); } -rtl::OUString OConnection::transFormPreparedStatement(const rtl::OUString& _sSQL) +OUString OConnection::transFormPreparedStatement(const OUString& _sSQL) { - rtl::OUString sSqlStatement = _sSQL; + OUString sSqlStatement = _sSQL; if (!m_xParameterSubstitution.is()) { try diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx index ed96d5e42290..b1c8d5bda8ed 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx @@ -69,8 +69,8 @@ typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWar struct ConnectionSettings { rtl_TextEncoding encoding; - rtl::OUString schema; - rtl::OUString connectionURL; + OUString schema; + OUString connectionURL; bool readOnly; ConnectionSettings() : encoding(RTL_TEXTENCODING_DONTKNOW) @@ -110,8 +110,7 @@ public: sal_Int32 getMysqlVersion(); /// @throws SQLException - void construct(const rtl::OUString& url, - const css::uno::Sequence<css::beans::PropertyValue>& info); + void construct(const OUString& url, const css::uno::Sequence<css::beans::PropertyValue>& info); OConnection(MysqlCDriver& _rDriver); virtual ~OConnection() override; @@ -122,22 +121,22 @@ public: virtual void SAL_CALL disposing() override; // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XConnection css::uno::Reference<css::sdbc::XStatement> SAL_CALL createStatement() override; css::uno::Reference<css::sdbc::XPreparedStatement> - SAL_CALL prepareStatement(const rtl::OUString& sql) override; + SAL_CALL prepareStatement(const OUString& sql) override; css::uno::Reference<css::sdbc::XPreparedStatement> - SAL_CALL prepareCall(const rtl::OUString& sql) override; + SAL_CALL prepareCall(const OUString& sql) override; - rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) override; + OUString SAL_CALL nativeSQL(const OUString& sql) override; void SAL_CALL setAutoCommit(sal_Bool autoCommit) override; @@ -155,9 +154,9 @@ public: sal_Bool SAL_CALL isReadOnly() override; - void SAL_CALL setCatalog(const rtl::OUString& catalog) override; + void SAL_CALL setCatalog(const OUString& catalog) override; - rtl::OUString SAL_CALL getCatalog() override; + OUString SAL_CALL getCatalog() override; void SAL_CALL setTransactionIsolation(sal_Int32 level) override; @@ -173,15 +172,15 @@ public: void SAL_CALL clearWarnings() override; // TODO: Not used - //sal_Int32 sdbcColumnType(rtl::OUString typeName); + //sal_Int32 sdbcColumnType(OUString typeName); const ConnectionSettings& getConnectionSettings() const { return m_settings; } - rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL); + OUString transFormPreparedStatement(const OUString& _sSQL); const MysqlCDriver& getDriver() const { return *m_xDriver.get(); } }; /* OConnection */ // TODO: Not used. -//inline rtl::OUString getPattern(rtl::OUString p) { return (p.getLength()) ? p : ASC2OU("%"); } +//inline OUString getPattern(OUString p) { return (p.getLength()) ? p : ASC2OU("%"); } } /* mysqlc */ } /* connectivity */ #endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx index a1575c728298..507ce0b91e45 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx @@ -79,7 +79,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon, MYSQL* pMySql) ODatabaseMetaData::~ODatabaseMetaData() {} -rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return rtl::OUString(); } +OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return OUString(); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() { return 16777208L; } @@ -172,11 +172,11 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength() { return 256; } sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns() { return true; } -rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return rtl::OUString("n/a"); } +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return OUString("n/a"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return rtl::OUString("\""); } +OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() { return OUString("\""); } -rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return rtl::OUString("#@"); } +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() { return OUString("#@"); } sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames() { return true; } @@ -355,39 +355,33 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds() sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL() { return false; } -rtl::OUString SAL_CALL ODatabaseMetaData::getURL() +OUString SAL_CALL ODatabaseMetaData::getURL() { return m_rConnection.getConnectionSettings().connectionURL; } -rtl::OUString SAL_CALL ODatabaseMetaData::getUserName() +OUString SAL_CALL ODatabaseMetaData::getUserName() { // TODO execute "SELECT USER()" SAL_WARN("connectivity.mysqlc", "method not implemented"); - return rtl::OUString(); + return OUString(); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName() -{ - return rtl::OUString("MySQL Connector/OO.org"); -} +OUString SAL_CALL ODatabaseMetaData::getDriverName() { return OUString("MySQL Connector/OO.org"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return rtl::OUString("0.9.2"); } +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { return OUString("0.9.2"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion() +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion() { - return rtl::OStringToOUString(mysql_get_server_info(m_pMySql), - m_rConnection.getConnectionEncoding()); + return OStringToOUString(mysql_get_server_info(m_pMySql), + m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() -{ - return rtl::OUString("MySQL"); -} +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() { return OUString("MySQL"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return rtl::OUString("procedure"); } +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() { return OUString("procedure"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return rtl::OUString("database"); } +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() { return OUString("database"); } sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion() { @@ -409,87 +403,87 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion() return MARIADBC_VERSION_MINOR; } -rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords() +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords() { - return rtl::OUString("ACCESSIBLE, ADD, ALL," - "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE," - "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL," - "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK," - "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT," - "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE," - "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR," - "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND," - "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE," - "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE," - "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE," - "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED," - "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH," - "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM," - "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY," - "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF," - "IGNORE, IN, INDEX, INFILE, INNER, INOUT," - "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4," - "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN," - "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE," - "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT," - "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT," - "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND," - "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT," - "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE," - "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER," - "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE," - "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL," - "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT," - "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT," - "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT," - "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL," - "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING," - "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT," - "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED," - "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING," - "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK," - "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE," - "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR," - "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH," - "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL" - "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD," - "MAXVALUE, RESIGNAL, SIGNAL, SLOW"); + return OUString("ACCESSIBLE, ADD, ALL," + "ALTER, ANALYZE, AND, AS, ASC, ASENSITIVE, BEFORE," + "BETWEEN, BIGINT, BINARY, BLOB, BOTH, BY, CALL," + "CASCADE, CASE, CHANGE, CHAR, CHARACTER, CHECK," + "COLLATE, COLUMN, CONDITION, CONNECTION, CONSTRAINT," + "CONTINUE, CONVERT, CREATE, CROSS, CURRENT_DATE," + "CURRENT_TIME, CURRENT_TIMESTAMP, CURRENT_USER, CURSOR," + "DATABASE, DATABASES, DAY_HOUR, DAY_MICROSECOND," + "DAY_MINUTE, DAY_SECOND, DEC, DECIMAL, DECLARE," + "DEFAULT, DELAYED, DELETE, DESC, DESCRIBE," + "DETERMINISTIC, DISTINCT, DISTINCTROW, DIV, DOUBLE," + "DROP, DUAL, EACH, ELSE, ELSEIF, ENCLOSED," + "ESCAPED, EXISTS, EXIT, EXPLAIN, FALSE, FETCH," + "FLOAT, FLOAT4, FLOAT8, FOR, FORCE, FOREIGN, FROM," + "FULLTEXT, GRANT, GROUP, HAVING, HIGH_PRIORITY," + "HOUR_MICROSECOND, HOUR_MINUTE, HOUR_SECOND, IF," + "IGNORE, IN, INDEX, INFILE, INNER, INOUT," + "INSENSITIVE, INSERT, INT, INT1, INT2, INT3, INT4," + "INT8, INTEGER, INTERVAL, INTO, IS, ITERATE, JOIN," + "KEY, KEYS, KILL, LEADING, LEAVE, LEFT, LIKE," + "LOCALTIMESTAMP, LOCK, LONG, LONGBLOB, LONGTEXT," + "LOOP, LOW_PRIORITY, MATCH, MEDIUMBLOB, MEDIUMINT," + "MEDIUMTEXT, MIDDLEINT, MINUTE_MICROSECOND," + "MINUTE_SECOND, MOD, MODIFIES, NATURAL, NOT," + "NO_WRITE_TO_BINLOG, NULL, NUMERIC, ON, OPTIMIZE," + "OPTION, OPTIONALLY, OR, ORDER, OUT, OUTER," + "OUTFILE, PRECISION, PRIMARY, PROCEDURE, PURGE," + "RANGE, READ, READS, READ_ONLY, READ_WRITE, REAL," + "REFERENCES, REGEXP, RELEASE, RENAME, REPEAT," + "REPLACE, REQUIRE, RESTRICT, RETURN, REVOKE, RIGHT," + "RLIKE, SCHEMA, SCHEMAS, SECOND_MICROSECOND, SELECT," + "SENSITIVE, SEPARATOR, SET, SHOW, SMALLINT, SPATIAL," + "SPECIFIC, SQL, SQLEXCEPTION, SQLSTATE, SQLWARNING," + "SQL_BIG_RESULT, SQL_CALC_FOUND_ROWS, SQL_SMALL_RESULT," + "SSL, STARTING, STRAIGHT_JOIN, TABLE, TERMINATED," + "THEN, TINYBLOB, TINYINT, TINYTEXT, TO, TRAILING," + "TRIGGER, TRUE, UNDO, UNION, UNIQUE, UNLOCK," + "UNSIGNED, UPDATE, USAGE, USE, USING, UTC_DATE," + "UTC_TIME, UTC_TIMESTAMP, VALUES, VARBINARY, VARCHAR," + "VARCHARACTER, VARYING, WHEN, WHERE, WHILE, WITH," + "WRITE, X509, XOR, YEAR_MONTH, ZEROFILL" + "GENERAL, IGNORE_SERVER_IDS, MASTER_HEARTBEAT_PERIOD," + "MAXVALUE, RESIGNAL, SIGNAL, SLOW"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return rtl::OUString("\\"); } +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() { return OUString("\\"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions() +OUString SAL_CALL ODatabaseMetaData::getStringFunctions() { - return rtl::OUString("ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT," - "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT," - "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD," - "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION," - "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX," - "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING," - "SUBSTRING_INDEX,TRIM,UCASE,UPPER"); + return OUString("ASCII,BIN,BIT_LENGTH,CHAR,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT," + "CONCAT_WS,CONV,ELT,EXPORT_SET,FIELD,FIND_IN_SET,HEX,INSERT," + "INSTR,LCASE,LEFT,LENGTH,LOAD_FILE,LOCATE,LOCATE,LOWER,LPAD," + "LTRIM,MAKE_SET,MATCH,MID,OCT,OCTET_LENGTH,ORD,POSITION," + "QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX," + "SPACE,STRCMP,SUBSTRING,SUBSTRING,SUBSTRING,SUBSTRING," + "SUBSTRING_INDEX,TRIM,UCASE,UPPER"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions() +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions() { - return rtl::OUString("DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME," - "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD," - "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT," - "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE," - "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME," - "SEC_TO_TIME,TIME_TO_SEC"); + return OUString("DAYOFWEEK,WEEKDAY,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME," + "MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,PERIOD_ADD," + "PERIOD_DIFF,TO_DAYS,FROM_DAYS,DATE_FORMAT,TIME_FORMAT," + "CURDATE,CURRENT_DATE,CURTIME,CURRENT_TIME,NOW,SYSDATE," + "CURRENT_TIMESTAMP,UNIX_TIMESTAMP,FROM_UNIXTIME," + "SEC_TO_TIME,TIME_TO_SEC"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions() +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions() { - return rtl::OUString("DATABASE,USER,SYSTEM_USER," - "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION"); + return OUString("DATABASE,USER,SYSTEM_USER," + "SESSION_USER,PASSWORD,ENCRYPT,LAST_INSERT_ID,VERSION"); } -rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions() +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions() { - return rtl::OUString("ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS," - "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW," - "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE"); + return OUString("ABS,ACOS,ASIN,ATAN,ATAN2,BIT_COUNT,CEILING,COS," + "COT,DEGREES,EXP,FLOOR,LOG,LOG10,MAX,MIN,MOD,PI,POW," + "POWER,RADIANS,RAND,ROUND,SIN,SQRT,TAN,TRUNCATE"); } sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar() { return false; } @@ -643,11 +637,11 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas() UNO_QUERY); std::vector<std::vector<Any>> rRows; - rtl::OUString sSql + OUString sSql = m_rConnection.getMysqlVersion() > 49999 - ? rtl::OUString{ "SELECT SCHEMA_NAME AS TABLE_SCHEM, CATALOG_NAME AS TABLE_CATALOG " - "FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME" } - : rtl::OUString{ "SHOW DATABASES" }; + ? OUString{ "SELECT SCHEMA_NAME AS TABLE_SCHEM, CATALOG_NAME AS TABLE_CATALOG " + "FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME" } + : OUString{ "SHOW DATABASES" }; Reference<XStatement> statement = m_rConnection.createStatement(); Reference<XInterface> executed = statement->executeQuery(sSql); @@ -663,7 +657,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas() bool informationSchema = false; for (sal_uInt32 i = 1; i <= columns; i++) { - rtl::OUString columnStringValue = xRow->getString(i); + OUString columnStringValue = xRow->getString(i); if (i == 1) { // TABLE_SCHEM informationSchema = !columnStringValue.equalsIgnoreAsciiCase("information_schema"); @@ -680,16 +674,17 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getSchemas() return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumnPrivileges( - const Any& /*catalog*/, const rtl::OUString& schema, const rtl::OUString& table, - const rtl::OUString& columnNamePattern) +Reference<XResultSet> + SAL_CALL ODatabaseMetaData::getColumnPrivileges(const Any& /*catalog*/, const OUString& schema, + const OUString& table, + const OUString& columnNamePattern) { - rtl::OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS " - "TABLE_SCHEM, TABLE_NAME, COLUMN_NAME, NULL AS GRANTOR, " - "GRANTEE, PRIVILEGE_TYPE AS PRIVILEGE, IS_GRANTABLE FROM " - "INFORMATION_SCHEMA.COLUMN_PRIVILEGES WHERE TABLE_SCHEMA LIKE " - "'?' AND TABLE_NAME='?' AND COLUMN_NAME LIKE '?' ORDER BY " - "COLUMN_NAME, PRIVILEGE_TYPE"); + OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS " + "TABLE_SCHEM, TABLE_NAME, COLUMN_NAME, NULL AS GRANTOR, " + "GRANTEE, PRIVILEGE_TYPE AS PRIVILEGE, IS_GRANTABLE FROM " + "INFORMATION_SCHEMA.COLUMN_PRIVILEGES WHERE TABLE_SCHEMA LIKE " + "'?' AND TABLE_NAME='?' AND COLUMN_NAME LIKE '?' ORDER BY " + "COLUMN_NAME, PRIVILEGE_TYPE"); query = query.replaceFirst("?", schema); query = query.replaceFirst("?", table); @@ -701,34 +696,34 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumnPrivileges( } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalog*/, - const rtl::OUString& /*schemaPattern*/, - const rtl::OUString& tableNamePattern, - const rtl::OUString& columnNamePattern) + const OUString& /*schemaPattern*/, + const OUString& tableNamePattern, + const OUString& columnNamePattern) { - rtl::OUStringBuffer queryBuf("SELECT TABLE_CATALOG AS TABLE_CAT, " // 1 - "TABLE_SCHEMA AS TABLE_SCHEM, " // 2 - "TABLE_NAME, " // 3 - "COLUMN_NAME, " // 4 - "DATA_TYPE, " // 5 - // TYPE_NAME missing - "CHARACTER_MAXIMUM_LENGTH, " // 6 - "NUMERIC_PRECISION, " // 7 - // buffer length missing - "NUMERIC_SCALE AS DECIMAL_DIGITS, " // 8 - // NUM_PREC_RADIX missing - // NULLABLE missing - "COLUMN_COMMENT AS REMARKS, " // 9 - "COLUMN_DEFAULT AS COLUMN_DEF," // 10 - "CHARACTER_OCTET_LENGTH, " // 11 - "ORDINAL_POSITION, " // 12 - "IS_NULLABLE, " // 13 - "COLUMN_TYPE " // 14 - "FROM INFORMATION_SCHEMA.COLUMNS " - "WHERE (1 = 1) "); + OUStringBuffer queryBuf("SELECT TABLE_CATALOG AS TABLE_CAT, " // 1 + "TABLE_SCHEMA AS TABLE_SCHEM, " // 2 + "TABLE_NAME, " // 3 + "COLUMN_NAME, " // 4 + "DATA_TYPE, " // 5 + // TYPE_NAME missing + "CHARACTER_MAXIMUM_LENGTH, " // 6 + "NUMERIC_PRECISION, " // 7 + // buffer length missing + "NUMERIC_SCALE AS DECIMAL_DIGITS, " // 8 + // NUM_PREC_RADIX missing + // NULLABLE missing + "COLUMN_COMMENT AS REMARKS, " // 9 + "COLUMN_DEFAULT AS COLUMN_DEF," // 10 + "CHARACTER_OCTET_LENGTH, " // 11 + "ORDINAL_POSITION, " // 12 + "IS_NULLABLE, " // 13 + "COLUMN_TYPE " // 14 + "FROM INFORMATION_SCHEMA.COLUMNS " + "WHERE (1 = 1) "); if (!tableNamePattern.isEmpty()) { - rtl::OUString sAppend; + OUString sAppend; if (tableNamePattern.match("%")) sAppend = "AND TABLE_NAME LIKE '%' "; else @@ -737,7 +732,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo } if (!columnNamePattern.isEmpty()) { - rtl::OUString sAppend; + OUString sAppend; if (columnNamePattern.match("%")) sAppend = "AND COLUMN_NAME LIKE '%' "; else @@ -745,7 +740,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo queryBuf.append(sAppend.replaceAll("%", columnNamePattern)); } - rtl::OUString query = queryBuf.makeStringAndClear(); + OUString query = queryBuf.makeStringAndClear(); Reference<XStatement> statement = m_rConnection.createStatement(); Reference<XResultSet> rs = statement->executeQuery(query.getStr()); Reference<XRow> xRow(rs, UNO_QUERY_THROW); @@ -767,13 +762,13 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo // column name aRow.push_back(makeAny(xRow->getString(4))); // data type - rtl::OUString sDataType = xRow->getString(5); + OUString sDataType = xRow->getString(5); aRow.push_back(makeAny(mysqlc_sdbc_driver::mysqlStrToOOOType(sDataType))); // type name aRow.push_back(makeAny(sDataType)); // TODO // column size sal_Int32 nColumnSize = 0; - rtl::OUString sColumnType = xRow->getString(14); + OUString sColumnType = xRow->getString(14); sal_Int32 nCharMaxLen = xRow->getShort(6); bool bIsCharMax = !xRow->wasNull(); if (sDataType.equalsIgnoreAsciiCase("year")) @@ -796,7 +791,7 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo // num_prec_radix aRow.push_back(makeAny(sal_Int32(10))); // nullable - rtl::OUString sIsNullable = xRow->getString(13); + OUString sIsNullable = xRow->getString(13); if (xRow->wasNull()) aRow.push_back(makeAny(ColumnValue::NULLABLE_UNKNOWN)); else if (sIsNullable.equalsIgnoreAsciiCase("YES")) @@ -823,11 +818,12 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getColumns(const Any& /*catalo return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables( - const Any& /*catalog*/, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern, const Sequence<rtl::OUString>& /*types */) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables(const Any& /*catalog*/, + const OUString& schemaPattern, + const OUString& tableNamePattern, + const Sequence<OUString>& /*types */) { - rtl::OUString query( + OUString query( "SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA AS TABLE_SCHEM, TABLE_NAME," "IF(STRCMP(TABLE_TYPE,'BASE TABLE'), TABLE_TYPE, 'TABLE') AS TABLE_TYPE, TABLE_COMMENT AS " "REMARKS " @@ -845,8 +841,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTables( } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedureColumns( - const Any& /* catalog */, const rtl::OUString& /* schemaPattern */, - const rtl::OUString& /* procedureNamePattern */, const rtl::OUString& /* columnNamePattern */) + const Any& /* catalog */, const OUString& /* schemaPattern */, + const OUString& /* procedureNamePattern */, const OUString& /* columnNamePattern */) { // Currently there is no information available return nullptr; @@ -854,8 +850,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedureColumns( Reference<XResultSet> SAL_CALL ODatabaseMetaData::getProcedures(const Any& /*catalog*/, - const rtl::OUString& /*schemaPattern*/, - const rtl::OUString& /*procedureNamePattern*/) + const OUString& /*schemaPattern*/, + const OUString& /*procedureNamePattern*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -867,8 +863,9 @@ Reference<XResultSet> return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& /* catalog */, const rtl::OUString& /* schema */, const rtl::OUString& /* table */) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns(const Any& /* catalog */, + const OUString& /* schema */, + const OUString& /* table */) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -879,8 +876,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getVersionColumns( } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getExportedKeys(const Any& /*catalog */, - const rtl::OUString& /*schema */, - const rtl::OUString& /*table */) + const OUString& /*schema */, + const OUString& /*table */) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -893,14 +890,14 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getExportedKeys(const Any& /*c } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getImportedKeys(const Any& /*catalog*/, - const rtl::OUString& schema, - const rtl::OUString& table) + const OUString& schema, + const OUString& table) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), UNO_QUERY); - rtl::OUString query( + OUString query( "SELECT refi.CONSTRAINT_CATALOG, k.COLUMN_NAME, " " refi.UNIQUE_CONSTRAINT_CATALOG, " " refi.UNIQUE_CONSTRAINT_SCHEMA, refi.REFERENCED_TABLE_NAME, k.REFERENCED_COLUMN_NAME, " @@ -959,16 +956,15 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getImportedKeys(const Any& /*c } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getPrimaryKeys(const Any& /*catalog*/, - const rtl::OUString& schema, - const rtl::OUString& table) + const OUString& schema, + const OUString& table) { - rtl::OUString query( - "SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA " - "AS TABLE_SCHEM, TABLE_NAME, " - "COLUMN_NAME, SEQ_IN_INDEX AS KEY_SEQ," - "INDEX_NAME AS PK_NAME FROM INFORMATION_SCHEMA.STATISTICS " - "WHERE TABLE_SCHEMA LIKE '?' AND TABLE_NAME LIKE '?' AND INDEX_NAME='PRIMARY' " - "ORDER BY TABLE_SCHEMA, TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX"); + OUString query("SELECT TABLE_CATALOG AS TABLE_CAT, TABLE_SCHEMA " + "AS TABLE_SCHEM, TABLE_NAME, " + "COLUMN_NAME, SEQ_IN_INDEX AS KEY_SEQ," + "INDEX_NAME AS PK_NAME FROM INFORMATION_SCHEMA.STATISTICS " + "WHERE TABLE_SCHEMA LIKE '?' AND TABLE_NAME LIKE '?' AND INDEX_NAME='PRIMARY' " + "ORDER BY TABLE_SCHEMA, TABLE_NAME, INDEX_NAME, SEQ_IN_INDEX"); // TODO use prepared stmt instead // TODO escape schema, table name ? @@ -981,8 +977,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getPrimaryKeys(const Any& /*ca } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getIndexInfo(const Any& /*catalog*/, - const rtl::OUString& /*schema*/, - const rtl::OUString& /*table*/, + const OUString& /*schema*/, + const OUString& /*table*/, sal_Bool /*unique*/, sal_Bool /*approximate*/) { @@ -996,9 +992,11 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getIndexInfo(const Any& /*cata return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier( - const Any& /*catalog*/, const rtl::OUString& /*schema*/, const rtl::OUString& /*table*/, - sal_Int32 /*scope*/, sal_Bool /*nullable*/) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier(const Any& /*catalog*/, + const OUString& /*schema*/, + const OUString& /*table*/, + sal_Int32 /*scope*/, + sal_Bool /*nullable*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -1010,10 +1008,8 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier( return xResultSet; } -Reference<XResultSet> - SAL_CALL ODatabaseMetaData::getTablePrivileges(const Any& /*catalog*/, - const rtl::OUString& /*schemaPattern*/, - const rtl::OUString& /*tableNamePattern*/) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTablePrivileges( + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -1026,9 +1022,9 @@ Reference<XResultSet> } Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference( - const Any& /*primaryCatalog*/, const rtl::OUString& /*primarySchema_*/, - const rtl::OUString& /*primaryTable_*/, const Any& /*foreignCatalog*/, - const rtl::OUString& /*foreignSchema*/, const rtl::OUString& /*foreignTable*/) + const Any& /*primaryCatalog*/, const OUString& /*primarySchema_*/, + const OUString& /*primaryTable_*/, const Any& /*foreignCatalog*/, + const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/) { Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance( "org.openoffice.comp.helper.DatabaseMetaDataResultSet"), @@ -1040,9 +1036,10 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference( return xResultSet; } -Reference<XResultSet> SAL_CALL ODatabaseMetaData::getUDTs( - const Any& /* catalog */, const rtl::OUString& /* schemaPattern */, - const rtl::OUString& /* typeNamePattern */, const Sequence<sal_Int32>& /* types */) +Reference<XResultSet> SAL_CALL ODatabaseMetaData::getUDTs(const Any& /* catalog */, + const OUString& /* schemaPattern */, + const OUString& /* typeNamePattern */, + const Sequence<sal_Int32>& /* types */) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getUDTs", *this); return nullptr; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx index 68865ae0bf1a..6814a574c87d 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx @@ -50,17 +50,17 @@ public: // XDatabaseMetaData sal_Bool SAL_CALL allProceduresAreCallable() override; sal_Bool SAL_CALL allTablesAreSelectable() override; - rtl::OUString SAL_CALL getURL() override; - rtl::OUString SAL_CALL getUserName() override; + OUString SAL_CALL getURL() override; + 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; + OUString SAL_CALL getDatabaseProductName() override; + OUString SAL_CALL getDatabaseProductVersion() override; + OUString SAL_CALL getDriverName() override; + OUString SAL_CALL getDriverVersion() override; sal_Int32 SAL_CALL getDriverMajorVersion() override; sal_Int32 SAL_CALL getDriverMinorVersion() override; sal_Bool SAL_CALL usesLocalFiles() override; @@ -73,14 +73,14 @@ public: 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; + OUString SAL_CALL getIdentifierQuoteString() override; + OUString SAL_CALL getSQLKeywords() override; + OUString SAL_CALL getNumericFunctions() override; + OUString SAL_CALL getStringFunctions() override; + OUString SAL_CALL getSystemFunctions() override; + OUString SAL_CALL getTimeDateFunctions() override; + OUString SAL_CALL getSearchStringEscape() override; + OUString SAL_CALL getExtraNameCharacters() override; sal_Bool SAL_CALL supportsAlterTableWithAddColumn() override; sal_Bool SAL_CALL supportsAlterTableWithDropColumn() override; sal_Bool SAL_CALL supportsColumnAliasing() override; @@ -108,11 +108,11 @@ public: 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; + OUString SAL_CALL getSchemaTerm() override; + OUString SAL_CALL getProcedureTerm() override; + OUString SAL_CALL getCatalogTerm() override; sal_Bool SAL_CALL isCatalogAtStart() override; - rtl::OUString SAL_CALL getCatalogSeparator() override; + OUString SAL_CALL getCatalogSeparator() override; sal_Bool SAL_CALL supportsSchemasInDataManipulation() override; sal_Bool SAL_CALL supportsSchemasInProcedureCalls() override; sal_Bool SAL_CALL supportsSchemasInTableDefinitions() override; @@ -167,57 +167,51 @@ public: 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) override; + SAL_CALL getProcedures(const Any& catalog, const OUString& schemaPattern, + const 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) override; + SAL_CALL getProcedureColumns(const Any& catalog, const OUString& schemaPattern, + const OUString& procedureNamePattern, + const 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) override; + SAL_CALL getTables(const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, + const css::uno::Sequence<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) override; + SAL_CALL getColumns(const Any& catalog, const OUString& schemaPattern, + const OUString& tableNamePattern, + const 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) override; + SAL_CALL getColumnPrivileges(const Any& catalog, const OUString& schema, + const OUString& table, + const OUString& columnNamePattern) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, - const rtl::OUString& tableNamePattern) override; + SAL_CALL getTablePrivileges(const Any& catalog, const OUString& schemaPattern, + const 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_CALL getBestRowIdentifier(const Any& catalog, const OUString& schema, + const OUString& table, sal_Int32 scope, sal_Bool nullable) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getVersionColumns(const Any& catalog, const OUString& schema, const OUString& table) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getPrimaryKeys(const Any& catalog, const OUString& schema, const OUString& table) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getImportedKeys(const Any& catalog, const OUString& schema, const OUString& table) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL + getExportedKeys(const Any& catalog, const OUString& schema, const OUString& table) override; css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, - 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) override; - css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, - 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) 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) override; + SAL_CALL getCrossReference(const Any& primaryCatalog, const OUString& primarySchema, + const OUString& primaryTable, const Any& foreignCatalog, + const OUString& foreignSchema, + const 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; + css::uno::Reference<css::sdbc::XResultSet> + SAL_CALL getIndexInfo(const Any& catalog, const OUString& schema, const 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) override; @@ -232,8 +226,8 @@ public: 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, + SAL_CALL getUDTs(const Any& catalog, const OUString& schemaPattern, + const OUString& typeNamePattern, 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 6a8a492f68b6..b55d9cfeeeaf 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx @@ -37,7 +37,6 @@ using css::uno::Exception; using css::uno::Reference; using css::uno::RuntimeException; using css::uno::Sequence; -using rtl::OUString; Reference<css::uno::XInterface> MysqlCDriver_CreateInstance(const Reference<css::lang::XMultiServiceFactory>& _rxFactory); diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx index d56be8b88500..179241193332 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_general.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_general.cxx @@ -90,16 +90,16 @@ void allocateSqlVar(void** mem, enum_field_types eType, unsigned nSize) void throwFeatureNotImplementedException(const sal_Char* _pAsciiFeatureName, const css::uno::Reference<XInterface>& _rxContext) { - const rtl::OUString sMessage - = rtl::OUString::createFromAscii(_pAsciiFeatureName) + ": feature not implemented."; + const OUString sMessage + = OUString::createFromAscii(_pAsciiFeatureName) + ": feature not implemented."; throw SQLException(sMessage, _rxContext, "HYC00", 0, Any()); } void throwInvalidArgumentException(const sal_Char* _pAsciiFeatureName, const css::uno::Reference<XInterface>& _rxContext) { - const rtl::OUString sMessage - = rtl::OUString::createFromAscii(_pAsciiFeatureName) + ": invalid arguments."; + const OUString sMessage + = OUString::createFromAscii(_pAsciiFeatureName) + ": invalid arguments."; throw SQLException(sMessage, _rxContext, "HYC00", 0, Any()); } @@ -107,10 +107,10 @@ void throwSQLExceptionWithMsg(const char* msg, unsigned int errorNum, const css::uno::Reference<css::uno::XInterface>& _context, const rtl_TextEncoding encoding) { - rtl::OString errorMsg{ msg }; + OString errorMsg{ msg }; // TODO error code? - throw SQLException(rtl::OStringToOUString(errorMsg, encoding), _context, rtl::OUString(), - errorNum, Any()); + throw SQLException(OStringToOUString(errorMsg, encoding), _context, OUString(), errorNum, + Any()); } sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept @@ -182,7 +182,7 @@ sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept return css::sdbc::DataType::VARCHAR; } -sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType) +sal_Int32 mysqlStrToOOOType(const OUString& sType) { // TODO other types. if (sType.equalsIgnoreAsciiCase("tiny") || sType.equalsIgnoreAsciiCase("tinyint")) @@ -225,7 +225,7 @@ sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType) return css::sdbc::DataType::VARCHAR; } -rtl::OUString mysqlTypeToStr(MYSQL_FIELD* field) +OUString mysqlTypeToStr(MYSQL_FIELD* field) { bool isUnsigned = (field->flags & UNSIGNED_FLAG) != 0; bool isZerofill = (field->flags & ZEROFILL_FLAG) != 0; @@ -322,9 +322,9 @@ rtl::OUString mysqlTypeToStr(MYSQL_FIELD* field) } } -rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) +OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) { - return rtl::OUString(_string.c_str(), _string.size(), encoding); + return OUString(_string.c_str(), _string.size(), encoding); } } /* namespace */ diff --git a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx index 2d468bb367da..a7886c3015d2 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_general.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_general.hxx @@ -107,11 +107,11 @@ void throwSQLExceptionWithMsg(const char* msg, unsigned int errorNum, sal_Int32 mysqlToOOOType(int eType, int charsetnr) noexcept; -rtl::OUString mysqlTypeToStr(MYSQL_FIELD* pField); +OUString mysqlTypeToStr(MYSQL_FIELD* pField); -sal_Int32 mysqlStrToOOOType(const rtl::OUString& sType); +sal_Int32 mysqlStrToOOOType(const OUString& sType); -rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding); +OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding); } #endif diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index 1f55c2466cb6..a3e45937b610 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -52,20 +52,20 @@ using ::osl::MutexGuard; #include <stdio.h> -rtl::OUString SAL_CALL OPreparedResultSet::getImplementationName() +OUString SAL_CALL OPreparedResultSet::getImplementationName() { - return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); + return OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); } -uno::Sequence<rtl::OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL OPreparedResultSet::getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aSupported(2); + uno::Sequence<OUString> aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; return aSupported; } -sal_Bool SAL_CALL OPreparedResultSet::supportsService(const rtl::OUString& _rServiceName) +sal_Bool SAL_CALL OPreparedResultSet::supportsService(const OUString& _rServiceName) { return cppu::supportsService(this, _rServiceName); } @@ -112,7 +112,7 @@ uno::Sequence<Type> SAL_CALL OPreparedResultSet::getTypes() return concatSequences(aTypes.getTypes(), OPreparedResultSet_BASE::getTypes()); } -sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const rtl::OUString& columnName) +sal_Int32 SAL_CALL OPreparedResultSet::findColumn(const OUString& columnName) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed); @@ -370,7 +370,7 @@ sal_Int16 SAL_CALL OPreparedResultSet::getShort(sal_Int32 column) return *static_cast<sal_Int16*>(m_aData[column - 1].buffer); } -rtl::OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column) +OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed); @@ -391,7 +391,7 @@ rtl::OUString SAL_CALL OPreparedResultSet::getString(sal_Int32 column) const char* sStr = static_cast<const char*>(m_aData[column - 1].buffer); - OUString sReturn = rtl::OUString(sStr, *m_aData[column - 1].length, m_encoding); + OUString sReturn = OUString(sStr, *m_aData[column - 1].length, m_encoding); return sReturn; } @@ -827,7 +827,7 @@ void SAL_CALL OPreparedResultSet::updateDouble(sal_Int32 column, double /* x */) *this); } -void SAL_CALL OPreparedResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */) +void SAL_CALL OPreparedResultSet::updateString(sal_Int32 column, const OUString& /* x */) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedResultSet_BASE::rBHelper.bDisposed); @@ -1036,7 +1036,7 @@ void OPreparedResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw uno::Exception("cannot set prop " + rtl::OUString::number(nHandle), nullptr); + throw uno::Exception("cannot set prop " + OUString::number(nHandle), nullptr); case PROPERTY_ID_FETCHDIRECTION: break; case PROPERTY_ID_FETCHSIZE: @@ -1083,11 +1083,11 @@ css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL OPreparedResultSet::g void OPreparedResultSet::checkColumnIndex(sal_Int32 index) { if (!m_aData) - throw SQLException("Cursor out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("Cursor out of range", *this, OUString(), 1, Any()); if (index < 1 || index > static_cast<int>(m_nFieldCount)) { /* static object for efficiency or thread safety is a problem ? */ - throw SQLException("index out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("index out of range", *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx index 7f5d6852c539..647d872c50d8 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -95,11 +95,11 @@ class OPreparedResultSet final : public OBase_Mutex, virtual ~OPreparedResultSet() override = default; public: - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; OPreparedResultSet(OConnection& rConn, OPreparedStatement* pStmt, MYSQL_STMT* pMyStmt); @@ -147,7 +147,7 @@ public: // XRow sal_Bool SAL_CALL wasNull() override; - rtl::OUString SAL_CALL getString(sal_Int32 column) override; + OUString SAL_CALL getString(sal_Int32 column) override; sal_Bool SAL_CALL getBoolean(sal_Int32 column) override; sal_Int8 SAL_CALL getByte(sal_Int32 column) override; @@ -205,7 +205,7 @@ public: 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 updateString(sal_Int32 column, const 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; @@ -220,7 +220,7 @@ public: void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override; // XColumnLocate - sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override; + sal_Int32 SAL_CALL findColumn(const OUString& columnName) override; // XRowLocate Any SAL_CALL getBookmark() override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx index 05204fe652a0..9b687f74e8ad 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx @@ -42,19 +42,19 @@ using namespace com::sun::star::io; using namespace com::sun::star::util; using ::osl::MutexGuard; -rtl::OUString OPreparedStatement::getImplementationName() +OUString OPreparedStatement::getImplementationName() { - return rtl::OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement"); + return OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement"); } -css::uno::Sequence<rtl::OUString> OPreparedStatement::getSupportedServiceNames() +css::uno::Sequence<OUString> OPreparedStatement::getSupportedServiceNames() { - css::uno::Sequence<rtl::OUString> s(1); + css::uno::Sequence<OUString> s(1); s[0] = "com.sun.star.sdbc.PreparedStatement"; return s; } -sal_Bool OPreparedStatement::supportsService(rtl::OUString const& ServiceName) +sal_Bool OPreparedStatement::supportsService(OUString const& ServiceName) { return cppu::supportsService(this, ServiceName); } @@ -176,13 +176,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() return affectedRows; } -void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUString& x) +void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& x) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - rtl::OString stringie(rtl::OUStringToOString(x, m_xConnection->getConnectionEncoding())); + OString stringie(OUStringToOString(x, m_xConnection->getConnectionEncoding())); const sal_Int32 nIndex = parameter - 1; m_binds[nIndex].buffer_type = MYSQL_TYPE_STRING; mysqlc_sdbc_driver::resetSqlVar(&m_binds[nIndex].buffer, stringie.getStr(), MYSQL_TYPE_STRING, @@ -425,7 +425,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co case DataType::NUMERIC: { double nValue(0.0); - rtl::OUString sValue; + OUString sValue; if (value >>= nValue) { setDouble(parameterIndex, nValue); @@ -433,8 +433,8 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co } else if (value >>= sValue) { - rtl::OString sAscii - = rtl::OUStringToOString(sValue, getOwnConnection()->getConnectionEncoding()); + OString sAscii + = OUStringToOString(sValue, getOwnConnection()->getConnectionEncoding()); std::stringstream sStream{ sAscii.getStr() }; sStream >> nValue; m_binds[nIndex].buffer_type = MYSQL_TYPE_DOUBLE; @@ -461,7 +461,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 parameterIndex, co } void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */, - const rtl::OUString& /* typeName */) + const OUString& /* typeName */) { MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); @@ -580,7 +580,7 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 column) { if (column < 1 || column > static_cast<sal_Int32>(m_paramCount)) { - throw SQLException("Parameter index out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("Parameter index out of range", *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx index 5d985de72e4b..1df2c704a38d 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx @@ -65,11 +65,11 @@ class OPreparedStatement final : public OCommonStatement, public OPreparedStatem virtual ~OPreparedStatement() override; public: - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; OPreparedStatement(OConnection* _pConnection, MYSQL_STMT* pStmt); @@ -96,7 +96,7 @@ public: 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) override; + const OUString& typeName) override; void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) override; @@ -112,7 +112,7 @@ public: void SAL_CALL setDouble(sal_Int32 parameter, double x) override; - void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) override; + void SAL_CALL setString(sal_Int32 parameter, const OUString& x) override; void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence<sal_Int8>& x) override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx index 3a6e063d7dbf..ab018ef9a777 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.cxx @@ -79,24 +79,24 @@ void OResultSet::checkRowIndex() { if (m_nRowPosition <= 0 || m_nRowPosition > m_nRowCount) { - throw SQLException("Cursor position out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("Cursor position out of range", *this, OUString(), 1, Any()); } } -rtl::OUString SAL_CALL OResultSet::getImplementationName() +OUString SAL_CALL OResultSet::getImplementationName() { - return rtl::OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); + return OUString("com.sun.star.sdbcx.mysqlc.ResultSet"); } -uno::Sequence<rtl::OUString> SAL_CALL OResultSet::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL OResultSet::getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aSupported(2); + uno::Sequence<OUString> aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet"; return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName) +sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) { return cppu::supportsService(this, _rServiceName); } @@ -149,7 +149,7 @@ uno::Sequence<Type> SAL_CALL OResultSet::getTypes() return concatSequences(aTypes.getTypes(), OResultSet_BASE::getTypes()); } -sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName) +sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName) { MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -255,8 +255,8 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column) return d; } - rtl::OString dateString(dateStr); - rtl::OString token; + OString dateString(dateStr); + OString token; sal_Int32 nIndex = 0, i = 0; do { @@ -443,7 +443,7 @@ sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column) return std::atoi(pValue); } -rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column) +OUString SAL_CALL OResultSet::getString(sal_Int32 column) { MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -454,10 +454,10 @@ rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column) if (!pValue) { m_bWasNull = true; - return rtl::OUString{}; + return OUString{}; } m_bWasNull = false; - return rtl::OUString(pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding); + return OUString(pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding); } Time SAL_CALL OResultSet::getTime(sal_Int32 column) @@ -474,8 +474,8 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column) m_bWasNull = true; return t; } - rtl::OUString timeString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }; - rtl::OUString token; + OUString timeString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }; + OUString token; sal_Int32 nIndex, i = 0; nIndex = timeString.indexOf(' ') + 1; @@ -516,8 +516,8 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column) } // YY-MM-DD HH:MM:SS - std::vector<rtl::OUString> dateAndTime = lcl_split( - rtl::OUString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }, u' '); + std::vector<OUString> dateAndTime = lcl_split( + OUString{ pValue, static_cast<sal_Int32>(m_aLengths[column - 1]), m_encoding }, u' '); auto dateParts = lcl_split(dateAndTime.at(0), u'-'); auto timeParts = lcl_split(dateAndTime.at(1), u':'); @@ -859,7 +859,7 @@ void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateDouble", *this); } -void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */) +void SAL_CALL OResultSet::updateString(sal_Int32 column, const OUString& /* x */) { MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1062,7 +1062,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& case PROPERTY_ID_CURSORNAME: case PROPERTY_ID_RESULTSETCONCURRENCY: case PROPERTY_ID_RESULTSETTYPE: - throw uno::Exception("cannot set prop " + rtl::OUString::number(nHandle), nullptr); + throw uno::Exception("cannot set prop " + OUString::number(nHandle), nullptr); case PROPERTY_ID_FETCHDIRECTION: break; case PROPERTY_ID_FETCHSIZE: @@ -1111,7 +1111,7 @@ void OResultSet::checkColumnIndex(sal_Int32 index) if (index < 1 || index > static_cast<int>(fieldCount)) { /* static object for efficiency or thread safety is a problem ? */ - throw SQLException("index out of range", *this, rtl::OUString(), 1, Any()); + throw SQLException("index out of range", *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx index 59b956850487..ce9f7bd61db8 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx @@ -91,11 +91,11 @@ class OResultSet final : public OBase_Mutex, virtual ~OResultSet() override = default; public: - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; OResultSet(OConnection& rConn, OCommonStatement* pStmt, MYSQL_RES* pResult, rtl_TextEncoding _encoding); @@ -144,7 +144,7 @@ public: // XRow sal_Bool SAL_CALL wasNull() override; - rtl::OUString SAL_CALL getString(sal_Int32 column) override; + OUString SAL_CALL getString(sal_Int32 column) override; sal_Bool SAL_CALL getBoolean(sal_Int32 column) override; sal_Int8 SAL_CALL getByte(sal_Int32 column) override; @@ -202,7 +202,7 @@ public: 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 updateString(sal_Int32 column, const 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; @@ -217,7 +217,7 @@ public: void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) override; // XColumnLocate - sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) override; + sal_Int32 SAL_CALL findColumn(const OUString& columnName) override; // XRowLocate Any SAL_CALL getBookmark() override; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx index 106ad775e7e5..f5962a2a54ff 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx @@ -56,8 +56,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) // MYSQL_FIELD::charsetnr is the collation identifier // _ci postfix means it's insensitive MYSQL_FIELD* pField = getField(column); - rtl::OUStringBuffer sql{ "SHOW COLLATION WHERE Id =" }; - sql.append(rtl::OUString::number(pField->charsetnr)); + OUStringBuffer sql{ "SHOW COLLATION WHERE Id =" }; + sql.append(OUString::number(pField->charsetnr)); Reference<XStatement> stmt = m_rConnection.createStatement(); Reference<XResultSet> rs = stmt->executeQuery(sql.makeStringAndClear()); @@ -66,42 +66,42 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) if (!rs->next()) // fetch first and only row return false; - rtl::OUString sColName = xRow->getString(1); // first column is Collation name + OUString sColName = xRow->getString(1); // first column is Collation name return !sColName.isEmpty() && !sColName.endsWith("_ci"); } -rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->db, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->db, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->table, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->table, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->catalog, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->catalog, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); @@ -109,18 +109,18 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) return mysqlc_sdbc_driver::mysqlTypeToStr(pField); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) { checkColumnIndex(column); MYSQL_FIELD* pField = getField(column); - return rtl::OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); + return OStringToOUString(pField->name, m_rConnection.getConnectionEncoding()); } -rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) { checkColumnIndex(column); - rtl::OUString aRet = rtl::OUString(); + OUString aRet = OUString(); return aRet; } @@ -192,13 +192,13 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) unsigned nColCount = mysql_num_fields(m_pRes); if (columnIndex < 1 || columnIndex > static_cast<sal_Int32>(nColCount)) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append("Column index out of range (expected 1 to "); buf.append(sal_Int32(nColCount)); buf.append(", got "); buf.append(columnIndex); buf.append('.'); - throw SQLException(buf.makeStringAndClear(), *this, rtl::OUString(), 1, Any()); + throw SQLException(buf.makeStringAndClear(), *this, OUString(), 1, Any()); } } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx index 56ca55c7b025..346695def388 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx @@ -70,25 +70,25 @@ public: sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) 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; + OUString SAL_CALL getColumnLabel(sal_Int32 column) override; + OUString SAL_CALL getColumnName(sal_Int32 column) override; + OUString SAL_CALL getSchemaName(sal_Int32 column) 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) override; - rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override; + OUString SAL_CALL getTableName(sal_Int32 column) override; + OUString SAL_CALL getCatalogName(sal_Int32 column) override; sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override; - rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; + OUString SAL_CALL getColumnTypeName(sal_Int32 column) 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) override; + OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; /// @throws SQLException /// @throws RuntimeException diff --git a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx index 002f4df40272..d23cf66aba06 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_services.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_services.cxx @@ -31,23 +31,23 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; typedef Reference<XSingleServiceFactory> (*createFactoryFunc)( - const Reference<XMultiServiceFactory>& rServiceManager, const rtl::OUString& rComponentName, - ::cppu::ComponentInstantiation pCreateFunction, const Sequence<rtl::OUString>& rServiceNames, + const Reference<XMultiServiceFactory>& rServiceManager, const OUString& rComponentName, + ::cppu::ComponentInstantiation pCreateFunction, const Sequence<OUString>& rServiceNames, rtl_ModuleCount*); struct ProviderRequest { Reference<XSingleServiceFactory> xRet; Reference<XMultiServiceFactory> const xServiceManager; - rtl::OUString const sImplementationName; + OUString const sImplementationName; ProviderRequest(void* pServiceManager, sal_Char const* pImplementationName) : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager)) - , sImplementationName(rtl::OUString::createFromAscii(pImplementationName)) + , sImplementationName(OUString::createFromAscii(pImplementationName)) { } - bool CREATE_PROVIDER(const rtl::OUString& Implname, const Sequence<rtl::OUString>& Services, + bool CREATE_PROVIDER(const OUString& Implname, const Sequence<OUString>& Services, ::cppu::ComponentInstantiation Factory, createFactoryFunc creator) { if (!xRet.is() && (Implname == sImplementationName)) diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx index cc6bf1492502..ce970113945f 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx @@ -121,14 +121,14 @@ void SAL_CALL OStatement::clearBatch() // if you support batches clear it here } -sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql) +sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - const rtl::OUString sSqlStatement = m_xConnection->transFormPreparedStatement(sql); + const OUString sSqlStatement = m_xConnection->transFormPreparedStatement(sql); - rtl::OString toExec - = rtl::OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); + OString toExec + = OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); MYSQL* pMySql = m_xConnection->getMysqlConnection(); @@ -145,14 +145,13 @@ sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql) return !failure; } -Reference<XResultSet> SAL_CALL OCommonStatement::executeQuery(const rtl::OUString& sql) +Reference<XResultSet> SAL_CALL OCommonStatement::executeQuery(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - const rtl::OUString sSqlStatement - = sql; // TODO m_xConnection->transFormPreparedStatement( sql ); - rtl::OString toExec - = rtl::OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); + const OUString sSqlStatement = sql; // TODO m_xConnection->transFormPreparedStatement( sql ); + OString toExec + = OUStringToOString(sSqlStatement, m_xConnection->getConnectionSettings().encoding); MYSQL* pMySql = m_xConnection->getMysqlConnection(); // toExec = mysqlc_sdbc_driver::escapeSql(toExec); @@ -194,7 +193,7 @@ Any SAL_CALL OStatement::queryInterface(const Type& rType) return aRet; } -void SAL_CALL OStatement::addBatch(const rtl::OUString&) +void SAL_CALL OStatement::addBatch(const OUString&) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -209,7 +208,7 @@ Sequence<sal_Int32> SAL_CALL OStatement::executeBatch() return aRet; } -sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql) { MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); @@ -255,7 +254,7 @@ void SAL_CALL OCommonStatement::clearWarnings() Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; pProperties[nPos++] - = Property("CursorName", PROPERTY_ID_CURSORNAME, cppu::UnoType<rtl::OUString>::get(), 0); + = Property("CursorName", PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); pProperties[nPos++] = Property("EscapeProcessing", PROPERTY_ID_ESCAPEPROCESSING, cppu::UnoType<bool>::get(), 0); pProperties[nPos++] = Property("FetchDirection", PROPERTY_ID_FETCHDIRECTION, @@ -328,19 +327,16 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con } } -rtl::OUString OStatement::getImplementationName() -{ - return rtl::OUString("com.sun.star.sdbcx.OStatement"); -} +OUString OStatement::getImplementationName() { return OUString("com.sun.star.sdbcx.OStatement"); } -css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames() +css::uno::Sequence<OUString> OStatement::getSupportedServiceNames() { - css::uno::Sequence<rtl::OUString> s(1); + css::uno::Sequence<OUString> s(1); s[0] = "com.sun.star.sdbc.Statement"; return s; } -sal_Bool OStatement::supportsService(rtl::OUString const& ServiceName) +sal_Bool OStatement::supportsService(OUString const& ServiceName) { return cppu::supportsService(this, ServiceName); } diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx index a9e00f915789..9b0d3c952763 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx @@ -111,12 +111,11 @@ public: css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; // XStatement - css::uno::Reference<css::sdbc::XResultSet> - SAL_CALL executeQuery(const rtl::OUString& sql) override; + css::uno::Reference<css::sdbc::XResultSet> SAL_CALL executeQuery(const OUString& sql) override; - sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) override; + sal_Int32 SAL_CALL executeUpdate(const OUString& sql) override; - sal_Bool SAL_CALL execute(const rtl::OUString& sql) override; + sal_Bool SAL_CALL execute(const OUString& sql) override; css::uno::Reference<css::sdbc::XConnection> SAL_CALL getConnection() override; @@ -159,11 +158,11 @@ public: { } - virtual rtl::OUString SAL_CALL getImplementationName() override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const& ServiceName) override; + virtual sal_Bool SAL_CALL supportsService(OUString const& ServiceName) override; - virtual css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; Any SAL_CALL queryInterface(const css::uno::Type& rType) override; @@ -171,7 +170,7 @@ public: void SAL_CALL release() throw() override; // XBatchExecution - void SAL_CALL addBatch(const rtl::OUString& sql) override; + void SAL_CALL addBatch(const OUString& sql) override; void SAL_CALL clearBatch() override; diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index c14f13351377..fc085ae9df57 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -82,9 +82,9 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = nullptr; #define SQL_NEW_KEYWORD(token) \ SQLyylval.pParseNode = new OSQLInternalNode("", SQLNodeType::Keyword, (token)); return token; -#define SQL_NEW_INTNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::IntNum); return SQL_TOKEN_INTNUM; -#define SQL_NEW_APPROXNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::ApproxNum); return SQL_TOKEN_APPROXNUM; -#define SQL_NEW_DATE SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; +#define SQL_NEW_INTNUM SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::IntNum); return SQL_TOKEN_INTNUM; +#define SQL_NEW_APPROXNUM SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::ApproxNum); return SQL_TOKEN_APPROXNUM; +#define SQL_NEW_DATE SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; #define YY_INPUT(buf,result,max_size) \ { \ @@ -422,14 +422,14 @@ YEARDAY {SQL_NEW_KEYWORD(SQL_TOKEN_YEARDAY); } ZONE {SQL_NEW_KEYWORD(SQL_TOKEN_ZONE); } -"<" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Less);return SQL_LESS;} -">" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Great);return SQL_GREAT;} -"=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Equal);return SQL_EQUAL;} -"<=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::LessEq);return SQL_LESSEQ;} -">=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::GreatEq);return SQL_GREATEQ;} -"<>" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} -"!=" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} -"||" { SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Concat);return SQL_CONCAT;} +"<" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Less);return SQL_LESS;} +">" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Great);return SQL_GREAT;} +"=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Equal);return SQL_EQUAL;} +"<=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::LessEq);return SQL_LESSEQ;} +">=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::GreatEq);return SQL_GREATEQ;} +"<>" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} +"!=" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::NotEqual);return SQL_NOTEQUAL;} +"||" { SQL_NEW_NODE(OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQLNodeType::Concat);return SQL_CONCAT;} [-+*/:(),.;?{}] { return SQLyytext[0]; } @@ -523,7 +523,7 @@ inline bool checkeof(int c) { return c == 0 || c == EOF; } sal_Int32 gatherString(int delim, sal_Int32 nTyp) { int ch; - ::rtl::OStringBuffer sBuffer(256); + OStringBuffer sBuffer(256); while (!checkeof(ch = yyinput())) { @@ -537,13 +537,13 @@ sal_Int32 gatherString(int delim, sal_Int32 nTyp) switch(nTyp) { case 0: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); + SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); return SQL_TOKEN_NAME; case 1: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::String); + SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::String); return SQL_TOKEN_STRING; case 2: - SQL_NEW_NODE(::rtl::OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); + SQL_NEW_NODE(OStringToOUString(sBuffer.makeStringAndClear(),RTL_TEXTENCODING_UTF8), SQLNodeType::AccessDate); return SQL_TOKEN_ACCESS_DATE; } } @@ -638,7 +638,7 @@ sal_Int32 gatherName(const sal_Char* text) SQL_NEW_KEYWORD(nToken); break; default: - SQL_NEW_NODE(::rtl::OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); + SQL_NEW_NODE(OUString(text,strlen(text),RTL_TEXTENCODING_UTF8), SQLNodeType::Name); return SQL_TOKEN_NAME; } } @@ -684,17 +684,17 @@ sal_Int32 gatherNamePre(const sal_Char* text) default: // we need a special handling for parameter { - ::rtl::OString sStmt = xxx_pGLOBAL_SQLSCAN->getStatement(); + OString sStmt = xxx_pGLOBAL_SQLSCAN->getStatement(); sal_Int32 nLength = strlen(text); sal_Int32 nPos = xxx_pGLOBAL_SQLSCAN->GetCurrentPos() - nLength - 2; if (sStmt.getStr()[nPos] == ':') { - SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::Name); + SQL_NEW_NODE(OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::Name); nToken = SQL_TOKEN_NAME; } else { - SQL_NEW_NODE(::rtl::OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::String); + SQL_NEW_NODE(OUString(text,nLength,RTL_TEXTENCODING_UTF8), SQLNodeType::String); nToken = SQL_TOKEN_STRING; } } @@ -728,12 +728,12 @@ void OSQLScanner::SQLyyerror(char const *fmt) IN_SQLyyerror = true; OSL_ENSURE(m_pContext, "OSQLScanner::SQLyyerror: No Context set"); - m_sErrorMessage = ::rtl::OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8); + m_sErrorMessage = OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8); if (m_nCurrentPos < m_sStatement.getLength()) { m_sErrorMessage += ": "; - ::rtl::OUString aError; + OUString aError; OUStringBuffer Buffer(256); int ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' '; @@ -762,13 +762,13 @@ void OSQLScanner::SQLyyerror(char const *fmt) } //------------------------------------------------------------------------------ -void OSQLScanner::prepareScan(const ::rtl::OUString & rNewStatement, const IParseContext* pContext, bool bInternational) +void OSQLScanner::prepareScan(const OUString & rNewStatement, const IParseContext* pContext, bool bInternational) { YY_FLUSH_BUFFER; BEGIN(m_nRule); - m_sErrorMessage = ::rtl::OUString(); - m_sStatement = ::rtl::OUStringToOString(rNewStatement, RTL_TEXTENCODING_UTF8); + m_sErrorMessage = OUString(); + m_sStatement = OUStringToOString(rNewStatement, RTL_TEXTENCODING_UTF8); m_nCurrentPos = 0; m_bInternational = bInternational; m_pContext = pContext; @@ -786,7 +786,7 @@ sal_Int32 OSQLScanner::SQLyygetc(void) IParseContext::InternationalKeyCode OSQLScanner::getInternationalTokenID(const sal_Char* sToken) const { OSL_ENSURE(m_pContext, "OSQLScanner::getInternationalTokenID: No Context set"); - return (m_bInternational) ? m_pContext->getIntlKeyCode(::rtl::OString(sToken) ) : IParseContext::InternationalKeyCode::None; + return (m_bInternational) ? m_pContext->getIntlKeyCode(OString(sToken) ) : IParseContext::InternationalKeyCode::None; } sal_Int32 OSQLScanner::GetGERRule() { return PREDICATE_GER; } sal_Int32 OSQLScanner::GetENGRule() { return PREDICATE_ENG; } |