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

3 files changed, 25 insertions, 2 deletions

diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx
index e5bf5d1a5f7e..ef1b3d6128e8 100644
--- a/svx/inc/svx/sdr/contact/viewcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontact.hxx
@@ -82,6 +82,9 @@ namespace sdr
             // A ViewObjectContact was deleted and shall be forgotten.
             void RemoveViewObjectContact(ViewObjectContact& rVOContact);
 
+            // internal tooling to delete VOCs
+            void deleteAllVOCs();
+
         protected:
             // Interface to allow derivates to travel over the registered VOC's
             sal_uInt32 getViewObjectContactCount() const { return maViewObjectContactVector.size(); }
@@ -101,6 +104,9 @@ namespace sdr
             // asserted there
             virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const;
 
+            // method for flushing View Independent Primitive2DSequence for VOC implementations
+            void flushViewIndependentPrimitive2DSequence() { mxViewIndependentPrimitive2DSequence.realloc(0); }
+
             // basic constructor. Since this is a base class only, it shall
             // never be called directly
             ViewContact();
@@ -152,6 +158,12 @@ namespace sdr
 
             // add Gluepoints (if available)
             virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const;
+
+            // delete all existing VOCs including DrawHierarchy which will invalidate all
+            // visualisations, too. Used mostly at object removal from DrawHierarchy to
+            // delete all existing VOCs by purpose, but can also be used for other purposes.
+            // It is always possible to delete the VOCs, these are re-created on demand
+            void flushViewObjectContacts(bool bWithHierarchy = true);
         };
     } // end of namespace contact
 } // end of namespace sdr
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
index 52105fa58818..0e52c6d6285b 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx
@@ -99,6 +99,9 @@ namespace sdr
             // This method will not handle included hierarchies and not check geometric visibility.
             virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
 
+            // method for flushing Primitive2DSequence for VOC implementations
+            void flushPrimitive2DSequence() { mxPrimitive2DSequence.realloc(0); }
+
         public:
             // basic constructor.
             ViewObjectContact(ObjectContact& rObjectContact, ViewContact& rViewContact);
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index 227be1157fe2..7a40c25511e4 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -31,7 +31,7 @@
 #ifndef SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
 #define SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
 
-#include <svx/sdr/contact/viewobjectcontact.hxx>
+#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
 /** === begin UNO includes === **/
 #include <com/sun/star/uno/Reference.hxx>
@@ -59,7 +59,7 @@ namespace sdr { namespace contact {
     //= ViewObjectContactOfUnoControl
     //====================================================================
     class ViewObjectContactOfUnoControl_Impl;
-    class SVX_DLLPRIVATE ViewObjectContactOfUnoControl : public ViewObjectContact
+    class SVX_DLLPRIVATE ViewObjectContactOfUnoControl : public ViewObjectContactOfSdrObj
     {
     protected:
         ::rtl::Reference< ViewObjectContactOfUnoControl_Impl >    m_pImpl;
@@ -101,6 +101,14 @@ namespace sdr { namespace contact {
         */
         void    positionControlForPaint( const DisplayInfo& _rDisplayInfo ) const;
 
+        /** callback from impl class to react on changes of properties form the XControlModel
+        */
+        void propertyChange();
+
+        /** React on changes of the object of this ViewContact
+        */
+        virtual void ActionChanged();
+
     protected:
         ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
         ~ViewObjectContactOfUnoControl();