diff options
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/methods.cxx | 1 | ||||
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 4 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 1 | ||||
| -rw-r--r-- | cppu/source/typelib/static_types.cxx | 3 | ||||
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 1 | ||||
| -rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 1 | ||||
| -rw-r--r-- | unotest/source/cpp/officeconnection.cxx | 1 | ||||
| -rw-r--r-- | vcl/generic/print/genpspgraphics.cxx | 1 | ||||
| -rw-r--r-- | vcl/generic/print/text_gfx.cxx | 2 |
10 files changed, 14 insertions, 3 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 ); diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 82640a014f54..887a884bf0ce 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -439,18 +439,17 @@ CPPU_DLLPUBLIC void SAL_CALL typelib_static_struct_type_init( ppMembers, pParameterizedTypes); } - CPPU_DLLPUBLIC void SAL_CALL typelib_static_interface_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, typelib_TypeDescriptionReference * pBaseType ) SAL_THROW_EXTERN_C() { + // coverity[array_vs_singleton] typelib_static_mi_interface_type_init( ppRef, pTypeName, pBaseType == 0 ? 0 : 1, &pBaseType); } - CPPU_DLLPUBLIC void SAL_CALL typelib_static_mi_interface_type_init( typelib_TypeDescriptionReference ** ppRef, const sal_Char * pTypeName, diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 56f8c8512e99..b0b1a17d306e 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -901,6 +901,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface( typelib_TypeDescriptionReference ** ppMembers ) SAL_THROW_EXTERN_C() { + // coverity[array_vs_singleton] typelib_typedescription_newMIInterface( ppRet, pTypeName, 0, 0, 0, 0, 0, pBaseInterface == 0 ? 0 : 1, &pBaseInterface, nMembers, ppMembers); diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 4e239519da5c..54941d311b25 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -455,6 +455,7 @@ static OString lcl_ConvertCharToHTML( sal_Unicode c, // If the character could not be converted to the destination // character set, the UNICODE character is exported as character // entity. + // coverity[array_vs_singleton] nLen = rtl_convertUnicodeToText( rContext.m_hConv, rContext.m_hContext, &c, 0, cBuffer, TXTCONV_BUFFER_SIZE, diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index ec1a8e66e485..b86a4c2abfff 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -81,6 +81,7 @@ void OfficeConnection::setUp() { { envs = &argEnv.pData; } + // coverity[array_vs_singleton] CPPUNIT_ASSERT_EQUAL( osl_Process_E_None, osl_executeProcess( diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 644e4fdb99a3..f83d7bc0de4e 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -638,6 +638,7 @@ bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs ) // update fallback_runs if needed psp::CharacterMetric aMetric; + // coverity[array_vs_singleton] mrPrinterGfx.GetFontMgr().getMetrics( mnFontID, cChar, cChar, &aMetric, mbVertical ); if( aMetric.width == -1 && aMetric.height == -1 ) rArgs.NeedFallback( nCharPos, bRightToLeft ); diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index c97a369f80ea..40744455a66d 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -329,6 +329,7 @@ PrinterGfx::DrawText ( for( int n = 0; n < nLen; n++ ) { CharacterMetric aBBox; + // coverity[array_vs_singleton] pFontMap[n] = getCharMetric (aFont, pEffectiveStr[n], &aBBox); pCharWidth[n] = getCharWidth (mbTextVertical, pEffectiveStr[n], &aBBox); } @@ -643,6 +644,7 @@ PrinterGfx::GetCharWidth (sal_Unicode nFrom, sal_Unicode nTo, long *pWidthArray) for( int n = 0; n < (nTo - nFrom + 1); n++ ) { CharacterMetric aBBox; + // coverity[array_vs_singleton] getCharMetric (aFont, n + nFrom, &aBBox); pWidthArray[n] = getCharWidth (mbTextVertical, n + nFrom, &aBBox); } |