summaryrefslogtreecommitdiffstats
path: root/desktop
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 /desktop
parentHandle *link return value in sfx2 test (diff)
downloadcore-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 'desktop')
-rw-r--r--desktop/source/app/dispatchwatcher.cxx2
-rw-r--r--desktop/source/app/opencl.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx2
-rw-r--r--desktop/source/migration/migration.cxx4
5 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 5393b07e130d..37fe079d18dc 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -114,7 +114,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const OUString&
std::shared_ptr<const SfxFilter> pBestMatch;
const Reference< XEnumeration > xFilterEnum(
- xFilterFactory->createSubSetEnumerationByQuery( sQuery.makeStringAndClear() ), UNO_QUERY_THROW );
+ xFilterFactory->createSubSetEnumerationByQuery( sQuery.makeStringAndClear() ), UNO_SET_THROW );
while ( xFilterEnum->hasMoreElements() )
{
comphelper::SequenceAsHashMap aFilterProps( xFilterEnum->nextElement() );
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index a728ba2b8b7d..92d720eeae9f 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -133,7 +133,7 @@ static bool testOpenCLCompute(const Reference< XDesktop2 > &xDesktop, const OUSt
// What an unpleasant API to use.
css::uno::Reference< css::sheet::XCalculatable > xCalculatable( xComponent, css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::sheet::XSpreadsheetDocument > xSpreadDoc( xComponent, css::uno::UNO_QUERY_THROW );
- css::uno::Reference< css::sheet::XSpreadsheets > xSheets( xSpreadDoc->getSheets(), css::uno::UNO_QUERY_THROW );
+ css::uno::Reference< css::sheet::XSpreadsheets > xSheets( xSpreadDoc->getSheets(), css::uno::UNO_SET_THROW );
css::uno::Reference< css::container::XIndexAccess > xIndex( xSheets, css::uno::UNO_QUERY_THROW );
css::uno::Reference< css::sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), css::uno::UNO_QUERY_THROW);
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 96a9a0881d39..2693d44836ce 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -97,7 +97,7 @@ TheExtensionManager::TheExtensionManager( const uno::Reference< awt::XWindow > &
{
// the registration should be done after the construction has been ended
// otherwise an exception prevents object creation, but it is registered as a listener
- m_xDesktop.set( frame::Desktop::create(xContext), uno::UNO_QUERY_THROW );
+ m_xDesktop.set( frame::Desktop::create(xContext), uno::UNO_SET_THROW );
m_xDesktop->addTerminateListener( this );
}
}
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 22d4931080b2..7167d2d1748a 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1110,7 +1110,7 @@ void extractComponentData(
css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
keys(registry->openKeys());
css::uno::Reference< css::lang::XMultiComponentFactory > smgr(
- context->getServiceManager(), css::uno::UNO_QUERY_THROW);
+ context->getServiceManager(), css::uno::UNO_SET_THROW);
for (sal_Int32 i = 0; i < keys.getLength(); ++i) {
OUString name(keys[i]->getKeyName().copy(prefix));
data->implementationNames.push_back(name);
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 4bccdfa46d3f..d3df7559998e 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -348,7 +348,7 @@ static void insertSorted(migrations_available& rAvailableMigrations, supported_m
void MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigrations)
{
// get supported version names
- uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW);
+ uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_SET_THROW);
uno::Sequence< OUString > seqSupportedVersions = aMigrationAccess->getElementNames();
const OUString aVersionIdentifiers( "VersionIdentifiers" );
@@ -374,7 +374,7 @@ void MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr
migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName)
{
// get migration access
- uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW);
+ uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_SET_THROW);
uno::Reference< XNameAccess > xMigrationData( aMigrationAccess->getByName(rMigrationName), uno::UNO_QUERY_THROW );
// get migration description from org.openoffice.Setup/Migration