diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-18 17:57:39 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-18 17:57:39 +0100 |
| commit | a063da487e6956eff19efd2619633caf333c39eb (patch) | |
| tree | fac6fc2d5faf43620ccc255bf99475c7bfb2108a /svx | |
| parent | df4adcc47a5cfad9e6562162ae6eb28a2271f344 (diff) | |
Simplify avmedia::MediaItem::setURL
Change-Id: I9835b96813c6bf3d8690cdaa5de66ca07afdc801
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdomedia.cxx | 10 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 94b4aa988b6e..f9d838b5cca2 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -246,7 +246,7 @@ void SdrMediaObj::setURL( const OUString& rURL) { ::avmedia::MediaItem aURLItem; - aURLItem.setURL( rURL, 0 ); + aURLItem.setURL( rURL, "" ); setMediaProperties( aURLItem ); } @@ -378,24 +378,24 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper if (bSuccess) { 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= { m_pImpl->m_pTempFile.reset(); - m_pImpl->m_MediaProperties.setURL(OUString(), 0); + m_pImpl->m_MediaProperties.setURL("", ""); } } else { m_pImpl->m_MediaProperties.setURL(url, - &rNewProperties.getTempURL()); + rNewProperties.getTempURL()); } } else { m_pImpl->m_pTempFile.reset(); - m_pImpl->m_MediaProperties.setURL(url, 0); + m_pImpl->m_MediaProperties.setURL(url, ""); } bBroadcastChanged = true; } diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 46981b5dda3c..53b02048f409 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -818,7 +818,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr if( rValue >>= aURL ) { bOk = true; - aItem.setURL( aURL, 0 ); + aItem.setURL( aURL, "" ); } } break; |