merge with DEV300_m64

4 files changed, 9 insertions, 48 deletions

diff --git a/svx/inc/svx/msdffimp.hxx b/svx/inc/svx/msdffimp.hxx
index bc40b396ec..4c7c991546 100644
--- a/svx/inc/svx/msdffimp.hxx
+++ b/svx/inc/svx/msdffimp.hxx
@@ -481,6 +481,7 @@ public:
     MSFilterTracer*		mpTracer;
     sal_Bool			mbTracing;
 
+    Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const;
     Color MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nContextProperty = DFF_Prop_lineColor ) const;
     virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const;
     FASTBOOL SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const;
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index b505756352..5d8c47d515 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -65,6 +65,8 @@ namespace sdr { namespace contact {
         ::rtl::Reference< ViewObjectContactOfUnoControl_Impl >    m_pImpl;
 
     public:
+        ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
+
         /// determines whether an XControl already exists, and is currently visible
         bool    isControlVisible() const;
 
@@ -98,7 +100,6 @@ namespace sdr { namespace contact {
         virtual void ActionChanged();
 
     protected:
-        ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
         ~ViewObjectContactOfUnoControl();
 
         // support for Primitive2D
@@ -111,36 +112,6 @@ namespace sdr { namespace contact {
     };
 
     //====================================================================
-    //= UnoControlDefaultContact
-    //====================================================================
-    class SVX_DLLPRIVATE UnoControlDefaultContact : public ViewObjectContactOfUnoControl
-    {
-    public:
-        UnoControlDefaultContact( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-        ~UnoControlDefaultContact();
-
-    private:
-        UnoControlDefaultContact();                                             // never implemented
-        UnoControlDefaultContact( const UnoControlDefaultContact& );            // never implemented
-        UnoControlDefaultContact& operator=( const UnoControlDefaultContact& ); // never implemented
-    };
-
-    //====================================================================
-    //= UnoControlWindowContact
-    //====================================================================
-    class SVX_DLLPRIVATE UnoControlWindowContact : public ViewObjectContactOfUnoControl
-    {
-    public:
-        UnoControlWindowContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-        ~UnoControlWindowContact();
-
-    private:
-        UnoControlWindowContact();                                              // never implemented
-        UnoControlWindowContact( const UnoControlWindowContact& );              // never implemented
-        UnoControlWindowContact& operator=( const UnoControlWindowContact& );   // never implemented
-    };
-
-    //====================================================================
     //= UnoControlPrintOrPreviewContact
     //====================================================================
     class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl
@@ -157,21 +128,6 @@ namespace sdr { namespace contact {
         virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const;
     };
 
-    //====================================================================
-    //= UnoControlPDFExportContact
-    //====================================================================
-    class SVX_DLLPRIVATE UnoControlPDFExportContact : public ViewObjectContactOfUnoControl
-    {
-    public:
-        UnoControlPDFExportContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
-        ~UnoControlPDFExportContact();
-
-    private:
-        UnoControlPDFExportContact();                                               // never implemented
-        UnoControlPDFExportContact( const UnoControlPDFExportContact& );            // never implemented
-        UnoControlPDFExportContact& operator=( const UnoControlPDFExportContact& ); // never implemented
-    };
-
 //........................................................................
 } } // namespace sdr::contact
 //........................................................................
diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index d37adb214c..d3bf028869 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -75,7 +75,8 @@ namespace drawinglayer
             const attribute::SdrTextAttribute& rText,
             const attribute::SdrLineAttribute* pStroke,
             bool bCellText,
-            bool bWordWrap);
+            bool bWordWrap,
+            bool bClipOnBounds);
 
         Primitive2DSequence createEmbeddedShadowPrimitive(
             const Primitive2DSequence& rContent, 
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index d5f841d85a..b9f27511e0 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -219,6 +219,7 @@ namespace drawinglayer
             unsigned								mbUnlimitedPage : 1;	// force layout with no text break
             unsigned								mbCellText : 1;			// this is a cell text as block text
             unsigned                                mbWordWrap : 1;         // for CustomShapes text layout
+            unsigned								mbClipOnBounds : 1;		// for CustomShapes text layout
 
         protected:
             // local decomposition.
@@ -234,7 +235,8 @@ namespace drawinglayer
                 bool bFixedCellHeight,
                 bool bUnlimitedPage,
                 bool bCellText,
-                bool bWordWrap);
+                bool bWordWrap,
+                bool bClipOnBounds);
 
             // get data
             const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; }
@@ -244,6 +246,7 @@ namespace drawinglayer
             bool getUnlimitedPage() const { return mbUnlimitedPage; }
             bool getCellText() const { return mbCellText; }
             bool getWordWrap() const { return mbWordWrap; }
+            bool getClipOnBounds() const { return mbClipOnBounds; }
 
             // compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;