diff options
Diffstat (limited to 'connectivity/source/inc')
-rw-r--r-- | connectivity/source/inc/OColumn.hxx | 37 | ||||
-rw-r--r-- | connectivity/source/inc/dbase/DIndexIter.hxx | 8 | ||||
-rw-r--r-- | connectivity/source/inc/dbase/dindexnode.hxx | 4 |
3 files changed, 17 insertions, 32 deletions
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index 74563555a51e..948d6f8f3731 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -76,25 +76,12 @@ namespace connectivity sal_Int32 _aColumnDisplaySize=0, sal_Int32 _aPrecision=0, sal_Int32 _aScale=0, - sal_Int32 _aColumnType=0, - - bool _aAutoIncrement=false, - bool _aCaseSensitive=false, - bool _aSearchable=true, - bool _aCurrency=false, - bool _aSigned=false, - bool _aReadOnly=true, - bool _aWritable=false, - bool _aDefinitelyWritable=false, - - const OUString &_aColumnLabel = OUString(), - const OUString &_aColumnTypeName = OUString(), - const OUString &_aColumnServiceName = OUString()) + sal_Int32 _aColumnType=0) : m_TableName(_aTableName), m_ColumnName(_aColumnName), - m_ColumnLabel(_aColumnLabel), - m_ColumnTypeName(_aColumnTypeName), - m_ColumnServiceName(_aColumnServiceName), + m_ColumnLabel(), + m_ColumnTypeName(), + m_ColumnServiceName(), m_Nullable(_aNullable), m_ColumnDisplaySize(_aColumnDisplaySize), @@ -102,14 +89,14 @@ namespace connectivity m_Scale(_aScale), m_ColumnType(_aColumnType), - m_AutoIncrement(_aAutoIncrement), - m_CaseSensitive(_aCaseSensitive), - m_Searchable(_aSearchable), - m_Currency(_aCurrency), - m_Signed(_aSigned), - m_ReadOnly(_aReadOnly), - m_Writable(_aWritable), - m_DefinitelyWritable(_aDefinitelyWritable) + m_AutoIncrement(false), + m_CaseSensitive(false), + m_Searchable(true), + m_Currency(false), + m_Signed(false), + m_ReadOnly(true), + m_Writable(false), + m_DefinitelyWritable(false) { if(m_ColumnLabel.isEmpty()) m_ColumnLabel = _aColumnName; diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx index 141b4bed83ba..55305bf3c74a 100644 --- a/connectivity/source/inc/dbase/DIndexIter.hxx +++ b/connectivity/source/inc/dbase/DIndexIter.hxx @@ -52,11 +52,9 @@ namespace connectivity ONDXKey* GetNextKey(); public: - OIndexIterator(ODbaseIndex* pInd, - file::OBoolOperator* pOp, - const file::OOperand* pOper) - :m_pOperator(pOp) - ,m_pOperand(pOper) + OIndexIterator(ODbaseIndex* pInd) + :m_pOperator(nullptr) + ,m_pOperand(nullptr) ,m_xIndex(pInd) ,m_nCurNode(NODE_NOTFOUND) { diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 9d5977e3a384..53d079c4c83a 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -48,7 +48,7 @@ namespace connectivity ORowSetValue xValue; /* Key values */ public: - ONDXKey(sal_uInt32 nRec=0); + ONDXKey(); ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec); ONDXKey(const OUString& aStr, sal_uInt32 nRec = 0); ONDXKey(double aVal, sal_uInt32 nRec = 0); @@ -90,7 +90,7 @@ namespace connectivity sal_uInt32 nPagePos; // Position in the index file public: - ONDXPagePtr(sal_uInt32 nPos = 0) : mpPage(nullptr), nPagePos(nPos) {} + ONDXPagePtr() : mpPage(nullptr), nPagePos(0) {} ONDXPagePtr(const ONDXPagePtr& rRef); ONDXPagePtr(ONDXPage* pRefPage); inline ~ONDXPagePtr(); |