mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:loopvartoosmall

Browse Source 
Change-Id: Ib90fb2c3f4d976dce764d4c91af797351317397b
This commit is contained in:
Stephan Bergmann
2017-02-26 22:00:26 +01:00
parent e821f8848f
commit a407e4da65
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
connectivity/source/drivers/dbase/DTable.cxx
View File

@@ -54,6 +54,7 @@
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <algorithm> #include <algorithm>
#include <cassert>
using namespace ::comphelper; using namespace ::comphelper;
using namespace connectivity; using namespace connectivity;
@@ -1679,7 +1680,6 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
// Update fields: // Update fields:
Reference<XPropertySet> xCol; Reference<XPropertySet> xCol;
Reference<XPropertySet> xIndex; Reference<XPropertySet> xIndex;
sal_uInt16 i;
OUString aColName; OUString aColName;
const sal_Int32 nColumnCount = m_pColumns->getCount(); const sal_Int32 nColumnCount = m_pColumns->getCount();
std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount); std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
@@ -1688,7 +1688,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
Reference<XIndexAccess> xColumns = m_pColumns; Reference<XIndexAccess> xColumns = m_pColumns;
// first search a key that exist already in the table // first search a key that exist already in the table
for (i = 0; i < nColumnCount; ++i) for (sal_Int32 i = 0; i < nColumnCount; ++i)
{ {
sal_Int32 nPos = i; sal_Int32 nPos = i;
if(_xCols != xColumns) if(_xCols != xColumns)
@@ -1746,14 +1746,15 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
// when we are here there is no double key in the table // when we are here there is no double key in the table
for (i = 0; i < nColumnCount && nByteOffset <= m_nBufferSize ; ++i) for (sal_Int32 i = 0; i < nColumnCount && nByteOffset <= m_nBufferSize ; ++i)
{ {
// Lengths for each data type: // Lengths for each data type:
OSL_ENSURE(i < m_aPrecisions.size(),"Illegal index!"); assert(i >= 0);
OSL_ENSURE(sal_uInt32(i) < m_aPrecisions.size(),"Illegal index!");
sal_Int32 nLen = 0; sal_Int32 nLen = 0;
sal_Int32 nType = 0; sal_Int32 nType = 0;
sal_Int32 nScale = 0; sal_Int32 nScale = 0;
if ( i < m_aPrecisions.size() ) if ( sal_uInt32(i) < m_aPrecisions.size() )
{ {
nLen = m_aPrecisions[i]; nLen = m_aPrecisions[i];
nType = m_aTypes[i]; nType = m_aTypes[i];

2
connectivity/source/parse/sqlnode.cxx
View File

@@ -1664,7 +1664,7 @@ bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
bResult = bResult && !SQL_ISRULE(this, parameter); bResult = bResult && !SQL_ISRULE(this, parameter);
// compare children // compare children
for (sal_uInt32 i=0; bResult && i < count(); i++) for (size_t i=0; bResult && i < count(); i++)
bResult = *getChild(i) == *rParseNode.getChild(i); bResult = *getChild(i) == *rParseNode.getChild(i);
return bResult; return bResult;