diff options
Diffstat (limited to 'svx/source/svdraw/svdedtv1.cxx')
-rw-r--r-- | svx/source/svdraw/svdedtv1.cxx | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index fe00380253..f2a23d057e 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1369,7 +1370,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) nRotateY = nOldRotateY = aRotateAxe.Y(); } - long nNewShearAngle=0; long nShearAngle=0; long nShearX=0; long nShearY=0; @@ -1377,7 +1377,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) BOOL bChgPos=FALSE; BOOL bChgSiz=FALSE; - BOOL bChgHgt=FALSE; BOOL bRotate=FALSE; BOOL bShear =FALSE; @@ -1403,7 +1402,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem)) { nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue(); bChgSiz=TRUE; - bChgHgt=TRUE; } if (bChgSiz) { eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue(); @@ -1425,7 +1423,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // Shear if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,TRUE,&pPoolItem)) { - nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue(); + long nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue(); if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR; if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR; if (nNewShearAngle!=nOldShearAngle) { @@ -1536,20 +1534,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // linear combination will not decompose to the same start values again, but to a // new combination. Thus it makes no sense to check if the wanted shear is reached // or not. Taking out. -#if 0 - long nTempAngle=GetMarkedObjShear(); - if (nTempAngle!=0 && nTempAngle!=nNewShearAngle && !bShearVert) { - // noch eine 2. Iteration zur Kompensation der Rundungsfehler - double nOld=tan((double)nTempAngle*nPi180); - double nNew=tan((double)nNewShearAngle*nPi180); - nNew-=nOld; - nNew=atan(nNew)/nPi180; - nTempAngle=Round(nNew); - if (nTempAngle!=0) { - ShearMarkedObj(aRef,nTempAngle,bShearVert); - } - } -#endif } // Position aendern @@ -1782,3 +1766,4 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL EndUndo(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |