diff options
Diffstat (limited to 'connectivity/source/inc/odbc')
| -rw-r--r-- | connectivity/source/inc/odbc/OConnection.hxx | 4 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 4 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OResultSet.hxx | 16 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OResultSetMetaData.hxx | 6 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OStatement.hxx | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index c5269d249067..73610e45afdc 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -42,7 +42,7 @@ namespace connectivity class ODBCDriver; typedef connectivity::OMetaConnection OConnection_BASE; - typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; + typedef std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; class OOO_DLLPUBLIC_ODBCBASE OConnection : public OConnection_BASE, @@ -55,7 +55,7 @@ namespace connectivity // Data attributes - ::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connections which are need for serveral statements + std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connections which are need for serveral statements OUString m_sUser; // the user name diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 80fdfcabf7ef..6f83876e8ae8 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -63,10 +63,10 @@ namespace connectivity { ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::map<sal_Int32, ::connectivity::TInt2IntMap > + std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + std::map<sal_Int32,SWORD> m_aODBCColumnTypes; SQLHANDLE m_aStatementHandle; // ... until freed css::uno::WeakReferenceHelper m_aStatement; diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 0a738d888596..9b79a07b84a2 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -63,11 +63,11 @@ namespace connectivity css::lang::XServiceInfo> OResultSet_BASE; - typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr; - typedef ::std::allocator< TVoidPtr > TVoidAlloc; - typedef ::std::vector<TVoidPtr> TVoidVector; + typedef std::pair<sal_Int64,sal_Int32> TVoidPtr; + typedef std::allocator< TVoidPtr > TVoidAlloc; + typedef std::vector<TVoidPtr> TVoidVector; /// unary_function Functor object for class ZZ returntype is void - struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool > + struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool > { inline bool operator()( const css::uno::Sequence<sal_Int8>& _rLH, const css::uno::Sequence<sal_Int8>& _rRH) const @@ -102,7 +102,7 @@ namespace connectivity } }; - typedef ::std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; + typedef std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; class OOO_DLLPUBLIC_ODBCBASE OResultSet : public cppu::BaseMutex, @@ -114,11 +114,11 @@ namespace connectivity protected: TBookmarkPosMap m_aPosToBookmarks; // used top hold the information about the value and the datatype to save calls to metadata - typedef ::std::vector<ORowSetValue> TDataRow; + typedef std::vector<ORowSetValue> TDataRow; TVoidVector m_aBindVector; - ::std::vector<SQLLEN> m_aLengthVector; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + std::vector<SQLLEN> m_aLengthVector; + std::map<sal_Int32,SWORD> m_aODBCColumnTypes; // In baseline ODBC, SQLGetData can only be called on monotonically increasing column numbers. // additionally, any variable-length data can be fetched only once (possibly in parts); diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index 388c7dded180..e9357c9015c0 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -40,8 +40,8 @@ namespace connectivity public OResultSetMetaData_BASE { protected: - ::std::vector<sal_Int32> m_vMapping; // when not every column is needed - ::std::map<sal_Int32,sal_Int32> m_aColumnTypes; + std::vector<sal_Int32> m_vMapping; // when not every column is needed + std::map<sal_Int32,sal_Int32> m_aColumnTypes; SQLHANDLE m_aStatementHandle; OConnection* m_pConnection; @@ -62,7 +62,7 @@ namespace connectivity ,m_nColCount(-1) ,m_bUseODBC2Types(false) {} - OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping) + OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const std::vector<sal_Int32> & _vMapping) :m_vMapping(_vMapping) ,m_aStatementHandle( _pStmt ) ,m_pConnection(_pConnection) diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 8863d048748d..5f130f948756 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -68,7 +68,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XStatement> m_xGeneratedStatement; // for this Statement - ::std::list< OUString> m_aBatchList; + std::list< OUString> m_aBatchList; OUString m_sSqlStatement; rtl::Reference<OConnection> m_pConnection;// The owning Connection object |