diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 11:39:07 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-19 10:48:30 +0000 |
| commit | 39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch) | |
| tree | ac4b224a66a18429cd4722a61ee3d401f8e9951c /pyuno | |
| parent | 5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff) | |
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms
Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b
Reviewed-on: https://gerrit.libreoffice.org/2835
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_module.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index eb9667f10427..07d0cc6dff73 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -113,7 +113,7 @@ OUString getImplementationName() Sequence< OUString > getSupportedServiceNames() { - OUString serviceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.Python" ) ); + OUString serviceName( "com.sun.star.loader.Python" ); return Sequence< OUString > ( &serviceName, 1 ); } @@ -171,7 +171,7 @@ static void prependPythonPath( const OUString & pythonPathBootstrap ) if( oldEnv ) bufPYTHONPATH.append( rtl::OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) ); - rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("PYTHONPATH")); + rtl::OUString envVar("PYTHONPATH"); rtl::OUString envValue(bufPYTHONPATH.makeStringAndClear()); osl_setEnvironment(envVar.pData, envValue.pData); } @@ -203,10 +203,10 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c #ifdef WNT //extend PATH under windows to include the branddir/program so ssl libs will be found //for use by terminal mailmerge dependency _ssl.pyd - rtl::OUString sEnvName(RTL_CONSTASCII_USTRINGPARAM("PATH")); + rtl::OUString sEnvName("PATH"); rtl::OUString sPath; osl_getEnvironment(sEnvName.pData, &sPath.pData); - rtl::OUString sBrandLocation(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")); + rtl::OUString sBrandLocation("$BRAND_BASE_DIR/program"); rtl::Bootstrap::expandMacros(sBrandLocation); osl::FileBase::getSystemPathFromFileURL(sBrandLocation, sBrandLocation); sPath = rtl::OUStringBuffer(sPath). diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index de051b2727f7..b709c13a63ca 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -225,7 +225,7 @@ OUString getLibDir() reinterpret_cast< oslGenericFunction >(getLibDir), libDir ) ) { libDir = OUString( libDir.getStr(), libDir.lastIndexOf('/' ) ); - OUString name ( RTL_CONSTASCII_USTRINGPARAM( "PYUNOLIBDIR" ) ); + OUString name ( "PYUNOLIBDIR" ); rtl_bootstrap_set( name.pData, libDir.pData ); } pLibDir = &libDir; |