diff options
Diffstat (limited to 'desktop/source/migration/services/autocorrmigration.cxx')
| -rw-r--r-- | desktop/source/migration/services/autocorrmigration.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx index 1f5290f383..ebf5f256fb 100644 --- a/desktop/source/migration/services/autocorrmigration.cxx +++ b/desktop/source/migration/services/autocorrmigration.cxx @@ -175,7 +175,7 @@ namespace migration ::rtl::OUString sLanguageType = sSourceLocalName.copy( nStart, nEnd - nStart ); ::rtl::OUString sIsoName = MsLangId::convertLanguageToIsoString( (LanguageType) sLanguageType.toInt32() ); ::rtl::OUString sTargetLocalName = sBaseName; - sTargetLocalName += ::rtl::OUString::createFromAscii( "_" ); + sTargetLocalName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" )); sTargetLocalName += sIsoName; sTargetLocalName += sSuffix; ::rtl::OUString sTargetName = sTargetDir + sTargetLocalName; @@ -188,14 +188,14 @@ namespace migration ::rtl::OString aMsg( "AutocorrectionMigration::copyFiles: cannot copy " ); aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); - OSL_ENSURE( sal_False, aMsg.getStr() ); + OSL_FAIL( aMsg.getStr() ); } ++aI; } } else { - OSL_ENSURE( sal_False, "AutocorrectionMigration::copyFiles: no user installation!" ); + OSL_FAIL( "AutocorrectionMigration::copyFiles: no user installation!" ); } } @@ -242,11 +242,11 @@ namespace migration { beans::NamedValue aValue; *pIter >>= aValue; - if ( aValue.Name.equalsAscii( "UserData" ) ) + if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) ) { if ( !(aValue.Value >>= m_sSourceDir) ) { - OSL_ENSURE( false, "AutocorrectionMigration::initialize: argument UserData has wrong type!" ); + OSL_FAIL( "AutocorrectionMigration::initialize: argument UserData has wrong type!" ); } m_sSourceDir += sSourceSubDir; break; |