dba33d: merge with DEV300_m67

14 files changed, 227 insertions, 147 deletions

diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index c7f172cbe5db..b5089d663c72 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -33,106 +33,75 @@
 // include     -----------------------------------------------------------
 #include <svtools/solar.hrc>
 
-// in solar.hrc
-//#define HID_FORMS_START               (HID_LIB_START+4000)
-//#define HID_FORMS_END                 (HID_LIB_START+4999)
-
 // Help-Ids --------------------------------------------------------------
 
-// insgesamt 200
-#define HID_DLG_DBINFO                          (HID_FORMS_START +   0)
-#define HID_DLG_DBMSG                           (HID_FORMS_START +   1)
-
-#define HID_FM_OTHER_START                      (HID_FORMS_START + 300)
-#define HID_FORM_NAVIGATOR                      (HID_FM_OTHER_START +  0)
-#define HID_FORM_NAVIGATOR_WIN                  (HID_FM_OTHER_START +  1)
-#define HID_FIELD_SEL                           (HID_FM_OTHER_START +  2)
-#define HID_FIELD_SEL_WIN                       (HID_FM_OTHER_START +  3)
-#define HID_FILTER_NAVIGATOR                    (HID_FM_OTHER_START +  4)
-#define HID_FILTER_NAVIGATOR_WIN                (HID_FM_OTHER_START +  5)
-
-#define HID_FORM_DLG_START                      (HID_FORMS_START + 400)
-// FREE
-// FREE
-// FREE
-#define HID_FM_PROPDLG_WINDOW                   (HID_FORM_DLG_START +   3)
-#define HID_FM_PROPDLG_CONTAINER                (HID_FORM_DLG_START +   4)
-#define HID_FM_PROPDLG_TABCTR                   (HID_FORM_DLG_START +   5)
-#define HID_FM_PROPDLG_TAB_GENERAL              (HID_FORM_DLG_START +   6)
-#define HID_FM_PROPDLG_TAB_DATA                 (HID_FORM_DLG_START +   7)
-#define HID_FM_PROPDLG_TAB_EVT                  (HID_FORM_DLG_START +   8)
-#define HID_FM_DLG_SEARCH                       (HID_FORM_DLG_START +   9)
-
-#define HID_SEARCH_TEXT                         (HID_FORM_DLG_START +  10)
-#define HID_SEARCH_ALLFIELDS                    (HID_FORM_DLG_START +  11)
-#define HID_SEARCH_SINGLEFIELD                  (HID_FORM_DLG_START +  12)
-#define HID_SEARCH_FIELDSELECTION               (HID_FORM_DLG_START +  13)
-#define HID_SEARCH_POSITION                     (HID_FORM_DLG_START +  14)
-#define HID_SEARCH_FORMATTER                    (HID_FORM_DLG_START +  15)
-#define HID_SEARCH_CASE                         (HID_FORM_DLG_START +  16)
-#define HID_SEARCH_BACKWARD                     (HID_FORM_DLG_START +  17)
-#define HID_SEARCH_STARTOVER                    (HID_FORM_DLG_START +  18)
-#define HID_SEARCH_WILDCARD                     (HID_FORM_DLG_START +  19)
-#define HID_SEARCH_REGULAR                      (HID_FORM_DLG_START +  20)
-#define HID_SEARCH_APPROX                       (HID_FORM_DLG_START +  21)
-#define HID_SEARCH_APPROXSETTINGS               (HID_FORM_DLG_START +  22)
-#define HID_SEARCH_BTN_SEARCH                   (HID_FORM_DLG_START +  23)
-#define HID_SEARCH_BTN_CLOSE                    (HID_FORM_DLG_START +  24)
-
-#define HID_TABORDER_CONTROLS                   (HID_FORM_DLG_START +  25)
-
-#define HID_CONTROLS_DATE_N_TIME                (HID_FORM_DLG_START +  26)
-#define HID_FM_DLG_PARAM                        (HID_FORM_DLG_START +  27)
-
-#define HID_GRID_TRAVEL_FIRST                   (HID_FORM_DLG_START +  28)
-#define HID_GRID_TRAVEL_PREV                    (HID_FORM_DLG_START +  29)
-#define HID_GRID_TRAVEL_NEXT                    (HID_FORM_DLG_START +  30)
-#define HID_GRID_TRAVEL_LAST                    (HID_FORM_DLG_START +  31)
-#define HID_GRID_TRAVEL_NEW                     (HID_FORM_DLG_START +  32)
-#define HID_GRID_TRAVEL_ABSOLUTE                (HID_FORM_DLG_START +  33)
-#define HID_GRID_NUMBEROFRECORDS                (HID_FORM_DLG_START +  34)
-
-#define UID_SEARCH_RECORDSTATUS                 (HID_FORM_DLG_START +  35)
-
-#define UID_FORMPROPBROWSER_FRAME               (HID_FORM_DLG_START +  37)
-#define UID_ABSOLUTE_RECORD_WINDOW              (HID_FORM_DLG_START +  38)
-
-#define HID_DATA_NAVIGATOR_WIN                  (HID_FM_OTHER_START +  39)
-#define HID_XFORMS_ADDDATAITEM_DLG              (HID_FM_OTHER_START +  40)
-#define HID_XFORMS_ADDCONDITION_DLG             (HID_FM_OTHER_START +  41)
-#define HID_XFORMS_NAMESPACEITEM_DLG            (HID_FM_OTHER_START +  42)
-#define HID_XFORMS_NAMESPACEITEM_LIST           (HID_FM_OTHER_START +  43)
-#define HID_XFORMS_MANAGENAMESPACE_DLG          (HID_FM_OTHER_START +  44)
-
-#define HID_TP_XFORMS_INSTANCE                  (HID_FM_OTHER_START +  45)
-#define HID_TP_XFORMS_SUBMISSION                (HID_FM_OTHER_START +  46)
-#define HID_TP_XFORMS_BINDING                   (HID_FM_OTHER_START +  47)
-
-#define HID_MN_XFORMS_MODELS_ADD                (HID_FM_OTHER_START +  48)
-#define HID_MN_XFORMS_MODELS_EDIT               (HID_FM_OTHER_START +  49)
-#define HID_MN_XFORMS_MODELS_REMOVE             (HID_FM_OTHER_START +  50)
-#define HID_MN_XFORMS_INSTANCES_ADD             (HID_FM_OTHER_START +  51)
-#define HID_MN_XFORMS_INSTANCES_EDIT            (HID_FM_OTHER_START +  52)
-#define HID_MN_XFORMS_INSTANCES_REMOVE          (HID_FM_OTHER_START +  53)
-#define HID_MN_XFORMS_SHOW_DETAILS              (HID_FM_OTHER_START +  54)
-#define HID_XFORMS_TOOLBOX                      (HID_FM_OTHER_START +  55)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD             (HID_FM_OTHER_START +  56)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT     (HID_FM_OTHER_START +  57)
-#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE   (HID_FM_OTHER_START +  58)
-#define HID_XFORMS_TOOLBOX_ITEM_EDIT            (HID_FM_OTHER_START +  59)
-#define HID_XFORMS_TOOLBOX_ITEM_REMOVE          (HID_FM_OTHER_START +  60)
-#define HID_XFORMS_ITEMS_LIST                   (HID_FM_OTHER_START +  61)
-#define HID_XFORMS_MODELS_LIST                  (HID_FM_OTHER_START +  62)
-#define HID_XFORMS_MODELS_MENUBTN               (HID_FM_OTHER_START +  63)
-#define HID_XFORMS_INSTANCES_MENUBTN            (HID_FM_OTHER_START +  64)
-#define HID_XFORMS_ADDSUBMISSION_DLG            (HID_FM_OTHER_START +  65)
-#define HID_XFORMS_ADDMODEL_DLG                 (HID_FM_OTHER_START +  66)
-#define HID_XFORMS_ADDINSTANCE_DLG              (HID_FM_OTHER_START +  67)
-#define HID_XFORMS_MID_INSERT_CONTROL           (HID_FM_OTHER_START +  68)
-#define HID_XFORMS_TAB_CONTROL                  (HID_FM_OTHER_START +  69)
-
-// if you add a new define here, please adjust the overflow check
-// at the end of the file!!
+#define HID_DLG_DBMSG                           ( HID_FORMS_START +   1)
+#define HID_FORM_NAVIGATOR                      ( HID_FORMS_START +   2)
+#define HID_FORM_NAVIGATOR_WIN                  ( HID_FORMS_START +   3)
+#define HID_FIELD_SEL                           ( HID_FORMS_START +   4)
+#define HID_FIELD_SEL_WIN                       ( HID_FORMS_START +   5)
+#define HID_FILTER_NAVIGATOR                    ( HID_FORMS_START +   6)
+#define HID_FILTER_NAVIGATOR_WIN                ( HID_FORMS_START +   7)
+#define HID_FM_DLG_SEARCH                       ( HID_FORMS_START +   8)
+#define HID_SEARCH_TEXT                         ( HID_FORMS_START +   9)
+#define HID_SEARCH_ALLFIELDS                    ( HID_FORMS_START +  10)
+#define HID_SEARCH_SINGLEFIELD                  ( HID_FORMS_START +  11)
+#define HID_SEARCH_FIELDSELECTION               ( HID_FORMS_START +  12)
+#define HID_SEARCH_POSITION                     ( HID_FORMS_START +  13)
+#define HID_SEARCH_FORMATTER                    ( HID_FORMS_START +  14)
+#define HID_SEARCH_CASE                         ( HID_FORMS_START +  15)
+#define HID_SEARCH_BACKWARD                     ( HID_FORMS_START +  16)
+#define HID_SEARCH_STARTOVER                    ( HID_FORMS_START +  17)
+#define HID_SEARCH_WILDCARD                     ( HID_FORMS_START +  18)
+#define HID_SEARCH_REGULAR                      ( HID_FORMS_START +  19)
+#define HID_SEARCH_APPROX                       ( HID_FORMS_START +  20)
+#define HID_SEARCH_APPROXSETTINGS               ( HID_FORMS_START +  21)
+#define HID_SEARCH_BTN_SEARCH                   ( HID_FORMS_START +  22)
+#define HID_SEARCH_BTN_CLOSE                    ( HID_FORMS_START +  23)
+#define HID_CONTROLS_DATE_N_TIME                ( HID_FORMS_START +  24)
+#define HID_GRID_TRAVEL_FIRST                   ( HID_FORMS_START +  25)
+#define HID_GRID_TRAVEL_PREV                    ( HID_FORMS_START +  26)
+#define HID_GRID_TRAVEL_NEXT                    ( HID_FORMS_START +  27)
+#define HID_GRID_TRAVEL_LAST                    ( HID_FORMS_START +  28)
+#define HID_GRID_TRAVEL_NEW                     ( HID_FORMS_START +  29)
+#define HID_GRID_TRAVEL_ABSOLUTE                ( HID_FORMS_START +  30)
+#define HID_GRID_NUMBEROFRECORDS                ( HID_FORMS_START +  31)
+#define UID_SEARCH_RECORDSTATUS                 ( HID_FORMS_START +  32)
+#define UID_FORMPROPBROWSER_FRAME               ( HID_FORMS_START +  33)
+#define UID_ABSOLUTE_RECORD_WINDOW              ( HID_FORMS_START +  34)
+#define HID_DATA_NAVIGATOR_WIN                  ( HID_FORMS_START +  35)
+#define HID_XFORMS_ADDDATAITEM_DLG              ( HID_FORMS_START +  36)
+#define HID_XFORMS_ADDCONDITION_DLG             ( HID_FORMS_START +  37)
+#define HID_XFORMS_NAMESPACEITEM_DLG            ( HID_FORMS_START +  38)
+#define HID_XFORMS_NAMESPACEITEM_LIST           ( HID_FORMS_START +  39)
+#define HID_XFORMS_MANAGENAMESPACE_DLG          ( HID_FORMS_START +  40)
+#define HID_TP_XFORMS_INSTANCE                  ( HID_FORMS_START +  41)
+#define HID_TP_XFORMS_SUBMISSION                ( HID_FORMS_START +  42)
+#define HID_TP_XFORMS_BINDING                   ( HID_FORMS_START +  43)
+#define HID_MN_XFORMS_MODELS_ADD                ( HID_FORMS_START +  44)
+#define HID_MN_XFORMS_MODELS_EDIT               ( HID_FORMS_START +  45)
+#define HID_MN_XFORMS_MODELS_REMOVE             ( HID_FORMS_START +  46)
+#define HID_MN_XFORMS_INSTANCES_ADD             ( HID_FORMS_START +  47)
+#define HID_MN_XFORMS_INSTANCES_EDIT            ( HID_FORMS_START +  48)
+#define HID_MN_XFORMS_INSTANCES_REMOVE          ( HID_FORMS_START +  49)
+#define HID_MN_XFORMS_SHOW_DETAILS              ( HID_FORMS_START +  50)
+#define HID_XFORMS_TOOLBOX                      ( HID_FORMS_START +  51)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD             ( HID_FORMS_START +  52)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT     ( HID_FORMS_START +  53)
+#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE   ( HID_FORMS_START +  54)
+#define HID_XFORMS_TOOLBOX_ITEM_EDIT            ( HID_FORMS_START +  55)
+#define HID_XFORMS_TOOLBOX_ITEM_REMOVE          ( HID_FORMS_START +  56)
+#define HID_XFORMS_ITEMS_LIST                   ( HID_FORMS_START +  57)
+#define HID_XFORMS_MODELS_LIST                  ( HID_FORMS_START +  58)
+#define HID_XFORMS_MODELS_MENUBTN               ( HID_FORMS_START +  59)
+#define HID_XFORMS_INSTANCES_MENUBTN            ( HID_FORMS_START +  60)
+#define HID_XFORMS_ADDSUBMISSION_DLG            ( HID_FORMS_START +  61)
+#define HID_XFORMS_ADDMODEL_DLG                 ( HID_FORMS_START +  62)
+#define HID_XFORMS_ADDINSTANCE_DLG              ( HID_FORMS_START +  63)
+#define HID_XFORMS_MID_INSERT_CONTROL           ( HID_FORMS_START +  64)
+#define HID_XFORMS_TAB_CONTROL                  ( HID_FORMS_START +  65)
+    // if you add a new define here, please adjust the overflow check
+    // at the end of the file!!
 
 
 // -----------------------------------------------------------------------
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index 2f61967bc3ac..f831729b5006 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -89,14 +89,16 @@ public:
     /** check whether the OpenInDesignMode has been set explicitly or been loaded (<FALSE/>)
         or if it still has the default value from construction (<TRUE/>)
     */
