INTEGRATION: CWS sj16 (1.9.52); FILE MERGED

2005/03/11 05:29:37 sj 1.9.52.2: RESYNC: (1.9-1.11); FILE MERGED
2005/03/01 10:35:45 sj 1.9.52.1: #i39239# RoundRectangle has now its own geometry, fixed textrect settings

1 files changed, 2 insertions, 16 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 89ba0cba2545..fffef08e0795 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EnhancedCustomShape2d.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: vg $ $Date: 2005-03-10 13:07:02 $
+ *  last change: $Author: vg $ $Date: 2005-03-23 13:29:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2309,20 +2309,6 @@ SdrObject* EnhancedCustomShape2d::CreateObject( sal_Bool bLineGeometryNeededOnly
 //      pRet->SetModel( pCustomShapeObj->GetModel() );
         pRet->SetMergedItemSet( *this );
     }
-    else if ( eSpType == mso_sptRoundRectangle )
-    {
-        sal_Int32 nW = aLogicRect.Right() - aLogicRect.Left();
-        sal_Int32 nH = aLogicRect.Bottom() - aLogicRect.Top();
-        if ( nH < nW )
-            nW = nH;
-        double fAdjust = GetAdjustValueAsDouble( 0 ) / 21600.0;
-        nW = (sal_Int32)( (double)nW * fAdjust );
-        pRet = new SdrRectObj( aLogicRect );
-// SJ: not setting model, so we save a lot of broadcasting and the model is not modified any longer
-//      pRet->SetModel( pCustomShapeObj->GetModel() );
-        pRet->SetMergedItemSet( *this );
-        pRet->SetMergedItem( SdrEckenradiusItem( nW ) );
-    }
     else if ( eSpType == mso_sptEllipse )
     {
         pRet = new SdrCircObj( OBJ_CIRC, aLogicRect );