diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-10 10:13:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-13 08:15:27 +0200 |
| commit | a361231b1363d072d737e9b1d411b71aa9550d84 (patch) | |
| tree | 08641fe2af10c1f22c7fd58e62f99b6dbe301c62 /avmedia | |
| parent | Handle *link return value in sfx2 test (diff) | |
| download | core-a361231b1363d072d737e9b1d411b71aa9550d84.tar.gz core-a361231b1363d072d737e9b1d411b71aa9550d84.zip | |
fix wrong SET/QUERY flags passed to uno::Reference
By creating deleted methods for the wrong calls.
Avoids the compiler needing to construct a temporary
Change-Id: I3b8c648d6bb22d22827bf74f21ea5a2a17fc0f6a
Reviewed-on: https://gerrit.libreoffice.org/72103
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediaitem.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx index 9a1a33ea5473..4c0289c1970e 100644 --- a/avmedia/source/framework/mediaitem.cxx +++ b/avmedia/source/framework/mediaitem.cxx @@ -424,7 +424,7 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel, uno::Reference<document::XStorageBasedDocument> const xSBD(xModel, uno::UNO_QUERY_THROW); uno::Reference<embed::XStorage> const xStorage( - xSBD->getDocumentStorage(), uno::UNO_QUERY_THROW); + xSBD->getDocumentStorage(), uno::UNO_SET_THROW); OUString const media("Media"); uno::Reference<embed::XStorage> const xSubStorage( diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index b004f7b52403..0b580399eb15 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -196,7 +196,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& try { m_bError = false; - m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete, aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()) ), css::uno::UNO_QUERY_THROW ); + m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete, aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()) ), css::uno::UNO_SET_THROW ); // OK- we can start async playing ... // Count this request and initialize self-holder against dying by uno ref count ... m_xSelfHold.set(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); |