From 96554f0590841bc03e90a15b98e9455d478ee31f Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 14 Oct 2014 16:29:04 -0400 Subject: Remove local variables that are no longer used. Armin removed their uses in 120e469d176026ceb59abbf74d2ad255323cbc9a. Conflicts: svx/source/svdraw/svdotxtr.cxx Change-Id: Id620466929ca3a66dd1c261e81aacd533a44cd76 --- svx/source/svdraw/svdotxtr.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'svx/source/svdraw') diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 120c3b70ce94..1107c9b486ca 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -42,7 +42,9 @@ using namespace com::sun::star; void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect) { - if (aGeo.nRotationAngle!=0 || aGeo.nShearAngle!=0) { + if (aGeo.nRotationAngle!=0 || aGeo.nShearAngle!=0) + { + // Either the rotation or shear angle exists. Rectangle aSR0(GetSnapRect()); long nWdt0=aSR0.Right()-aSR0.Left(); long nHgt0=aSR0.Bottom()-aSR0.Top(); @@ -50,13 +52,11 @@ void SdrTextObj::NbcSetSnapRect(const Rectangle& rRect) long nHgt1=rRect.Bottom()-rRect.Top(); SdrTextObj::NbcResize(maSnapRect.TopLeft(),boost::rational(nWdt1,nWdt0),boost::rational(nHgt1,nHgt0)); SdrTextObj::NbcMove(Size(rRect.Left()-aSR0.Left(),rRect.Top()-aSR0.Top())); - } else { - long nHDist=GetTextLeftDistance()+GetTextRightDistance(); - long nVDist=GetTextUpperDistance()+GetTextLowerDistance(); - long nTWdt0=aRect.GetWidth ()-1-nHDist; if (nTWdt0<0) nTWdt0=0; - long nTHgt0=aRect.GetHeight()-1-nVDist; if (nTHgt0<0) nTHgt0=0; - long nTWdt1=rRect.GetWidth ()-1-nHDist; if (nTWdt1<0) nTWdt1=0; - long nTHgt1=rRect.GetHeight()-1-nVDist; if (nTHgt1<0) nTHgt1=0; + } + else + { + // No rotation or shear. + aRect=rRect; ImpJustifyRect(aRect); -- cgit