diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-06 04:36:22 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-06 04:36:22 +0100 |
| commit | 431604f9fa603a7acf67985c9e4851f37d9cd580 (patch) | |
| tree | 2dbbe2e40af935229dbc8f2738dc446ab18a93b8 /svx/inc | |
| parent | f3c19f8263f3352ce4efff0965f8000d8347f6a5 (diff) | |
refactor media embedding completely:
Do the tempfile handling in SdrMediaObj, not in the window;
this has the advantage that it works even in the presence of clipboard
documents without SfxBaseModels and thus without storage (sc, sw).
The SdrMediaObj instances share ownership of a temp file.
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/svdomedia.hxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index bc832c0de11e..e3e2f4248877 100644 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _SVDOMEDIA_HXX -#define _SVDOMEDIA_HXX +#ifndef SVDOMEDIA_HXX +#define SVDOMEDIA_HXX #include <svx/svdorect.hxx> #include <avmedia/mediaitem.hxx> @@ -54,8 +54,6 @@ public: virtual ~SdrMediaObj(); - virtual void SetModel(SdrModel* pNewModel); - virtual bool HasTextEdit() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; @@ -71,9 +69,7 @@ public: public: - void setURL( const ::rtl::OUString& rURL, - ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XModel> const& xModel = 0); + void setURL( const ::rtl::OUString& rURL ); const ::rtl::OUString& getURL() const; void setMediaProperties( const ::avmedia::MediaItem& rState ); @@ -82,6 +78,8 @@ public: Size getPreferredSize() const; void setGraphic( const Graphic* pGraphic = NULL ); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> + GetInputStream(); protected: @@ -89,11 +87,10 @@ protected: virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact(); private: - - ::avmedia::MediaItem maMediaProperties; - ::std::auto_ptr< Graphic > mapGraphic; + struct Impl; + ::boost::scoped_ptr<Impl> m_pImpl; }; -#endif //_SVDOMEDIA_HXX +#endif // SVDOMEDIA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |