From ba0a57702cdef7a0389c06841711d7e3079d471c Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 29 Jun 2013 21:24:12 +0200 Subject: 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 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold --- pyuno/source/module/pyuno_module.cxx | 2 +- pyuno/source/module/pyuno_runtime.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pyuno') diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 06632c828f89..cb8fd95d2543 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -95,7 +95,7 @@ public: , nMembersSet (0) { if ( ! used ) - throw RuntimeException(OUString("pyuno._createUnoStructHelper failed to create new dictionary"), Reference< XInterface > ()); + throw RuntimeException("pyuno._createUnoStructHelper failed to create new dictionary", Reference< XInterface > ()); } ~fillStructState() { diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 96d8c15fc795..00252180764f 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -136,7 +136,7 @@ static void getRuntimeImpl( PyRef & globalDict, PyRef &runtimeImpl ) if( ! globalDict.is() ) // FATAL ! { - throw RuntimeException( OUString( "can't find __main__ module" ), Reference< XInterface > ()); + throw RuntimeException("can't find __main__ module", Reference< XInterface > ()); } runtimeImpl = PyDict_GetItemString( globalDict.get() , "pyuno_runtime" ); } @@ -272,7 +272,7 @@ PyRef stRuntimeImpl::create( const Reference< XComponentContext > &ctx ) c->xIntrospection = Introspection::create(ctx); - Any a = ctx->getValueByName(OUString( "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ); + Any a = ctx->getValueByName("/singletons/com.sun.star.reflection.theTypeDescriptionManager"); a >>= c->xTdMgr; if( ! c->xTdMgr.is() ) throw RuntimeException( @@ -302,7 +302,7 @@ void Runtime::initialize( const Reference< XComponentContext > & ctx ) if( runtime.is() && impl->cargo->valid ) { - throw RuntimeException( OUString( "pyuno runtime has already been initialized before" ), + throw RuntimeException("pyuno runtime has already been initialized before", Reference< XInterface > () ); } PyRef keep( RuntimeImpl::create( ctx ) ); @@ -362,7 +362,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const { if( ! impl->cargo->valid ) { - throw RuntimeException( OUString( "pyuno runtime must be initialized before calling any2PyObject" ), + throw RuntimeException("pyuno runtime must be initialized before calling any2PyObject", Reference< XInterface > () ); } @@ -615,7 +615,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con { if( ! impl->cargo->valid ) { - throw RuntimeException( OUString( "pyuno runtime must be initialized before calling any2PyObject" ), + throw RuntimeException("pyuno runtime must be initialized before calling any2PyObject", Reference< XInterface > () ); } -- cgit