[Libreoffice-commits] core.git: basegfx/source idlc/source sc/source sd/source svx/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Aug 11 19:10:16 UTC 2018
basegfx/source/matrix/b3dhommatrix.cxx | 2 +-
idlc/source/parser.y | 2 +-
sc/source/core/data/dptabres.cxx | 2 +-
sc/source/core/tool/compiler.cxx | 2 +-
sc/source/ui/view/viewdata.cxx | 4 ++--
sd/source/ui/animations/CustomAnimationPane.cxx | 4 ++--
sd/source/ui/view/DocumentRenderer.cxx | 10 ++++++----
svx/source/xoutdev/_xoutbmp.cxx | 2 +-
vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
9 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit 5262ec68f36216cdca9be87b3b2e126d724b69c5
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 11 17:20:10 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 11 21:09:55 2018 +0200
set copy_paste_error to false rather than intentional
Change-Id: I152482ef594c286d3c2a94cab62feff49bbf79fa
Reviewed-on: https://gerrit.libreoffice.org/58884
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index 2e5e798fb001..d23aed896120 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -461,7 +461,7 @@ namespace basegfx
if(!fTools::equalZero(fShearY))
{
- // coverity[copy_paste_error] - this is correct getZ, not getY
+ // coverity[copy_paste_error : FALSE] - this is correct getZ, not getY
rShear.setY(rShear.getY() / rScale.getZ());
}
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index cb5f3ec470e3..71b88d05c816 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -2115,7 +2115,7 @@ at_least_one_scoped_name :
} else
{
std::list< OString >* pScopedNames = new std::list< OString >;
- // coverity[copy_paste_error] - this is not a cut and paste
+ // coverity[copy_paste_error : FALSE] - this is not a cut and paste
pScopedNames->push_back(*$1);
$$ = pScopedNames;
}
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index ae0e38ce3da1..30ee19333830 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2736,7 +2736,7 @@ bool ScDPGroupCompare::TestIncluded( const ScDPMember& rMember )
{
if (pResultData->GetGroupBase(it->mnSrcIndex) == nGroupBase)
{
- // coverity[copy_paste_error] - same base (hierarchy between
+ // coverity[copy_paste_error : FALSE] - same base (hierarchy between
// the two groups is irrelevant)
bInclude = pResultData->HasCommonElement(
it->mnNameIndex, it->mnSrcIndex, aMemberData, nDimSource);
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6568f2db0da0..d0849f8e1bf7 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5702,7 +5702,7 @@ bool ScCompiler::HandleTableRef()
default:
; // nothing
}
- // coverity[copy_paste_error] - this is correct, aStart in both aDBRange uses
+ // coverity[copy_paste_error : FALSE] - this is correct, aStart in both aDBRange uses
if (aColRange.aStart.Row() != aDBRange.aStart.Row() || aColRange.aEnd.Row() != aDBRange.aStart.Row())
aRange = ScRange( ScAddress::INITIALIZE_INVALID);
else
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 9044e527c490..1aa33415f54b 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -179,7 +179,7 @@ ScPositionHelper::getNearestByIndex(index_type nIndex) const
}
auto posLB = std::prev(posUB);
- // coverity[copy_paste_error] - posUB is correct
+ // coverity[copy_paste_error : FALSE] - posUB is correct
if (posUB == mData.end())
{
return *posLB;
@@ -210,7 +210,7 @@ ScPositionHelper::getNearestByPosition(long nPos) const
}
auto posLB = std::prev(posUB);
- // coverity[copy_paste_error] - posUB is correct
+ // coverity[copy_paste_error : FALSE] - posUB is correct
if (posUB == mData.end())
{
return *posLB;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 50bf2231a20b..dea81a9cd6c9 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2343,7 +2343,7 @@ void CustomAnimationPane::moveSelection( bool bUp )
CustomAnimationEffectPtr pEffect = (*aIter++);
EffectSequence::iterator aUpEffectPos( pSequence->find( pEffect ) );
- // coverity[copy_paste_error] - this is correct, checking if it exists
+ // coverity[copy_paste_error : FALSE] - this is correct, checking if it exists
if( aUpEffectPos != rEffectSequence.end() )
{
EffectSequence::iterator aInsertPos( rEffectSequence.erase( aUpEffectPos ) );
@@ -2374,7 +2374,7 @@ void CustomAnimationPane::moveSelection( bool bUp )
CustomAnimationEffectPtr pEffect = (*aIter++);
EffectSequence::iterator aDownEffectPos( pSequence->find( pEffect ) );
- // coverity[copy_paste_error] - this is correct, checking if it exists
+ // coverity[copy_paste_error : FALSE] - this is correct, checking if it exists
if( aDownEffectPos != rEffectSequence.end() )
{
EffectSequence::iterator aInsertPos( rEffectSequence.erase( aDownEffectPos ) );
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 0b7820679956..c701c0640893 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1601,10 +1601,12 @@ private:
Size aPaperSize( rInfo.mpPrinter->PixelToLogic( rInfo.mpPrinter->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ) );
maPrintSize.Width = aPaperSize.Height();
maPrintSize.Height = aPaperSize.Width();
- const long nRotatedWidth = aOutRect.GetHeight();
- const long nRotatedHeight = aOutRect.GetWidth();
- aOutRect = ::tools::Rectangle( Point( aPageOfs.Y(), aPageOfs.X() ),
- Size( nRotatedWidth, nRotatedHeight ) );
+ const auto nRotatedWidth = aOutRect.GetHeight();
+ const auto nRotatedHeight = aOutRect.GetWidth();
+ const auto nRotatedX = aPageOfs.Y();
+ const auto nRotatedY = aPageOfs.X();
+ aOutRect = ::tools::Rectangle(Point( nRotatedX, nRotatedY),
+ Size(nRotatedWidth, nRotatedHeight));
}
Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner();
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 7534de8a5687..718b73e3f412 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -572,7 +572,7 @@ tools::Polygon XOutBitmap::GetContour( const Bitmap& rBmp, const XOutFlags nFlag
// this loop always breaks eventually as there is at least one pixel
while( true )
{
- // coverity[copy_paste_error] - this is correct nX, not nY
+ // coverity[copy_paste_error : FALSE] - this is correct nX, not nY
if( aBlack == pAcc->GetPixelFromData( pScanline, nX ) )
{
pPoints2[ nPolyPos ] = Point( nX, nY );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 91dcd3515e37..6a7bb3d91ea5 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6288,7 +6288,7 @@ void PDFWriterImpl::drawRelief( SalLayout& rLayout, const OUString& rText, bool
aTextLineColor = COL_WHITE;
if( aOverlineColor == COL_BLACK )
aOverlineColor = COL_WHITE;
- // coverity[copy_paste_error] - aReliefColor depending on aTextColor is correct
+ // coverity[copy_paste_error : FALSE] - aReliefColor depending on aTextColor is correct
if( aTextColor == COL_WHITE )
aReliefColor = COL_BLACK;
More information about the Libreoffice-commits
mailing list