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, 18 insertions, 9 deletions

diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 7d41191c99a9..102b5b1eb824 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -401,26 +401,35 @@ bool SdrCaptionObj::applySpecialDrag(SdrDragStat& rDrag)
 
 String SdrCaptionObj::getSpecialDragComment(const SdrDragStat& rDrag) const
 {
-    const SdrHdl* pHdl = rDrag.GetHdl();
+    const bool bCreateComment(rDrag.GetView() && this == rDrag.GetView()->GetCreateObj());
 
-    if(pHdl && 0 == pHdl->GetPolyNum())
+    if(bCreateComment)
     {
-        return SdrRectObj::getSpecialDragComment(rDrag);
+        return String();
     }
     else
     {
-        XubString aStr;
+        const SdrHdl* pHdl = rDrag.GetHdl();
 
-        if(!pHdl)
+        if(pHdl && 0 == pHdl->GetPolyNum())
         {
-            ImpTakeDescriptionStr(STR_DragCaptFram, aStr);
+            return SdrRectObj::getSpecialDragComment(rDrag);
         }
         else
         {
-            ImpTakeDescriptionStr(STR_DragCaptTail, aStr);
-        }
+            XubString aStr;
+
+            if(!pHdl)
+            {
+                ImpTakeDescriptionStr(STR_DragCaptFram, aStr);
+            }
+            else
+            {
+                ImpTakeDescriptionStr(STR_DragCaptTail, aStr);
+            }
 
-        return aStr;
+            return aStr;
+        }
     }
 }