diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 09:28:39 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 09:28:39 +0100 |
commit | 1d922012beecb3e94a1bbe521010d92486102d6c (patch) | |
tree | 841a990632293e7c0704e8575bef6ea00dc25077 /odk/examples/cpp | |
parent | 7ccc9aaef5c992f7baa7b0c547e3f3a2c06056fe (diff) |
RTL_CONSTASCII_USTRINGPARAM in sdk 2
Notes
Notes:
split repo tag: sdk_LIBREOFFICE_PRE_BOOTSTRAP_BUILD
Diffstat (limited to 'odk/examples/cpp')
4 files changed, 7 insertions, 7 deletions
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx index b620edf5829e..73934563ad55 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx @@ -131,7 +131,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: ::rtl::OUString SAL_CALL MyListener::getImplementationName() throw (css::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii(MYLISTENER_IMPLEMENTATIONNAME); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME)); } /*----------------------------------------------------- @@ -141,7 +141,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNa throw (css::uno::RuntimeException) { css::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii(MYLISTENER_SERVICENAME); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_SERVICENAME)); return lNames; } diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 52fb110af2f7..8bec59245220 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -206,7 +206,7 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches( ::rtl::OUString MyProtocolHandler_getImplementationName () throw (RuntimeException) { - return ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME)); } sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName ) @@ -222,7 +222,7 @@ Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( throw (RuntimeException) { Sequence < ::rtl::OUString > aRet(1); - aRet[0] = ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_SERVICENAME); + aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME)); return aRet; } diff --git a/odk/examples/cpp/complextoolbarcontrols/exports.cxx b/odk/examples/cpp/complextoolbarcontrols/exports.cxx index 1a850cfd7458..34e54f5fc3e8 100644 --- a/odk/examples/cpp/complextoolbarcontrols/exports.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/exports.cxx @@ -100,14 +100,14 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplNa if (sImplName.equalsAscii(MYLISTENER_IMPLEMENTATIONNAME)) { css::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii(MYLISTENER_IMPLEMENTATIONNAME); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYLISTENER_IMPLEMENTATIONNAME)); xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyListener::st_createInstance, lNames); } else if (sImplName.equalsAscii(MYPROTOCOLHANDLER_IMPLEMENTATIONNAME)) { css::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii(MYPROTOCOLHANDLER_SERVICENAME); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MYPROTOCOLHANDLER_SERVICENAME)); xFactory = ::cppu::createSingleFactory(xSMGR, sImplName, MyProtocolHandler_createInstance, lNames); } diff --git a/odk/examples/cpp/remoteclient/remoteclient.cxx b/odk/examples/cpp/remoteclient/remoteclient.cxx index 2e114d57c001..90863b4c78d8 100644 --- a/odk/examples/cpp/remoteclient/remoteclient.cxx +++ b/odk/examples/cpp/remoteclient/remoteclient.cxx @@ -243,7 +243,7 @@ sal_Bool SAL_CALL component_writeInfo( { Reference< XRegistryKey > xNewKey( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) ); const Sequence< OUString > & rSNL = getSupportedServiceNames(); const OUString * pArray = rSNL.getConstArray(); |