diff options
Diffstat (limited to 'connectivity/source/inc')
33 files changed, 115 insertions, 115 deletions
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index e714f6d63a7f..9e8eea7bb9cd 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -37,8 +37,8 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; - ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; + std::map<sal_Int32,connectivity::OColumn> m_mColumns; + std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; protected: virtual ~ODatabaseMetaDataResultSetMetaData() override; diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 596a960ddfef..b8841927addc 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -40,21 +40,21 @@ namespace connectivity ::connectivity::ODatabaseMetaDataResultSet::ORows m_aTypeInfoRows; // cached database information - ::std::pair<bool,bool> m_isCatalogAtStart; - ::std::pair<bool,OUString> m_sCatalogSeparator; - ::std::pair<bool,OUString> m_sIdentifierQuoteString; - ::std::pair<bool,bool> m_supportsCatalogsInTableDefinitions; - ::std::pair<bool,bool> m_supportsSchemasInTableDefinitions; - ::std::pair<bool,bool> m_supportsCatalogsInDataManipulation; - ::std::pair<bool,bool> m_supportsSchemasInDataManipulation; - ::std::pair<bool,bool> m_supportsMixedCaseQuotedIdentifiers; - ::std::pair<bool,bool> m_supportsAlterTableWithAddColumn; - ::std::pair<bool,bool> m_supportsAlterTableWithDropColumn; - ::std::pair<bool,sal_Int32> m_MaxStatements; - ::std::pair<bool,sal_Int32> m_MaxTablesInSelect; - ::std::pair<bool,bool> m_storesMixedCaseQuotedIdentifiers; + std::pair<bool,bool> m_isCatalogAtStart; + std::pair<bool,OUString> m_sCatalogSeparator; + std::pair<bool,OUString> m_sIdentifierQuoteString; + std::pair<bool,bool> m_supportsCatalogsInTableDefinitions; + std::pair<bool,bool> m_supportsSchemasInTableDefinitions; + std::pair<bool,bool> m_supportsCatalogsInDataManipulation; + std::pair<bool,bool> m_supportsSchemasInDataManipulation; + std::pair<bool,bool> m_supportsMixedCaseQuotedIdentifiers; + std::pair<bool,bool> m_supportsAlterTableWithAddColumn; + std::pair<bool,bool> m_supportsAlterTableWithDropColumn; + std::pair<bool,sal_Int32> m_MaxStatements; + std::pair<bool,sal_Int32> m_MaxTablesInSelect; + std::pair<bool,bool> m_storesMixedCaseQuotedIdentifiers; - template <typename T> T callImplMethod(::std::pair<bool,T>& _rCache,const ::std::mem_fun_t<T,ODatabaseMetaDataBase>& _pImplMethod) + template <typename T> T callImplMethod(std::pair<bool,T>& _rCache,const std::mem_fun_t<T,ODatabaseMetaDataBase>& _pImplMethod) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rCache.first ) diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index e308b91a278d..6d7f1b336d5f 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -27,7 +27,7 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OKeyValue { private: - ::std::vector<ORowSetValueDecoratorRef> m_aKeys; + std::vector<ORowSetValueDecoratorRef> m_aKeys; sal_Int32 m_nValue; protected: @@ -53,12 +53,12 @@ namespace connectivity m_aKeys.push_back(_aValueRef); } - OUString getKeyString(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + OUString getKeyString(std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); } - double getKeyDouble(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + double getKeyDouble(std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 4b610082756f..6b8231a5d48b 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -32,7 +32,7 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS OSkipDeletedSet { - ::std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position + std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position IResultSetHelper* m_pHelper; // used for moving in the resultset bool m_bDeletedVisible; diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 4db3fbd60566..599e8f7209c8 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -39,7 +39,7 @@ namespace connectivity }; class OKeySet; - class OKeyValue; // simple class which holds a sal_Int32 and a ::std::vector<ORowSetValueDecoratorRef> + class OKeyValue; // simple class which holds a sal_Int32 and a std::vector<ORowSetValueDecoratorRef> /** The class OSortIndex can be used to implement a sorted index. @@ -48,19 +48,19 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSortIndex { public: - typedef ::std::vector< ::std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; - typedef ::std::vector<OKeyType> TKeyTypeVector; + typedef std::vector< std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; + typedef std::vector<OKeyType> TKeyTypeVector; private: TIntValuePairVector m_aKeyValues; TKeyTypeVector m_aKeyType; - ::std::vector<TAscendingOrder> m_aAscending; + std::vector<TAscendingOrder> m_aAscending; bool m_bFrozen; public: - OSortIndex( const ::std::vector<OKeyType>& _aKeyType, - const ::std::vector<TAscendingOrder>& _aAscending); + OSortIndex( const std::vector<OKeyType>& _aKeyType, + const std::vector<TAscendingOrder>& _aAscending); ~OSortIndex(); @@ -93,8 +93,8 @@ namespace connectivity */ ::rtl::Reference<OKeySet> CreateKeySet(); - inline const ::std::vector<OKeyType>& getKeyType() const { return m_aKeyType; } - inline TAscendingOrder getAscending(::std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; } + inline const std::vector<OKeyType>& getKeyType() const { return m_aKeyType; } + inline TAscendingOrder getAscending(std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; } }; diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 74d6bd7750f3..0ac1470fa1aa 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -44,7 +44,7 @@ namespace connectivity class WpADOConnection; class ODriver; class OCatalog; - typedef ::std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; + typedef std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; typedef connectivity::OMetaConnection OConnection_BASE; diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index 5f3f7d616956..e8ebb65b844b 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx @@ -42,7 +42,7 @@ namespace connectivity bool fSupported; }; - ::std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; + std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; WpADOConnection* m_pADOConnection; OConnection* m_pConnection; diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 234e986b85c0..8883600ee6d2 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -55,16 +55,16 @@ namespace connectivity public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time + std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::map<sal_Int32, TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; + std::map<sal_Int32, TInt2IntMap > m_aValueRange; + std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; - ::std::map<sal_Int32, ::std::map< OUString,sal_Int32> > m_aStrValueRange; - ::std::map<sal_Int32, ::std::map< OUString,sal_Int32> >::iterator m_aStrValueRangeIter; + std::map<sal_Int32, std::map< OUString,sal_Int32> > m_aStrValueRange; + std::map<sal_Int32, std::map< OUString,sal_Int32> >::iterator m_aStrValueRangeIter; - ::std::map<sal_Int32, ::std::map< sal_Int32,OUString> > m_aIntValueRange; - ::std::map<sal_Int32, ::std::map< sal_Int32,OUString> >::iterator m_aIntValueRangeIter; + std::map<sal_Int32, std::map< sal_Int32,OUString> > m_aIntValueRange; + std::map<sal_Int32, std::map< sal_Int32,OUString> >::iterator m_aIntValueRangeIter; ADORecordset* m_pRecordSet; css::uno::WeakReferenceHelper m_aStatement; @@ -193,7 +193,7 @@ namespace connectivity // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; - const ::std::vector<sal_Int32>& getColumnMapping() { return m_aColMapping; } + const std::vector<sal_Int32>& getColumnMapping() { return m_aColMapping; } void setCatalogsMap(); void setSchemasMap(); diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index cfe57f924f98..db3e9808200a 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -40,9 +40,9 @@ namespace connectivity { friend class ODatabaseMetaDataResultSet; - const ::std::vector<sal_Int32> &m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; - ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; + const std::vector<sal_Int32> &m_vMapping; // when not every column is needed + std::map<sal_Int32,connectivity::OColumn> m_mColumns; + std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; ADORecordset* m_pRecordSet; sal_Int32 m_nColCount; diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 111e45885cb6..fab79415258b 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -67,7 +67,7 @@ namespace connectivity OStatement_Base* m_pStmt; css::uno::Reference< css::uno::XInterface> m_xStatement; css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; - ::std::vector<OLEVariant> m_aBookmarks; + std::vector<OLEVariant> m_aBookmarks; OLEVariant m_aValue; ADO_LONGPTR m_nRowPos; bool m_bEOF; diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index e0c31099344f..bf16e48dff04 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -62,7 +62,7 @@ namespace connectivity css::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< OUString> m_aBatchList; + std::list< OUString> m_aBatchList; css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement @@ -72,7 +72,7 @@ namespace connectivity WpADORecordset m_RecordSet; OLEVariant m_RecordsAffected; OLEVariant m_Parameters; - ::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry + std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. ADO_LONGPTR m_nMaxRows; diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 717b298d58f3..c00d09cf22e5 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -42,9 +42,9 @@ namespace connectivity class OCalcTable : public OCalcTable_BASE { private: - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + std::vector<sal_Int32> m_aPrecisions; // same as aboth + std::vector<sal_Int32> m_aScales; css::uno::Reference< css::sheet::XSpreadsheet > m_xSheet; OCalcConnection* m_pConnection; sal_Int32 m_nStartCol; diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 72155a9685fb..5bfe40272db9 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -85,10 +85,10 @@ namespace connectivity } }; - ::std::vector<sal_Int32> m_aTypes; // holds all types for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as above - ::std::vector<sal_Int32> m_aScales; - ::std::vector<sal_Int32> m_aRealFieldLengths; + std::vector<sal_Int32> m_aTypes; // holds all types for columns just to avoid to ask the propertyset + std::vector<sal_Int32> m_aPrecisions; // same as above + std::vector<sal_Int32> m_aScales; + std::vector<sal_Int32> m_aRealFieldLengths; DBFHeader m_aHeader; DBFMemoHeader m_aMemoHeader; SvStream* m_pMemoStream; diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 4e19f19f0f91..00c359cbfad6 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -229,7 +229,7 @@ namespace connectivity SvStream& WriteONDXPage(SvStream &rStream, const ONDXPage& rPage); - typedef ::std::vector<ONDXPage*> ONDXPageList; + typedef std::vector<ONDXPage*> ONDXPageList; // Index Node diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx index 0d8d53b22c06..76d934b38342 100644 --- a/connectivity/source/inc/file/FDateFunctions.hxx +++ b/connectivity/source/inc/file/FDateFunctions.hxx @@ -137,7 +137,7 @@ namespace connectivity class OOp_Week : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** YEAR(date) @@ -199,7 +199,7 @@ namespace connectivity class OOp_CurDate : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** CURTIME() @@ -212,7 +212,7 @@ namespace connectivity class OOp_CurTime : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** NOW() @@ -224,7 +224,7 @@ namespace connectivity class OOp_Now : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; } } diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx index f71885170979..79592c14b012 100644 --- a/connectivity/source/inc/file/FNumericFunctions.hxx +++ b/connectivity/source/inc/file/FNumericFunctions.hxx @@ -128,7 +128,7 @@ namespace connectivity class OOp_Round : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** EXP(X) @@ -179,7 +179,7 @@ namespace connectivity class OOp_Log : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LOG10(X) @@ -238,7 +238,7 @@ namespace connectivity class OOp_Pi : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** COS(X) diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index e9511207207e..6441202ded24 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -60,7 +60,7 @@ namespace connectivity sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, const css::uno::Reference< css::beans::XPropertySet>& _xCol); - void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); + void scanParameter(OSQLParseNode* pParseNode,std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); void describeParameter(); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 503198ac46dd..7044200286fe 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -69,10 +69,10 @@ namespace connectivity { protected: - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time + std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; - ::std::vector<TAscendingOrder> m_aOrderbyAscending; + std::vector<sal_Int32> m_aOrderbyColumnNumber; + std::vector<TAscendingOrder> m_aOrderbyAscending; OValueRefRow m_aSelectRow; OValueRefRow m_aRow; @@ -274,11 +274,11 @@ namespace connectivity m_aSelectRow = _rRow; m_nColumnCount = m_aSelectRow->get().size(); } - inline void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } + inline void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } - inline void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } - inline void setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } + inline void setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } + inline void setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} static void setBoundedColumns(const OValueRefRow& _rRow, @@ -287,7 +287,7 @@ namespace connectivity const css::uno::Reference< css::container::XIndexAccess>& _xNames, bool _bSetColumnMapping, const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData, - ::std::vector<sal_Int32>& _rColMapping); + std::vector<sal_Int32>& _rColMapping); // IResultSetHelper virtual bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) override; diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index cd2a5c8defcb..baa9cf74f437 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -62,10 +62,10 @@ namespace connectivity { protected: - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; - ::std::vector<TAscendingOrder> m_aOrderbyAscending; + std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time + std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index + std::vector<sal_Int32> m_aOrderbyColumnNumber; + std::vector<TAscendingOrder> m_aOrderbyAscending; css::sdbc::SQLWarning m_aLastWarning; css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created @@ -117,7 +117,7 @@ namespace connectivity const OUString& aValue, bool bSetNull = false, sal_uInt32 nParameter=SQL_NO_PARAMETER); - void ParseAssignValues( const ::std::vector< OUString>& aColumnNameList, + void ParseAssignValues( const std::vector< OUString>& aColumnNameList, connectivity::OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex); virtual void parseParamterElem(const OUString& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem); diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx index 232d438c5d3f..b184787f4322 100644 --- a/connectivity/source/inc/file/FStringFunctions.hxx +++ b/connectivity/source/inc/file/FStringFunctions.hxx @@ -102,7 +102,7 @@ namespace connectivity class OOp_Char : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** CONCAT(str1,str2,...) @@ -119,7 +119,7 @@ namespace connectivity class OOp_Concat : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LOCATE(substr,str) @@ -140,7 +140,7 @@ namespace connectivity class OOp_Locate : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** SUBSTRING(str,pos) @@ -162,7 +162,7 @@ namespace connectivity class OOp_SubString : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LTRIM(str) @@ -214,7 +214,7 @@ namespace connectivity class OOp_Replace : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** REPEAT(str,count) @@ -240,7 +240,7 @@ namespace connectivity class OOp_Insert : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LEFT(str,len) diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 0188f623c7ea..919f31df66bd 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -30,9 +30,9 @@ namespace connectivity class OConnection; class OOO_DLLPUBLIC_FILE OSQLAnalyzer final { - typedef ::std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates; + typedef std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates; - ::std::vector< TPredicates > m_aSelectionEvaluations; + std::vector< TPredicates > m_aSelectionEvaluations; ::rtl::Reference<OPredicateCompiler> m_aCompiler; ::rtl::Reference<OPredicateInterpreter> m_aInterpreter; OConnection* m_pConnection; @@ -73,7 +73,7 @@ namespace connectivity bool hasRestriction() const; bool hasFunctions() const; inline bool evaluateRestriction() { return m_aInterpreter->start(); } - void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping); + void setSelectionEvaluationResult(OValueRefRow& _pRow,const std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols); static OOperandAttr* createOperandAttr(sal_Int32 _nPos, const css::uno::Reference< css::beans::XPropertySet>& _xCol, diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 191d3d24e166..14d66831bd93 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -37,7 +37,7 @@ namespace connectivity { class OOperand; - typedef ::std::stack<OOperand*> OCodeStack; + typedef std::stack<OOperand*> OCodeStack; class OOO_DLLPUBLIC_FILE OCode { @@ -321,7 +321,7 @@ namespace connectivity protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const = 0; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const = 0; }; class OBinaryOperator : public OOperator diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index a774b2f3c6f5..aa04fb54e1bd 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -31,7 +31,7 @@ namespace connectivity class OCode; class OOperand; class OSQLAnalyzer; - typedef::std::vector<OCode*> OCodeList; + typedef std::vector<OCode*> OCodeList; class OPredicateCompiler : public ::salhelper::SimpleReferenceObject { diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index 4b3bf72e6383..fbeff5c3ccd0 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -35,18 +35,18 @@ namespace connectivity typedef file::OFileTable OFlatTable_BASE; class OFlatConnection; - typedef ::std::pair<sal_Int32, sal_Int32> TRowPositionInFile; + typedef std::pair<sal_Int32, sal_Int32> TRowPositionInFile; class OFlatTable : public OFlatTable_BASE { // maps a row position to a file position // row n is positions [m_aRowPosToFilePos[n]->first, m_aRowPosToFilePos[n]->second) in file // "real" row indexes start at 1; for the purposes of m_aRowPosToFilePos, row 0 is headers - ::std::vector<TRowPositionInFile> + std::vector<TRowPositionInFile> m_aRowPosToFilePos; - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + std::vector<sal_Int32> m_aPrecisions; // same as aboth + std::vector<sal_Int32> m_aScales; QuotedTokenizedString m_aCurrentLine; css::uno::Reference< css::util::XNumberFormatter > m_xNumberFormatter; css::util::Date m_aNullDate; @@ -58,7 +58,7 @@ namespace connectivity private: void fillColumns(const css::lang::Locale& _aLocale); bool readLine(sal_Int32 *pEndPos, sal_Int32 *pStartPos, bool nonEmpty = false); - void setRowPos(::std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos); + void setRowPos(std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos); void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2, sal_Int32& io_nType, sal_Int32& io_nPrecisions, sal_Int32& io_nScales, OUString& o_sTypeName, const sal_Unicode cDecimalDelimiter, const sal_Unicode cThousandDelimiter, const CharClass& aCharClass); diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index d070347b15d1..6a9957c1499b 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -48,11 +48,11 @@ namespace connectivity , css::embed::XTransactionListener > ODriverDelegator_BASE; - typedef ::std::pair< css::uno::WeakReferenceHelper,css::uno::WeakReferenceHelper> TWeakRefPair; - typedef ::std::pair< OUString ,TWeakRefPair > TWeakConnectionPair; + typedef std::pair< css::uno::WeakReferenceHelper,css::uno::WeakReferenceHelper> TWeakRefPair; + typedef std::pair< OUString ,TWeakRefPair > TWeakConnectionPair; - typedef ::std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; - typedef ::std::vector< TWeakPair > TWeakPairVector; + typedef std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; + typedef std::vector< TWeakPair > TWeakPairVector; /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 29667d0958db..159ed9931d10 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -50,9 +50,9 @@ namespace connectivity , css::lang::XServiceInfo > ODriverDelegator_BASE; - typedef ::std::pair< css::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair; - typedef ::std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; - typedef ::std::vector< TWeakPair > TWeakPairVector; + typedef std::pair< css::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair; + typedef std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; + typedef std::vector< TWeakPair > TWeakPairVector; typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > TJDBCDrivers; /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. 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 diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index 409f3c568cdc..538fe88c586e 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -30,7 +30,7 @@ namespace dbtools { class OOO_DLLPUBLIC_DBTOOLS OPropertyMap { - ::std::map<sal_Int32, OUString> m_aPropertyMap; + std::map<sal_Int32, OUString> m_aPropertyMap; public: OPropertyMap(); const OUString& getNameByIndex(sal_Int32 _nIndex) const; diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index fadbf354822b..f0cbaec43784 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -140,7 +140,7 @@ namespace connectivity the string from the resource file, with applied string substitution */ OUString getResourceStringWithSubstitution( ResourceId _nResId, - const ::std::list< ::std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const; + const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const; }; |