[Libreoffice-commits] core.git: svx/source

Stephan Bergmann sbergman at redhat.com
Wed Sep 9 07:27:51 PDT 2015


 svx/source/svdraw/svdotxtr.cxx |   13 -------------
 1 file changed, 13 deletions(-)

New commits:
commit 1544d1257582af96bee633e2ce1ab2b39b4de7d1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 9 16:26:17 2015 +0200

    clang-analyzer-deadcode.DeadStores
    
    ...since 120e469d176026ceb59abbf74d2ad255323cbc9a "i#115391 better support for
    MinTextSize settings"
    
    Change-Id: I7d09b2a9341c9798ea4b1ca2047b9504361e27e3

diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index ae88eb6..0d5b0e1 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -75,12 +75,6 @@ const Rectangle& SdrTextObj::GetLogicRect() const
 
 void SdrTextObj::NbcSetLogicRect(const Rectangle& rRect)
 {
-    long nHDist=GetTextLeftDistance()+GetTextRightDistance();
-    long nVDist=GetTextUpperDistance()+GetTextLowerDistance();
-    long nTWdt0=maRect.GetWidth ()-1-nHDist; if (nTWdt0<0) nTWdt0=0;
-    long nTHgt0=maRect.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;
     maRect = rRect;
     ImpJustifyRect(maRect);
 
@@ -112,10 +106,6 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
 {
     bool bNoShearMerk=aGeo.nShearAngle==0;
     bool bRota90Merk=bNoShearMerk && aGeo.nRotationAngle % 9000 ==0;
-    long nHDist=GetTextLeftDistance()+GetTextRightDistance();
-    long nVDist=GetTextUpperDistance()+GetTextLowerDistance();
-    long nTWdt0=maRect.GetWidth ()-1-nHDist; if (nTWdt0<0) nTWdt0=0;
-    long nTHgt0=maRect.GetHeight()-1-nVDist; if (nTHgt0<0) nTHgt0=0;
     bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
     bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
     if (bXMirr || bYMirr) {
@@ -185,9 +175,6 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
 
     ImpJustifyRect(maRect);
 
-    long nTWdt1=maRect.GetWidth ()-1-nHDist; if (nTWdt1<0) nTWdt1=0;
-    long nTHgt1=maRect.GetHeight()-1-nVDist; if (nTHgt1<0) nTHgt1=0;
-
     // #115391#
     AdaptTextMinSize();
 


More information about the Libreoffice-commits mailing list