diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-03-31 20:41:33 +0200 |
|---|---|---|
| committer | Christina Roßmanith <ChrRossmanith@web.de> | 2013-04-02 20:25:44 +0000 |
| commit | 7dac241ca0dd0e8c53c246d8490e954d5b594862 (patch) | |
| tree | 9a5e51a4dc4863d7db12ca48e4c52a97a02c2033 /bridges/test | |
| parent | 43d426aca1f5ef699db9efe8e370677be85165e5 (diff) | |
Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges
Change-Id: Id8777ee7f587846399e95cf3b1b37d669a76bae5
Reviewed-on: https://gerrit.libreoffice.org/3139
Reviewed-by: Christina Roßmanith <ChrRossmanith@web.de>
Tested-by: Christina Roßmanith <ChrRossmanith@web.de>
Diffstat (limited to 'bridges/test')
| -rw-r--r-- | bridges/test/java_uno/any/transport.cxx | 4 | ||||
| -rw-r--r-- | bridges/test/testclient.cxx | 6 | ||||
| -rw-r--r-- | bridges/test/testoffice.cxx | 6 | ||||
| -rw-r--r-- | bridges/test/testsameprocess.cxx | 8 | ||||
| -rw-r--r-- | bridges/test/testserver.cxx | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx index dbf900ad6d82..fda624987eca 100644 --- a/bridges/test/java_uno/any/transport.cxx +++ b/bridges/test/java_uno/any/transport.cxx @@ -77,8 +77,8 @@ extern "C" JNIEXPORT jobject JNICALL Java_test_java_1uno_anytest_TestJni_create_ throw; } // create uno envs - OUString java_name( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_JAVA) ); - OUString cpp_name( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ); + OUString java_name( UNO_LB_JAVA ); + OUString cpp_name( CPPU_CURRENT_LANGUAGE_BINDING_NAME ); Environment java_env, cpp_env; uno_getEnvironment( (uno_Environment **)&java_env, java_name.pData, vm.get() ); OSL_ASSERT( java_env.is() ); diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx index 052f598ba5e2..52f70bff08f9 100644 --- a/bridges/test/testclient.cxx +++ b/bridges/test/testclient.cxx @@ -132,7 +132,7 @@ int main( int argc, char *argv[] ) Reference < XConnector > rConnector( createComponent( OUString("com.sun.star.connection.Connector"), - OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)), + OUString( "connector.uno" SAL_DLLEXTENSION), rSMgr ), UNO_QUERY ); @@ -155,12 +155,12 @@ int main( int argc, char *argv[] ) { // just ensure that it is registered createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), - OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)), + OUString( "remotebridge.uno" SAL_DLLEXTENSION), rSMgr ); Reference < XBridgeFactory > rFactory( createComponent( OUString("com.sun.star.bridge.BridgeFactory"), - OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)), + OUString( "bridgefac.uno" SAL_DLLEXTENSION), rSMgr ), UNO_QUERY ); diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx index 3f9157d01c3b..8c18fbf25a6d 100644 --- a/bridges/test/testoffice.cxx +++ b/bridges/test/testoffice.cxx @@ -209,17 +209,17 @@ int main( int argc, char *argv[] ) Reference < XConnector > rConnector( createComponent( OUString("com.sun.star.connection.Connector"), - OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)), + OUString( "connector.uno" SAL_DLLEXTENSION), rSMgr ), UNO_QUERY ); createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), - OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)), + OUString( "remotebridge.uno" SAL_DLLEXTENSION), rSMgr ); Reference < XBridgeFactory > rFactory( createComponent( OUString("com.sun.star.bridge.BridgeFactory"), - OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)), + OUString( "bridgefac.uno" SAL_DLLEXTENSION), rSMgr ), UNO_QUERY ); diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx index 00d399b25400..675ec857e08e 100644 --- a/bridges/test/testsameprocess.cxx +++ b/bridges/test/testsameprocess.cxx @@ -123,24 +123,24 @@ int main( int argc, char *argv[] ) Reference < XConnector > rConnector( createComponent( OUString("com.sun.star.connection.Connector"), - OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)), + OUString( "connector.uno" SAL_DLLEXTENSION), rSMgr ), UNO_QUERY ); Reference < XAcceptor > rAcceptor( createComponent( OUString("com.sun.star.connection.Acceptor"), - OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)), + OUString( "acceptor.uno" SAL_DLLEXTENSION), rSMgr ), UNO_QUERY ); // just ensure that it is registered // createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), -// OUString( RTL_CONSTASCII_USTRINGPARAM("iiopbrdg" SAL_DLLEXTENSION)), +// OUString( "iiopbrdg" SAL_DLLEXTENSION), // rSMgr ); Reference < XBridgeFactory > rFactory( createComponent( OUString("com.sun.star.bridge.BridgeFactory"), - OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)), + OUString( "bridgefac.uno" SAL_DLLEXTENSION), rSMgr ), UNO_QUERY ); diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx index 4617b2350739..8aefdfd909b1 100644 --- a/bridges/test/testserver.cxx +++ b/bridges/test/testserver.cxx @@ -194,19 +194,19 @@ int main( int argc, char *argv[] ) Reference < XBridgeFactory > rBridgeFactory ( createComponent( OUString("com.sun.star.bridge.BridgeFactory"), - OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION )), + OUString( "bridgefac.uno" SAL_DLLEXTENSION ), rSMgr ), UNO_QUERY ); createComponent( OUString("com.sun.star.bridge.Bridge.iiop"), - OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)), + OUString( "remotebridge.uno" SAL_DLLEXTENSION), rSMgr ); Reference < XAcceptor > rAcceptor( createComponent( OUString("com.sun.star.connection.Acceptor"), - OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)), + OUString( "acceptor.uno" SAL_DLLEXTENSION), rSMgr ) , UNO_QUERY ); |