diff options
Diffstat (limited to 'avmedia/source/framework/mediaitem.cxx')
| -rw-r--r-- | avmedia/source/framework/mediaitem.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index f5150f659b79..2ec4ae574457 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -28,7 +28,6 @@ #include <avmedia/mediaitem.hxx> -#include <cppuhelper/weakref.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -61,8 +60,7 @@ TYPEINIT1_AUTOFACTORY( MediaItem, ::SfxPoolItem ); struct MediaItem::Impl { ::rtl::OUString m_URL; - // store a weak ref to the model so we can get at embedded media - uno::WeakReference<frame::XModel> m_wModel; + ::rtl::OUString m_TempFileURL; sal_uInt32 m_nMaskSet; MediaState m_eState; double m_fTime; @@ -85,7 +83,7 @@ struct MediaItem::Impl } Impl(Impl const& rOther) : m_URL( rOther.m_URL ) - , m_wModel( rOther.m_wModel ) + , m_TempFileURL( rOther.m_TempFileURL ) , m_nMaskSet( rOther.m_nMaskSet ) , m_eState( rOther.m_eState ) , m_fTime( rOther.m_fTime ) @@ -212,7 +210,7 @@ void MediaItem::merge( const MediaItem& rMediaItem ) const sal_uInt32 nMaskSet = rMediaItem.getMaskSet(); if( AVMEDIA_SETMASK_URL & nMaskSet ) - setURL( rMediaItem.getURL(), rMediaItem.getModel() ); + setURL( rMediaItem.getURL(), &rMediaItem.getTempURL() ); if( AVMEDIA_SETMASK_STATE & nMaskSet ) setState( rMediaItem.getState() ); @@ -246,11 +244,11 @@ sal_uInt32 MediaItem::getMaskSet() const //------------------------------------------------------------------------ void MediaItem::setURL( const ::rtl::OUString& rURL, - uno::Reference<frame::XModel> const & xModel) + ::rtl::OUString const*const pTempURL) { m_pImpl->m_URL = rURL; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_URL; - m_pImpl->m_wModel = xModel; + m_pImpl->m_TempFileURL = (pTempURL) ? *pTempURL : ::rtl::OUString(); } //------------------------------------------------------------------------ @@ -260,9 +258,9 @@ const ::rtl::OUString& MediaItem::getURL() const return m_pImpl->m_URL; } -uno::Reference<frame::XModel> MediaItem::getModel() const +const ::rtl::OUString& MediaItem::getTempURL() const { - return m_pImpl->m_wModel; + return m_pImpl->m_TempFileURL; } //------------------------------------------------------------------------ |