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 /framework/source | |
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 'framework/source')
-rw-r--r-- | framework/source/fwe/helper/documentundoguard.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/autorecovery.cxx | 4 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx index da80a48adac9..c4aac1619b1e 100644 --- a/framework/source/fwe/helper/documentundoguard.cxx +++ b/framework/source/fwe/helper/documentundoguard.cxx @@ -174,7 +174,7 @@ namespace framework { Reference< XUndoManagerSupplier > xUndoSupplier( i_undoSupplierComponent, UNO_QUERY ); if ( xUndoSupplier.is() ) - i_data.xUndoManager.set( xUndoSupplier->getUndoManager(), UNO_QUERY_THROW ); + i_data.xUndoManager.set( xUndoSupplier->getUndoManager(), css::uno::UNO_SET_THROW ); if ( i_data.xUndoManager.is() ) i_data.pContextListener.set( new UndoManagerContextListener( i_data.xUndoManager ) ); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index da3db64cb68f..a5a0e93ee292 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1878,7 +1878,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume implts_openConfig(); // open module config on demand and cache the update access xCFG.set(officecfg::Setup::Office::Factories::get(m_xContext), - css::uno::UNO_QUERY_THROW); + css::uno::UNO_SET_THROW); /* SAFE */ { osl::MutexGuard g2(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2446,7 +2446,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame css::uno::Reference< css::document::XDocumentPropertiesSupplier > xSupplier(aNew.Document, css::uno::UNO_QUERY); if (xSupplier.is()) // optional interface! { - css::uno::Reference< css::document::XDocumentProperties > xDocProps(xSupplier->getDocumentProperties(), css::uno::UNO_QUERY_THROW); + css::uno::Reference< css::document::XDocumentProperties > xDocProps(xSupplier->getDocumentProperties(), css::uno::UNO_SET_THROW); aNew.TemplateURL = xDocProps->getTemplateURL(); } diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 80f0f6bc59df..b759e57c38f8 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1762,7 +1762,7 @@ OUString SAL_CALL XFrameImpl::getTitle() // SAFE -> SolarMutexClearableGuard aReadLock; - css::uno::Reference< css::frame::XTitle > xTitle(m_xTitleHelper, css::uno::UNO_QUERY_THROW); + css::uno::Reference< css::frame::XTitle > xTitle(m_xTitleHelper, css::uno::UNO_SET_THROW); aReadLock.clear(); // <- SAFE @@ -1775,7 +1775,7 @@ void SAL_CALL XFrameImpl::setTitle( const OUString& sTitle ) // SAFE -> SolarMutexClearableGuard aReadLock; - css::uno::Reference< css::frame::XTitle > xTitle(m_xTitleHelper, css::uno::UNO_QUERY_THROW); + css::uno::Reference< css::frame::XTitle > xTitle(m_xTitleHelper, css::uno::UNO_SET_THROW); aReadLock.clear(); // <- SAFE |