-    sal_Bool    OpenInDesignModeIsDefaulted( );
+    sal_Bool    OpenInDesignModeIsDefaulted();
 
-//#if 0 // _SOLAR__PRIVATE
-    void        implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _bForce );
+    /** determines whether form controls should use the SdrModel's reference device for text rendering
+    */
+    sal_Bool    ControlsUseRefDevice() const;
 
     FmXUndoEnvironment& GetUndoEnv();
-//#endif
 
+private:
+    void        implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _bForce );
 };
 
 #endif          // _FM_FMMODEL_HXX
diff --git a/svx/inc/svx/msvbahelper.hxx b/svx/inc/svx/msvbahelper.hxx
new file mode 100644
index 000000000000..b1db44237fa6
--- /dev/null
+++ b/svx/inc/svx/msvbahelper.hxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile:
+ * $Revision:
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _MSVBAHELPER_HXX
+#define _MSVBAHELPER_HXX
+
+#include <sfx2/objsh.hxx>
+#include "svx/svxdllapi.h"
+
+namespace ooo { namespace vba
+{
+    class SVX_DLLPUBLIC VBAMacroResolvedInfo
+    {
+        SfxObjectShell* mpDocContext;
+        bool mbFound;
+        String msResolvedMacro;
+        public:
+        VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){}
+        void SetResolved( bool bRes ) { mbFound = bRes; }
+        bool IsResolved() { return mbFound; }
+        void SetMacroDocContext(SfxObjectShell* pShell )  { mpDocContext = pShell; }
+        SfxObjectShell* MacroDocContext() { return mpDocContext; }
+        String ResolvedMacro() { return msResolvedMacro; }
+        void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; }
+    };
+
+    SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName );
+    SVX_DLLPUBLIC  VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false );
+    SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller );
+} }
+
+#endif
diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx
index 17eb3d62630c..9840ec1688ac 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/svx/inc/svx/numitem.hxx
@@ -76,12 +76,6 @@ namespace com{namespace sun{ namespace star{
 #define SVX_NO_NUM              200 // Markierung fuer keine Numerierung
 #define SVX_NO_NUMLEVEL         0x20
 
-// --> OD 2008-01-10 #newlistlevelattrs# - no longer used
-//#define NUMITEM_VERSION_01        0x01
-//#define NUMITEM_VERSION_02        0x02
-//#define NUMITEM_VERSION_03        0x03
-// <--
-
 #define LINK_TOKEN  0x80 //indicate linked bitmaps - for use in dialog only
 class SVX_DLLPUBLIC SvxNumberType
 {
@@ -191,14 +185,10 @@ public:
                      SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
     // <--
     SvxNumberFormat(const SvxNumberFormat& rFormat);
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    SvxNumberFormat(SvStream &rStream);
-    // <--
+    SvxNumberFormat(SvStream &rStream);
     virtual ~SvxNumberFormat();
 
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
-    // <--
+    SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
 
     SvxNumberFormat& operator=( const SvxNumberFormat&  );
     BOOL            operator==( const SvxNumberFormat&  ) const;
@@ -304,9 +294,7 @@ public:
                                 = SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
     // <--
     SvxNumRule(const SvxNumRule& rCopy);
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//  SvxNumRule(SvStream &rStream);
-    // <--
+    SvxNumRule(SvStream &rStream);
     virtual ~SvxNumRule();
 
     int                     operator==( const SvxNumRule& ) const;
@@ -314,9 +302,7 @@ public:
 
     SvxNumRule&             operator=( const SvxNumRule&  );
 
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    SvStream&               Store(SvStream &rStream);
-    // <--
+    SvStream&               Store(SvStream &rStream);
 
     const SvxNumberFormat*  Get(USHORT nLevel)const;
     const SvxNumberFormat&  GetLevel(USHORT nLevel)const;
@@ -354,11 +340,9 @@ public:
     virtual ~SvxNumBulletItem();
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-//    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
-//    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
-    // <--
+    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
+    USHORT  GetVersion( USHORT nFileVersion ) const;
+    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
     virtual int              operator==( const SfxPoolItem& ) const;
 
     SvxNumRule*             GetNumRule() const {return pNumRule;}
diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index f94ad61ddd4d..33eee0126604 100644
--- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -109,11 +109,14 @@ namespace sdr { namespace contact {
         // support for Primitive2D
         virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const;
 
+        // visibility check
+        virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const;
+
         /// to be called when any aspect of the control which requires view updates changed
         void impl_onControlChangedOrModified();
 
     private:
-        ViewObjectContactOfUnoControl();                                                  // never implemented
+        ViewObjectContactOfUnoControl();                                                    // never implemented
         ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& );              // never implemented
         ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& );   // never implemented
     };
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 4eddc4386a0d..8f7f0eb23cb3 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/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index 1e68a61432a0..a7084993b5f2 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -39,19 +39,19 @@
 //////////////////////////////////////////////////////////////////////////////
 // predefines
 
-namespace drawinglayer
-{
-    namespace primitive2d
+namespace drawinglayer { namespace primitive2d {
+    enum MeasureTextPosition
     {
-        enum MeasureTextPosition
-        {
-            MEASURETEXTPOSITION_AUTOMATIC,
-            MEASURETEXTPOSITION_NEGATIVE,
-            MEASURETEXTPOSITION_CENTERED,
-            MEASURETEXTPOSITION_POSITIVE
-        };
-    } // end of namespace primitive2d
-} // end of namespace drawinglayer
+        MEASURETEXTPOSITION_AUTOMATIC,
+        MEASURETEXTPOSITION_NEGATIVE,
+        MEASURETEXTPOSITION_CENTERED,
+        MEASURETEXTPOSITION_POSITIVE
+    };
+}}
+
+namespace drawinglayer { namespace attribute {
+    class SdrLineAttribute;
+}}
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -80,6 +80,7 @@ namespace drawinglayer
 
             // internal decomposition helper
             Primitive2DReference impCreatePart(
+                const attribute::SdrLineAttribute& rLineAttribute,
                 const basegfx::B2DHomMatrix& rObjectMatrix,
                 const basegfx::B2DPoint& rStart,
                 const basegfx::B2DPoint& rEnd,
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 70e28d599a44..9ee4f3f69417 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -53,6 +53,11 @@ namespace drawinglayer
             SdrObjectWeakRef                            mpSdrOle2Obj;
             basegfx::B2DHomMatrix                       maObjectTransform;
 
+            // #i104867# The GraphicVersion number to identify in operator== if
+            // the graphic has changed, but without fetching it (which may
+            // be expensive, e.g. triggering chart creation)
+            sal_uInt32                                  mnGraphicVersion;
+
             // bitfield
             unsigned                                    mbHighContrast : 1;
 
@@ -64,6 +69,7 @@ namespace drawinglayer
             SdrOleContentPrimitive2D(
                 const SdrOle2Obj& rSdrOle2Obj,
                 const basegfx::B2DHomMatrix& rObjectTransform,
+                sal_uInt32 nGraphicVersion,
                 bool bHighContrast);
 
             // compare operator
@@ -74,6 +80,7 @@ namespace drawinglayer
 
             // data access
             const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
+            sal_uInt32 getGraphicVersion() const { return mnGraphicVersion; }
             bool getHighContrast() const { return mbHighContrast; }
 
             // provide unique ID
diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 650cc1a882c5..23bbc2676f22 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/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx
index 5cf8c294a1bb..b9c04b54c0dc 100644
--- a/svx/inc/svx/selectioncontroller.hxx
+++ b/svx/inc/svx/selectioncontroller.hxx
@@ -33,6 +33,8 @@
 
 #include "svx/svxdllapi.h"
 
+#include <boost/shared_ptr.hpp>
+
 #include <cppuhelper/weak.hxx>
 
 class KeyEvent;
@@ -70,6 +72,15 @@ public:
 
     virtual bool GetMarkedObjModel( SdrPage* pNewPage );
     virtual bool PasteObjModel( const SdrModel& rModel );
+
+    /** returns a format paint brush set from the current selection */
+    virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet  );
+
+    /** applies a format paint brush set from the current selection.
+        if bNoCharacterFormats is true, no character attributes are changed.
+        if bNoParagraphFormats is true, no paragraph attributes are changed.
+    */
+    virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats );
 };
 
 }
diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx
index fa4e09c9a324..91112a7dd287 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);
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 17333ad74459..293e50896044 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -41,6 +41,8 @@
 //   Vorausdeklarationen
 //************************************************************
 
+#include <boost/shared_ptr.hpp>
+
 class SdrOutliner;
 class OutlinerView;
 class EditStatus;
@@ -282,6 +284,21 @@ public:
 
     rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; }
 
+    /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */
+    virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
+
+    /** returns a format paint brush set from the current selection */
+    virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet  );
+
+    /** applies a format paint brush set from the current selection.
+        if bNoCharacterFormats is true, no character attributes are changed.
+        if bNoParagraphFormats is true, no paragraph attributes are changed.
+    */
+    virtual void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats );
+
+    /** helper function for selections with multiple SdrText for one SdrTextObj (f.e. tables ) */
+    void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats );
+
 protected:
     virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos );
     virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos );
diff --git a/svx/inc/svx/svdfppt.hxx b/svx/inc/svx/svdfppt.hxx
index 63f196876e93..fb7f75598c4e 100644
--- a/svx/inc/svx/svdfppt.hxx
+++ b/svx/inc/svx/svdfppt.hxx
@@ -610,7 +610,7 @@ public:
                                         UINT32& nMappedFontId, Font& rFont, char nDefault ) const;
     const PptDocumentAtom&              GetDocumentAtom() const { return aDocAtom; }
     virtual const PptSlideLayoutAtom*   GetSlideLayoutAtom() const;
-    SdrObject*  CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ) const;
+    SdrObject*  CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* );
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index faf1aa7055aa..f65afc0b4efe 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -179,6 +179,8 @@ public:
     virtual UINT16 GetObjIdentifier() const;
     virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
 
+    virtual void SetModel(SdrModel* pNewModel);

+
     virtual void RecalcSnapRect();
 
     virtual const Rectangle& GetSnapRect()  const;