From 1d922012beecb3e94a1bbe521010d92486102d6c Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Sat, 27 Nov 2010 09:28:39 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in sdk 2 --- .../Database/DriverSkeleton/SDatabaseMetaData.cxx | 2 +- .../FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 6 +++--- .../DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx | 4 ++-- odk/examples/cpp/complextoolbarcontrols/MyListener.cxx | 4 ++-- .../cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 4 ++-- odk/examples/cpp/complextoolbarcontrols/exports.cxx | 4 ++-- odk/examples/cpp/remoteclient/remoteclient.cxx | 2 +- unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 12 ++++++------ unodevtools/source/skeletonmaker/cpptypemaker.cxx | 4 ++-- unodevtools/source/skeletonmaker/skeletoncommon.cxx | 8 ++++---- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx index 817dea1428f5..ac21ce7ea941 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx @@ -213,7 +213,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc ::rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) { // normally this is " - ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\""); + ::rtl::OUString aVal(RTL_CONSTASCII_USTRINGPARAM("\"")); return aVal; } // ------------------------------------------------------------------------- diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx index 024dd8350427..c171e56d3145 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx @@ -303,8 +303,8 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString::createFromAscii( - "devguide.officedev.samples.filter.FlatXmlCpp"); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( + "devguide.officedev.samples.filter.FlatXmlCpp")); pNames = &seqNames; } } @@ -333,7 +333,7 @@ sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void * pRegistryKe { 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(); diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx index e24ff2de8fa1..a02b184047da 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx @@ -75,8 +75,8 @@ SAL_IMPLEMENT_MAIN() try { // resolve the uno-url - rInstance = rResolver->resolve( OUString::createFromAscii( - "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" ) ); + rInstance = rResolver->resolve( OUString(RTL_CONSTASCII_USTRINGPARAM( + "uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager" )) ); if( ! rInstance.is() ) { 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(); diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index d76af17fba09..b8af603c0212 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -536,13 +536,13 @@ void generateAddinConstructorAndHelper(std::ostream& o, " RTL_CONSTASCII_USTRINGPARAM(\n" " \"com.sun.star.configuration.ConfigurationAccess\"));\n\n"; - o << " ::rtl::OUStringBuffer sPath(::rtl::OUString::createFromAscii(\n" - " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n" + o << " ::rtl::OUStringBuffer sPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\n" + " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\")));\n" " sPath.appendAscii(sADDIN_SERVICENAME);\n" " sPath.appendAscii(\"/AddInFunctions\");\n\n" " // create arguments: nodepath\n" " css::beans::PropertyValue aArgument;\n" - " aArgument.Name = ::rtl::OUString::createFromAscii(\"nodepath\");\n" + " aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"nodepath\"));\n" " aArgument.Value <<= sPath.makeStringAndClear();\n\n" " css::uno::Sequence< css::uno::Any > aArguments(1);\n" " aArguments[0] <<= aArgument;\n\n"; @@ -557,8 +557,8 @@ void generateAddinConstructorAndHelper(std::ostream& o, o << " // extend arguments to create a view for all locales to get " "simple\n // access to the compatibilityname property\n" - " aArgument.Name = ::rtl::OUString::createFromAscii(\"locale\");\n" - " aArgument.Value <<= ::rtl::OUString::createFromAscii(\"*\");\n" + " aArgument.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"locale\"));\n" + " aArgument.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"*\"));\n" " aArguments.realloc(2);\n" " aArguments[1] <<= aArgument;\n\n" " // create view for all locales\n" @@ -582,7 +582,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, " m_xHAccess->getByHierarchicalName(\n" " buf.makeStringAndClear()), css::uno::UNO_QUERY);\n" " xPropSet->getPropertyValue(\n " - "::rtl::OUString::createFromAscii(propName)) >>= ret;\n }\n" + "::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(propName))) >>= ret;\n }\n" " catch ( css::uno::RuntimeException & e ) {\n throw e;\n }\n" " catch ( css::uno::Exception & ) {\n }\n return ret;\n"; } diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx index 15ae7ae95988..ce9f4b8d95a6 100644 --- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx +++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx @@ -420,8 +420,8 @@ void printMethods(std::ostream & o, o << "// ::com::sun::star::lang::XServiceName:\n" "::rtl::OUString SAL_CALL " << classname << "getServiceName() " "throw (css::uno::RuntimeException)\n{\n " - "return ::rtl::OUString::createFromAscii(" - "sADDIN_SERVICENAME);\n}\n"; + "return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" + "sADDIN_SERVICENAME));\n}\n"; generated.add(type); return; } else if (type.equals("com/sun/star/sheet/XAddIn")) { diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index 188e0fa05101..6452bace295c 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -669,9 +669,9 @@ void generateFunctionParamterMap(std::ostream& o, for ( sal_uInt16 p = 0; p < reader.getMethodParameterCount(m); ++p ) { if ( options.language == 2 ) { o << " fpm[" << p - << "] = ::rtl::OUString::createFromAscii(\"" + << "] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"" << codemaker::convertString(reader.getMethodParameterName(m, p)) - << "\");\n"; + << "\"));\n"; } else { if ( options.java5 ) @@ -688,8 +688,8 @@ void generateFunctionParamterMap(std::ostream& o, } if ( options.language == 2 ) { - o << " m_functionMap[::rtl::OUString::createFromAscii(\"" - << sMethod << "\")] = fpm;\n\n"; + o << " m_functionMap[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\"" + << sMethod << "\"))] = fpm;\n\n"; } else { o << " m_functionMap.put(\"" << sMethod << "\", fpm);\n\n"; -- cgit v1.2.3