diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-11 17:20:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-11 21:09:55 +0200 |
| commit | 5262ec68f36216cdca9be87b3b2e126d724b69c5 (patch) | |
| tree | 02cc33c8e0b86db9bc57c0ce152bab5321c0be68 /sd | |
| parent | 12ea892df9ca1691c406b4c98f996456e3b69307 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 10 |
2 files changed, 8 insertions, 6 deletions
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(); |