diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-11 15:56:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-12 10:31:25 +0100 |
| commit | f147b160aef1735d34c488353a7d4b875788a7e1 (patch) | |
| tree | ab3bd613cf016cde906b3fdcbaab4246ca699e1e /sd | |
| parent | 718f540fb63af27c1336f89213444e9af753b8a9 (diff) | |
clang-analyzer-deadcode.DeadStores
Change-Id: Ifa384933569b27d0d08eb479bb95b799163ae386
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88450
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 5 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 1cd19b23c1f8..0f5abc02cfbf 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -92,13 +92,9 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi if ( rGraphicSize.Width() && rGraphicSize.Height() ) { - Size aNewSize; - bool changed = false; if (aPrefSize.Width() == 0 || aPrefSize.Height() == 0) { aBmpEx.Scale(aPrefSize); - aNewSize = aPrefSize; - changed = true; } else { @@ -115,14 +111,8 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi if ( ( fXScale != 1.0 ) || ( fYScale != 1.0 ) ) { aBmpEx.Scale( fXScale, fYScale ); - aNewSize = Size( static_cast<sal_Int32>(static_cast<double>(rGraphicSize.Width()) / fXScale + 0.5 ), + rGraphicSize = Size( static_cast<sal_Int32>(static_cast<double>(rGraphicSize.Width()) / fXScale + 0.5 ), static_cast<sal_Int32>(static_cast<double>(rGraphicSize.Height()) / fYScale + 0.5 ) ); - changed = true; - } - - if (changed) - { - rGraphicSize = aNewSize; aMappedGraphic = Graphic( aBmpEx ); xGraphicObject.reset(new GraphicObject(aMappedGraphic)); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index e41f34a19774..734f1a03f34f 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1283,12 +1283,9 @@ sal_Int8 DrawViewShell::AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* /*pTargetWindow*/, - sal_uInt16 nPage, + sal_uInt16 /*nPage*/, SdrLayerID nLayer ) { - if( nPage != SDRPAGE_NOTFOUND ) - nPage = GetDoc()->GetSdPage( nPage, mePageKind )->GetPageNum(); - if( SlideShow::IsRunning( GetViewShellBase() ) ) return DND_ACTION_NONE; |