Kaydet (Commit) e1755ac8 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:countusersofdefaultparams in connectivity

Change-Id: Ia613257f2de1395c6629c1c37026ed48d4b927c8
Reviewed-on: https://gerrit.libreoffice.org/45854Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst c7e5c7da
...@@ -82,7 +82,7 @@ struct TRemoveEventListenerFunctor ...@@ -82,7 +82,7 @@ struct TRemoveEventListenerFunctor
OConnectionPool* m_pConnectionPool; OConnectionPool* m_pConnectionPool;
bool m_bDispose; bool m_bDispose;
TRemoveEventListenerFunctor(OConnectionPool* _pConnectionPool,bool _bDispose = false) TRemoveEventListenerFunctor(OConnectionPool* _pConnectionPool, bool _bDispose)
: m_pConnectionPool(_pConnectionPool) : m_pConnectionPool(_pConnectionPool)
,m_bDispose(_bDispose) ,m_bDispose(_bDispose)
{ {
......
...@@ -38,9 +38,9 @@ namespace connectivity ...@@ -38,9 +38,9 @@ namespace connectivity
OEvoabConnection* _pConnection, OEvoabConnection* _pConnection,
const OUString& Name, const OUString& Name,
const OUString& Type, const OUString& Type,
const OUString& Description = OUString(), const OUString& Description,
const OUString& SchemaName = OUString(), const OUString& SchemaName,
const OUString& CatalogName = OUString() const OUString& CatalogName
); );
OEvoabConnection* getConnection() { return m_pConnection;} OEvoabConnection* getConnection() { return m_pConnection;}
......
...@@ -63,6 +63,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName) ...@@ -63,6 +63,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
aName, aName,
xRow->getString(4), xRow->getString(4),
xRow->getString(5), xRow->getString(5),
"",
""); "");
xRet = pRet; xRet = pRet;
} }
......
...@@ -29,7 +29,8 @@ Columns::Columns(Table& rTable, ...@@ -29,7 +29,8 @@ Columns::Columns(Table& rTable,
OColumnsHelper(rTable, OColumnsHelper(rTable,
true, // TODO: is this case sensitivity? true, // TODO: is this case sensitivity?
rMutex, rMutex,
rVector) rVector,
/*bUseHardRef*/true)
{ {
OColumnsHelper::setParent(&rTable); OColumnsHelper::setParent(&rTable);
} }
......
...@@ -71,12 +71,11 @@ namespace connectivity ...@@ -71,12 +71,11 @@ namespace connectivity
OColumn(const OUString &_aTableName, OColumn(const OUString &_aTableName,
const OUString &_aColumnName, const OUString &_aColumnName,
sal_Int32 _aNullable,
sal_Int32 _aNullable=0, sal_Int32 _aColumnDisplaySize,
sal_Int32 _aColumnDisplaySize=0, sal_Int32 _aPrecision,
sal_Int32 _aPrecision=0, sal_Int32 _aScale,
sal_Int32 _aScale=0, sal_Int32 _aColumnType)
sal_Int32 _aColumnType=0)
: m_TableName(_aTableName), : m_TableName(_aTableName),
m_ColumnName(_aColumnName), m_ColumnName(_aColumnName),
m_ColumnLabel(), m_ColumnLabel(),
......
...@@ -49,9 +49,9 @@ namespace connectivity ...@@ -49,9 +49,9 @@ namespace connectivity
OComponentTable( sdbcx::OCollection* _pTables,file::OConnection* _pConnection, OComponentTable( sdbcx::OCollection* _pTables,file::OConnection* _pConnection,
const OUString& Name, const OUString& Name,
const OUString& Type, const OUString& Type,
const OUString& Description = OUString(), const OUString& Description,
const OUString& SchemaName = OUString(), const OUString& SchemaName,
const OUString& CatalogName = OUString() const OUString& CatalogName
); );
virtual void refreshColumns() override; virtual void refreshColumns() override;
......
...@@ -51,8 +51,8 @@ namespace connectivity ...@@ -51,8 +51,8 @@ namespace connectivity
public: public:
ONDXKey(); ONDXKey();
ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec); ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec);
ONDXKey(const OUString& aStr, sal_uInt32 nRec = 0); ONDXKey(const OUString& aStr, sal_uInt32 nRec);
ONDXKey(double aVal, sal_uInt32 nRec = 0); ONDXKey(double aVal, sal_uInt32 nRec);
inline ONDXKey(const ONDXKey& rKey); inline ONDXKey(const ONDXKey& rKey);
...@@ -177,7 +177,7 @@ namespace connectivity ...@@ -177,7 +177,7 @@ namespace connectivity
void SearchAndReplace(const ONDXKey& rSearch, ONDXKey const & rReplace); void SearchAndReplace(const ONDXKey& rSearch, ONDXKey const & rReplace);
protected: protected:
ONDXPage(ODbaseIndex& rIndex, sal_uInt32 nPos, ONDXPage* = nullptr); ONDXPage(ODbaseIndex& rIndex, sal_uInt32 nPos, ONDXPage*);
~ONDXPage(); ~ONDXPage();
void ReleaseRef(); void ReleaseRef();
......
...@@ -58,9 +58,9 @@ namespace connectivity ...@@ -58,9 +58,9 @@ namespace connectivity
OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
const OUString& Name, const OUString& Name,
const OUString& Type, const OUString& Type,
const OUString& Description = OUString(), const OUString& Description,
const OUString& SchemaName = OUString(), const OUString& SchemaName,
const OUString& CatalogName = OUString() const OUString& CatalogName
); );
//XInterface //XInterface
......
...@@ -245,7 +245,7 @@ namespace connectivity ...@@ -245,7 +245,7 @@ namespace connectivity
const sal_Unicode cEscape; const sal_Unicode cEscape;
public: public:
OOp_LIKE(const sal_Unicode cEsc = L'\0'):cEscape(cEsc){}; OOp_LIKE(const sal_Unicode cEsc):cEscape(cEsc){};
virtual bool operate(const OOperand*, const OOperand*) const override; virtual bool operate(const OOperand*, const OOperand*) const override;
}; };
...@@ -254,7 +254,7 @@ namespace connectivity ...@@ -254,7 +254,7 @@ namespace connectivity
{ {
public: public:
public: public:
OOp_NOTLIKE(const sal_Unicode cEsc = L'\0'):OOp_LIKE(cEsc){}; OOp_NOTLIKE(const sal_Unicode cEsc):OOp_LIKE(cEsc){};
virtual bool operate(const OOperand*, const OOperand*) const override; virtual bool operate(const OOperand*, const OOperand*) const override;
}; };
......
...@@ -77,10 +77,10 @@ namespace connectivity ...@@ -77,10 +77,10 @@ namespace connectivity
const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
const OUString& Name, const OUString& Name,
const OUString& Type, const OUString& Type,
const OUString& Description = OUString(), const OUString& Description,
const OUString& SchemaName = OUString(), const OUString& SchemaName,
const OUString& CatalogName = OUString(), const OUString& CatalogName,
sal_Int32 _nPrivileges = 0 sal_Int32 _nPrivileges
); );
// ODescriptor // ODescriptor
......
...@@ -84,10 +84,10 @@ namespace connectivity ...@@ -84,10 +84,10 @@ namespace connectivity
const css::uno::Reference< css::sdbc::XConnection >& _xConnection, const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
const OUString& Name, const OUString& Name,
const OUString& Type, const OUString& Type,
const OUString& Description = OUString(), const OUString& Description,
const OUString& SchemaName = OUString(), const OUString& SchemaName,
const OUString& CatalogName = OUString(), const OUString& CatalogName,
sal_Int32 _nPrivileges = 0 sal_Int32 _nPrivileges
); );
// ODescriptor // ODescriptor
......
...@@ -460,7 +460,7 @@ void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVecto ...@@ -460,7 +460,7 @@ void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVecto
{ {
io_aRow[aJoinIter->second] = io_aRow[i_nColumnIndex]; io_aRow[aJoinIter->second] = io_aRow[i_nColumnIndex];
io_aInsertRow[aJoinIter->second] = io_aInsertRow[i_nColumnIndex]; io_aInsertRow[aJoinIter->second] = io_aInsertRow[i_nColumnIndex];
io_aRow[aJoinIter->second].setModified(); io_aRow[aJoinIter->second].setModified(true);
o_aChangedColumns.push_back(aJoinIter->second); o_aChangedColumns.push_back(aJoinIter->second);
} }
} }
...@@ -496,7 +496,7 @@ bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCac ...@@ -496,7 +496,7 @@ bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCac
if ( aCol.second.sTableName == sTableName ) if ( aCol.second.sTableName == sTableName )
{ {
io_aRow[aCol.second.nPosition] = io_aCachedRow[aCol.second.nPosition]; io_aRow[aCol.second.nPosition] = io_aCachedRow[aCol.second.nPosition];
io_aRow[aCol.second.nPosition].setModified(); io_aRow[aCol.second.nPosition].setModified(true);
} }
} }
} }
...@@ -537,7 +537,7 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow ...@@ -537,7 +537,7 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow
if ( aCol2.second.sTableName == sTableName ) if ( aCol2.second.sTableName == sTableName )
{ {
o_aCachedRow[aCol2.second.nPosition] = i_aRow[aCol2.second.nPosition]; o_aCachedRow[aCol2.second.nPosition] = i_aRow[aCol2.second.nPosition];
o_aCachedRow[aCol2.second.nPosition].setModified(); o_aCachedRow[aCol2.second.nPosition].setModified(true);
} }
} }
fillMissingValues(o_aCachedRow); fillMissingValues(o_aCachedRow);
...@@ -609,7 +609,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const ...@@ -609,7 +609,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
if ( aColIter->second.sTableName == aSqlIter->first ) if ( aColIter->second.sTableName == aSqlIter->first )
{ {
io_aRow[aColIter->second.nPosition].fill(i++, aColIter->second.nType, xRow); io_aRow[aColIter->second.nPosition].fill(i++, aColIter->second.nType, xRow);
io_aRow[aColIter->second.nPosition].setModified(); io_aRow[aColIter->second.nPosition].setModified(true);
} }
} }
} }
......
...@@ -562,7 +562,7 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& ...@@ -562,7 +562,7 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector&
{ {
rInsert[columnIndex].setBound(true); rInsert[columnIndex].setBound(true);
rInsert[columnIndex].setNull(); rInsert[columnIndex].setNull();
rInsert[columnIndex].setModified(); rInsert[columnIndex].setModified(true);
io_aRow[columnIndex].setNull(); io_aRow[columnIndex].setNull();
m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns); m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
...@@ -582,7 +582,7 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x ...@@ -582,7 +582,7 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x
{ {
rInsert[columnIndex].setBound(true); rInsert[columnIndex].setBound(true);
rInsert[columnIndex] = x; rInsert[columnIndex] = x;
rInsert[columnIndex].setModified(); rInsert[columnIndex].setModified(true);
io_aRow[columnIndex] = rInsert[columnIndex]; io_aRow[columnIndex] = rInsert[columnIndex];
m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns); m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
...@@ -604,7 +604,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference ...@@ -604,7 +604,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference
ORowSetValueVector::Vector& rInsert = (*m_aInsertRow)->get(); ORowSetValueVector::Vector& rInsert = (*m_aInsertRow)->get();
rInsert[columnIndex].setBound(true); rInsert[columnIndex].setBound(true);
rInsert[columnIndex] = aSeq; rInsert[columnIndex] = aSeq;
rInsert[columnIndex].setModified(); rInsert[columnIndex].setModified(true);
io_aRow[columnIndex] = makeAny(x); io_aRow[columnIndex] = makeAny(x);
m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns); m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
...@@ -625,7 +625,7 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x ...@@ -625,7 +625,7 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
{ {
rInsert[columnIndex].setBound(true); rInsert[columnIndex].setBound(true);
rInsert[columnIndex] = aTemp; rInsert[columnIndex] = aTemp;
rInsert[columnIndex].setModified(); rInsert[columnIndex].setModified(true);
io_aRow[columnIndex] = rInsert[columnIndex]; io_aRow[columnIndex] = rInsert[columnIndex];
m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns); m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
...@@ -647,7 +647,7 @@ void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x ...@@ -647,7 +647,7 @@ void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x
{ {
rInsert[columnIndex].setBound(true); rInsert[columnIndex].setBound(true);
rInsert[columnIndex] = aTemp; rInsert[columnIndex] = aTemp;
rInsert[columnIndex].setModified(); rInsert[columnIndex].setModified(true);
io_aRow[columnIndex] = rInsert[columnIndex]; io_aRow[columnIndex] = rInsert[columnIndex];
m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns); m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
......
...@@ -381,10 +381,10 @@ namespace connectivity ...@@ -381,10 +381,10 @@ namespace connectivity
void setBound(bool _bBound) { m_bBound = _bBound; } void setBound(bool _bBound) { m_bBound = _bBound; }
bool isModified() const { return m_bModified; } bool isModified() const { return m_bModified; }
void setModified(bool _bMod=true) { m_bModified = _bMod; } void setModified(bool _bMod) { m_bModified = _bMod; }
bool isSigned() const { return m_bSigned; } bool isSigned() const { return m_bSigned; }
void setSigned(bool _bSig=true); void setSigned(bool _bSig);
sal_Int32 getTypeKind() const { return m_eTypeKind; } sal_Int32 getTypeKind() const { return m_eTypeKind; }
void setTypeKind(sal_Int32 _eType); void setTypeKind(sal_Int32 _eType);
......
...@@ -48,7 +48,7 @@ namespace connectivity ...@@ -48,7 +48,7 @@ namespace connectivity
,bool _bCase ,bool _bCase
,::osl::Mutex& _rMutex ,::osl::Mutex& _rMutex
,const TStringVector &_rVector ,const TStringVector &_rVector
,bool _bUseHardRef = true ,bool _bUseHardRef
); );
virtual ~OColumnsHelper() override; virtual ~OColumnsHelper() override;
......
...@@ -309,7 +309,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( ...@@ -309,7 +309,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
const OUString& _rMessage, const OUString& _rMessage,
const OUString& _rSQLState, const OUString& _rSQLState,
const css::uno::Reference< css::uno::XInterface >& _rxContext, const css::uno::Reference< css::uno::XInterface >& _rxContext,
const sal_Int32 _nErrorCode = 0 const sal_Int32 _nErrorCode
); );
......
...@@ -704,9 +704,9 @@ namespace dbtools ...@@ -704,9 +704,9 @@ namespace dbtools
const OUString& _rName, const OUString& _rName,
bool _bCase, bool _bCase,
bool _bQueryForInfo, bool _bQueryForInfo,
bool _bIsAutoIncrement = false, bool _bIsAutoIncrement,
bool _bIsCurrency = false, bool _bIsCurrency,
sal_Int32 _nDataType = css::sdbc::DataType::OTHER); sal_Int32 _nDataType);
/** tries to locate the corresponding DataDefinitionSupplier for the given url and connection /** tries to locate the corresponding DataDefinitionSupplier for the given url and connection
@param _rsUrl @param _rsUrl
...@@ -803,7 +803,7 @@ namespace dbtools ...@@ -803,7 +803,7 @@ namespace dbtools
OOO_DLLPUBLIC_DBTOOLS bool isAggregateColumn( OOO_DLLPUBLIC_DBTOOLS bool isAggregateColumn(
const css::uno::Reference< css::container::XNameAccess > &_xColumns, const css::uno::Reference< css::container::XNameAccess > &_xColumns,
const OUString &_sName, const OUString &_sName,
bool whenNotFound = false bool whenNotFound
); );
/** is this column an aggregate? /** is this column an aggregate?
......
...@@ -207,7 +207,7 @@ namespace connectivity ...@@ -207,7 +207,7 @@ namespace connectivity
// RuleId with enum, far more efficient // RuleId with enum, far more efficient
static sal_uInt32 RuleID(OSQLParseNode::Rule eRule); static sal_uInt32 RuleID(OSQLParseNode::Rule eRule);
// compares the _sFunctionName with all known function names and return the DataType of the return value // compares the _sFunctionName with all known function names and return the DataType of the return value
static sal_Int32 getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext = nullptr); static sal_Int32 getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext);
// returns the type for a parameter in a given function name // returns the type for a parameter in a given function name
static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment