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 /vcl | |
| parent | ce76026231d9536d2025a1e69f435bcbf39fe4f8 (diff) | |
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 'vcl')
| -rw-r--r-- | vcl/qa/api/XGraphicTest.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/qa/api/XGraphicTest.cxx b/vcl/qa/api/XGraphicTest.cxx index 0272c24645cc..fab083b666a0 100644 --- a/vcl/qa/api/XGraphicTest.cxx +++ b/vcl/qa/api/XGraphicTest.cxx @@ -122,7 +122,7 @@ void XGraphicTest::testGraphicProvider() { // Load lazy uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext()); uno::Reference<graphic::XGraphicProvider> xGraphicProvider; - xGraphicProvider.set(graphic::GraphicProvider::create(xContext), uno::UNO_QUERY_THROW); + xGraphicProvider.set(graphic::GraphicProvider::create(xContext), uno::UNO_SET_THROW); auto aMediaProperties(comphelper::InitPropertySequence({ { "URL", uno::makeAny(aGraphicURL) }, @@ -161,7 +161,7 @@ void XGraphicTest::testGraphicProvider() { // Load as link uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext()); uno::Reference<graphic::XGraphicProvider> xGraphicProvider; - xGraphicProvider.set(graphic::GraphicProvider::create(xContext), uno::UNO_QUERY_THROW); + xGraphicProvider.set(graphic::GraphicProvider::create(xContext), uno::UNO_SET_THROW); auto aMediaProperties(comphelper::InitPropertySequence({ { "URL", uno::makeAny(aGraphicURL) }, @@ -198,7 +198,7 @@ void XGraphicTest::testGraphicProvider() { // Load lazy and as link uno::Reference<uno::XComponentContext> xContext(comphelper::getProcessComponentContext()); uno::Reference<graphic::XGraphicProvider> xGraphicProvider; - xGraphicProvider.set(graphic::GraphicProvider::create(xContext), uno::UNO_QUERY_THROW); + xGraphicProvider.set(graphic::GraphicProvider::create(xContext), uno::UNO_SET_THROW); auto aMediaProperties(comphelper::InitPropertySequence({ { "URL", uno::makeAny(aGraphicURL) }, diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 7f7fc3a9ef7d..bd17f377043d 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -636,7 +636,7 @@ void Dialog::dispose() css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); - css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_SET_THROW); css::document::DocumentEvent aObject; aObject.EventName = "DialogClosed"; xEventBroadcaster->documentEventOccured(aObject); @@ -971,7 +971,7 @@ bool Dialog::ImplStartExecute() if (bModal) pSVData->maAppData.mnModalMode++; - css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_SET_THROW); css::document::DocumentEvent aObject; aObject.EventName = "DialogExecute"; xEventBroadcaster->documentEventOccured(aObject); @@ -1561,7 +1561,7 @@ void Dialog::Activate() { css::uno::Reference< css::uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); - css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::frame::XGlobalEventBroadcaster> xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), css::uno::UNO_SET_THROW); css::document::DocumentEvent aObject; aObject.EventName = "ModelessDialogVisible"; xEventBroadcaster->documentEventOccured(aObject); |