CWS-TOOLING: integrate CWS ooo32gsl02_DEV300

3 files changed, 34 insertions, 8 deletions

diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 09da0ee8ee..2193dd63af 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -56,8 +56,13 @@ namespace drawinglayer
             // defines if SdrTextWordWrapItem was set at SdrObjCustomShape which means
             // that the text needs to be block formatted
             unsigned                                    mbWordWrap : 1;
-            // #SJ# Allow text clipping against TextBox in special cases (used for SC)

-            unsigned                                    mbForceTextClipToTextRange : 1;

+
+            // #SJ# Allow text clipping against TextBox in special cases (used for SC)
+            unsigned                                    mbForceTextClipToTextRange : 1;
+
+            // defines that the object contains/is a 3D AutoShape. Needed for
+            // making exceptions with shadow generation
+            unsigned                                    mb3DShape : 1;
 
         protected:
             // local decomposition.
@@ -69,7 +74,8 @@ namespace drawinglayer
                 const Primitive2DSequence& rSubPrimitives,
                 const basegfx::B2DHomMatrix& rTextBox,
                 bool bWordWrap,
-                bool bForceTextClipToTextRange);
+                bool bForceTextClipToTextRange,
+                bool b3DShape);
 
             // data access
             const attribute::SdrShadowTextAttribute& getSdrSTAttribute() const { return maSdrSTAttribute; }
@@ -77,6 +83,7 @@ namespace drawinglayer
             const basegfx::B2DHomMatrix& getTextBox() const { return maTextBox; }
             bool getWordWrap() const { return mbWordWrap; }
             bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; }
+             bool get3DShape() const { return mb3DShape; }
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index c604b4e1e9..20dede7f44 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -55,9 +55,8 @@ namespace drawinglayer
             double										mfCornerRadiusY;	// [0.0..1.0] relative to 1/2 height
 
             // bitfield
-            // flag which decides if this is a text frame. If Yes, the HitArea
-            // should be the filled geometry
-            bool                                        mbTextFrame : 1;
+            // flag which decides if the HitArea should be the filled geometry
+            bool                                        mbForceFillForHitTest : 1;
 
         protected:
             // local decomposition.
@@ -69,7 +68,7 @@ namespace drawinglayer
                 const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
                 double fCornerRadiusX, 
                 double fCornerRadiusY,
-                bool bTextFrame);
+                bool bForceFillForHitTest);
 
             // data access
             const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
@@ -77,7 +76,7 @@ namespace drawinglayer
             double getCornerRadiusX() const { return mfCornerRadiusX; }
             double getCornerRadiusY() const { return mfCornerRadiusY; }
             bool isCornerRadiusUsed() const { return (0.0 != mfCornerRadiusX || 0.0 != mfCornerRadiusY); }
-            bool getTextFrame() const { return mbTextFrame; }
+            bool getForceFillForHitTest() const { return mbForceFillForHitTest; }
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx
index f1890c3bc7..96fb97c7e6 100644
--- a/svx/inc/svx/svddrgmt.hxx
+++ b/svx/inc/svx/svddrgmt.hxx
@@ -107,6 +107,22 @@ public:
 
 //////////////////////////////////////////////////////////////////////////////
 
+class SdrDragEntryPrimitive2DSequence : public SdrDragEntry
+{
+private:
+    drawinglayer::primitive2d::Primitive2DSequence  maPrimitive2DSequence;
+
+public:
+    SdrDragEntryPrimitive2DSequence(
+        const drawinglayer::primitive2d::Primitive2DSequence& rSequence,
+        bool bAddToTransparent);
+    virtual ~SdrDragEntryPrimitive2DSequence();
+
+    virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod);
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
 class SdrDragEntryPointGlueDrag : public SdrDragEntry
 {
 private:
@@ -138,6 +154,7 @@ protected:
     void clearSdrDragEntries() { for(sal_uInt32 a(0); a < maSdrDragEntries.size(); a++) { delete maSdrDragEntries[a]; } maSdrDragEntries.clear(); }
     void addSdrDragEntry(SdrDragEntry* pNew) { if(pNew) { maSdrDragEntries.push_back(pNew); }}
     virtual void createSdrDragEntries();
+    virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify);
 
     // access for derivated classes to maOverlayObjectList
     void clearOverlayObjectList() { maOverlayObjectList.clear(); }
@@ -236,6 +253,9 @@ private:
 
     void ImpCheckSnap(const Point& rPt);
 
+protected:
+    virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify);
+
 public:
     TYPEINFO();
     SdrDragMove(SdrDragView& rNewView);