summaryrefslogtreecommitdiffstats
path: root/extensions
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 /extensions
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 'extensions')
-rw-r--r--extensions/source/logging/loggerconfig.cxx2
-rw-r--r--extensions/source/logging/loghandler.cxx8
-rw-r--r--extensions/source/propctrlr/browserline.cxx4
-rw-r--r--extensions/source/propctrlr/defaulthelpprovider.cxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx6
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.cxx6
-rw-r--r--extensions/source/update/check/updatehdl.cxx6
9 files changed, 19 insertions, 19 deletions
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index fe4e5b315446..b6cdfa1d0c01 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -244,7 +244,7 @@ namespace logging
{
// no node yet for this logger. Create default settings.
Reference< XSingleServiceFactory > xNodeFactory( xAllSettings, UNO_QUERY_THROW );
- Reference< XInterface > xLoggerSettings( xNodeFactory->createInstance(), UNO_QUERY_THROW );
+ Reference< XInterface > xLoggerSettings( xNodeFactory->createInstance(), css::uno::UNO_SET_THROW );
xAllSettings->insertByName( sLoggerName, makeAny( xLoggerSettings ) );
Reference< XChangesBatch > xChanges( xAllSettings, UNO_QUERY_THROW );
xChanges->commitChanges();
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index d2a49e24a0ab..e52a807db24f 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -85,7 +85,7 @@ namespace logging
{
try
{
- Reference< XLogFormatter > xFormatter( PlainTextFormatter::create( m_xContext ), UNO_QUERY_THROW );
+ Reference< XLogFormatter > xFormatter( PlainTextFormatter::create( m_xContext ), css::uno::UNO_SET_THROW );
setFormatter( xFormatter );
}
catch( const Exception& )
@@ -130,7 +130,7 @@ namespace logging
try
{
- Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW );
+ Reference< XLogFormatter > xFormatter( getFormatter(), css::uno::UNO_SET_THROW );
OUString sEntry( xFormatter->format( _rRecord ) );
_out_rEntry = OUStringToOString( sEntry, getTextEncoding() );
return true;
@@ -147,7 +147,7 @@ namespace logging
{
try
{
- Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW );
+ Reference< XLogFormatter > xFormatter( getFormatter(), css::uno::UNO_SET_THROW );
OUString sHead( xFormatter->getHead() );
_out_rHead = OUStringToOString( sHead, getTextEncoding() );
return true;
@@ -164,7 +164,7 @@ namespace logging
{
try
{
- Reference< XLogFormatter > xFormatter( getFormatter(), UNO_QUERY_THROW );
+ Reference< XLogFormatter > xFormatter( getFormatter(), css::uno::UNO_SET_THROW );
OUString sTail( xFormatter->getTail() );
_out_rTail = OUStringToOString( sTail, getTextEncoding() );
return true;
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index da973f3626d8..4c18b30ec708 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -401,7 +401,7 @@ namespace pcr
aMediaProperties[0].Name = "URL";
aMediaProperties[0].Value <<= _rImageURL;
- Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW );
+ Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), css::uno::UNO_SET_THROW );
aImage = Image( xGraphic );
}
catch( const Exception& )
@@ -471,7 +471,7 @@ namespace pcr
{
try
{
- Reference< XPropertyControlContext > xContext( m_xControl->getControlContext(), UNO_QUERY_THROW );
+ Reference< XPropertyControlContext > xContext( m_xControl->getControlContext(), css::uno::UNO_SET_THROW );
xContext->focusGained( m_xControl );
}
catch( const Exception& )
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index c4c49c769839..4f4a4b0b9cbf 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -153,7 +153,7 @@ namespace pcr
try
{
- Reference< XWindow > xControlWindow( _rxControl->getControlWindow(), UNO_QUERY_THROW );
+ Reference< XWindow > xControlWindow( _rxControl->getControlWindow(), css::uno::UNO_SET_THROW );
pControlWindow = VCLUnoHelper::GetWindow( xControlWindow ).get();
}
catch( const Exception& )
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 65191db05240..9d414a4be13a 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -287,7 +287,7 @@ namespace pcr
OSL_PRECOND( _rxIntrospection.is(), "lcl_addListenerTypesFor_throw: this will crash!" );
Reference< XIntrospectionAccess > xIntrospectionAccess(
- _rxIntrospection->inspect( makeAny( _rxComponent ) ), UNO_QUERY_THROW );
+ _rxIntrospection->inspect( makeAny( _rxComponent ) ), UNO_SET_THROW );
Sequence< Type > aListeners( xIntrospectionAccess->getSupportedListeners() );
@@ -952,7 +952,7 @@ namespace pcr
try
{
Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW );
- Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
+ Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_SET_THROW );
Sequence< OUString > aEventNames( xEvents->getElementNames() );
sal_Int32 nEventCount = aEventNames.getLength();
@@ -1077,7 +1077,7 @@ namespace pcr
bool bResetScript = sScriptCode.isEmpty();
Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW );
- Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
+ Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_SET_THROW );
OUStringBuffer aCompleteName;
aCompleteName.append( _rScriptEvent.ListenerType );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 8411260afc5b..d7b4e835a7a2 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -3173,7 +3173,7 @@ namespace pcr
if ( !impl_ensureRowsetConnection_nothrow() )
return false;
- Reference< XPropertySet > xComponentProperties( m_xComponent, UNO_QUERY_THROW );
+ Reference< XPropertySet > xComponentProperties( m_xComponent, UNO_SET_THROW );
::rtl::Reference< ISQLCommandPropertyUI > xCommandUI;
switch ( _nDesignForProperty )
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index a220b164493d..7e91a0b79d51 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -243,7 +243,7 @@ namespace pcr
xTransformer->parseStrict( aURL );
Reference< XDesktop2 > xDispProv = Desktop::create( m_xContext );
- Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, OUString(), 0 ), UNO_QUERY_THROW );
+ Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aURL, OUString(), 0 ), UNO_SET_THROW );
Sequence< PropertyValue > aDispatchArgs(1);
aDispatchArgs[0].Name = "URL";
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 62aba8359442..0158e92160f7 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -195,8 +195,8 @@ namespace pcr
try
{
// activate the frame for this component
- Reference< XFrame > xFrame( m_xDesigner->getFrame(), UNO_QUERY_THROW );
- Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW );
+ Reference< XFrame > xFrame( m_xDesigner->getFrame(), css::uno::UNO_SET_THROW );
+ Reference< XWindow > xWindow( xFrame->getContainerWindow(), css::uno::UNO_SET_THROW );
Reference< XTopWindow > xTopWindow( xWindow, UNO_QUERY_THROW );
xTopWindow->toFront();
@@ -283,7 +283,7 @@ namespace pcr
{
Reference< XDesktop2 > xDesktop = Desktop::create(m_xContext);
- Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), UNO_QUERY_THROW );
+ Reference< XFrames > xDesktopFramesCollection( xDesktop->getFrames(), css::uno::UNO_SET_THROW );
xFrame = xDesktop->findFrame( "_blank", FrameSearchFlag::CREATE );
OSL_ENSURE( xFrame.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: could not create an empty frame!" );
xDesktopFramesCollection->remove( xFrame );
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index dfe09b68644b..a54dd15cbadd 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -702,8 +702,8 @@ void UpdateHandler::setControlProperty( const OUString &rCtrlName,
if ( !mxUpdDlg.is() ) return;
uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY );
- uno::Reference< awt::XControl > xControl( xContainer->getControl( rCtrlName ), uno::UNO_QUERY_THROW );
- uno::Reference< awt::XControlModel > xControlModel( xControl->getModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< awt::XControl > xControl( xContainer->getControl( rCtrlName ), uno::UNO_SET_THROW );
+ uno::Reference< awt::XControlModel > xControlModel( xControl->getModel(), uno::UNO_SET_THROW );
uno::Reference< beans::XPropertySet > xPropSet( xControlModel, uno::UNO_QUERY_THROW );
try {
@@ -1020,7 +1020,7 @@ void UpdateHandler::createDialog()
loadStrings();
- uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
+ uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW );
uno::Reference< awt::XControlModel > xControlModel( xFactory->createInstanceWithContext(
"com.sun.star.awt.UnoControlDialogModel",
mxContext), uno::UNO_QUERY_THROW );