diff options
| -rw-r--r-- | sc/source/filter/excel/xlroot.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/addruno.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/styleuno.cxx | 4 | ||||
| -rw-r--r-- | sccomp/source/solver/solver.cxx | 6 |
5 files changed, 14 insertions, 13 deletions
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index fbca2c85918a..5d439a249bc1 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -178,8 +178,9 @@ XclRoot::XclRoot( XclRootData& rRootData ) : // filter tracer // do not use CREATE_OUSTRING for conditional expression - mrData.mxTracer.reset( new XclTracer( GetDocUrl(), OUString::createFromAscii( - IsExport() ? "Office.Tracing/Export/Excel" : "Office.Tracing/Import/Excel" ) ) ); + mrData.mxTracer.reset( new XclTracer( GetDocUrl(), IsExport() ? + OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Tracing/Export/Excel")) + : OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Tracing/Import/Excel" )) ) ); } XclRoot::XclRoot( const XclRoot& rRoot ) : diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index ec79d21aba40..07c983e90180 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -57,10 +57,10 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_Bool bFooter, sal_Bool bLft ) : SvXMLImportContext( rImport, nPrfx, rLName ), xPropSet( rPageStylePropSet ), - sOn( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_FTRON : SC_UNO_PAGE_HDRON ) ), - sShareContent( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_FTRSHARED : SC_UNO_PAGE_HDRSHARED ) ), - sContent( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_RIGHTFTRCON : SC_UNO_PAGE_RIGHTHDRCON ) ), - sContentLeft( OUString::createFromAscii( bFooter ? SC_UNO_PAGE_LEFTFTRCONT : SC_UNO_PAGE_LEFTHDRCONT ) ), + sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRON)) ), + sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRSHARED)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRSHARED)) ), + sContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON)) ), + sContentLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTFTRCONT)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTHDRCONT)) ), bDisplay( sal_True ), bInsertContent( sal_True ), bLeft( bLft ), diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 3dafb940aef6..4b4a0381e18f 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -320,8 +320,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAddressConversionObj::getSupportedServic { uno::Sequence<rtl::OUString> aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii( bIsRange ? SC_SERVICENAME_RANGEADDRESS - : SC_SERVICENAME_CELLADDRESS ); + pArray[0] = bIsRange ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICENAME_RANGEADDRESS)) + : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICENAME_CELLADDRESS)); return aRet; } diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 245bdd4237a2..85ea48a88b8f 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -2126,8 +2126,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() uno::Sequence<rtl::OUString> aRet(2); rtl::OUString* pArray = aRet.getArray(); pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSTYLE_SERVICE )); - pArray[1] = rtl::OUString::createFromAscii( bPage ? SCPAGESTYLE_SERVICE - : SCCELLSTYLE_SERVICE ); + pArray[1] = bPage ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCPAGESTYLE_SERVICE)) + : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCCELLSTYLE_SERVICE)); return aRet; } diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index ce81f14cce69..23f40299e2b2 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -559,13 +559,13 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException) uno::Sequence< OUString > SolverComponent_getSupportedServiceNames() { uno::Sequence< OUString > aServiceNames( 1 ); - aServiceNames[ 0 ] = OUString::createFromAscii( "com.sun.star.sheet.Solver" ); + aServiceNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Solver" )); return aServiceNames; } OUString SolverComponent_getImplementationName() { - return OUString::createFromAscii( "com.sun.star.comp.Calc.Solver" ); + return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.Solver" )); } OUString SAL_CALL SolverComponent::getImplementationName() throw(uno::RuntimeException) @@ -614,7 +614,7 @@ extern "C" sal_Int32 nPos; xNewKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey )->createKey( SolverComponent_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); + xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) ); const uno::Sequence< OUString > & rSNL1 = SolverComponent_getSupportedServiceNames(); const OUString * pArray1 = rSNL1.getConstArray(); for ( nPos = rSNL1.getLength(); nPos--; ) |