diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:22:44 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 09:00:26 +0000 |
| commit | 8b27d78b4afaa9c47ca0fda144c8060f2f14046b (patch) | |
| tree | 2dbddceebf0f96492adc5652697e8efce8a8ba06 /pyuno | |
| parent | fe8eba5faa59ddf9ee82f3eb009daac72a0ec846 (diff) | |
automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
Done with a perl regex:
s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms
Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec
Reviewed-on: https://gerrit.libreoffice.org/2832
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/pyuno_loader.cxx | 8 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno.cxx | 2 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_adapter.cxx | 3 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_module.cxx | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 3905360818ee..eb9667f10427 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -86,7 +86,7 @@ static PyRef getLoaderModule() throw( RuntimeException ) if( !module.is() ) { throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( "pythonloader: Couldn't load pythonloader module" ) ), + OUString( "pythonloader: Couldn't load pythonloader module" ), Reference< XInterface > () ); } return PyRef( PyModule_GetDict( module.get() )); @@ -108,7 +108,7 @@ static PyRef getObjectFromLoaderModule( const char * func ) OUString getImplementationName() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.pyuno.Loader" ) ); + return OUString( "org.openoffice.comp.pyuno.Loader" ); } Sequence< OUString > getSupportedServiceNames() @@ -189,8 +189,8 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c rtl::Bootstrap bootstrap(path); // look for pythonhome - bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONHOME") ), pythonHome ); - bootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "PYUNO_LOADER_PYTHONPATH" ) ) , pythonPath ); + bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONHOME"), pythonHome ); + bootstrap.getFrom( OUString( "PYUNO_LOADER_PYTHONPATH" ) , pythonPath ); // pythonhome+pythonpath must be set before Py_Initialize(), otherwise there appear warning on the console // sadly, there is no api for setting the pythonpath, we have to use the environment variable diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index efc1d62ba670..d42aa20589e6 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -72,7 +72,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef { OSL_ASSERT( pVal ); if (pTypeRef->eTypeClass == typelib_TypeClass_VOID) - return OUString( RTL_CONSTASCII_USTRINGPARAM("void") ); + return OUString("void"); OUStringBuffer buf( 64 ); buf.append( (sal_Unicode)'(' ); diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx index 08b76ad78a25..968f52bb9f9e 100644 --- a/pyuno/source/module/pyuno_adapter.cxx +++ b/pyuno/source/module/pyuno_adapter.cxx @@ -138,8 +138,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName ) { throw RuntimeException( (OUString( - RTL_CONSTASCII_USTRINGPARAM( - "pyuno bridge: Couldn't get reflection for method ")) + "pyuno bridge: Couldn't get reflection for method ") + functionName), Reference< XInterface > () ); } diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index f8231045bcf2..de051b2727f7 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -101,7 +101,7 @@ public: , nMembersSet (0) { if ( ! used ) - throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("pyuno._createUnoStructHelper failed to create new dictionary")), Reference< XInterface > ()); + throw RuntimeException(OUString("pyuno._createUnoStructHelper failed to create new dictionary"), Reference< XInterface > ()); } ~fillStructState() { |