CWS-TOOLING: integrate CWS aw058

2008-11-19 14:27:57 +0100 aw  r263994 : #i95264# corrected line primitive range calculation for hairlines
2008-11-18 11:31:52 +0100 wg  r263754 : i96156
2008-11-18 11:22:38 +0100 wg  r263752 : i96156
2008-11-13 11:46:49 +0100 aw  r263626 : #i93169# used flag the wrong way; true means that nothing was done yet
2008-11-12 15:33:41 +0100 wg  r263601 : i96156
2008-11-12 13:22:38 +0100 wg  r263592 : i95527
2008-11-12 13:18:51 +0100 wg  r263591 : i95527
2008-10-29 13:22:02 +0100 aw  r262794 : #i93485# identified reason and with PL's help changed problem accordingly with usage of an old fallback. This will need to be optimized again by HDU when he finds the time.
2008-10-28 18:23:04 +0100 aw  r262763 : unxmacxi compiler warning fixed
2008-10-28 18:17:01 +0100 aw  r262762 : unxmacxi compiler warning fixed
2008-10-28 17:55:18 +0100 aw  r262761 : unxmacxi compiler warning fixed
2008-10-28 13:48:22 +0100 aw  r262743 : #i93485# added UnifiedAlphaPrimitive2D to VclRenderer; corrected getB2DRange implementations for hairlines which are view-dependent
2008-10-28 12:40:55 +0100 aw  r262735 : #i93485# had to move Pre/PostPaint to LocalPre/PostPaint since PrePaint is a virtual window method
2008-10-27 15:54:10 +0100 aw  r262679 : #i19871# adapted the call order to parent implementations in some Nbc methods in SdrPathObj due to errors in SnapRect recalculation when GluePoints are involved
2008-10-24 18:31:48 +0200 aw  r262661 : #i77187# disable all buttons in bezier toolbar when move and/or resize protected object is involved
2008-10-24 18:30:16 +0200 aw  r262660 : #i77187# simplified and secured model changers, added toolbar update, disabled move drag start when polygon point is selected
2008-10-24 12:57:50 +0200 hdu  r262635 : #i93485# use device transformation for SAL layer
2008-10-24 12:41:37 +0200 hdu  r262634 : #i93485# use device transformation for SAL layer
2008-10-23 19:46:12 +0200 aw  r262630 : mac compiler warning fixed
2008-10-23 18:15:02 +0200 aw  r262628 : #i93485# modified dialog previews to use prerendering
2008-10-23 18:14:27 +0200 aw  r262627 : #i93485# added assert when render helper uses Window as copy source
2008-10-22 18:07:30 +0200 aw  r262610 : #i95264# fixes assertion
2008-10-22 14:31:51 +0200 aw  r262606 : #i89661# also enabling DrawTransparent shortcut for VCL-Renderer
2008-10-22 14:10:31 +0200 aw  r262604 : #i89661# new HitTest 2D primitive to support BoundRect and HitTest calculations/tests
2008-10-22 14:09:22 +0200 aw  r262603 : #i89661# new HitTest tolerance, new TextFrame selection overlay, support for HitTest geometry
2008-10-22 14:08:16 +0200 aw  r262602 : #i89661# correcting old HitTest tolerance expansion
2008-10-20 15:31:48 +0200 aw  r262321 : #i89661# added patch to test it
2008-10-20 11:50:31 +0200 aw  r262310 : #i87762# removed no longer used icons (aw053)
2008-10-17 15:41:48 +0200 aw  r262288 : #i93169#, #i93180# FormControl corrections for Primitive handling
2008-10-17 15:40:54 +0200 aw  r262287 : #i93169#, #i93180# FormControl corrections for Primitive handling
2008-10-16 11:12:44 +0200 aw  r262253 : #i93595# removed superfluous grid interface
2008-10-16 11:11:20 +0200 aw  r262252 : #i93595# changed grid display to sub-grid usage and new defaults
2008-10-15 15:09:40 +0200 aw  r262234 : #i93597# moved flag for only vertical PageBorder, added reacting on it to primitive creation
2008-10-15 15:09:09 +0200 aw  r262233 : #i93597# moved flag for only vertical PageBorder
2008-10-15 15:08:46 +0200 aw  r262232 : #i93597# moved flag for only vertical PageBorder, added reacting on it to primitive creation
2008-10-14 16:27:07 +0200 aw  r262207 : #i93648# (flushViewObjectContacts) and #i93318# (propertyChange)
2008-10-14 16:25:10 +0200 aw  r262206 : #i93318# back to old state since detecting a change is not placed well at the primitive (which is a graphical information at the itme it was fetched). Instead i will add the needed check and flush at the FormControl's VOC
2008-10-14 13:47:38 +0200 aw  r262201 : #i93318# added a change listener to the XControlModel and code to make the operator== at control primitive fail

1 files changed, 73 insertions, 52 deletions

diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index de9e68918aaa..d5603bd8818b 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -150,72 +150,93 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet)
         }
     }
 
