[Libreoffice-commits] core.git: connectivity/qa connectivity/source connectivity/workben
Noel Grandin
noel at peralex.com
Mon May 30 08:37:48 UTC 2016
connectivity/qa/connectivity/mork/DriverTest.cxx | 2
connectivity/source/commontools/BlobHelper.cxx | 16
connectivity/source/commontools/ConnectionWrapper.cxx | 14
connectivity/source/commontools/DateConversion.cxx | 26
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 22
connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx | 2
connectivity/source/commontools/FValue.cxx | 42 -
connectivity/source/commontools/ParamterSubstitution.cxx | 8
connectivity/source/commontools/TConnection.cxx | 2
connectivity/source/commontools/TIndexColumns.cxx | 2
connectivity/source/commontools/TKeyColumns.cxx | 4
connectivity/source/commontools/TTableHelper.cxx | 38 -
connectivity/source/commontools/conncleanup.cxx | 14
connectivity/source/commontools/dbexception.cxx | 42 -
connectivity/source/commontools/dbtools.cxx | 10
connectivity/source/commontools/parameters.cxx | 24
connectivity/source/cpool/ZConnectionPool.cxx | 6
connectivity/source/cpool/ZConnectionPool.hxx | 32
connectivity/source/cpool/ZConnectionWrapper.cxx | 22
connectivity/source/cpool/ZConnectionWrapper.hxx | 49 -
connectivity/source/cpool/ZDriverWrapper.hxx | 21
connectivity/source/cpool/ZPoolCollection.cxx | 8
connectivity/source/cpool/ZPoolCollection.hxx | 86 +-
connectivity/source/cpool/ZPooledConnection.cxx | 2
connectivity/source/cpool/ZPooledConnection.hxx | 18
connectivity/source/drivers/ado/ACallableStatement.cxx | 12
connectivity/source/drivers/ado/AColumn.cxx | 2
connectivity/source/drivers/ado/AConnection.cxx | 10
connectivity/source/drivers/ado/ADatabaseMetaData.cxx | 6
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 56 -
connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx | 2
connectivity/source/drivers/ado/ADriver.cxx | 10
connectivity/source/drivers/ado/AGroup.cxx | 10
connectivity/source/drivers/ado/AIndex.cxx | 2
connectivity/source/drivers/ado/AKey.cxx | 2
connectivity/source/drivers/ado/APreparedStatement.cxx | 6
connectivity/source/drivers/ado/AResultSet.cxx | 72 +-
connectivity/source/drivers/ado/AResultSetMetaData.cxx | 2
connectivity/source/drivers/ado/AStatement.cxx | 36 -
connectivity/source/drivers/ado/ATable.cxx | 6
connectivity/source/drivers/ado/AUser.cxx | 4
connectivity/source/drivers/ado/AView.cxx | 2
connectivity/source/drivers/ado/Aolevariant.cxx | 40 -
connectivity/source/drivers/ado/Awrapado.cxx | 26
connectivity/source/drivers/ado/adoimp.cxx | 4
connectivity/source/drivers/calc/CConnection.cxx | 2
connectivity/source/drivers/calc/CDriver.cxx | 6
connectivity/source/drivers/calc/CResultSet.cxx | 2
connectivity/source/drivers/calc/CTable.cxx | 12
connectivity/source/drivers/dbase/DConnection.cxx | 2
connectivity/source/drivers/dbase/DDriver.cxx | 2
connectivity/source/drivers/dbase/DResultSet.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 28
connectivity/source/drivers/dbase/dindexnode.cxx | 4
connectivity/source/drivers/evoab2/NCatalog.hxx | 6
connectivity/source/drivers/evoab2/NColumns.hxx | 2
connectivity/source/drivers/evoab2/NConnection.cxx | 6
connectivity/source/drivers/evoab2/NConnection.hxx | 50 -
connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 248 +++----
connectivity/source/drivers/evoab2/NDriver.cxx | 4
connectivity/source/drivers/evoab2/NDriver.hxx | 34 -
connectivity/source/drivers/evoab2/NPreparedStatement.hxx | 89 +-
connectivity/source/drivers/evoab2/NResultSet.cxx | 18
connectivity/source/drivers/evoab2/NResultSet.hxx | 124 +--
connectivity/source/drivers/evoab2/NResultSetMetaData.cxx | 2
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 48 -
connectivity/source/drivers/evoab2/NServices.cxx | 2
connectivity/source/drivers/evoab2/NStatement.hxx | 42 -
connectivity/source/drivers/evoab2/NTable.hxx | 2
connectivity/source/drivers/evoab2/NTables.hxx | 6
connectivity/source/drivers/file/FDateFunctions.cxx | 24
connectivity/source/drivers/file/FDriver.cxx | 8
connectivity/source/drivers/file/FPreparedStatement.cxx | 6
connectivity/source/drivers/file/FResultSet.cxx | 36 -
connectivity/source/drivers/file/FResultSetMetaData.cxx | 2
connectivity/source/drivers/file/FStatement.cxx | 10
connectivity/source/drivers/file/FTable.cxx | 8
connectivity/source/drivers/file/fcomp.cxx | 2
connectivity/source/drivers/firebird/Blob.hxx | 76 +-
connectivity/source/drivers/firebird/Catalog.hxx | 4
connectivity/source/drivers/firebird/Connection.cxx | 2
connectivity/source/drivers/firebird/Connection.hxx | 82 +-
connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 300 ++++-----
connectivity/source/drivers/firebird/Driver.cxx | 2
connectivity/source/drivers/firebird/Driver.hxx | 46 -
connectivity/source/drivers/firebird/PreparedStatement.cxx | 4
connectivity/source/drivers/firebird/PreparedStatement.hxx | 132 ++--
connectivity/source/drivers/firebird/ResultSet.cxx | 10
connectivity/source/drivers/firebird/ResultSet.hxx | 136 ++--
connectivity/source/drivers/firebird/ResultSetMetaData.cxx | 2
connectivity/source/drivers/firebird/ResultSetMetaData.hxx | 46 -
connectivity/source/drivers/firebird/Statement.hxx | 38 -
connectivity/source/drivers/firebird/StatementCommonBase.cxx | 22
connectivity/source/drivers/firebird/StatementCommonBase.hxx | 54 -
connectivity/source/drivers/firebird/SubComponent.hxx | 6
connectivity/source/drivers/firebird/Table.hxx | 30
connectivity/source/drivers/firebird/Tables.hxx | 10
connectivity/source/drivers/firebird/User.hxx | 4
connectivity/source/drivers/firebird/Users.hxx | 10
connectivity/source/drivers/firebird/Util.hxx | 4
connectivity/source/drivers/flat/EConnection.cxx | 2
connectivity/source/drivers/flat/EDriver.cxx | 12
connectivity/source/drivers/flat/EResultSet.cxx | 2
connectivity/source/drivers/flat/EStatement.cxx | 2
connectivity/source/drivers/flat/ETable.cxx | 14
connectivity/source/drivers/hsqldb/HDriver.cxx | 38 -
connectivity/source/drivers/hsqldb/HTable.cxx | 2
connectivity/source/drivers/hsqldb/HTerminateListener.hxx | 15
connectivity/source/drivers/hsqldb/HUser.cxx | 6
connectivity/source/drivers/hsqldb/HUsers.cxx | 2
connectivity/source/drivers/hsqldb/HViews.cxx | 12
connectivity/source/drivers/hsqldb/Hservices.cxx | 8
connectivity/source/drivers/jdbc/Array.cxx | 16
connectivity/source/drivers/jdbc/Blob.cxx | 12
connectivity/source/drivers/jdbc/CallableStatement.cxx | 26
connectivity/source/drivers/jdbc/Clob.cxx | 10
connectivity/source/drivers/jdbc/InputStream.cxx | 12
connectivity/source/drivers/jdbc/JConnection.cxx | 4
connectivity/source/drivers/jdbc/JDriver.cxx | 4
connectivity/source/drivers/jdbc/JStatement.cxx | 52 -
connectivity/source/drivers/jdbc/Object.cxx | 2
connectivity/source/drivers/jdbc/PreparedStatement.cxx | 70 +-
connectivity/source/drivers/jdbc/Reader.cxx | 10
connectivity/source/drivers/jdbc/Ref.cxx | 2
connectivity/source/drivers/jdbc/ResultSet.cxx | 140 ++--
connectivity/source/drivers/jdbc/ResultSetMetaData.cxx | 2
connectivity/source/drivers/jdbc/Timestamp.cxx | 12
connectivity/source/drivers/jdbc/tools.cxx | 8
connectivity/source/drivers/kab/KCatalog.hxx | 6
connectivity/source/drivers/kab/KColumns.hxx | 2
connectivity/source/drivers/kab/KConnection.cxx | 6
connectivity/source/drivers/kab/KConnection.hxx | 58 -
connectivity/source/drivers/kab/KDatabaseMetaData.hxx | 304 ++++-----
connectivity/source/drivers/kab/KDriver.cxx | 4
connectivity/source/drivers/kab/KDriver.hxx | 52 -
connectivity/source/drivers/kab/KPreparedStatement.cxx | 4
connectivity/source/drivers/kab/KPreparedStatement.hxx | 84 +-
connectivity/source/drivers/kab/KResultSet.cxx | 26
connectivity/source/drivers/kab/KResultSet.hxx | 198 +++---
connectivity/source/drivers/kab/KResultSetMetaData.cxx | 2
connectivity/source/drivers/kab/KResultSetMetaData.hxx | 48 -
connectivity/source/drivers/kab/KStatement.cxx | 28
connectivity/source/drivers/kab/KStatement.hxx | 76 +-
connectivity/source/drivers/kab/KTable.hxx | 2
connectivity/source/drivers/kab/KTables.hxx | 6
connectivity/source/drivers/kab/kcondition.hxx | 14
connectivity/source/drivers/kab/kfields.hxx | 2
connectivity/source/drivers/macab/MacabCatalog.hxx | 6
connectivity/source/drivers/macab/MacabColumns.hxx | 2
connectivity/source/drivers/macab/MacabConnection.cxx | 6
connectivity/source/drivers/macab/MacabConnection.hxx | 64 -
connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx | 304 ++++-----
connectivity/source/drivers/macab/MacabDriver.cxx | 2
connectivity/source/drivers/macab/MacabDriver.hxx | 50 -
connectivity/source/drivers/macab/MacabPreparedStatement.cxx | 4
connectivity/source/drivers/macab/MacabPreparedStatement.hxx | 82 +-
connectivity/source/drivers/macab/MacabResultSet.cxx | 40 -
connectivity/source/drivers/macab/MacabResultSet.hxx | 196 +++---
connectivity/source/drivers/macab/MacabResultSetMetaData.cxx | 2
connectivity/source/drivers/macab/MacabResultSetMetaData.hxx | 48 -
connectivity/source/drivers/macab/MacabStatement.cxx | 28
connectivity/source/drivers/macab/MacabStatement.hxx | 82 +-
connectivity/source/drivers/macab/MacabTable.hxx | 2
connectivity/source/drivers/macab/MacabTables.hxx | 6
connectivity/source/drivers/macab/macabcondition.hxx | 14
connectivity/source/drivers/macab/macabutilities.hxx | 12
connectivity/source/drivers/mork/MCatalog.hxx | 4
connectivity/source/drivers/mork/MColumnAlias.cxx | 4
connectivity/source/drivers/mork/MColumnAlias.hxx | 4
connectivity/source/drivers/mork/MColumns.hxx | 2
connectivity/source/drivers/mork/MConnection.cxx | 4
connectivity/source/drivers/mork/MConnection.hxx | 52 -
connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 254 +++----
connectivity/source/drivers/mork/MDriver.cxx | 6
connectivity/source/drivers/mork/MDriver.hxx | 2
connectivity/source/drivers/mork/MPreparedStatement.cxx | 14
connectivity/source/drivers/mork/MPreparedStatement.hxx | 88 +-
connectivity/source/drivers/mork/MResultSet.cxx | 66 +-
connectivity/source/drivers/mork/MResultSet.hxx | 226 +++---
connectivity/source/drivers/mork/MResultSetMetaData.cxx | 2
connectivity/source/drivers/mork/MResultSetMetaData.hxx | 46 -
connectivity/source/drivers/mork/MStatement.cxx | 22
connectivity/source/drivers/mork/MStatement.hxx | 56 -
connectivity/source/drivers/mork/MTables.hxx | 7
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 32
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 40 -
connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx | 4
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 12
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 12
connectivity/source/drivers/mysql/YDriver.cxx | 2
connectivity/source/drivers/mysql/YTable.cxx | 2
connectivity/source/drivers/mysql/YUser.cxx | 6
connectivity/source/drivers/mysql/YUsers.cxx | 2
connectivity/source/drivers/odbc/OConnection.cxx | 4
connectivity/source/drivers/odbc/ODatabaseMetaData.cxx | 8
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 30
connectivity/source/drivers/odbc/ODriver.cxx | 2
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 6
connectivity/source/drivers/odbc/ORealDriver.cxx | 4
connectivity/source/drivers/odbc/ORealDriver.hxx | 8
connectivity/source/drivers/odbc/OResultSet.cxx | 28
connectivity/source/drivers/odbc/OResultSetMetaData.cxx | 8
connectivity/source/drivers/odbc/OStatement.cxx | 24
connectivity/source/drivers/odbc/OTools.cxx | 14
connectivity/source/drivers/postgresql/pq_array.cxx | 30
connectivity/source/drivers/postgresql/pq_array.hxx | 42 -
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 32
connectivity/source/drivers/postgresql/pq_baseresultset.hxx | 172 ++---
connectivity/source/drivers/postgresql/pq_connection.cxx | 20
connectivity/source/drivers/postgresql/pq_connection.hxx | 98 +--
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 144 ++--
connectivity/source/drivers/postgresql/pq_databasemetadata.hxx | 326 +++++-----
connectivity/source/drivers/postgresql/pq_driver.cxx | 18
connectivity/source/drivers/postgresql/pq_driver.hxx | 54 -
connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx | 32
connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx | 66 +-
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 34 -
connectivity/source/drivers/postgresql/pq_preparedstatement.hxx | 162 ++--
connectivity/source/drivers/postgresql/pq_resultset.cxx | 30
connectivity/source/drivers/postgresql/pq_resultset.hxx | 14
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 22
connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx | 54 -
connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx | 16
connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx | 22
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx | 2
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx | 46 -
connectivity/source/drivers/postgresql/pq_statement.cxx | 32
connectivity/source/drivers/postgresql/pq_statement.hxx | 100 +--
connectivity/source/drivers/postgresql/pq_statics.cxx | 128 +--
connectivity/source/drivers/postgresql/pq_statics.hxx | 6
connectivity/source/drivers/postgresql/pq_tools.cxx | 66 +-
connectivity/source/drivers/postgresql/pq_tools.hxx | 48 -
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 46 -
connectivity/source/drivers/postgresql/pq_updateableresultset.hxx | 90 +-
connectivity/source/drivers/postgresql/pq_xbase.cxx | 48 -
connectivity/source/drivers/postgresql/pq_xbase.hxx | 68 +-
connectivity/source/drivers/postgresql/pq_xcolumn.cxx | 4
connectivity/source/drivers/postgresql/pq_xcolumn.hxx | 12
connectivity/source/drivers/postgresql/pq_xcolumns.cxx | 66 +-
connectivity/source/drivers/postgresql/pq_xcolumns.hxx | 46 -
connectivity/source/drivers/postgresql/pq_xcontainer.cxx | 96 +-
connectivity/source/drivers/postgresql/pq_xcontainer.hxx | 118 +--
connectivity/source/drivers/postgresql/pq_xindex.cxx | 16
connectivity/source/drivers/postgresql/pq_xindex.hxx | 56 -
connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx | 4
connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx | 12
connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx | 62 -
connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx | 48 -
connectivity/source/drivers/postgresql/pq_xindexes.cxx | 44 -
connectivity/source/drivers/postgresql/pq_xindexes.hxx | 36 -
connectivity/source/drivers/postgresql/pq_xkey.cxx | 16
connectivity/source/drivers/postgresql/pq_xkey.hxx | 56 -
connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx | 4
connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx | 12
connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx | 46 -
connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx | 44 -
connectivity/source/drivers/postgresql/pq_xkeys.cxx | 64 -
connectivity/source/drivers/postgresql/pq_xkeys.hxx | 36 -
connectivity/source/drivers/postgresql/pq_xtable.cxx | 80 +-
connectivity/source/drivers/postgresql/pq_xtable.hxx | 122 +--
connectivity/source/drivers/postgresql/pq_xtables.cxx | 56 -
connectivity/source/drivers/postgresql/pq_xtables.hxx | 32
connectivity/source/drivers/postgresql/pq_xuser.cxx | 22
connectivity/source/drivers/postgresql/pq_xuser.hxx | 38 -
connectivity/source/drivers/postgresql/pq_xusers.cxx | 42 -
connectivity/source/drivers/postgresql/pq_xusers.hxx | 32
connectivity/source/drivers/postgresql/pq_xview.cxx | 20
connectivity/source/drivers/postgresql/pq_xview.hxx | 38 -
connectivity/source/drivers/postgresql/pq_xviews.cxx | 42 -
connectivity/source/drivers/postgresql/pq_xviews.hxx | 32
connectivity/source/inc/FDatabaseMetaDataResultSet.hxx | 130 +--
connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 44 -
connectivity/source/inc/OTypeInfo.hxx | 4
connectivity/source/inc/ParameterSubstitution.hxx | 34 -
connectivity/source/inc/TConnection.hxx | 24
connectivity/source/inc/TDatabaseMetaDataBase.hxx | 76 +-
connectivity/source/inc/TPrivilegesResultSet.hxx | 12
connectivity/source/inc/ado/ACallableStatement.hxx | 50 -
connectivity/source/inc/ado/AColumn.hxx | 10
connectivity/source/inc/ado/AColumns.hxx | 6
connectivity/source/inc/ado/AConnection.hxx | 58 -
connectivity/source/inc/ado/ADatabaseMetaData.hxx | 276 ++++----
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 144 ++--
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 46 -
connectivity/source/inc/ado/ADriver.hxx | 40 -
connectivity/source/inc/ado/AGroup.hxx | 18
connectivity/source/inc/ado/AGroups.hxx | 6
connectivity/source/inc/ado/AIndex.hxx | 8
connectivity/source/inc/ado/AIndexes.hxx | 6
connectivity/source/inc/ado/AKey.hxx | 8
connectivity/source/inc/ado/AKeys.hxx | 6
connectivity/source/inc/ado/APreparedStatement.hxx | 76 +-
connectivity/source/inc/ado/AResultSet.hxx | 220 +++---
connectivity/source/inc/ado/AResultSetMetaData.hxx | 44 -
connectivity/source/inc/ado/AStatement.hxx | 114 +--
connectivity/source/inc/ado/ATable.hxx | 20
connectivity/source/inc/ado/ATables.hxx | 8
connectivity/source/inc/ado/AUser.hxx | 22
connectivity/source/inc/ado/AUsers.hxx | 6
connectivity/source/inc/ado/AView.hxx | 10
connectivity/source/inc/ado/AViews.hxx | 8
connectivity/source/inc/ado/Aolevariant.hxx | 18
connectivity/source/inc/ado/Awrapado.hxx | 26
connectivity/source/inc/ado/adoimp.hxx | 4
connectivity/source/inc/calc/CConnection.hxx | 20
connectivity/source/inc/calc/CDatabaseMetaData.hxx | 18
connectivity/source/inc/calc/CDriver.hxx | 27
connectivity/source/inc/calc/CResultSet.hxx | 26
connectivity/source/inc/calc/CTable.hxx | 14
connectivity/source/inc/calc/CTables.hxx | 2
connectivity/source/inc/dbase/DColumns.hxx | 6
connectivity/source/inc/dbase/DConnection.hxx | 10
connectivity/source/inc/dbase/DDatabaseMetaData.hxx | 28
connectivity/source/inc/dbase/DDriver.hxx | 16
connectivity/source/inc/dbase/DIndex.hxx | 6
connectivity/source/inc/dbase/DIndexColumns.hxx | 6
connectivity/source/inc/dbase/DIndexes.hxx | 6
connectivity/source/inc/dbase/DResultSet.hxx | 26
connectivity/source/inc/dbase/DTable.hxx | 34 -
connectivity/source/inc/dbase/DTables.hxx | 10
connectivity/source/inc/file/FCatalog.hxx | 6
connectivity/source/inc/file/FColumns.hxx | 2
connectivity/source/inc/file/FConnection.hxx | 60 -
connectivity/source/inc/file/FDatabaseMetaData.hxx | 246 +++----
connectivity/source/inc/file/FDriver.hxx | 36 -
connectivity/source/inc/file/FPreparedStatement.hxx | 80 +-
connectivity/source/inc/file/FResultSet.hxx | 192 ++---
connectivity/source/inc/file/FResultSetMetaData.hxx | 46 -
connectivity/source/inc/file/FStatement.hxx | 50 -
connectivity/source/inc/file/FTable.hxx | 14
connectivity/source/inc/file/FTables.hxx | 8
connectivity/source/inc/file/fanalyzer.hxx | 6
connectivity/source/inc/file/fcode.hxx | 8
connectivity/source/inc/file/fcomp.hxx | 20
connectivity/source/inc/flat/EConnection.hxx | 12
connectivity/source/inc/flat/EDatabaseMetaData.hxx | 6
connectivity/source/inc/flat/EDriver.hxx | 16
connectivity/source/inc/flat/EResultSet.hxx | 20
connectivity/source/inc/flat/ETable.hxx | 16
connectivity/source/inc/flat/ETables.hxx | 2
connectivity/source/inc/hsqldb/HCatalog.hxx | 12
connectivity/source/inc/hsqldb/HColumns.hxx | 4
connectivity/source/inc/hsqldb/HConnection.hxx | 40 -
connectivity/source/inc/hsqldb/HDriver.hxx | 66 +-
connectivity/source/inc/hsqldb/HStorageMap.hxx | 24
connectivity/source/inc/hsqldb/HTable.hxx | 20
connectivity/source/inc/hsqldb/HTables.hxx | 12
connectivity/source/inc/hsqldb/HUser.hxx | 20
connectivity/source/inc/hsqldb/HUsers.hxx | 10
connectivity/source/inc/hsqldb/HView.hxx | 16
connectivity/source/inc/hsqldb/HViews.hxx | 14
connectivity/source/inc/java/ContextClassLoader.hxx | 2
connectivity/source/inc/java/io/InputStream.hxx | 12
connectivity/source/inc/java/io/Reader.hxx | 12
connectivity/source/inc/java/lang/Object.hxx | 8
connectivity/source/inc/java/sql/Array.hxx | 14
connectivity/source/inc/java/sql/Blob.hxx | 12
connectivity/source/inc/java/sql/CallableStatement.hxx | 52 -
connectivity/source/inc/java/sql/Clob.hxx | 12
connectivity/source/inc/java/sql/Connection.hxx | 64 -
connectivity/source/inc/java/sql/ConnectionLog.hxx | 8
connectivity/source/inc/java/sql/DatabaseMetaData.hxx | 276 ++++----
connectivity/source/inc/java/sql/Driver.hxx | 26
connectivity/source/inc/java/sql/JStatement.hxx | 106 +--
connectivity/source/inc/java/sql/PreparedStatement.hxx | 76 +-
connectivity/source/inc/java/sql/Ref.hxx | 4
connectivity/source/inc/java/sql/ResultSet.hxx | 196 +++---
connectivity/source/inc/java/sql/ResultSetMetaData.hxx | 44 -
connectivity/source/inc/java/sql/SQLException.hxx | 2
connectivity/source/inc/java/sql/SQLWarning.hxx | 2
connectivity/source/inc/java/sql/Timestamp.hxx | 12
connectivity/source/inc/java/tools.hxx | 8
connectivity/source/inc/mysql/YCatalog.hxx | 12
connectivity/source/inc/mysql/YColumns.hxx | 4
connectivity/source/inc/mysql/YDriver.hxx | 46 -
connectivity/source/inc/mysql/YTable.hxx | 14
connectivity/source/inc/mysql/YTables.hxx | 14
connectivity/source/inc/mysql/YUser.hxx | 20
connectivity/source/inc/mysql/YUsers.hxx | 10
connectivity/source/inc/mysql/YViews.hxx | 12
connectivity/source/inc/odbc/OBoundParam.hxx | 10
connectivity/source/inc/odbc/OConnection.hxx | 44 -
connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 270 ++++----
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 214 +++---
connectivity/source/inc/odbc/ODriver.hxx | 28
connectivity/source/inc/odbc/OPreparedStatement.hxx | 90 +-
connectivity/source/inc/odbc/OResultSet.hxx | 228 +++---
connectivity/source/inc/odbc/OResultSetMetaData.hxx | 56 -
connectivity/source/inc/odbc/OStatement.hxx | 78 +-
connectivity/source/inc/odbc/OTools.hxx | 40 -
connectivity/source/manager/mdrivermanager.cxx | 6
connectivity/source/manager/mdrivermanager.hxx | 46 -
connectivity/source/parse/PColumn.cxx | 4
connectivity/source/parse/sqlbison.y | 2
connectivity/source/parse/sqlnode.cxx | 24
connectivity/source/sdbcx/VCatalog.cxx | 2
connectivity/source/sdbcx/VColumn.cxx | 14
connectivity/source/sdbcx/VDescriptor.cxx | 2
connectivity/source/sdbcx/VGroup.cxx | 14
connectivity/source/sdbcx/VIndex.cxx | 16
connectivity/source/sdbcx/VIndexColumn.cxx | 8
connectivity/source/sdbcx/VKey.cxx | 16
connectivity/source/sdbcx/VKeyColumn.cxx | 8
connectivity/source/sdbcx/VTable.cxx | 16
connectivity/source/sdbcx/VUser.cxx | 16
connectivity/source/sdbcx/VView.cxx | 10
connectivity/workben/iniParser/main.cxx | 6
connectivity/workben/little/main.cxx | 6
connectivity/workben/skeleton/SResultSet.hxx | 220 +++---
410 files changed, 7581 insertions(+), 7595 deletions(-)
New commits:
commit a52231c78526e14977d2129fa1abe812de567f03
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 27 12:31:29 2016 +0200
com::sun::star->css in connectivity
Change-Id: I9489e92dc89a6d83a26ff4f0d9aad26acd28ad9f
Reviewed-on: https://gerrit.libreoffice.org/25537
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx b/connectivity/qa/connectivity/mork/DriverTest.cxx
index 38de452..f765ce2 100644
--- a/connectivity/qa/connectivity/mork/DriverTest.cxx
+++ b/connectivity/qa/connectivity/mork/DriverTest.cxx
@@ -96,7 +96,7 @@ void MorkDriverTest::setUp()
void MorkDriverTest::tearDown()
{
// how to make dispose() work?
-// Reference< com::sun::star::lang::XComponent >( m_xMorkComponent, UNO_QUERY_THROW )->dispose();
+// Reference< css::lang::XComponent >( m_xMorkComponent, UNO_QUERY_THROW )->dispose();
m_xConnection->close();
test::BootstrapFixture::tearDown();
}
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index c4e83d7..396e356 100644
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -25,23 +25,23 @@ using namespace dbtools;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::uno;
-BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val) : m_aValue(_val)
+BlobHelper::BlobHelper(const css::uno::Sequence< sal_Int8 >& _val) : m_aValue(_val)
{
}
-::sal_Int64 SAL_CALL BlobHelper::length( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::length( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
return m_aValue.getLength();
}
-::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
if ( sal_Int32(pos + _length) > m_aValue.getLength() )
- throw ::com::sun::star::sdbc::SQLException();
- return ::com::sun::star::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length);
+ throw css::sdbc::SQLException();
+ return css::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length);
}
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
return new ::comphelper::SequenceInputStream(m_aValue);
}
@@ -53,13 +53,13 @@ BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val)
SAL_WNOUNREACHABLE_CODE_PUSH
-::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::position( const css::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
::dbtools::throwFeatureNotImplementedSQLException( "XBlob::position", *this );
return 0;
}
-::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this );
return 0;
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index aa60abf..f28c0e8 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -105,13 +105,13 @@ OConnectionWrapper::~OConnectionWrapper()
// XServiceInfo
-OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (css::uno::RuntimeException, std::exception)
{
return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
}
-::com::sun::star::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception)
{
// first collect the services which are supported by our aggregate
Sequence< OUString > aSupported;
@@ -132,7 +132,7 @@ OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::su
}
-sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, _rServiceName);
}
@@ -144,7 +144,7 @@ Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) throw (Run
return aReturn.hasValue() ? aReturn : (m_xProxyConnection.is() ? m_xProxyConnection->queryAggregation(_rType) : aReturn);
}
-Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (css::uno::RuntimeException, std::exception)
{
return ::comphelper::concatSequences(
OConnection_BASE::getTypes(),
@@ -152,7 +152,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (::com::sun::st
);
}
-// com::sun::star::lang::XUnoTunnel
+// css::lang::XUnoTunnel
sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception)
{
if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
@@ -181,12 +181,12 @@ Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId()
namespace
{
- class TPropertyValueLessFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,::com::sun::star::beans::PropertyValue,bool>
+ class TPropertyValueLessFunctor : public ::std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool>
{
public:
TPropertyValueLessFunctor()
{}
- bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const ::com::sun::star::beans::PropertyValue& rhs) const
+ bool operator() (const css::beans::PropertyValue& lhs, const css::beans::PropertyValue& rhs) const
{
return lhs.Name.compareToIgnoreAsciiCase(rhs.Name) < 0;
}
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 4fa40665..1986adc 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -59,7 +59,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
case DataType::BOOLEAN:
case DataType::TINYINT:
case DataType::SMALLINT:
- if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
+ if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_BOOLEAN)
{
if (::cppu::any2bool(_rVal))
aRet.append("1");
@@ -112,14 +112,14 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
{
DateTime aDateTime;
bool bOk = false;
- if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE)
+ if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
_rVal >>= nValue;
aDateTime = DBTypeConversion::toDateTime(nValue);
bOk = true;
}
- else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
+ else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING)
{
OUString sValue;
_rVal >>= sValue;
@@ -146,14 +146,14 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
{
Date aDate;
bool bOk = false;
- if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE)
+ if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
_rVal >>= nValue;
aDate = DBTypeConversion::toDate(nValue);
bOk = true;
}
- else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
+ else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING)
{
OUString sValue;
_rVal >>= sValue;
@@ -173,14 +173,14 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool b
{
css::util::Time aTime;
bool bOk = false;
- if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_DOUBLE)
+ if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
_rVal >>= nValue;
aTime = DBTypeConversion::toTime(nValue);
bOk = true;
}
- else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
+ else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING)
{
OUString sValue;
_rVal >>= sValue;
@@ -234,7 +234,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
const OUString& rString,
sal_Int32 nKey,
sal_Int16 nFieldType,
- sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException)
+ sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException)
{
if (!rString.isEmpty())
{
@@ -317,9 +317,9 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
{
switch (nFieldType)
{
- case ::com::sun::star::sdbc::DataType::CHAR:
- case ::com::sun::star::sdbc::DataType::VARCHAR:
- case ::com::sun::star::sdbc::DataType::LONGVARCHAR:
+ case css::sdbc::DataType::CHAR:
+ case css::sdbc::DataType::VARCHAR:
+ case css::sdbc::DataType::LONGVARCHAR:
xVariant->updateString(rString);
break;
default:
@@ -332,7 +332,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
const Date& rNullDate,
const double& rValue,
- sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException)
+ sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException)
{
switch (nKeyType & ~NumberFormat::DEFINED)
{
@@ -424,7 +424,7 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D
OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn,
const Reference<XNumberFormatter>& _xFormatter,
- const ::com::sun::star::lang::Locale& _rLocale,
+ const css::lang::Locale& _rLocale,
const Date& _rNullDate)
{
OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getFormattedValue: invalid arg !");
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index d78dad6..3337bd1 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -149,9 +149,9 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th
Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception)
{
- ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
- cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
- cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
+ ::cppu::OTypeCollection aTypes( cppu::UnoType<css::beans::XMultiPropertySet>::get(),
+ cppu::UnoType<css::beans::XFastPropertySet>::get(),
+ cppu::UnoType<css::beans::XPropertySet>::get());
return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
}
@@ -187,18 +187,18 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum
#endif
}
-void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
+void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException)
{
if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1)
::dbtools::throwInvalidIndexException(*this);
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
return nullptr;
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception)
{
return nullptr;
}
@@ -222,7 +222,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co
}
-::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return getValue(columnIndex);
}
@@ -293,7 +293,7 @@ Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*colum
}
-Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
+Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception)
{
return getValue(columnIndex).makeAny();
}
@@ -311,13 +311,13 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
}
-::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return getValue(columnIndex);
}
-::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
+css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception)
{
return getValue(columnIndex);
}
@@ -638,7 +638,7 @@ void ODatabaseMetaDataResultSet::setImportedKeysMap()
m_xMetaData = pMetaData;
}
-Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception)
+Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception)
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index d75b8e5..99479ca 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -134,7 +134,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 c
return 0;
}
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
{
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.getScale();
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 9e86bf2..62861bf 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1844,7 +1844,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
do
{
- ::com::sun::star::uno::Sequence< sal_Int8 > aReadSeq;
+ css::uno::Sequence< sal_Int8 > aReadSeq;
nRead = xStream->readSomeBytes( aReadSeq, nBytesToRead );
@@ -1885,9 +1885,9 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
}
-::com::sun::star::util::Date ORowSetValue::getDate() const
+css::util::Date ORowSetValue::getDate() const
{
- ::com::sun::star::util::Date aValue;
+ css::util::Date aValue;
if(!m_bNull)
{
switch(m_eTypeKind)
@@ -1906,11 +1906,11 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
break;
case DataType::DATE:
- aValue = *static_cast< ::com::sun::star::util::Date*>(m_aValue.m_pValue);
+ aValue = *static_cast< css::util::Date*>(m_aValue.m_pValue);
break;
case DataType::TIMESTAMP:
{
- ::com::sun::star::util::DateTime* pDateTime = static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue);
+ css::util::DateTime* pDateTime = static_cast< css::util::DateTime*>(m_aValue.m_pValue);
aValue.Day = pDateTime->Day;
aValue.Month = pDateTime->Month;
aValue.Year = pDateTime->Year;
@@ -1943,9 +1943,9 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
return aValue;
}
-::com::sun::star::util::Time ORowSetValue::getTime() const
+css::util::Time ORowSetValue::getTime() const
{
- ::com::sun::star::util::Time aValue;
+ css::util::Time aValue;
if(!m_bNull)
{
switch(m_eTypeKind)
@@ -1966,7 +1966,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
break;
case DataType::TIMESTAMP:
{
- ::com::sun::star::util::DateTime* pDateTime = static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue);
+ css::util::DateTime* pDateTime = static_cast< css::util::DateTime*>(m_aValue.m_pValue);
aValue.NanoSeconds = pDateTime->NanoSeconds;
aValue.Seconds = pDateTime->Seconds;
aValue.Minutes = pDateTime->Minutes;
@@ -1974,7 +1974,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
}
break;
case DataType::TIME:
- aValue = *static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue);
+ aValue = *static_cast< css::util::Time*>(m_aValue.m_pValue);
break;
default:
{
@@ -1987,9 +1987,9 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
return aValue;
}
-::com::sun::star::util::DateTime ORowSetValue::getDateTime() const
+css::util::DateTime ORowSetValue::getDateTime() const
{
- ::com::sun::star::util::DateTime aValue;
+ css::util::DateTime aValue;
if(!m_bNull)
{
switch(m_eTypeKind)
@@ -2010,7 +2010,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
break;
case DataType::DATE:
{
- ::com::sun::star::util::Date* pDate = static_cast< ::com::sun::star::util::Date*>(m_aValue.m_pValue);
+ css::util::Date* pDate = static_cast< css::util::Date*>(m_aValue.m_pValue);
aValue.Day = pDate->Day;
aValue.Month = pDate->Month;
aValue.Year = pDate->Year;
@@ -2018,7 +2018,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
break;
case DataType::TIME:
{
- ::com::sun::star::util::Time* pTime = static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue);
+ css::util::Time* pTime = static_cast< css::util::Time*>(m_aValue.m_pValue);
aValue.NanoSeconds = pTime->NanoSeconds;
aValue.Seconds = pTime->Seconds;
aValue.Minutes = pTime->Minutes;
@@ -2026,7 +2026,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
}
break;
case DataType::TIMESTAMP:
- aValue = *static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue);
+ aValue = *static_cast< css::util::DateTime*>(m_aValue.m_pValue);
break;
default:
{
@@ -2197,7 +2197,7 @@ void ORowSetValue::fill( sal_Int32 _nPos, sal_Int32 _nType, bool _bNullable, co
void ORowSetValue::fill(sal_Int32 _nPos,
sal_Int32 _nType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow)
+ const css::uno::Reference< css::sdbc::XRow>& _xRow)
{
fill(_nPos,_nType,true,_xRow);
}
@@ -2220,7 +2220,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
(*this) = _rValueSource.getLong();
else
// TODO: this is rather horrible performance-wise
- // but fixing it needs extending the ::com::sun::star::sdbc::XRow API
+ // but fixing it needs extending the css::sdbc::XRow API
// to have a getULong(), and needs updating all drivers :-|
// When doing that, add getUByte, getUShort, getUInt for symmetry/completeness
(*this) = _rValueSource.getString().toUInt64();
@@ -2269,11 +2269,11 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
(*this) = _rValueSource.getLong();
break;
case DataType::CLOB:
- (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getClob());
+ (*this) = css::uno::makeAny(_rValueSource.getClob());
setTypeKind(DataType::CLOB);
break;
case DataType::BLOB:
- (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getBlob());
+ (*this) = css::uno::makeAny(_rValueSource.getBlob());
setTypeKind(DataType::BLOB);
break;
case DataType::OTHER:
@@ -2402,9 +2402,9 @@ void ORowSetValue::fill(const Any& _rValue)
case TypeClass_STRUCT:
{
- ::com::sun::star::util::Date aDate;
- ::com::sun::star::util::Time aTime;
- ::com::sun::star::util::DateTime aDateTime;
+ css::util::Date aDate;
+ css::util::Time aTime;
+ css::util::DateTime aDateTime;
if ( _rValue >>= aDate )
{
(*this) = aDate;
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 95a8ebb..59d2411 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -28,7 +28,7 @@ namespace connectivity
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
- ParameterSubstitution::ParameterSubstitution(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)
+ ParameterSubstitution::ParameterSubstitution(const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext)
{
}
void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception)
@@ -72,7 +72,7 @@ namespace connectivity
return *(new ParameterSubstitution(_xContext));
}
- OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception)
+ OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
OUString sRet = _sText;
uno::Reference< sdbc::XConnection > xConnection = m_xConnection;
@@ -99,12 +99,12 @@ namespace connectivity
return sRet;
}
- OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+ OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (css::uno::RuntimeException, std::exception)
{
return _sText;
}
- OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception)
+ OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
{
throw container::NoSuchElementException();
}
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index e613468..7e34c98 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -56,7 +56,7 @@ void OMetaConnection::disposing()
m_aStatements.clear();
}
//XUnoTunnel
-sal_Int64 SAL_CALL OMetaConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException, std::exception)
{
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index fe4a9cd..c5b9249 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -48,7 +48,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
OUString aCatalog, aSchema, aTable;
- ::com::sun::star::uno::Any Catalog(m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)));
+ css::uno::Any Catalog(m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)));
Catalog >>= aCatalog;
m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema;
m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable;
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 278ff6a..b2ad196 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -49,7 +49,7 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
OUString aCatalog, aSchema, aTable;
- ::com::sun::star::uno::Any Catalog(m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)));
+ css::uno::Any Catalog(m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)));
Catalog >>= aCatalog;
m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema;
m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable;
@@ -129,7 +129,7 @@ Reference< XPropertySet > OKeyColumnsHelper::createDescriptor()
return new OKeyColumn(isCaseSensitive());
}
-void OKeyColumnsHelper::impl_refresh() throw(::com::sun::star::uno::RuntimeException)
+void OKeyColumnsHelper::impl_refresh() throw(css::uno::RuntimeException)
{
m_pKey->refreshColumns();
}
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index eefd94e..5db3524 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -66,17 +66,17 @@ public:
// noncopyable
OTableContainerListener(const OTableContainerListener&) = delete;
const OTableContainerListener& operator=(const OTableContainerListener&) = delete;
- virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) override
{
}
- virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
{
OUString sName;
Event.Accessor >>= sName;
if ( m_aRefNames.find(sName) != m_aRefNames.end() )
m_pComponent->refreshKeys();
}
- virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
+ virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override
{
OUString sOldComposedName,sNewComposedName;
Event.ReplacedElement >>= sOldComposedName;
@@ -94,7 +94,7 @@ public:
}
namespace connectivity
{
- OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& i_sSetting)
+ OUString lcl_getServiceNameForSetting(const Reference< css::sdbc::XConnection >& _xConnection,const OUString& i_sSetting)
{
OUString sSupportService;
Any aValue;
@@ -108,16 +108,16 @@ namespace connectivity
{
TKeyMap m_aKeys;
// helper services which can be provided by extensions
- Reference< ::com::sun::star::sdb::tools::XTableRename> m_xRename;
- Reference< ::com::sun::star::sdb::tools::XTableAlteration> m_xAlter;
- Reference< ::com::sun::star::sdb::tools::XKeyAlteration> m_xKeyAlter;
- Reference< ::com::sun::star::sdb::tools::XIndexAlteration> m_xIndexAlter;
-
- Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
- Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- rtl::Reference<OTableContainerListener> m_xTablePropertyListener;
- ::std::vector< ColumnDesc > m_aColumnDesc;
- explicit OTableHelperImpl(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection)
+ Reference< css::sdb::tools::XTableRename> m_xRename;
+ Reference< css::sdb::tools::XTableAlteration> m_xAlter;
+ Reference< css::sdb::tools::XKeyAlteration> m_xKeyAlter;
+ Reference< css::sdb::tools::XIndexAlteration> m_xIndexAlter;
+
+ Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
+ Reference< css::sdbc::XConnection > m_xConnection;
+ rtl::Reference<OTableContainerListener> m_xTablePropertyListener;
+ ::std::vector< ColumnDesc > m_aColumnDesc;
+ explicit OTableHelperImpl(const Reference< css::sdbc::XConnection >& _xConnection)
: m_xConnection(_xConnection)
{
try
@@ -542,7 +542,7 @@ Reference< XDatabaseMetaData> OTableHelper::getMetaData() const
return m_pImpl->m_xMetaData;
}
-void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(
@@ -609,22 +609,22 @@ Reference< XConnection> OTableHelper::getConnection() const
return m_pImpl->m_xConnection;
}
-Reference< ::com::sun::star::sdb::tools::XTableRename> OTableHelper::getRenameService() const
+Reference< css::sdb::tools::XTableRename> OTableHelper::getRenameService() const
{
return m_pImpl->m_xRename;
}
-Reference< ::com::sun::star::sdb::tools::XTableAlteration> OTableHelper::getAlterService() const
+Reference< css::sdb::tools::XTableAlteration> OTableHelper::getAlterService() const
{
return m_pImpl->m_xAlter;
}
-Reference< ::com::sun::star::sdb::tools::XKeyAlteration> OTableHelper::getKeyService() const
+Reference< css::sdb::tools::XKeyAlteration> OTableHelper::getKeyService() const
{
return m_pImpl->m_xKeyAlter;
}
-Reference< ::com::sun::star::sdb::tools::XIndexAlteration> OTableHelper::getIndexService() const
+Reference< css::sdb::tools::XIndexAlteration> OTableHelper::getIndexService() const
{
return m_pImpl->m_xIndexAlter;
}
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index c140474f..9b5f780 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -27,10 +27,10 @@ namespace dbtools
{
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::beans;
- using namespace ::com::sun::star::sdbc;
- using namespace ::com::sun::star::lang;
+ using namespace css::uno;
+ using namespace css::beans;
+ using namespace css::sdbc;
+ using namespace css::lang;
static const char ACTIVE_CONNECTION_PROPERTY_NAME[] = "ActiveConnection";
@@ -204,15 +204,15 @@ namespace dbtools
}
}
- void SAL_CALL OAutoConnectionDisposer::cursorMoved( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::cursorMoved( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
{
}
- void SAL_CALL OAutoConnectionDisposer::rowChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::rowChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
{
}
- void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+ void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception)
{
stopRowSetListening();
clearConnection();
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 8cb71fb..f718a3c 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -45,21 +45,21 @@ SQLExceptionInfo::SQLExceptionInfo()
}
-SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdbc::SQLException& _rError)
+SQLExceptionInfo::SQLExceptionInfo(const css::sdbc::SQLException& _rError)
{
m_aContent <<= _rError;
implDetermineType();
}
-SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdbc::SQLWarning& _rError)
+SQLExceptionInfo::SQLExceptionInfo(const css::sdbc::SQLWarning& _rError)
{
m_aContent <<= _rError;
implDetermineType();
}
-SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdb::SQLContext& _rError)
+SQLExceptionInfo::SQLExceptionInfo(const css::sdb::SQLContext& _rError)
{
m_aContent <<= _rError;
implDetermineType();
@@ -82,7 +82,7 @@ SQLExceptionInfo::SQLExceptionInfo(const SQLExceptionInfo& _rCopySource)
}
-SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLException& _rError)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const css::sdbc::SQLException& _rError)
{
m_aContent <<= _rError;
implDetermineType();
@@ -90,7 +90,7 @@ SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLE
}
-SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLWarning& _rError)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const css::sdbc::SQLWarning& _rError)
{
m_aContent <<= _rError;
implDetermineType();
@@ -98,7 +98,7 @@ SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdbc::SQLW
}
-SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLContext& _rError)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const css::sdb::SQLContext& _rError)
{
m_aContent <<= _rError;
implDetermineType();
@@ -106,7 +106,7 @@ SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLCo
}
-SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLErrorEvent& _rErrorEvent)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const css::sdb::SQLErrorEvent& _rErrorEvent)
{
m_aContent = _rErrorEvent.Reason;
implDetermineType();
@@ -114,7 +114,7 @@ SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::sdb::SQLEr
}
-SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno::Any& _rCaughtSQLException)
+SQLExceptionInfo& SQLExceptionInfo::operator=(const css::uno::Any& _rCaughtSQLException)
{
m_aContent = _rCaughtSQLException;
implDetermineType();
@@ -124,7 +124,7 @@ SQLExceptionInfo& SQLExceptionInfo::operator=(const ::com::sun::star::uno::Any&
SQLExceptionInfo::SQLExceptionInfo(const css::uno::Any& _rError)
{
- const css::uno::Type& aSQLExceptionType = cppu::UnoType<com::sun::star::sdbc::SQLException>::get();
+ const css::uno::Type& aSQLExceptionType = cppu::UnoType<css::sdbc::SQLException>::get();
bool bValid = isAssignableFrom(aSQLExceptionType, _rError.getValueType());
if (bValid)
m_aContent = _rError;
@@ -171,17 +171,17 @@ bool SQLExceptionInfo::isKindOf(TYPE _eType) const
}
-SQLExceptionInfo::operator const ::com::sun::star::sdbc::SQLException*() const
+SQLExceptionInfo::operator const css::sdbc::SQLException*() const
{
OSL_ENSURE(isKindOf(TYPE::SQLException), "SQLExceptionInfo::operator SQLException* : invalid call !");
- return static_cast<const ::com::sun::star::sdbc::SQLException*>(m_aContent.getValue());
+ return static_cast<const css::sdbc::SQLException*>(m_aContent.getValue());
}
-SQLExceptionInfo::operator const ::com::sun::star::sdb::SQLContext*() const
+SQLExceptionInfo::operator const css::sdb::SQLContext*() const
{
OSL_ENSURE(isKindOf(TYPE::SQLContext), "SQLExceptionInfo::operator SQLException* : invalid call !");
- return static_cast<const ::com::sun::star::sdb::SQLContext*>(m_aContent.getValue());
+ return static_cast<const css::sdb::SQLContext*>(m_aContent.getValue());
}
@@ -263,7 +263,7 @@ SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const SQLExceptionInfo&
}
-SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const ::com::sun::star::sdbc::SQLException& _rChainStart )
+SQLExceptionIteratorHelper::SQLExceptionIteratorHelper( const css::sdbc::SQLException& _rChainStart )
:m_pCurrent( &_rChainStart )
,m_eCurrentType( SQLExceptionInfo::TYPE::SQLException )
{
@@ -293,11 +293,11 @@ void SQLExceptionIteratorHelper::current( SQLExceptionInfo& _out_rInfo ) const
}
-const ::com::sun::star::sdbc::SQLException* SQLExceptionIteratorHelper::next()
+const css::sdbc::SQLException* SQLExceptionIteratorHelper::next()
{
OSL_ENSURE( hasMoreElements(), "SQLExceptionIteratorHelper::next : invalid call (please use hasMoreElements)!" );
- const ::com::sun::star::sdbc::SQLException* pReturn = current();
+ const css::sdbc::SQLException* pReturn = current();
if ( !m_pCurrent )
return pReturn;
@@ -343,7 +343,7 @@ void SQLExceptionIteratorHelper::next( SQLExceptionInfo& _out_rInfo )
}
-void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next) throw ( ::com::sun::star::sdbc::SQLException )
+void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next) throw ( css::sdbc::SQLException )
{
::connectivity::SharedResources aResources;
throw SQLException(
@@ -355,8 +355,8 @@ void throwFunctionSequenceException(const Reference< XInterface >& Context, cons
);
}
-void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context,
- const ::com::sun::star::uno::Any& Next) throw ( ::com::sun::star::sdbc::SQLException )
+void throwInvalidIndexException(const css::uno::Reference< css::uno::XInterface >& Context,
+ const css::uno::Any& Next) throw ( css::sdbc::SQLException )
{
::connectivity::SharedResources aResources;
throw SQLException(
@@ -399,8 +399,8 @@ void throwFunctionNotSupportedRuntimeException(const OUString& _rFunctionName,
);
}
-void throwGenericSQLException(const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource)
- throw (::com::sun::star::sdbc::SQLException)
+void throwGenericSQLException(const OUString& _rMsg, const css::uno::Reference< css::uno::XInterface >& _rxSource)
+ throw (css::sdbc::SQLException)
{
throwGenericSQLException(_rMsg, _rxSource, Any());
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 69c1524..45e0e36 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1640,7 +1640,7 @@ namespace
public:
OParameterWrapper(const ::std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){}
private:
- // ::com::sun::star::container::XElementAccess
+ // css::container::XElementAccess
virtual Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override
{
return m_xSource->getElementType();
@@ -1651,7 +1651,7 @@ namespace
return m_xSource->hasElements();
return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
}
- // ::com::sun::star::container::XIndexAccess
+ // css::container::XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) override
{
if ( m_aSet.empty() )
@@ -1822,7 +1822,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
_xParams->setClob(parameterIndex,xClob);
else
{
- Reference< ::com::sun::star::io::XInputStream > xStream;
+ Reference< css::io::XInputStream > xStream;
if(x >>= xStream)
_xParams->setCharacterStream(parameterIndex,xStream,xStream->available());
}
@@ -1873,7 +1873,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
_xParams->setClob(parameterIndex,xClob);
else
{
- Reference< ::com::sun::star::io::XInputStream > xBinStream;
+ Reference< css::io::XInputStream > xBinStream;
if(x >>= xBinStream)
_xParams->setBinaryStream(parameterIndex,xBinStream,xBinStream->available());
}
@@ -1966,7 +1966,7 @@ namespace connectivity
void release(oslInterlockedCount& _refCount,
::cppu::OBroadcastHelper& rBHelper,
Reference< XInterface >& _xInterface,
- ::com::sun::star::lang::XComponent* _pObject)
+ css::lang::XComponent* _pObject)
{
if (osl_atomic_decrement( &_refCount ) == 0)
{
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 73619e8..32c2cc0 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -1018,73 +1018,73 @@ namespace dbtools
}
- void ParameterManager::setBytes( sal_Int32 _nIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x )
+ void ParameterManager::setBytes( sal_Int32 _nIndex, const css::uno::Sequence< sal_Int8 >& x )
{
VISIT_PARAMETER( setBytes( _nIndex, x ) );
}
- void ParameterManager::setDate( sal_Int32 _nIndex, const ::com::sun::star::util::Date& x )
+ void ParameterManager::setDate( sal_Int32 _nIndex, const css::util::Date& x )
{
VISIT_PARAMETER( setDate( _nIndex, x ) );
}
- void ParameterManager::setTime( sal_Int32 _nIndex, const ::com::sun::star::util::Time& x )
+ void ParameterManager::setTime( sal_Int32 _nIndex, const css::util::Time& x )
{
VISIT_PARAMETER( setTime( _nIndex, x ) );
}
- void ParameterManager::setTimestamp( sal_Int32 _nIndex, const ::com::sun::star::util::DateTime& x )
+ void ParameterManager::setTimestamp( sal_Int32 _nIndex, const css::util::DateTime& x )
{
VISIT_PARAMETER( setTimestamp( _nIndex, x ) );
}
- void ParameterManager::setBinaryStream( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length )
+ void ParameterManager::setBinaryStream( sal_Int32 _nIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length )
{
VISIT_PARAMETER( setBinaryStream( _nIndex, x, length ) );
}
- void ParameterManager::setCharacterStream( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, sal_Int32 length )
+ void ParameterManager::setCharacterStream( sal_Int32 _nIndex, const css::uno::Reference< css::io::XInputStream>& x, sal_Int32 length )
{
VISIT_PARAMETER( setCharacterStream( _nIndex, x, length ) );
}
- void ParameterManager::setObject( sal_Int32 _nIndex, const ::com::sun::star::uno::Any& x )
+ void ParameterManager::setObject( sal_Int32 _nIndex, const css::uno::Any& x )
{
VISIT_PARAMETER( setObject( _nIndex, x ) );
}
- void ParameterManager::setObjectWithInfo( sal_Int32 _nIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale )
+ void ParameterManager::setObjectWithInfo( sal_Int32 _nIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale )
{
VISIT_PARAMETER( setObjectWithInfo( _nIndex, x, targetSqlType, scale ) );
}
- void ParameterManager::setRef( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef>& x )
+ void ParameterManager::setRef( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XRef>& x )
{
VISIT_PARAMETER( setRef( _nIndex, x ) );
}
- void ParameterManager::setBlob( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>& x )
+ void ParameterManager::setBlob( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XBlob>& x )
{
VISIT_PARAMETER( setBlob( _nIndex, x ) );
}
- void ParameterManager::setClob( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob>& x )
+ void ParameterManager::setClob( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XClob>& x )
{
VISIT_PARAMETER( setClob( _nIndex, x ) );
}
- void ParameterManager::setArray( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray>& x )
+ void ParameterManager::setArray( sal_Int32 _nIndex, const css::uno::Reference< css::sdbc::XArray>& x )
{
VISIT_PARAMETER( setArray( _nIndex, x ) );
}
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index edbd244..68fde8a 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -49,7 +49,7 @@ static const char TIMEOUT_NODENAME[] = "Timeout";
OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
const Reference< XInterface >& _xDriverNode,
- const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory)
+ const Reference< css::reflection::XProxyFactory >& _rxProxyFactory)
:m_xDriver(_xDriver)
,m_xDriverNode(_xDriverNode)
,m_xProxyFactory(_rxProxyFactory)
@@ -173,7 +173,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const
return xConnection;
}
-void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception)
+void SAL_CALL OConnectionPool::disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception)
{
Reference<XConnection> xConnection(Source.Source,UNO_QUERY);
if(xConnection.is())
@@ -285,7 +285,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite
return xConnection;
}
-void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception)
{
if(TIMEOUT_NODENAME == evt.PropertyName)
{
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 06a400d..7cb93c2 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -59,10 +59,10 @@ namespace connectivity
// OConnectionPool - the one-instance service for PooledConnections
// manages the active connections and the connections in the pool
- typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base;
+ typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener> OConnectionPool_Base;
// typedef for the internal structure
- typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> > TPooledConnections;
+ typedef ::std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections;
// contains the currently pooled connections
typedef struct
@@ -100,10 +100,10 @@ namespace connectivity
typedef struct
{
TConnectionMap::iterator aPos;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> xPooledConnection;
+ css::uno::Reference< css::sdbc::XPooledConnection> xPooledConnection;
} TActiveConnectionInfo;
- typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>,
+ typedef ::std::map< css::uno::Reference< css::sdbc::XConnection>,
TActiveConnectionInfo> TActiveConnectionMap;
class OConnectionPool : public OConnectionPool_Base
@@ -114,16 +114,16 @@ namespace connectivity
::osl::Mutex m_aMutex;
::rtl::Reference<OPoolTimer> m_xInvalidator; // invalidates the conntection pool when shot
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDriverNode; // config node entry
- ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory;
+ css::uno::Reference< css::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool
+ css::uno::Reference< css::uno::XInterface > m_xDriverNode; // config node entry
+ css::uno::Reference< css::reflection::XProxyFactory > m_xProxyFactory;
sal_Int32 m_nTimeOut;
sal_Int32 m_nALiveCount;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const OUString& _rURL,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo);
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator& _rIter);
+ css::uno::Reference< css::sdbc::XConnection> createNewConnection(const OUString& _rURL,
+ const css::uno::Sequence< css::beans::PropertyValue >& _rInfo);
+ css::uno::Reference< css::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator& _rIter);
// calculate the timeout and the corresponding ALiveCount
void calculateTimeOuts();
@@ -131,17 +131,17 @@ namespace connectivity
// the dtor will be called from the last instance (last release call)
virtual ~OConnectionPool();
public:
- OConnectionPool(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _xDriver,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xDriverNode,
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory);
+ OConnectionPool(const css::uno::Reference< css::sdbc::XDriver >& _xDriver,
+ const css::uno::Reference< css::uno::XInterface >& _xDriverNode,
+ const css::uno::Reference< css::reflection::XProxyFactory >& _rxProxyFactory);
// delete all refs
void clear(bool _bDispose);
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+ css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
void invalidatePooledConnections();
};
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index 359c189..d61c18f 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -193,7 +193,7 @@ sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQL
return m_xConnection->getTransactionIsolation();
}
-Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException, std::exception)
+Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -202,7 +202,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWr
return m_xConnection->getTypeMap();
}
-void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -230,15 +230,17 @@ void OConnectionWeakWrapper::disposing()
OConnectionWrapper::disposing();
}
-// com::sun::star::lang::XUnoTunnel
-IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE ) \
-::com::sun::star::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \
-{ \
- ::com::sun::star::uno::Any aReturn = OConnectionWeakWrapper_BASE::queryInterface( _rType ); \
- if ( !aReturn.hasValue() ) \
- aReturn = OConnectionWrapper::queryInterface( _rType ); \
- return aReturn; \
+// css::lang::XUnoTunnel
+IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE )
+
+css::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception)
+{
+ css::uno::Any aReturn = OConnectionWeakWrapper_BASE::queryInterface( _rType );
+ if ( !aReturn.hasValue() )
+ aReturn = OConnectionWrapper::queryInterface( _rType );
+ return aReturn;
}
+
IMPLEMENT_FORWARD_XTYPEPROVIDER2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper)
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index c59d2bc..668d1fd 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -33,19 +33,18 @@ namespace connectivity
// OConnectionWeakWrapper - wraps all methods to the real connection from the driver
// but when disposed it doesn't dispose the real connection
- typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XConnection
- > OConnectionWeakWrapper_BASE;
+ typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection > OConnectionWeakWrapper_BASE;
- class OConnectionWeakWrapper : public ::comphelper::OBaseMutex
- ,public OConnectionWeakWrapper_BASE
- , public OConnectionWrapper
+ class OConnectionWeakWrapper : public ::comphelper::OBaseMutex
+ , public OConnectionWeakWrapper_BASE
+ , public OConnectionWrapper
{
protected:
// OComponentHelper
virtual void SAL_CALL disposing() override;
virtual ~OConnectionWeakWrapper();
public:
- explicit OConnectionWeakWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _xConnection);
+ explicit OConnectionWeakWrapper(css::uno::Reference< css::uno::XAggregation >& _xConnection);
// XServiceInfo
DECLARE_SERVICE_INFO();
@@ -53,26 +52,26 @@ namespace connectivity
DECLARE_XINTERFACE( )
// XConnection
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// XCloseable
- virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
};
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 92d5b0e..baac4ce 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -32,15 +32,14 @@ namespace connectivity
class OConnectionPool;
- typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XDriver
- > ODriverWrapper_BASE;
+ typedef ::cppu::WeakImplHelper< css::sdbc::XDriver > ODriverWrapper_BASE;
class ODriverWrapper : public ODriverWrapper_BASE
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >
+ css::uno::Reference< css::uno::XAggregation >
m_xDriverAggregate;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >
+ css::uno::Reference< css::sdbc::XDriver >
m_xDriver;
OConnectionPool* m_pConnectionPool;
@@ -50,23 +49,23 @@ namespace connectivity
the driver to aggregate. The object will be reset to <NULL/> when returning from the ctor.
*/
ODriverWrapper(
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _rxAggregateDriver,
+ css::uno::Reference< css::uno::XAggregation >& _rxAggregateDriver,
OConnectionPool* _pPool
);
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
protected:
/// dtor
virtual ~ODriverWrapper();
// XDriver
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index cf205ee..f145757 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -83,7 +83,7 @@ OPoolCollection::OPoolCollection(const Reference< XComponentContext >& _rxContex
osl_atomic_increment( &m_refCount );
{
- m_xDesktop = ::com::sun::star::frame::Desktop::create( m_xContext );
+ m_xDesktop = css::frame::Desktop::create( m_xContext );
m_xDesktop->addTerminateListener(this);
}
@@ -318,7 +318,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const
{
return createWithProvider(
- com::sun::star::configuration::theDefaultProvider::get(m_xContext),
+ css::configuration::theDefaultProvider::get(m_xContext),
_rPath);
}
@@ -404,7 +404,7 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterf
return aReturn;
}
-void SAL_CALL OPoolCollection::queryTermination( const EventObject& /*Event*/ ) throw (::com::sun::star::frame::TerminationVetoException, RuntimeException, std::exception)
+void SAL_CALL OPoolCollection::queryTermination( const EventObject& /*Event*/ ) throw (css::frame::TerminationVetoException, RuntimeException, std::exception)
{
}
@@ -441,7 +441,7 @@ void SAL_CALL OPoolCollection::disposing( const EventObject& Source ) throw (Run
}
}
-void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
+void SAL_CALL OPoolCollection::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (RuntimeException, std::exception)
{
MutexGuard aGuard(m_aMutex);
if(evt.Source == m_xConfigNode)
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 667e005..865e6b0 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -47,10 +47,10 @@ namespace connectivity
// OPoolCollection - the one-instance service for PooledConnections
// manages the active connections and the connections in the pool
- typedef ::cppu::WeakImplHelper< ::com::sun::star::sdbc::XConnectionPool,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::frame::XTerminateListener,
- ::com::sun::star::beans::XPropertyChangeListener
+ typedef ::cppu::WeakImplHelper< css::sdbc::XConnectionPool,
+ css::lang::XServiceInfo,
+ css::frame::XTerminateListener,
+ css::beans::XPropertyChangeListener
> OPoolCollection_Base;
/// OPoolCollection: control the whole connection pooling for oo
@@ -58,84 +58,84 @@ namespace connectivity
{
- typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare;
+ typedef ::comphelper::OInterfaceCompare< css::sdbc::XDriver > ODriverCompare;
typedef std::map<OUString, OConnectionPool*> OConnectionPools;
typedef std::map<
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >,
- ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDriver >,
+ css::uno::Reference< css::sdbc::XDriver >,
+ css::uno::WeakReference< css::sdbc::XDriver >,
ODriverCompare>
MapDriver2DriverRef;
- MapDriver2DriverRef m_aDriverProxies;
- ::osl::Mutex m_aMutex;
- OConnectionPools m_aPools; // the driver pools
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriverManager2 > m_xManager;
- ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xConfigNode; // config node for general connection pooling
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2> m_xDesktop;
+ MapDriver2DriverRef m_aDriverProxies;
+ ::osl::Mutex m_aMutex;
+ OConnectionPools m_aPools; // the driver pools
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::sdbc::XDriverManager2 > m_xManager;
+ css::uno::Reference< css::reflection::XProxyFactory > m_xProxyFactory;
+ css::uno::Reference< css::uno::XInterface > m_xConfigNode; // config node for general connection pooling
+ css::uno::Reference< css::frame::XDesktop2> m_xDesktop;
private:
OPoolCollection(const OPoolCollection&) = delete;
int operator= (const OPoolCollection&) = delete;
explicit OPoolCollection(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
// some configuration helper methods
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getConfigPoolRoot();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider,
+ css::uno::Reference< css::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const;
+ css::uno::Reference< css::uno::XInterface > getConfigPoolRoot();
+ static css::uno::Reference< css::uno::XInterface > createWithProvider( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxConfProvider,
const OUString& _rPath);
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) throw();
+ static css::uno::Reference< css::uno::XInterface > openNode( const OUString& _rPath,
+ const css::uno::Reference< css::uno::XInterface >& _xTreeNode) throw();
bool isPoolingEnabled();
bool isDriverPoolingEnabled(const OUString& _sDriverImplName,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode);
+ css::uno::Reference< css::uno::XInterface >& _rxDriverNode);
bool isPoolingEnabledByUrl( const OUString& _sUrl,
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _rxDriver,
+ css::uno::Reference< css::sdbc::XDriver >& _rxDriver,
OUString& _rsImplName,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode);
+ css::uno::Reference< css::uno::XInterface >& _rxDriverNode);
OConnectionPool* getConnectionPool( const OUString& _sImplName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _xDriver,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode);
+ const css::uno::Reference< css::sdbc::XDriver >& _xDriver,
+ const css::uno::Reference< css::uno::XInterface >& _rxDriverNode);
void clearConnectionPools(bool _bDispose);
void clearDesktop();
protected:
virtual ~OPoolCollection();
public:
- static ::com::sun::star::uno::Any getNodeValue( const OUString& _rPath,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xTreeNode)throw();
+ static css::uno::Any getNodeValue( const OUString& _rPath,
+ const css::uno::Reference< css::uno::XInterface>& _xTreeNode)throw();
// XDriverManager
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(css::uno::RuntimeException, std::exception) override;
//XDriverAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL CreateInstance(const::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
- static OUString SAL_CALL getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
+ static OUString SAL_CALL getImplementationName_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override;
// XTerminateListener
- virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
};
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLCOLLECTION_HXX
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 87b7669..dc33e17 100644
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
@@ -34,7 +34,7 @@ using namespace connectivity;
using namespace ::osl;
OPooledConnection::OPooledConnection(const Reference< XConnection >& _xConnection,
- const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory)
+ const Reference< css::reflection::XProxyFactory >& _rxProxyFactory)
: OPooledConnection_Base(m_aMutex)
,m_xRealConnection(_xConnection)
,m_xProxyFactory(_rxProxyFactory)
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index 8784f73..6b6c745 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -32,27 +32,27 @@ namespace connectivity
// OPooledConnection -
// allows to pool a real connection
- typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::sdbc::XPooledConnection
- ,::com::sun::star::lang::XEventListener> OPooledConnection_Base;
+ typedef ::cppu::WeakComponentImplHelper< css::sdbc::XPooledConnection
+ ,css::lang::XEventListener> OPooledConnection_Base;
class OPooledConnection : public ::comphelper::OBaseMutex
,public OPooledConnection_Base
{
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xRealConnection; // the connection fom driver
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; // the connection which wraps the real connection
- ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory;
+ css::uno::Reference< css::sdbc::XConnection > m_xRealConnection; // the connection fom driver
+ css::uno::Reference< css::lang::XComponent > m_xComponent; // the connection which wraps the real connection
+ css::uno::Reference< css::reflection::XProxyFactory > m_xProxyFactory;
public:
// OComponentHelper
virtual void SAL_CALL disposing() override;
- OPooledConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
- const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory);
+ OPooledConnection(const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
+ const css::uno::Reference< css::reflection::XProxyFactory >& _rxProxyFactory);
//XPooledConnection
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
};
}
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index b9c1bd6..2a627a0 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -76,7 +76,7 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
return m_aValue;
}
-::com::sun::star::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
GET_PARAM()
return m_aValue;
@@ -110,7 +110,7 @@ sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQ
}
-Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
+Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
{
::dbtools::throwFeatureNotImplementedSQLException( "XRow::getObject", *this );
return Any();
@@ -131,14 +131,14 @@ OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(S
}
- ::com::sun::star::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+ css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
GET_PARAM()
return m_aValue;
}
- ::com::sun::star::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+ css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
{
GET_PARAM()
return m_aValue;
@@ -169,13 +169,13 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
{
::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this );
return NULL;
}
-Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
+Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
{
::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this );
return NULL;
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index c12d63f..98d865c 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -90,7 +90,7 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId()
return pId->getImplementationId();
}
-// com::sun::star::lang::XUnoTunnel
+// css::lang::XUnoTunnel
sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
{
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 5e06ab7..45a0dfd 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -379,7 +379,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException,
return nRet;
}
-Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException)
+Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -388,7 +388,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT
return NULL;
}
-void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
{
::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this );
}
@@ -480,8 +480,8 @@ void OConnection::disposing()
OConnection_BASE::disposing();
m_bClosed = sal_True;
- m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>();
- m_xCatalog = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier>();
+ m_xMetaData = css::uno::WeakReference< css::sdbc::XDatabaseMetaData>();
+ m_xCatalog = css::uno::WeakReference< css::sdbcx::XTablesSupplier>();
m_pDriver = NULL;
m_pAdoConnection->Close();
@@ -498,7 +498,7 @@ void OConnection::disposing()
dispose_ChildImpl();
}
-sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException)
+sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException)
{
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
?
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index 10349df..7ae2f3f 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
{
}
-sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException)
{
connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
// ADOS::ThrowException(*m_pADOConnection,*this);
@@ -59,7 +59,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw
}
-sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list