diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-08 10:48:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-08 19:57:01 +0200 |
| commit | 8536b96ab71bff7c996ad01063c5b514aaf4726f (patch) | |
| tree | c427cc97661f929e31d7d2126dcc51befbe5e4e2 /svx | |
| parent | a6c9228fd1cf02eb9de5647ee00f6f60680bf44d (diff) | |
loplugin:singlevalfields
Change-Id: I75554209ad247173381ea96a14c8bf532bed13a8
Reviewed-on: https://gerrit.libreoffice.org/58724
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 20 | ||||
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 29 |
2 files changed, 6 insertions, 43 deletions
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index f4bc875fccf6..81978611458f 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -517,8 +517,7 @@ SvxDialControl::DialControl_Impl::DialControl_Impl(OutputDevice& rReference) : mnInitialAngle( 0 ), mnOldAngle( 0 ), mnCenterX( 0 ), - mnCenterY( 0 ), - mbNoRot( false ) + mnCenterY( 0 ) { } @@ -690,26 +689,19 @@ void SvxDialControl::Init( const Size& rWinSize ) void SvxDialControl::InvalidateControl() { mpImpl->mxBmpBuffered->CopyBackground( IsEnabled() ? *mpImpl->mxBmpEnabled : *mpImpl->mxBmpDisabled ); - if( !mpImpl->mbNoRot ) - mpImpl->mxBmpBuffered->DrawElements( OUString(), mpImpl->mnAngle ); + mpImpl->mxBmpBuffered->DrawElements( OUString(), mpImpl->mnAngle ); Invalidate(); } void SvxDialControl::SetRotation( sal_Int32 nAngle ) { - bool bOldSel = mpImpl->mbNoRot; - mpImpl->mbNoRot = false; - while( nAngle < 0 ) nAngle += 36000; - if( !bOldSel || (mpImpl->mnAngle != nAngle) ) - { - mpImpl->mnAngle = nAngle; - InvalidateControl(); - if( mpImpl->mpLinkField ) - mpImpl->mpLinkField->set_value(GetRotation() / mpImpl->mnLinkedFieldValueMultiplyer); - } + mpImpl->mnAngle = nAngle; + InvalidateControl(); + if( mpImpl->mpLinkField ) + mpImpl->mpLinkField->set_value(GetRotation() / mpImpl->mnLinkedFieldValueMultiplyer); } void SvxDialControl::HandleMouseEvent( const Point& rPos, bool bInitial ) diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 2e5f955b0165..6e6e926ba849 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -346,7 +346,6 @@ SdrGrafObj::SdrGrafObj(SdrModel& rSdrModel) // #i25616# mbLineIsOutsideGeometry = true; - mbInsidePaint = false; // #i25616# mbSupportTextIndentingOnLineWidthChange = false; @@ -373,7 +372,6 @@ SdrGrafObj::SdrGrafObj( // #i25616# mbLineIsOutsideGeometry = true; - mbInsidePaint = false; // #i25616# mbSupportTextIndentingOnLineWidthChange = false; @@ -399,7 +397,6 @@ SdrGrafObj::SdrGrafObj( // #i25616# mbLineIsOutsideGeometry = true; - mbInsidePaint = false; // #i25616# mbSupportTextIndentingOnLineWidthChange = false; @@ -909,32 +906,6 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj ) return *this; } -basegfx::B2DPolyPolygon SdrGrafObj::TakeXorPoly() const -{ - if(mbInsidePaint) - { - basegfx::B2DPolyPolygon aRetval; - - // take grown rectangle - const sal_Int32 nHalfLineWidth(ImpGetLineWdt() / 2); - const tools::Rectangle aGrownRect( - maRect.Left() - nHalfLineWidth, - maRect.Top() - nHalfLineWidth, - maRect.Right() + nHalfLineWidth, - maRect.Bottom() + nHalfLineWidth); - - XPolygon aXPoly(ImpCalcXPoly(aGrownRect, GetEckenradius())); - aRetval.append(aXPoly.getB2DPolygon()); - - return aRetval; - } - else - { - // call parent - return SdrRectObj::TakeXorPoly(); - } -} - sal_uInt32 SdrGrafObj::GetHdlCount() const { return 8L; |