summaryrefslogtreecommitdiff
path: root/sdext/source/presenter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-05-10 10:13:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-05-13 08:15:27 +0200
commita361231b1363d072d737e9b1d411b71aa9550d84 (patch)
tree08641fe2af10c1f22c7fd58e62f99b6dbe301c62 /sdext/source/presenter
parentce76026231d9536d2025a1e69f435bcbf39fe4f8 (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 'sdext/source/presenter')
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx2
-rw-r--r--sdext/source/presenter/PresenterNotesView.cxx2
-rw-r--r--sdext/source/presenter/PresenterPane.cxx2
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.cxx4
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.cxx4
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx4
-rw-r--r--sdext/source/presenter/PresenterSpritePane.cxx2
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx2
8 files changed, 11 insertions, 11 deletions
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 57dd858a2ea1..03df1dcd3797 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -141,7 +141,7 @@ PresenterHelpView::PresenterHelpView (
// Get the content window via the pane anchor.
Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW);
Reference<XConfigurationController> xCC (
- xCM->getConfigurationController(), UNO_QUERY_THROW);
+ xCM->getConfigurationController(), UNO_SET_THROW);
mxPane.set(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW);
mxWindow = mxPane->getWindow();
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index ca3e362fcc19..dcf4fa51ba73 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -79,7 +79,7 @@ PresenterNotesView::PresenterNotesView (
try
{
Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW);
- Reference<XConfigurationController> xCC (xCM->getConfigurationController(), UNO_QUERY_THROW);
+ Reference<XConfigurationController> xCC (xCM->getConfigurationController(), UNO_SET_THROW);
Reference<XPane> xPane (xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW);
mxParentWindow = xPane->getWindow();
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index e539d98b4373..91b5bcdbac3f 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -40,7 +40,7 @@ PresenterPane::PresenterPane (
maBoundingBox()
{
Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
+ mxComponentContext->getServiceManager(), UNO_SET_THROW);
mxPresenterHelper.set(
xFactory->createInstanceWithContext(
"com.sun.star.comp.Draw.PresenterHelper",
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 3bc43ebbd2cc..90ee5dec609b 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -248,7 +248,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
{
Reference<XComponentContext> xContext (mxComponentContextWeak);
Reference<lang::XMultiComponentFactory> xFactory (
- xContext->getServiceManager(), UNO_QUERY_THROW);
+ xContext->getServiceManager(), UNO_SET_THROW);
// Create a border window and canvas and store it in the pane
// container.
@@ -287,7 +287,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
pDescriptor->mbIsSprite = bIsSpritePane;
// Get the window of the frame and make that visible.
- Reference<awt::XWindow> xWindow (pDescriptor->mxBorderWindow, UNO_QUERY_THROW);
+ Reference<awt::XWindow> xWindow (pDescriptor->mxBorderWindow, UNO_SET_THROW);
xWindow->setVisible(true);
}
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 29ccb0f66c0c..5dbea9683bca 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -92,12 +92,12 @@ PresenterSlideShowView::PresenterSlideShowView (
void PresenterSlideShowView::LateInit()
{
- mxSlideShow.set( mxSlideShowController->getSlideShow(), UNO_QUERY_THROW);
+ mxSlideShow.set( mxSlideShowController->getSlideShow(), UNO_SET_THROW);
Reference<lang::XComponent> xSlideShowComponent (mxSlideShow, UNO_QUERY);
xSlideShowComponent->addEventListener(static_cast<awt::XWindowListener*>(this));
Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
+ mxComponentContext->getServiceManager(), UNO_SET_THROW);
mxPresenterHelper.set (xFactory->createInstanceWithContext(
"com.sun.star.comp.Draw.PresenterHelper",
mxComponentContext),
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 1ee15e43e993..c965ef004e32 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -276,9 +276,9 @@ PresenterSlideSorter::PresenterSlideSorter (
// Get pane and window.
Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW);
Reference<XConfigurationController> xCC (
- xCM->getConfigurationController(), UNO_QUERY_THROW);
+ xCM->getConfigurationController(), UNO_SET_THROW);
Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
+ mxComponentContext->getServiceManager(), UNO_SET_THROW);
mxPane.set(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW);
mxWindow = mxPane->getWindow();
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index d8821bfcb43a..197e2dbf5aa9 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -37,7 +37,7 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx
mpSprite(new PresenterSprite())
{
Reference<lang::XMultiComponentFactory> xFactory (
- mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
+ mxComponentContext->getServiceManager(), UNO_SET_THROW);
mxPresenterHelper.set(
xFactory->createInstanceWithContext(
"com.sun.star.comp.Draw.PresenterHelper",
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 10dfda0bcea4..5d065da4454e 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1021,7 +1021,7 @@ PresenterToolBarView::PresenterToolBarView (
try
{
Reference<XControllerManager> xCM (rxController, UNO_QUERY_THROW);
- Reference<XConfigurationController> xCC(xCM->getConfigurationController(),UNO_QUERY_THROW);
+ Reference<XConfigurationController> xCC(xCM->getConfigurationController(),UNO_SET_THROW);
mxPane.set(xCC->getResource(rxViewId->getAnchor()), UNO_QUERY_THROW);
mxWindow = mxPane->getWindow();