Kaydet (Commit) c608782d authored tarafından Noel Grandin's avatar Noel Grandin

convert editeng/source/misc/*.cxx from String to OUString

Change-Id: I9ed5ec9430abcf8d3794e7baa6532e0f8449046d
üst 6322b703
...@@ -129,7 +129,7 @@ SvXMLWordContext::SvXMLWordContext( ...@@ -129,7 +129,7 @@ SvXMLWordContext::SvXMLWordContext(
if( !bOnlyTxt ) if( !bOnlyTxt )
{ {
const OUString sLongSave( sRight ); const OUString sLongSave( sRight );
if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, String(), sWrong, sRight ) && if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, OUString(), sWrong, sRight ) &&
!sLongSave.isEmpty() ) !sLongSave.isEmpty() )
{ {
sRight = sLongSave; sRight = sLongSave;
...@@ -212,7 +212,7 @@ SvXMLExceptionContext::SvXMLExceptionContext( ...@@ -212,7 +212,7 @@ SvXMLExceptionContext::SvXMLExceptionContext(
SvXMLImportContext ( rImport, nPrefix, rLocalName ), SvXMLImportContext ( rImport, nPrefix, rLocalName ),
rLocalRef(rImport) rLocalRef(rImport)
{ {
String sWord; OUString sWord;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for (sal_Int16 i=0; i < nAttrCount; i++) for (sal_Int16 i=0; i < nAttrCount; i++)
...@@ -229,7 +229,7 @@ SvXMLExceptionContext::SvXMLExceptionContext( ...@@ -229,7 +229,7 @@ SvXMLExceptionContext::SvXMLExceptionContext(
} }
} }
} }
if (!sWord.Len() ) if (sWord.isEmpty() )
return; return;
rLocalRef.rList.insert( sWord ); rLocalRef.rList.insert( sWord );
......
...@@ -48,10 +48,10 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : ...@@ -48,10 +48,10 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
bSearchInAllCategories(sal_False) bSearchInAllCategories(sal_False)
{ {
SvtPathOptions aPathOpt; SvtPathOptions aPathOpt;
String sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() ); OUString sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
sSharePath = sAutoPath.GetToken(0, ';'); sSharePath = sAutoPath.getToken(0, ';');
sUserPath = sAutoPath.GetToken(1, ';'); sUserPath = sAutoPath.getToken(1, ';');
//fdo#67743 ensure the userdir exists so that any later attempt to copy the //fdo#67743 ensure the userdir exists so that any later attempt to copy the
//shared autocorrect file into the user dir will succeed //shared autocorrect file into the user dir will succeed
...@@ -59,7 +59,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : ...@@ -59,7 +59,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
Reference < ucb::XCommandEnvironment > xEnv; Reference < ucb::XCommandEnvironment > xEnv;
::utl::UCBContentHelper::ensureFolder(comphelper::getProcessComponentContext(), xEnv, sUserPath, aContent); ::utl::UCBContentHelper::ensureFolder(comphelper::getProcessComponentContext(), xEnv, sUserPath, aContent);
String* pS = &sSharePath; OUString* pS = &sSharePath;
for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath ) for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath )
{ {
INetURLObject aPath( *pS ); INetURLObject aPath( *pS );
......
...@@ -836,7 +836,7 @@ namespace editeng ...@@ -836,7 +836,7 @@ namespace editeng
if ( m_pConversionDialog ) if ( m_pConversionDialog )
{ {
String sCurrentUnit = m_pConversionDialog->GetCurrentString(); OUString sCurrentUnit = m_pConversionDialog->GetCurrentString();
DBG_ASSERT( m_sIgnoreList.end() == m_sIgnoreList.find( sCurrentUnit ), DBG_ASSERT( m_sIgnoreList.end() == m_sIgnoreList.find( sCurrentUnit ),
"HangulHanjaConversion_Impl, OnIgnoreAll: shouldn't this have been ignored before" ); "HangulHanjaConversion_Impl, OnIgnoreAll: shouldn't this have been ignored before" );
......
...@@ -112,14 +112,14 @@ void SvxSpellWrapper::ShowLanguageErrors() ...@@ -112,14 +112,14 @@ void SvxSpellWrapper::ShowLanguageErrors()
if (SVX_LANG_MISSING_DO_WARN == nTmpSpell) if (SVX_LANG_MISSING_DO_WARN == nTmpSpell)
{ {
String aErr( SvtLanguageTable::GetLanguageString( nLang ) ); OUString aErr( SvtLanguageTable::GetLanguageString( nLang ) );
ErrorHandler::HandleError( ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) ); *new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) );
nTmpSpell = SVX_LANG_MISSING; nTmpSpell = SVX_LANG_MISSING;
} }
if (SVX_LANG_MISSING_DO_WARN == nTmpHyph) if (SVX_LANG_MISSING_DO_WARN == nTmpHyph)
{ {
String aErr( SvtLanguageTable::GetLanguageString( nLang ) ); OUString aErr( SvtLanguageTable::GetLanguageString( nLang ) );
ErrorHandler::HandleError( ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) ); *new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) );
nTmpHyph = SVX_LANG_MISSING; nTmpHyph = SVX_LANG_MISSING;
......
...@@ -122,7 +122,7 @@ void ThesDummy_Impl::GetCfgLocales() ...@@ -122,7 +122,7 @@ void ThesDummy_Impl::GetCfgLocales()
if (!pLocaleSeq) if (!pLocaleSeq)
{ {
SvtLinguConfig aCfg; SvtLinguConfig aCfg;
String aNode("ServiceManager/ThesaurusList"); OUString aNode("ServiceManager/ThesaurusList");
Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) ); Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) );
const OUString *pNodeNames = aNodeNames.getConstArray(); const OUString *pNodeNames = aNodeNames.getConstArray();
sal_Int32 nLen = aNodeNames.getLength(); sal_Int32 nLen = aNodeNames.getLength();
...@@ -678,7 +678,7 @@ uno::Reference< XDictionary > LinguMgr::GetChangeAll() ...@@ -678,7 +678,7 @@ uno::Reference< XDictionary > LinguMgr::GetChangeAll()
_xDicList->createDictionary( _xDicList->createDictionary(
"ChangeAllList", "ChangeAllList",
LanguageTag::convertToLocale( LANGUAGE_NONE ), LanguageTag::convertToLocale( LANGUAGE_NONE ),
DictionaryType_NEGATIVE, String() ), UNO_QUERY ); DictionaryType_NEGATIVE, OUString() ), UNO_QUERY );
} }
return xChangeAll; return xChangeAll;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment