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 --- .../DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx | 2 +- .../OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx | 6 +++--- odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'odk/examples/DevelopersGuide') 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() ) { -- cgit