diff options
| author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 09:10:56 +0100 |
|---|---|---|
| committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 09:10:56 +0100 |
| commit | 7ccc9aaef5c992f7baa7b0c547e3f3a2c06056fe (patch) | |
| tree | 3b6b1e202e7ace21d826587664284d0ec99406ad /odk/examples/cpp/counter/countermain.cxx | |
| parent | 6fdcddfa77a32f324e5b67d3bf71d54cf88f7a54 (diff) | |
RTL_CONSTASCII_USTRINGPARAM in sdk 1
Diffstat (limited to 'odk/examples/cpp/counter/countermain.cxx')
| -rw-r--r-- | odk/examples/cpp/counter/countermain.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx index 9473ff01d1ae..2a64acec106f 100644 --- a/odk/examples/cpp/counter/countermain.cxx +++ b/odk/examples/cpp/counter/countermain.cxx @@ -72,7 +72,7 @@ SAL_IMPLEMENT_MAIN() Reference< XSimpleRegistry > xReg = createSimpleRegistry(); OSL_ENSURE( xReg.is(), "### cannot get service instance of \"com.sun.star.regiystry.SimpleRegistry\"!" ); - xReg->open(OUString::createFromAscii("counter.uno.rdb"), sal_False, sal_False); + xReg->open(OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.rdb")), sal_False, sal_False); OSL_ENSURE( xReg->isValid(), "### cannot open test registry \"counter.uno.rdb\"!" ); Reference< XComponentContext > xContext = bootstrap_InitialComponentContext(xReg); @@ -83,21 +83,21 @@ SAL_IMPLEMENT_MAIN() // register my counter component Reference< XImplementationRegistration > xImplReg( - xMgr->createInstanceWithContext(OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration"), xContext), UNO_QUERY); + xMgr->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")), xContext), UNO_QUERY); OSL_ENSURE( xImplReg.is(), "### cannot get service instance of \"com.sun.star.registry.ImplementationRegistration\"!" ); if (xImplReg.is()) { xImplReg->registerImplementation( - OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), // loader for component + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), // loader for component #ifdef UNX #ifdef MACOSX - OUString::createFromAscii("counter.uno.dylib"), // component location + OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.dylib")), // component location #else - OUString::createFromAscii("counter.uno.so"), // component location + OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.so")), // component location #endif #else - OUString::createFromAscii("counter.uno.dll"), // component location + OUString(RTL_CONSTASCII_USTRINGPARAM("counter.uno.dll")), // component location #endif Reference< XSimpleRegistry >() // registry omitted, // defaulting to service manager registry used @@ -105,7 +105,7 @@ SAL_IMPLEMENT_MAIN() // get a counter instance Reference< XInterface > xx ; - xx = xMgr->createInstanceWithContext(OUString::createFromAscii("foo.Counter"), xContext); + xx = xMgr->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("foo.Counter")), xContext); Reference< XCountable > xCount( xx, UNO_QUERY ); OSL_ENSURE( xCount.is(), "### cannot get service instance of \"foo.Counter\"!" ); |