summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-05 10:15:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-05 14:58:00 +0000
commit12bcfec04fcbe6425e327109ad47cd2b2b80d2bd (patch)
treeb57ac6784ce892defa6d06fd5974318c8ffb6972 /vcl
parentea272d9fe4bf2dc7419f76e2ddee707d768ccd50 (diff)
markup with event type not checker type
Change-Id: I14c0c5d90b67000cb4fe9e6be647854abfe784da
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/print/genpspgraphics.cxx2
-rw-r--r--vcl/generic/print/text_gfx.cxx10
-rw-r--r--vcl/qa/cppunit/timer.cxx9
3 files changed, 10 insertions, 11 deletions
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index f83d7bc0de4e..3b2ce07de4a9 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -638,7 +638,7 @@ bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs )
// update fallback_runs if needed
psp::CharacterMetric aMetric;
- // coverity[array_vs_singleton]
+ // coverity[callee_ptr_arith]
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 40744455a66d..a228aa9bd50b 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -329,9 +329,9 @@ 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);
+ // coverity[callee_ptr_arith]
+ pFontMap[n] = getCharMetric(aFont, pEffectiveStr[n], &aBBox);
+ pCharWidth[n] = getCharWidth(mbTextVertical, pEffectiveStr[n], &aBBox);
}
// setup a new delta array, use virtual resolution of 1000
@@ -644,8 +644,8 @@ 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);
+ // coverity[callee_ptr_arith]
+ getCharMetric(aFont, n + nFrom, &aBBox);
pWidthArray[n] = getCharWidth (mbTextVertical, n + nFrom, &aBBox);
}
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index 0732baaf5a96..84dd40a75b69 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/vcl/qa/cppunit/timer.cxx
@@ -104,7 +104,7 @@ void TimerTest::testDurations()
{
bool bDone = false;
TimerBool aTimer( aDurations[i], bDone );
- // coverity[infinite_loop]
+ // coverity[loop_top] - Application::Yield allows the timer to fire and toggle bDone
while( !bDone )
{
Application::Yield();
@@ -135,7 +135,6 @@ void TimerTest::testAutoTimer()
{
sal_Int32 nCount = 0;
AutoTimerCount aCount(1, nCount);
- // coverity[infinite_loop]
while (nCount < 100) {
Application::Yield();
}
@@ -163,7 +162,7 @@ void TimerTest::testRecursiveTimer()
sal_Int32 nCount = 0;
YieldTimer aCount(5);
AutoTimerCount aCountUp( 3, nCount );
- // coverity[infinite_loop]
+ // coverity[loop_top] - Application::Yield allows the timer to fire and increment nCount
while (nCount < 20)
Application::Yield();
}
@@ -197,10 +196,10 @@ void TimerTest::testSlowTimerCallback()
sal_Int32 nCount = 0;
AutoTimerCount aHighFreq(1, nCount);
SlowCallbackTimer aSlow(250, bBeenSlow);
- // coverity[infinite_loop]
+ // coverity[loop_top] - Application::Yield allows the timer to fire and toggle bBeenSlow
while (!bBeenSlow)
Application::Yield();
- // coverity[infinite_loop]
+ // coverity[loop_top] - Application::Yield allows the timer to fire and increment nCount
while (nCount < 200)
Application::Yield();
}