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 /cui | |
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 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 6 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/SignatureLineDialog.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index d5b38b0f8625..78351cdd187c 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1334,7 +1334,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void if (xCfgMgr.is()) { // open the configuration and update our UI - uno::Reference<ui::XAcceleratorConfiguration> xTempAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_QUERY_THROW); + uno::Reference<ui::XAcceleratorConfiguration> xTempAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_SET_THROW); m_xEntriesBox->freeze(); ResetConfig(); @@ -1395,7 +1395,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void uno::Reference<embed::XStorage> xUIConfig( xRootStorage->openStorageElement(FOLDERNAME_UICONFIG, embed::ElementModes::WRITE), - uno::UNO_QUERY_THROW); + uno::UNO_SET_THROW); uno::Reference<beans::XPropertySet> xUIConfigProps( xUIConfig, uno::UNO_QUERY_THROW); @@ -1413,7 +1413,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void // which are set currently at the UI! // Don't copy the m_xAct content to it... because m_xAct will be updated // from the UI on pressing the button "OK" only. And inbetween it's not up to date! - uno::Reference<ui::XAcceleratorConfiguration> xTargetAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_QUERY_THROW); + uno::Reference<ui::XAcceleratorConfiguration> xTargetAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_SET_THROW); Apply(xTargetAccMgr); // commit (order is important!) diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 05c6e1fdacb6..4ae83691ae40 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1028,7 +1028,7 @@ void SvxConfigPage::Reset( const SfxItemSet* ) uno::Reference < css::ui::XUIConfigurationManager > xDocCfgMgr; uno::Reference< uno::XComponentContext > xContext( - ::comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW ); + ::comphelper::getProcessComponentContext(), uno::UNO_SET_THROW ); m_xFrame = GetFrame(); OUString aModuleId = GetFrameWithDefaultAndIdentify( m_xFrame ); diff --git a/cui/source/dialogs/SignatureLineDialog.cxx b/cui/source/dialogs/SignatureLineDialog.cxx index b5f7e846512c..16f3b22ddd4a 100644 --- a/cui/source/dialogs/SignatureLineDialog.cxx +++ b/cui/source/dialogs/SignatureLineDialog.cxx @@ -199,9 +199,9 @@ void SignatureLineDialog::Apply() xShape->setPosition(aCellPosition); Reference<XSpreadsheetView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW); - Reference<XSpreadsheet> xSheet(xView->getActiveSheet(), UNO_QUERY_THROW); + Reference<XSpreadsheet> xSheet(xView->getActiveSheet(), UNO_SET_THROW); Reference<XDrawPageSupplier> xDrawPageSupplier(xSheet, UNO_QUERY_THROW); - Reference<XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_QUERY_THROW); + Reference<XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<XShapes> xShapes(xDrawPage, UNO_QUERY_THROW); xShapes->add(xShape); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index d34b27a9b806..11ef3a8820e2 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -616,7 +616,7 @@ IMPL_LINK(SvxScriptOrgDialog, ButtonHdl, weld::Button&, rButton, void) try { Reference< provider::XScript > xScript( - mspNode->getScript( scriptURL ), UNO_QUERY_THROW ); + mspNode->getScript( scriptURL ), UNO_SET_THROW ); const Sequence< Any > args(0); Sequence< sal_Int16 > outIndex; |