From f125fb2f995a7afc644417f000c7e9c329e88d8e Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 12 Nov 2010 09:58:58 -0500 Subject: Replace rtl::OUString::createFromAscii with RTL_CONSTASCII_USTRINGPARAM. --- scaddins/source/analysis/analysishelper.cxx | 2 +- scaddins/source/datefunc/datefunc.cxx | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'scaddins') diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 03894c0d21ed..e9a100fe3ea5 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2850,7 +2850,7 @@ ScaAnyConverter::ScaAnyConverter( const uno::Reference< lang::XMultiServiceFacto if( xServiceFact.is() ) { uno::Reference< uno::XInterface > xInstance = xServiceFact->createInstance( - OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.NumberFormatter" )) ); xFormatter = uno::Reference< util::XNumberFormatter >( xInstance, uno::UNO_QUERY ); } } diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 3ae28745a32f..fb2d6b2e82f8 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -250,9 +250,9 @@ sal_Bool SAL_CALL component_writeInfo( { try { - OUString aImpl = OUString::createFromAscii( "/" ); + OUString aImpl(RTL_CONSTASCII_USTRINGPARAM( "/" )); aImpl += ScaDateAddIn::getImplementationName_Static(); - aImpl += OUString::createFromAscii( "/UNO/SERVICES" ); + aImpl += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); uno::Reference< registry::XRegistryKey > xNewKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( aImpl ) ); @@ -401,15 +401,15 @@ OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex OUString ScaDateAddIn::getImplementationName_Static() { - return OUString::createFromAscii( MY_IMPLNAME ); + return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_IMPLNAME )); } uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static() { uno::Sequence< OUString > aRet( 2 ); OUString* pArray = aRet.getArray(); - pArray[0] = OUString::createFromAscii( ADDIN_SERVICE ); - pArray[1] = OUString::createFromAscii( MY_SERVICE ); + pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( ADDIN_SERVICE )); + pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE )); return aRet; } @@ -418,7 +418,7 @@ uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static() OUString SAL_CALL ScaDateAddIn::getServiceName() throw( uno::RuntimeException ) { // name of specific AddIn service - return OUString::createFromAscii( MY_SERVICE ); + return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE )); } // XServiceInfo @@ -711,7 +711,7 @@ sal_Int32 GetNullDate( const uno::Reference< beans::XPropertySet >& xOptions ) try { uno::Any aAny = xOptions->getPropertyValue( - OUString::createFromAscii( "NullDate" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "NullDate" )) ); util::Date aDate; if ( aAny >>= aDate ) return DateToDays( aDate.Day, aDate.Month, aDate.Year ); -- cgit v1.2.3