Kaydet (Commit) a063da48 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Simplify avmedia::MediaItem::setURL

Change-Id: I9835b96813c6bf3d8690cdaa5de66ca07afdc801
üst df4adcc4
...@@ -498,7 +498,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p ) ...@@ -498,7 +498,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
::avmedia::MediaWindow::executeFormatErrorBox( this ); ::avmedia::MediaWindow::executeFormatErrorBox( this );
else else
{ {
aExecItem.setURL( aURL, 0 ); aExecItem.setURL( aURL, "" );
aExecItem.setState( MEDIASTATE_PLAY ); aExecItem.setState( MEDIASTATE_PLAY );
} }
} }
......
...@@ -202,7 +202,7 @@ void MediaItem::merge( const MediaItem& rMediaItem ) ...@@ -202,7 +202,7 @@ void MediaItem::merge( const MediaItem& rMediaItem )
const sal_uInt32 nMaskSet = rMediaItem.getMaskSet(); const sal_uInt32 nMaskSet = rMediaItem.getMaskSet();
if( AVMEDIA_SETMASK_URL & nMaskSet ) if( AVMEDIA_SETMASK_URL & nMaskSet )
setURL( rMediaItem.getURL(), &rMediaItem.getTempURL() ); setURL( rMediaItem.getURL(), rMediaItem.getTempURL() );
if( AVMEDIA_SETMASK_STATE & nMaskSet ) if( AVMEDIA_SETMASK_STATE & nMaskSet )
setState( rMediaItem.getState() ); setState( rMediaItem.getState() );
...@@ -235,12 +235,11 @@ sal_uInt32 MediaItem::getMaskSet() const ...@@ -235,12 +235,11 @@ sal_uInt32 MediaItem::getMaskSet() const
//------------------------------------------------------------------------ //------------------------------------------------------------------------
void MediaItem::setURL( const OUString& rURL, void MediaItem::setURL( const OUString& rURL, const OUString& rTempURL )
OUString const*const pTempURL)
{ {
m_pImpl->m_URL = rURL;
m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_URL; m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_URL;
m_pImpl->m_TempFileURL = (pTempURL) ? *pTempURL : OUString(); m_pImpl->m_URL = rURL;
m_pImpl->m_TempFileURL = rTempURL;
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
......
...@@ -328,7 +328,7 @@ void MediaWindowImpl::updateMediaItem( MediaItem& rItem ) const ...@@ -328,7 +328,7 @@ void MediaWindowImpl::updateMediaItem( MediaItem& rItem ) const
rItem.setMute( isMute() ); rItem.setMute( isMute() );
rItem.setVolumeDB( getVolumeDB() ); rItem.setVolumeDB( getVolumeDB() );
rItem.setZoom( getZoom() ); rItem.setZoom( getZoom() );
rItem.setURL( getURL(), &mTempFileURL ); rItem.setURL( getURL(), mTempFileURL );
} }
void MediaWindowImpl::executeMediaItem( const MediaItem& rItem ) void MediaWindowImpl::executeMediaItem( const MediaItem& rItem )
......
...@@ -106,7 +106,7 @@ public: ...@@ -106,7 +106,7 @@ public:
::com::sun::star::media::ZoomLevel getZoom() const; ::com::sun::star::media::ZoomLevel getZoom() const;
void setURL( const OUString& rURL, void setURL( const OUString& rURL,
OUString const*const pTempURL); const OUString& rTempURL);
const OUString& getURL() const; const OUString& getURL() const;
const OUString& getTempURL() const; const OUString& getTempURL() const;
......
...@@ -246,7 +246,7 @@ void SdrMediaObj::setURL( const OUString& rURL) ...@@ -246,7 +246,7 @@ void SdrMediaObj::setURL( const OUString& rURL)
{ {
::avmedia::MediaItem aURLItem; ::avmedia::MediaItem aURLItem;
aURLItem.setURL( rURL, 0 ); aURLItem.setURL( rURL, "" );
setMediaProperties( aURLItem ); setMediaProperties( aURLItem );
} }
...@@ -378,24 +378,24 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper ...@@ -378,24 +378,24 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper
if (bSuccess) if (bSuccess)
{ {
m_pImpl->m_pTempFile.reset(new MediaTempFile(tempFileURL)); m_pImpl->m_pTempFile.reset(new MediaTempFile(tempFileURL));
m_pImpl->m_MediaProperties.setURL(url, & tempFileURL); m_pImpl->m_MediaProperties.setURL(url, tempFileURL);
} }
else // this case is for Clone via operator= else // this case is for Clone via operator=
{ {
m_pImpl->m_pTempFile.reset(); m_pImpl->m_pTempFile.reset();
m_pImpl->m_MediaProperties.setURL(OUString(), 0); m_pImpl->m_MediaProperties.setURL("", "");
} }
} }
else else
{ {
m_pImpl->m_MediaProperties.setURL(url, m_pImpl->m_MediaProperties.setURL(url,
&rNewProperties.getTempURL()); rNewProperties.getTempURL());
} }
} }
else else
{ {
m_pImpl->m_pTempFile.reset(); m_pImpl->m_pTempFile.reset();
m_pImpl->m_MediaProperties.setURL(url, 0); m_pImpl->m_MediaProperties.setURL(url, "");
} }
bBroadcastChanged = true; bBroadcastChanged = true;
} }
......
...@@ -818,7 +818,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr ...@@ -818,7 +818,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
if( rValue >>= aURL ) if( rValue >>= aURL )
{ {
bOk = true; bOk = true;
aItem.setURL( aURL, 0 ); aItem.setURL( aURL, "" );
} }
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment