Revert "SOSAW080: Added first bunch of basic changes to helpers"

This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91.

4 files changed, 16 insertions, 15 deletions

diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 2ac1274fbb96..d8eba435c667 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -30,7 +30,7 @@
 class E3dDragMethodUnit
 {
 public:
-    E3dObject&                      mr3DObj;
+    E3dObject*                      mp3DObj;
     basegfx::B3DPolyPolygon         maWireframePoly;
     basegfx::B3DHomMatrix           maDisplayTransform;
     basegfx::B3DHomMatrix           maInvDisplayTransform;
@@ -39,8 +39,8 @@ public:
     sal_Int32                       mnStartAngle;
     sal_Int32                       mnLastAngle;
 
-    E3dDragMethodUnit(E3dObject& r3DObj)
-    :   mr3DObj(r3DObj),
+    E3dDragMethodUnit()
+    :   mp3DObj(nullptr),
         maWireframePoly(),
         maDisplayTransform(),
         maInvDisplayTransform(),
@@ -48,8 +48,7 @@ public:
         maTransform(),
         mnStartAngle(0),
         mnLastAngle(0)
-    {
-    }
+    {}
 };
 
 // Derivative of SdrDragMethod for 3D objects
diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx
index d12374f31ee1..603442634df2 100644
--- a/svx/inc/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/sdr/properties/attributeproperties.hxx
@@ -31,12 +31,6 @@ namespace sdr
     {
         class AttributeProperties : public DefaultProperties, public SfxListener, public svl::StyleSheetUser
         {
-            // get the correct (#119287#) default SfyStyleSheet from SdrObject's SdrModel
-            SfxStyleSheet* ImpGetDefaultStyleSheet() const;
-
-            // core to set parent at SfxItemSet and to execute the hard attribute computations
-            void ImpSetParentAtSfxItemSet(bool bDontRemoveHardAttr);
-
             // add style sheet, do all the necessary handling
             void ImpAddStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
 
@@ -66,10 +60,6 @@ namespace sdr
             // Clone() operator, normally just calls the local copy constructor
             virtual BaseProperties& Clone(SdrObject& rObj) const override;
 
-            // Get the local ItemSet. This directly returns the local ItemSet of the object. No
-            // merging of ItemSets is done for e.g. Group objects.
-            virtual const SfxItemSet& GetObjectItemSet() const override;
-
             // destructor
             virtual ~AttributeProperties() override;
 
@@ -79,6 +69,12 @@ namespace sdr
             // get the installed StyleSheet
             virtual SfxStyleSheet* GetStyleSheet() const override;
 
+            // Move properties to a new ItemPool.
+            virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel) override;
+
+            // Set new model.
+            virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel) override;
+
             // force all attributes which come from styles to hard attributes
             // to be able to live without the style.
             virtual void ForceStyleToHardAttributes() override;
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx
index 00d377766e01..3705fd684258 100644
--- a/svx/inc/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx
@@ -68,6 +68,9 @@ namespace sdr
             // get the installed StyleSheet
             virtual SfxStyleSheet* GetStyleSheet() const override;
 
+            // Move properties to a new ItemPool. Default implementation does nothing.
+            virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel) override;
+
             // Special for scene:
             void SetSceneItemsFromCamera();
         };
diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx
index 9b6b28a73dc3..af197dc91360 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -103,6 +103,9 @@ namespace sdr
             // DefaultProperties::GetObjectItemSet() if a new ItemSet is created
             virtual void ForceDefaultAttributes() override;
 
+            // Move properties to a new ItemPool.
+            virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel) override;
+
             // force all attributes which come from styles to hard attributes
             // to be able to live without the style.
             virtual void ForceStyleToHardAttributes() override;