From e7bc3cab019fbf040f9fb8b53ae2cf3f977d200b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 23 May 2014 12:03:21 +0200 Subject: remove boilerplate in UNO Exception constructor calls Now that we have default values for Exception constructor params, remove lots of boilerplate code. Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74 --- uui/source/iahndl-authentication.cxx | 6 ++---- uui/source/iahndl-errorhandler.cxx | 3 +-- uui/source/iahndl-filter.cxx | 4 +--- uui/source/iahndl-locking.cxx | 9 +++------ uui/source/iahndl-ssl.cxx | 8 ++------ uui/source/iahndl.cxx | 16 ++++++---------- 6 files changed, 15 insertions(+), 31 deletions(-) (limited to 'uui/source') diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 006cdf066924..b39eee4798f0 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -125,8 +125,7 @@ executeLoginDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException("out of memory", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } } @@ -438,8 +437,7 @@ executeMasterPasswordDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException("out of memory", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } sal_uInt8 aKey[RTL_DIGEST_LENGTH_MD5]; diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 97d608a53284..85f552b4b239 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -98,8 +98,7 @@ executeErrorDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException("out of memory", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } sal_uInt16 aResult = xBox->Execute(); diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 7c9854d90754..cfa692135538 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -73,9 +73,7 @@ executeFilterDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException( - OUString("out of memory"), - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } } diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index 46e9c0b5ccba..9a877f95fa5f 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -140,8 +140,7 @@ handleLockedDocumentRequest_( } catch (std::bad_alloc const &) { - throw uno::RuntimeException("out of memory", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } } @@ -177,8 +176,7 @@ handleChangedByOthersRequest_( } catch (std::bad_alloc const &) { - throw uno::RuntimeException("out of memory", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } } @@ -214,8 +212,7 @@ handleLockFileIgnoreRequest_( } catch (std::bad_alloc const &) { - throw uno::RuntimeException("out of memory", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } } diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index 774ae967bfa5..e8403813b554 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -172,9 +172,7 @@ executeUnknownAuthDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException( - OUString("out of memory"), - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } } @@ -244,9 +242,7 @@ executeSSLWarnDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException( - OUString("out of memory"), - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } } diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 09970d9aaf56..24225fad37e9 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -918,8 +918,7 @@ UUIInteractionHelper::handleRequest_impl( } catch (std::bad_alloc const &) { - throw uno::RuntimeException("out of memory", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("out of memory"); } catch( const uno::RuntimeException& ) { @@ -957,15 +956,13 @@ UUIInteractionHelper::getInteractionHandlerList( "com.sun.star.configuration.ConfigurationAccess" , aArguments ) ); if ( !xInterface.is() ) - throw uno::RuntimeException("unable to instanciate config access", - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException("unable to instanciate config access"); uno::Reference< container::XNameAccess > xNameAccess( xInterface, uno::UNO_QUERY ); if ( !xNameAccess.is() ) - throw uno::RuntimeException(OUString( - "config access does not implement XNameAccess"), - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException( + "config access does not implement XNameAccess"); uno::Sequence< OUString > aElems = xNameAccess->getElementNames(); const OUString* pElems = aElems.getConstArray(); @@ -977,9 +974,8 @@ UUIInteractionHelper::getInteractionHandlerList( xHierNameAccess( xInterface, uno::UNO_QUERY ); if ( !xHierNameAccess.is() ) - throw uno::RuntimeException(OUString( - "config access does not implement XHierarchicalNameAccess"), - uno::Reference< uno::XInterface >()); + throw uno::RuntimeException( + "config access does not implement XHierarchicalNameAccess"); // Iterate over children. for ( sal_Int32 n = 0; n < nCount; ++n ) -- cgit +backports LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/scp2/source/python/module_python_librelogo.scp
nn
AgeCommit message (Collapse)Author
2018-05-14MSI: do not install LibreLogo by defaultAndras Timar
Change-Id: Ibde24b2045497aca4ea37845fc42c327d22d3d42
2015-02-28scp2: move python librelogo packages to AutoInstallMichael Stahl
Change-Id: Ib70d1510bac2eb6bd5491f3177191ad5a8aebe2d
2015-02-08scp2: 'Minimal' key is unused, let's remove it from everywhereAndras Timar
Change-Id: I2c0d9c6870c52de85e288f4f70bc4d7c492e9987 Reviewed-on: https://gerrit.libreoffice.org/14361 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Change-Id: Ibcbb5b002e8326c484547a825cb295d0f5158a3b