Move the embedded object to the impl class.

Change-Id: I15af9a74fdcc40d65b3f8b394fc69037c017fe76

include/svx/svdoole2.hxx

@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_SVDOOLE2_HXX
 #define INCLUDED_SVX_SVDOOLE2_HXX
 
-#include <svtools/embedhlp.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -31,9 +30,17 @@
 #include <sot/storage.hxx>
 #include <svx/svxdllapi.h>
 
+namespace com { namespace sun { namespace star { namespace embed {
 
-//   SdrOle2Obj
+class XEmbeddedObject;
 
+}}}}
+
+namespace svt {
+
+class EmbeddedObjectRef;
+
+}
 
 class SvxUnoShapeModifyListener;
 class SdrOle2ObjImpl;
@@ -61,7 +68,6 @@ protected:
 private:
     SdrOle2ObjImpl*             mpImpl;
 
-    svt::EmbeddedObjectRef      xObjRef;
     Graphic*                    pGraphic;
     OUString                    aProgName;
 
@@ -87,10 +93,9 @@ public:
     SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false );
     virtual ~SdrOle2Obj();
 
-    // access to svt::EmbeddedObjectRef
-    const svt::EmbeddedObjectRef& getEmbeddedObjectRef() const { return xObjRef; }
+    const svt::EmbeddedObjectRef& getEmbeddedObjectRef() const;
 
-    sal_Int64 GetAspect() const { return xObjRef.GetViewAspect(); }
+    sal_Int64 GetAspect() const;
     bool isInplaceActive() const;
     bool isUiActive() const;
     void SetAspect( sal_Int64 nAspect );

svx/source/sdr/contact/viewcontactofsdrole2obj.cxx

@@ -33,7 +33,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <svx/charthelper.hxx>
-
+#include <svtools/embedhlp.hxx>
 
 
 namespace sdr

svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx

@@ -30,7 +30,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-
+#include <svtools/embedhlp.hxx>
 
 
 using namespace com::sun::star;

svx/source/unodraw/unoshap4.cxx

@@ -52,7 +52,7 @@
 #include "svx/svdstr.hrc"
 #include <svdoopengl.hxx>
 #include <vcl/wmf.hxx>
-
+#include <svtools/embedhlp.hxx>
 
 
 using namespace ::osl;