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

This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91.

1 files changed, 10 insertions, 8 deletions

diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 52dc63b1a282..8c4deca123b9 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -25,7 +25,7 @@
 #include <vcl/gdimtf.hxx>
 #include <svx/svxdllapi.h>
 
-class SVX_DLLPUBLIC SdrExchangeView : public SdrObjEditView
+class SVX_DLLPUBLIC SdrExchangeView: public SdrObjEditView
 {
     friend class SdrPageView;
 
@@ -40,9 +40,7 @@ protected:
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
-    SdrExchangeView(
-        SdrModel& rSdrModel,
-        OutputDevice* pOut);
+    SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut);
 
 public:
     // Output all marked objects on the specified OutputDevice
@@ -74,16 +72,20 @@ public:
 
     Graphic         GetAllMarkedGraphic() const;
 
-    /** Generate a Graphic for the given draw object
+    /** Generate a Graphic for the given draw object in the given model
 
-        @param rSdrObject
+        @param pModel
+        Must not be NULL. Denotes the draw model the object is a part
+        of.
+
+        @param pObj
         The object (can also be a group object) to retrieve a Graphic
-        for.
+        for. Must not be NULL.
 
         @return a graphical representation of the given object, as it
         appears on screen (e.g. with rotation, if any, applied).
      */
-    static Graphic GetObjGraphic(const SdrObject& rSdrObject);
+    static Graphic  GetObjGraphic( const SdrModel* pModel, const SdrObject* pObj );
 
     // The new Draw objects are marked for all paste methods.
     // If bAddMark is true, the new Draw objects are added to an existing