diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx index fddc466417bb..b02c7deba53b 100644 --- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx @@ -397,9 +397,9 @@ void PrintOptTest::impl_checkPrint() if ( bNewValue == bOldValue ) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReduceTransparency() error!"), + "the SetReduceTransparency() error!")), 0); } @@ -413,9 +413,9 @@ void PrintOptTest::impl_checkPrint() if(bNewValue == bOldValue) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the IsReduceTransparency() error!"), + "the IsReduceTransparency() error!")), 0); } @@ -430,9 +430,9 @@ void PrintOptTest::impl_checkPrint() if ( nNewMode == nOldMode ) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReducedTransparencyMode() error!"), + "the SetReducedTransparencyMode() error!")), 0); } @@ -446,10 +446,10 @@ void PrintOptTest::impl_checkPrint() if(nNewMode == nOldMode) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." "the IsReducedTransparencyMode() error!" - "nOldMode's value is :"), + "nOldMode's value is :")), 0); } @@ -463,9 +463,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) //test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReduceGradients() error!"), + "the SetReduceGradients() error!")), 0); } @@ -480,9 +480,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the IsReduceGradients() error!"), + "the IsReduceGradients() error!")), 0); } @@ -497,9 +497,9 @@ void PrintOptTest::impl_checkPrint() if (nNewMode == nOldMode)// test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetRedecedGradientMode() error!"), + "the SetRedecedGradientMode() error!")), 0); } @@ -513,9 +513,9 @@ void PrintOptTest::impl_checkPrint() if (nNewMode == nOldMode) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the GetReducedGradientMode() error!"), + "the GetReducedGradientMode() error!")), 0); } @@ -532,9 +532,9 @@ void PrintOptTest::impl_checkPrint() if (nNewStepCount == nOldStepCount) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReducedGradientStepCount() error!"), + "the SetReducedGradientStepCount() error!")), 0); } @@ -549,9 +549,9 @@ void PrintOptTest::impl_checkPrint() if (nNewStepCount == nOldStepCount) //test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the GetReduceGradientStepCount() error!"), + "the GetReduceGradientStepCount() error!")), 0); } @@ -565,9 +565,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReduceBitmaps() error!"), + "the SetReduceBitmaps() error!")), 0); } @@ -581,9 +581,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the IsReduceBitmaps() error!"), + "the IsReduceBitmaps() error!")), 0); } @@ -597,9 +597,9 @@ void PrintOptTest::impl_checkPrint() if (nNewMode == nOldMode)// test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReduceBitmap() error!"), + "the SetReduceBitmap() error!")), 0); } @@ -613,9 +613,9 @@ void PrintOptTest::impl_checkPrint() if (nNewMode == nOldMode) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReduceBitmapMode() error!"), + "the SetReduceBitmapMode() error!")), 0); } @@ -629,9 +629,9 @@ void PrintOptTest::impl_checkPrint() if (nNewMode == nOldMode)// test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the GetReduceBitmapMode() error!"), + "the GetReduceBitmapMode() error!")), 0); } @@ -648,9 +648,9 @@ void PrintOptTest::impl_checkPrint() if (nNewResolution == nOldResolution)// test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReducedBitmapResolution() error!"), + "the SetReducedBitmapResolution() error!")), 0); } @@ -664,9 +664,9 @@ void PrintOptTest::impl_checkPrint() if (nNewResolution == nOldResolution) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the GetReduceBitmapResolution() error!"), + "the GetReduceBitmapResolution() error!")), 0); } @@ -680,9 +680,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) // test the old source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetReducedBitmapIncludesTransparency() error!"), + "the SetReducedBitmapIncludesTransparency() error!")), 0); } @@ -696,9 +696,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the IsReducedBitmapIncludesTransparency() error!"), + "the IsReducedBitmapIncludesTransparency() error!")), 0); } @@ -712,9 +712,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the SetConvertToGreyscales() error!"), + "the SetConvertToGreyscales() error!")), 0); } @@ -728,9 +728,9 @@ void PrintOptTest::impl_checkPrint() if (bNewValue == bOldValue) // test the new source { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." - "the IsConvertToGreyscales() error!"), + "the IsConvertToGreyscales() error!")), 0); } } diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 91ca71f180fe..16a7268a3861 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -112,7 +112,7 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames() SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), - ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ), + ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ), aSearchOpt ( SearchAlgorithms_ABSOLUTE, SearchFlags::LEV_RELAXED, @@ -200,7 +200,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) : SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) : SfxPoolItem ( rItem ), - ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ), + ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ), aSearchOpt ( rItem.aSearchOpt ), eFamily ( rItem.eFamily ), diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 243958a38839..4142bca372e2 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -419,7 +419,7 @@ uno::Sequence SAL_CALL SvNumberFormatterServiceObj::getSupportedS { uno::Sequence aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMATTER); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATTER)); return aRet; } @@ -708,7 +708,7 @@ uno::Sequence SAL_CALL SvNumberFormatsObj::getSupportedServiceNam { uno::Sequence aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMATS); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMATS)); return aRet; } @@ -909,31 +909,31 @@ uno::Sequence SAL_CALL SvNumberFormatObj::getPropertyValue uno::Sequence aSeq(13); beans::PropertyValue* pArray = aSeq.getArray(); - pArray[0].Name = rtl::OUString::createFromAscii( PROPERTYNAME_FMTSTR ); + pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_FMTSTR )); pArray[0].Value <<= rtl::OUString( aFmtStr ); - pArray[1].Name = rtl::OUString::createFromAscii( PROPERTYNAME_LOCALE ); + pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LOCALE )); pArray[1].Value <<= aLocale; - pArray[2].Name = rtl::OUString::createFromAscii( PROPERTYNAME_TYPE ); + pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_TYPE )); pArray[2].Value <<= (sal_Int16)( pFormat->GetType() ); - pArray[3].Name = rtl::OUString::createFromAscii( PROPERTYNAME_COMMENT ); + pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_COMMENT )); pArray[3].Value <<= rtl::OUString( aComment ); - pArray[4].Name = rtl::OUString::createFromAscii( PROPERTYNAME_STDFORM ); + pArray[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_STDFORM )); pArray[4].Value.setValue( &bStandard, getBooleanCppuType() ); - pArray[5].Name = rtl::OUString::createFromAscii( PROPERTYNAME_USERDEF ); + pArray[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_USERDEF )); pArray[5].Value.setValue( &bUserDef, getBooleanCppuType() ); - pArray[6].Name = rtl::OUString::createFromAscii( PROPERTYNAME_DECIMALS ); + pArray[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_DECIMALS )); pArray[6].Value <<= (sal_Int16)( nDecimals ); - pArray[7].Name = rtl::OUString::createFromAscii( PROPERTYNAME_LEADING ); + pArray[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LEADING )); pArray[7].Value <<= (sal_Int16)( nLeading ); - pArray[8].Name = rtl::OUString::createFromAscii( PROPERTYNAME_NEGRED ); + pArray[8].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_NEGRED )); pArray[8].Value.setValue( &bRed, getBooleanCppuType() ); - pArray[9].Name = rtl::OUString::createFromAscii( PROPERTYNAME_THOUS ); + pArray[9].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_THOUS )); pArray[9].Value.setValue( &bThousand, getBooleanCppuType() ); - pArray[10].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURRSYM ); + pArray[10].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRSYM )); pArray[10].Value <<= rtl::OUString( aSymbol ); - pArray[11].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURREXT ); + pArray[11].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURREXT )); pArray[11].Value <<= rtl::OUString( aExt ); - pArray[12].Name = rtl::OUString::createFromAscii( PROPERTYNAME_CURRABB ); + pArray[12].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_CURRABB )); pArray[12].Value <<= rtl::OUString( aAbb ); return aSeq; @@ -969,7 +969,7 @@ uno::Sequence SAL_CALL SvNumberFormatObj::getSupportedServiceName { uno::Sequence aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERFORMAT); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERFORMAT)); return aRet; } @@ -1132,7 +1132,7 @@ uno::Sequence SAL_CALL SvNumberFormatSettingsObj::getSupportedSer { uno::Sequence aRet(1); rtl::OUString* pArray = aRet.getArray(); - pArray[0] = rtl::OUString::createFromAscii(SERVICENAME_NUMBERSETTINGS); + pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME_NUMBERSETTINGS)); return aRet; } diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index 5aa63b297e07..66efc892cd65 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -39,8 +39,8 @@ SysCredentialsConfigItem::SysCredentialsConfigItem( m_pOwner( pOwner ) { uno::Sequence< ::rtl::OUString > aNode( 1 ); - aNode[ 0 ] = rtl::OUString::createFromAscii( - "Office.Common/Passwords/AuthenticateUsingSystemCredentials" ); + aNode[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "Office.Common/Passwords/AuthenticateUsingSystemCredentials" )); EnableNotification( aNode ); } @@ -70,8 +70,8 @@ SysCredentialsConfigItem::getSystemCredentialsURLs() { // read config item uno::Sequence< ::rtl::OUString > aPropNames( 1 ); - aPropNames[ 0 ] = rtl::OUString::createFromAscii( - "AuthenticateUsingSystemCredentials" ); + aPropNames[ 0 ] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "AuthenticateUsingSystemCredentials" )); uno::Sequence< uno::Any > aAnyValues( utl::ConfigItem::GetProperties( aPropNames ) ); @@ -100,8 +100,8 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs( uno::Sequence< rtl::OUString > aPropNames( 1 ); uno::Sequence< uno::Any > aPropValues( 1 ); aPropNames[ 0 ] - = ::rtl::OUString::createFromAscii( - "AuthenticateUsingSystemCredentials" ); + = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "AuthenticateUsingSystemCredentials" )); aPropValues[ 0 ] <<= seqURLList; utl::ConfigItem::SetModified(); diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index e90d5bfe5de6..49f00d6a7845 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.cxx @@ -71,14 +71,14 @@ SVL_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo ( Reference< css::registry::XRegistryKey > xNewKey; xNewKey = xRegistryKey->createKey ( - OUString::createFromAscii( - "/com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject/UNO/SERVICES" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "/com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject/UNO/SERVICES" )) ); xNewKey->createKey ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")) ); xNewKey = xRegistryKey->createKey ( - OUString::createFromAscii( - "/com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject/UNO/SERVICES" ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "/com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject/UNO/SERVICES" )) ); xNewKey->createKey ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter")) );