CWS-TOOLING: integrate CWS aw077

2009-09-17 Armin Le Grand #resolved conflicts for integration
2009-09-07 Armin Le Grand #i103058# re-added handling of StatusBar texts for DrawObject creation, added FullDrag for circle-similar shapes (all in the ellipse toolbar)
2009-09-03 Armin Le Grand #i100514# extended TextAttributes and handling, adapted for super/subscript, adapted WordBreaking (again)
2009-09-02 Armin Le Grand #i104432# secured TextLayouterDevice::getTextBoundRect implementation and usage
2009-09-02 Armin Le Grand #i104232#, #i100514# Mainly solved 1st one, no more local SpellCheck remembering, but adding to compare op's where needed
2009-08-19 Armin Le Grand #i100514# commited in-between version due to 2week holiday
2009-08-13 Armin Le Grand #i99157# applied changes to BitmapEx and SdrHdlBitmapSet
2009-08-06 Armin Le Grand #i100357# added clipping for too big MetaFiles

1 files changed, 28 insertions, 19 deletions

diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 837b75bcf849..7d69955ec441 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -419,33 +419,42 @@ bool SdrRectObj::applySpecialDrag(SdrDragStat& rDrag)
 
 String SdrRectObj::getSpecialDragComment(const SdrDragStat& rDrag) const
 {
-    const bool bRad(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
+    const bool bCreateComment(rDrag.GetView() && this == rDrag.GetView()->GetCreateObj());
 
-    if(bRad)
+    if(bCreateComment)
     {
-        Point aPt(rDrag.GetNow());
+        return String();
+    }
+    else
+    {
+        const bool bRad(rDrag.GetHdl() && HDL_CIRC == rDrag.GetHdl()->GetKind());
 
-        // -sin fuer Umkehrung
-        if(aGeo.nDrehWink)
-            RotatePoint(aPt, aRect.TopLeft(), -aGeo.nSin, aGeo.nCos);
+        if(bRad)
+        {
+            Point aPt(rDrag.GetNow());
 
-        sal_Int32 nRad(aPt.X() - aRect.Left());
+            // -sin fuer Umkehrung
+            if(aGeo.nDrehWink)
+                RotatePoint(aPt, aRect.TopLeft(), -aGeo.nSin, aGeo.nCos);
 
-        if(nRad < 0)
-            nRad = 0;
+            sal_Int32 nRad(aPt.X() - aRect.Left());
 
-        XubString aStr;
+            if(nRad < 0)
+                nRad = 0;
 
-        ImpTakeDescriptionStr(STR_DragRectEckRad, aStr);
-        aStr.AppendAscii(" (");
-        aStr += GetMetrStr(nRad);
-        aStr += sal_Unicode(')');
+            XubString aStr;
 
-        return aStr;
-    }
-    else
-    {
-        return SdrTextObj::getSpecialDragComment(rDrag);
+            ImpTakeDescriptionStr(STR_DragRectEckRad, aStr);
+            aStr.AppendAscii(" (");
+            aStr += GetMetrStr(nRad);
+            aStr += sal_Unicode(')');
+
+            return aStr;
+        }
+        else
+        {
+            return SdrTextObj::getSpecialDragComment(rDrag);
+        }
     }
 }