summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-30 10:10:09 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-10-30 10:10:09 +0000
commitcb0e009a9e6903fc7b814c38b60f3f895a878028 (patch)
tree374f57165023c0f743ecf5bb91a75f49b8506b1e /basic
parent2bc6b0d5f06a4608f9bb43bdc0775b9e59e7126b (diff)
document array_vs_singleton dismissals
Change-Id: I8d7eb4c01197e885abca717c7814c61a7641ac9d
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/sbunoobj.cxx2
-rw-r--r--basic/source/runtime/methods.cxx1
-rw-r--r--basic/source/runtime/methods1.cxx4
-rw-r--r--basic/source/runtime/runtime.cxx1
4 files changed, 7 insertions, 1 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 31067081eab8..0ff639372491 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -905,6 +905,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal )
sal_Int32 nIdx = nLower;
for( sal_Int32 i = 0 ; i < nSize ; i++,nIdx++ )
{
+ // coverity[array_vs_singleton]
SbxVariableRef xVar = pArray->Get32( &nIdx );
Type aType = getUnoTypeForSbxValue( (SbxVariable*)xVar );
if( bNeedsInit )
@@ -1350,6 +1351,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper
sal_Int32 nIdx = nLower;
for( sal_Int32 i = 0 ; i < nSeqSize ; i++,nIdx++ )
{
+ // coverity[array_vs_singleton]
SbxVariableRef xVar = pArray->Get32( &nIdx );
// Convert the value of Sbx to Uno
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 194b06bb6444..4ab4fff52036 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4372,6 +4372,7 @@ RTLFUNC(StrConv)
{
++index;
}
+ // coverity[array_vs_singleton]
pArray->Put( pNew, &index );
}
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 2e824862627d..3c816524e7db 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -839,6 +839,7 @@ RTLFUNC(Array)
{
++index;
}
+ // coverity[array_vs_singleton]
pArray->Put( pNew, &index );
}
@@ -1731,8 +1732,9 @@ RTLFUNC(Join)
OUString aRetStr;
short nLower, nUpper;
pArr->GetDim( 1, nLower, nUpper );
- for( short i = nLower ; i <= nUpper ; ++i )
+ for (short i = nLower; i <= nUpper; ++i)
{
+ // coverity[array_vs_singleton]
OUString aStr = pArr->Get( &i )->GetOUString();
aRetStr += aStr;
if( i != nUpper )
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 8cae088a738f..455611f4c4e2 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -669,6 +669,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
{
SbxVariable* v = pParams->Get( j );
short nDimIndex = j - i;
+ // coverity[array_vs_singleton]
pArray->Put( v, &nDimIndex );
}
SbxVariable* pArrayVar = new SbxVariable( SbxVARIANT );