diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-10 13:08:07 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-10 14:13:57 -0400 |
commit | 2aef59dca407a1d342874cde88732b6cb9e131b4 (patch) | |
tree | a0dbc808ff9737a8726f00bc88d17b7d8793267f /include/svx | |
parent | cef8eb1f7e906c5717c12967d63f164dced9e8a5 (diff) |
Move the embedded object to the impl class.
Change-Id: I15af9a74fdcc40d65b3f8b394fc69037c017fe76
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/svdoole2.hxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 3b6b00645fd3..7384662f42c0 100644 --- a/include/svx/svdoole2.hxx +++ b/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 ); |