-    IPolyPolygonEditorController* pIPPEC = 0;
-    if( mpView->GetMarkedObjectList().GetMarkCount() )
-        pIPPEC = mpView;
-    else
-        pIPPEC = dynamic_cast< IPolyPolygonEditorController* >( mpView->getSmartTags().getSelected().get() );
-
-    if ( !pIPPEC || !pIPPEC->IsRipUpAtMarkedPointsPossible())
-    {
-        rSet.DisableItem(SID_BEZIER_CUTLINE);
-    }
-    if (!pIPPEC || !pIPPEC->IsDeleteMarkedPointsPossible())
+    if(!mpView->IsMoveAllowed() || !mpView->IsResizeAllowed())
     {
+        // #i77187# if object is move and/or size protected, do not allow point editing at all
+        rSet.DisableItem(SID_BEZIER_MOVE);
+        rSet.DisableItem(SID_BEZIER_INSERT);
+
         rSet.DisableItem(SID_BEZIER_DELETE);
-    }
-    if (!pIPPEC || !pIPPEC->IsSetMarkedSegmentsKindPossible())
-    {
+        rSet.DisableItem(SID_BEZIER_CUTLINE);
         rSet.DisableItem(SID_BEZIER_CONVERT);
-    }
-    else
-    {
-        SdrPathSegmentKind eSegm = pIPPEC->GetMarkedSegmentsKind();
-        switch (eSegm)
-        {
-            case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break;
-            case SDRPATHSEGMENT_LINE    : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,FALSE)); break; // Button reingedrueckt = Kurve
-            case SDRPATHSEGMENT_CURVE   : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,TRUE));  break;
-            default: break;
-        }
-    }
-    if (!pIPPEC || !pIPPEC->IsSetMarkedPointsSmoothPossible())
-    {
+
         rSet.DisableItem(SID_BEZIER_EDGE);
         rSet.DisableItem(SID_BEZIER_SMOOTH);
         rSet.DisableItem(SID_BEZIER_SYMMTR);
+
+        rSet.DisableItem(SID_BEZIER_CLOSE);
+
+        rSet.DisableItem(SID_BEZIER_ELIMINATE_POINTS);
     }
     else
     {
-        SdrPathSmoothKind eSmooth = pIPPEC->GetMarkedPointsSmooth();
-        switch (eSmooth)
+        IPolyPolygonEditorController* pIPPEC = 0;
+        if( mpView->GetMarkedObjectList().GetMarkCount() )
+            pIPPEC = mpView;
+        else
+            pIPPEC = dynamic_cast< IPolyPolygonEditorController* >( mpView->getSmartTags().getSelected().get() );
+
+        if ( !pIPPEC || !pIPPEC->IsRipUpAtMarkedPointsPossible())
         {
-            case SDRPATHSMOOTH_DONTCARE  : break;
-            case SDRPATHSMOOTH_ANGULAR   : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE,  TRUE)); break;
-            case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,TRUE)); break;
-            case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,TRUE)); break;
+            rSet.DisableItem(SID_BEZIER_CUTLINE);
         }
-    }
-    if (!pIPPEC || !pIPPEC->IsOpenCloseMarkedObjectsPossible())
-    {
-        rSet.DisableItem(SID_BEZIER_CLOSE);
-    }
-    else
-    {
-        SdrObjClosedKind eClose = pIPPEC->GetMarkedObjectsClosedState();
-        switch (eClose)
+        if (!pIPPEC || !pIPPEC->IsDeleteMarkedPointsPossible())
         {
-            case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break;
-            case SDROBJCLOSED_OPEN    : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,FALSE)); break;
-            case SDROBJCLOSED_CLOSED  : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,TRUE)); break;
-            default: break;
+            rSet.DisableItem(SID_BEZIER_DELETE);
+        }
+        if (!pIPPEC || !pIPPEC->IsSetMarkedSegmentsKindPossible())
+        {
+            rSet.DisableItem(SID_BEZIER_CONVERT);
+        }
+        else
+        {
+            SdrPathSegmentKind eSegm = pIPPEC->GetMarkedSegmentsKind();
+            switch (eSegm)
+            {
+                case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break;
+                case SDRPATHSEGMENT_LINE    : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,FALSE)); break; // Button reingedrueckt = Kurve
+                case SDRPATHSEGMENT_CURVE   : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,TRUE));  break;
+                default: break;
+            }
+        }
+        if (!pIPPEC || !pIPPEC->IsSetMarkedPointsSmoothPossible())
+        {
+            rSet.DisableItem(SID_BEZIER_EDGE);
+            rSet.DisableItem(SID_BEZIER_SMOOTH);
+            rSet.DisableItem(SID_BEZIER_SYMMTR);
+        }
+        else
+        {
+            SdrPathSmoothKind eSmooth = pIPPEC->GetMarkedPointsSmooth();
+            switch (eSmooth)
+            {
+                case SDRPATHSMOOTH_DONTCARE  : break;
+                case SDRPATHSMOOTH_ANGULAR   : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE,  TRUE)); break;
+                case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,TRUE)); break;
+                case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,TRUE)); break;
+            }
+        }
+        if (!pIPPEC || !pIPPEC->IsOpenCloseMarkedObjectsPossible())
+        {
+            rSet.DisableItem(SID_BEZIER_CLOSE);
+        }
+        else
+        {
+            SdrObjClosedKind eClose = pIPPEC->GetMarkedObjectsClosedState();
+            switch (eClose)
+            {
+                case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break;
+                case SDROBJCLOSED_OPEN    : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,FALSE)); break;
+                case SDROBJCLOSED_CLOSED  : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,TRUE)); break;
+                default: break;
+            }
         }
-    }
 
-    if(pIPPEC == mpView)
-        rSet.Put(SfxBoolItem(SID_BEZIER_ELIMINATE_POINTS, mpView->IsEliminatePolyPoints()));
-    else
-        rSet.DisableItem( SID_BEZIER_ELIMINATE_POINTS ); // only works for views
+        if(pIPPEC == mpView)
+            rSet.Put(SfxBoolItem(SID_BEZIER_ELIMINATE_POINTS, mpView->IsEliminatePolyPoints()));
+        else
+            rSet.DisableItem( SID_BEZIER_ELIMINATE_POINTS ); // only works for views
+    }
 }