summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/file
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/inc/file')
-rw-r--r--connectivity/source/inc/file/FDateFunctions.hxx8
-rw-r--r--connectivity/source/inc/file/FNumericFunctions.hxx6
-rw-r--r--connectivity/source/inc/file/FPreparedStatement.hxx2
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx14
-rw-r--r--connectivity/source/inc/file/FStatement.hxx10
-rw-r--r--connectivity/source/inc/file/FStringFunctions.hxx12
-rw-r--r--connectivity/source/inc/file/fanalyzer.hxx6
-rw-r--r--connectivity/source/inc/file/fcode.hxx4
-rw-r--r--connectivity/source/inc/file/fcomp.hxx2
9 files changed, 32 insertions, 32 deletions
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
{