diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-06-29 21:24:12 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-06-29 21:52:54 +0000 |
commit | ba0a57702cdef7a0389c06841711d7e3079d471c (patch) | |
tree | 223c0dd50de4b71cf7df9d0073f7cacca1f18c8d /uui | |
parent | 8a7ede404ca4980f169c4ce634805ea5c1b6b56e (diff) |
remove OUString wrap for string literals
For some functions and all kinds of Exceptions.
CannotConvertException
CloseVetoException
DisposedException
EmptyUndoStackException
ErrorCodeIOException
Exception
GridInvalidDataException
GridInvalidModelException
IOException
IllegalAccessException
IllegalArgumentException
IllegalTypeException
IndexOutOfBoundsException
NoMasterException
NoSuchElementException
NoSupportException
PropertyVetoException
RuntimeException
SAXException
ScannerException
StorageWrappedTargetException
UnsupportedFlavorException
VetoException
WrappedTargetException
ZipIOException
throwGenericSQLException
throwIllegallArgumentException
createInstance
createInstanceWithContext
forName
getByName
getPackageManager
getPropertyValue
getUnpackedValueOrDefault
getValueByName
hasPropertyByName
openKey
setName
setPropertyValue
supportsService
bash command:
for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx'
| cut -d ':' -f1 | sort -u
| xargs sed -i
-e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g"
-e "s/\($i.*\)\"+ /\1\" + /g";
done
Change-Id: Iaf8e641b0abf28c082906014f87a183517630535
Reviewed-on: https://gerrit.libreoffice.org/4624
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/iahndl-authentication.cxx | 6 | ||||
-rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 2 | ||||
-rw-r--r-- | uui/source/iahndl-locking.cxx | 6 | ||||
-rw-r--r-- | uui/source/iahndl.cxx | 4 | ||||
-rw-r--r-- | uui/source/interactionhandler.cxx | 2 | ||||
-rw-r--r-- | uui/source/newerverwarn.cxx | 2 | ||||
-rw-r--r-- | uui/source/requeststringresolver.cxx | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 50e4d078b111..ef1b260eb4af 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -125,7 +125,7 @@ executeLoginDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface >()); } } @@ -438,7 +438,7 @@ executeMasterPasswordDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface >()); } @@ -558,7 +558,7 @@ executePasswordDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface>()); } } diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index beedaab3ed22..3b3d0ad983cb 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -99,7 +99,7 @@ executeErrorDialog( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface >()); } diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index 291d3825fed1..c07227fcab35 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -140,7 +140,7 @@ handleLockedDocumentRequest_( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface >()); } } @@ -177,7 +177,7 @@ handleChangedByOthersRequest_( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface >()); } } @@ -214,7 +214,7 @@ handleLockFileIgnoreRequest_( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface >()); } } diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index c14784b2d50a..4557c9fdef77 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -917,7 +917,7 @@ UUIInteractionHelper::handleRequest_impl( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), + throw uno::RuntimeException("out of memory", uno::Reference< uno::XInterface >()); } catch( const uno::RuntimeException& ) @@ -956,7 +956,7 @@ UUIInteractionHelper::getInteractionHandlerList( "com.sun.star.configuration.ConfigurationAccess" , aArguments ) ); if ( !xInterface.is() ) - throw uno::RuntimeException(OUString("unable to instanciate config access"), + throw uno::RuntimeException("unable to instanciate config access", uno::Reference< uno::XInterface >()); uno::Reference< container::XNameAccess > xNameAccess( diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index a6bbb280f7a5..de0a13ca61dc 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -150,7 +150,7 @@ UUIInteractionHandler::createInstance( } catch (std::bad_alloc const &) { - throw uno::RuntimeException(OUString("out of memory"), 0); + throw uno::RuntimeException("out of memory", 0); } } diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx index 2c5022258a96..afa21bd75f0f 100644 --- a/uui/source/newerverwarn.cxx +++ b/uui/source/newerverwarn.cxx @@ -101,7 +101,7 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl) setup::UpdateCheckConfig::create(xContext); sal_Bool bUpdateCheckEnabled = sal_False; - OSL_VERIFY( xUpdateConfig->getByName( OUString( "AutoCheckEnabled" ) ) >>= bUpdateCheckEnabled ); + OSL_VERIFY( xUpdateConfig->getByName("AutoCheckEnabled") >>= bUpdateCheckEnabled ); // TODO: do we need to respect the bUpdateCheckEnabled flag? Finally, its meaning is "are automatic // updates enabled", but this here is not an automatic update, but one triggered explicitly by the user. diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index 77642f4bc957..918b1ff2cfbf 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -102,7 +102,7 @@ UUIInteractionRequestStringResolver::createInstance( } catch (std::bad_alloc const &) { - throw star::uno::RuntimeException(OUString("out of memory"), 0); + throw star::uno::RuntimeException("out of memory", 0); } } |