extensions/source/scanner/sane.cxx | 2 +-
sw/qa/extras/tiledrendering/tiledrendering.cxx | 5 +++--
vcl/source/gdi/bitmap3.cxx | 2 ++
writerperfect/source/common/WPXSvInputStream.cxx | 4 ++--
4 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 2670d43a840276d990a1c3bd993c06faa42e8b1d
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 24 08:35:36 2017 +0100
pQLine2 will be non-zero in any case that nHeight is non-zero
Change-Id: Ic0fcf6c095dd2ebb2bfd901ac176229a95edd630
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 95525fe61cff..08c0cda4d7f4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -1445,6 +1445,8 @@ bool Bitmap::ImplDitherFloyd16()
pQLine2[ nX ] = pReadAcc->GetPixel( nYTmp, nX );
}
+ assert(pQLine2 || nHeight == 0);
+
for( long nY = 0; nY < nHeight; nY++, nYTmp++ )
{
// First RowPixel
commit 040a917c73c0af8635f96d0a097ecf7c61db176b
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 24 08:25:34 2017 +0100
const these up
Change-Id: I78e0cea5afd2e226ea11aaf1bd440e67bbb376f0
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx
b/writerperfect/source/common/WPXSvInputStream.cxx
index b864966f6567..0fd2ae33ef0a 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -510,7 +510,7 @@ long WPXSvInputStreamImpl::tell()
return -1L;
else
{
- sal_Int64 tmpPosition = mxSeekable->getPosition();
+ const sal_Int64 tmpPosition = mxSeekable->getPosition();
if ((tmpPosition < 0) || (tmpPosition > LONG_MAX))
return -1L;
return (long)tmpPosition;
@@ -522,7 +522,7 @@ int WPXSvInputStreamImpl::seek(long offset)
if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
return -1;
- sal_Int64 tmpPosition = mxSeekable->getPosition();
+ const sal_Int64 tmpPosition = mxSeekable->getPosition();
if ((tmpPosition < 0) || (tmpPosition > LONG_MAX))
return -1;
commit f5fae0f97b494cce5fef92b567f62f15e423fa01
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 24 08:13:41 2017 +0100
coverity#1411569 Unchecked dynamic_cast
Change-Id: I87521de07e18ea56c49083576e5de56023e45aa4
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b33e8ea42206..e3541c4898c7 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1796,8 +1796,9 @@ void SwTiledRenderingTest::testDisableUndoRepair()
// first view, undo conflict
pView1->GetState(aItemSet1);
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
aItemSet1.GetItemState(SID_UNDO));
- CPPUNIT_ASSERT(dynamic_cast< const SfxUInt32Item *
>(aItemSet1.GetItem(SID_UNDO)));
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SID_REPAIRPACKAGE),
dynamic_cast< const SfxUInt32Item * >(aItemSet1.GetItem(SID_UNDO))->GetValue());
+ const SfxUInt32Item* pUInt32Item = dynamic_cast<const
SfxUInt32Item*>(aItemSet1.GetItem(SID_UNDO));
+ CPPUNIT_ASSERT(pUInt32Item);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(SID_REPAIRPACKAGE),
pUInt32Item->GetValue());
}
// Insert a character in the first view.
commit fd1647ad9042a359127fccc03d6c99d7d1fea7fb
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 24 08:11:36 2017 +0100
coverity#1242860 Unused value
Change-Id: I0749fc82ebdf45b3cb022d3989df774e73e715bd
diff --git a/extensions/source/scanner/sane.cxx
b/extensions/source/scanner/sane.cxx
index 7ed2a978c42c..006b4c6c59a7 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -666,7 +666,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
if( nStatus != SANE_STATUS_GOOD )
{
bSynchronousRead = false;
- nStatus = p_set_io_mode( maHandle, SANE_TRUE );
+ nStatus = p_set_io_mode(maHandle, SANE_TRUE); (void)nStatus;
CheckConsistency( "sane_set_io_mode" );
SAL_WARN_IF(nStatus != SANE_STATUS_GOOD, "extensions.scanner",
"driver is confused" );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
