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 /cpputools | |
| 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 'cpputools')
| -rw-r--r-- | cpputools/source/unoexe/unoexe.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 7f3361a1bc5f..0aed44a083df 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -270,13 +270,13 @@ static Reference< XInterface > loadComponent( aExt.compareToAscii( "so" ) == 0) { createInstance( - xLoader, xContext, OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary") ) ); + xLoader, xContext, OUString("com.sun.star.loader.SharedLibrary") ); } else if (aExt.compareToAscii( "jar" ) == 0 || aExt.compareToAscii( "class" ) == 0) { createInstance( - xLoader, xContext, OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.Java") ) ); + xLoader, xContext, OUString("com.sun.star.loader.Java") ); } else { @@ -533,7 +533,7 @@ SAL_IMPLEMENT_MAIN() } if (!(aImplName.isEmpty() || aServiceName.isEmpty())) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("give component exOR service name!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString("give component exOR service name!" ), Reference< XInterface >() ); if (aImplName.isEmpty() && aServiceName.isEmpty()) { if (! aUnoUrl.endsWithIgnoreAsciiCaseAsciiL( @@ -545,12 +545,12 @@ SAL_IMPLEMENT_MAIN() Reference<XInterface>() ); if (bSingleInstance) throw RuntimeException( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "unexpected option --singleinstance!") ), + OUString( + "unexpected option --singleinstance!"), Reference<XInterface>() ); } if (!aImplName.isEmpty() && aLocation.isEmpty()) - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("give component location!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString("give component location!" ), Reference< XInterface >() ); if (!aServiceName.isEmpty() && !aLocation.isEmpty()) out( "\n> warning: service name given, will ignore location!" ); @@ -573,9 +573,9 @@ SAL_IMPLEMENT_MAIN() sal_Int32 nIndex = 0, nTokens = 0; do { aUnoUrl.getToken( 0, ';', nIndex ); nTokens++; } while( nIndex != -1 ); if (nTokens != 3 || aUnoUrl.getLength() < 10 || - !aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("uno:") ) )) + !aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( OUString("uno:") )) { - throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal uno url given!" ) ), Reference< XInterface >() ); + throw RuntimeException( OUString("illegal uno url given!" ), Reference< XInterface >() ); } nIndex = 0; OUString aConnectDescr( aUnoUrl.getToken( 0, ';', nIndex ).copy( 4 ) ); // uno:CONNECTDESCR;iiop;InstanceName @@ -584,7 +584,7 @@ SAL_IMPLEMENT_MAIN() Reference< XAcceptor > xAcceptor; createInstance( xAcceptor, xContext, - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.connection.Acceptor") ) ); + OUString("com.sun.star.connection.Acceptor") ); // init params Sequence< Any > aInitParams( aParams.getLength() ); @@ -614,7 +614,7 @@ SAL_IMPLEMENT_MAIN() Reference< XBridgeFactory > xBridgeFactory; createInstance( xBridgeFactory, xContext, - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.BridgeFactory") ) ); + OUString("com.sun.star.bridge.BridgeFactory") ); // bridge Reference< XBridge > xBridge( xBridgeFactory->createBridge( |