summaryrefslogtreecommitdiff
path: root/editeng/source/misc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-10 10:09:32 +0200
committerNoel Grandin <noel@peralex.com>2013-09-11 09:45:38 +0200
commitc608782dc3ff2847d36c0bd86a1ef87adf382416 (patch)
tree4e8760aad7b447aecf05d206f6f4c5cfa078a55c /editeng/source/misc
parent6322b703ec64da03396e3802f4e76fc2e7da5509 (diff)
convert editeng/source/misc/*.cxx from String to OUString
Change-Id: I9ed5ec9430abcf8d3794e7baa6532e0f8449046d
Diffstat (limited to 'editeng/source/misc')
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.cxx6
-rw-r--r--editeng/source/misc/acorrcfg.cxx8
-rw-r--r--editeng/source/misc/hangulhanja.cxx2
-rw-r--r--editeng/source/misc/splwrap.cxx4
-rw-r--r--editeng/source/misc/unolingu.cxx4
5 files changed, 12 insertions, 12 deletions
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index 912d1878e5f3..10ea2274476d 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -129,7 +129,7 @@ SvXMLWordContext::SvXMLWordContext(
if( !bOnlyTxt )
{
const OUString sLongSave( sRight );
- if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, String(), sWrong, sRight ) &&
+ if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, OUString(), sWrong, sRight ) &&
!sLongSave.isEmpty() )
{
sRight = sLongSave;
@@ -212,7 +212,7 @@ SvXMLExceptionContext::SvXMLExceptionContext(
SvXMLImportContext ( rImport, nPrefix, rLocalName ),
rLocalRef(rImport)
{
- String sWord;
+ OUString sWord;
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for (sal_Int16 i=0; i < nAttrCount; i++)
@@ -229,7 +229,7 @@ SvXMLExceptionContext::SvXMLExceptionContext(
}
}
}
- if (!sWord.Len() )
+ if (sWord.isEmpty() )
return;
rLocalRef.rList.insert( sWord );
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index af4d5bde0d9a..a8469bfcd542 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -48,10 +48,10 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
bSearchInAllCategories(sal_False)
{
SvtPathOptions aPathOpt;
- String sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
+ OUString sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
- sSharePath = sAutoPath.GetToken(0, ';');
- sUserPath = sAutoPath.GetToken(1, ';');
+ sSharePath = sAutoPath.getToken(0, ';');
+ sUserPath = sAutoPath.getToken(1, ';');
//fdo#67743 ensure the userdir exists so that any later attempt to copy the
//shared autocorrect file into the user dir will succeed
@@ -59,7 +59,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
Reference < ucb::XCommandEnvironment > xEnv;
::utl::UCBContentHelper::ensureFolder(comphelper::getProcessComponentContext(), xEnv, sUserPath, aContent);
- String* pS = &sSharePath;
+ OUString* pS = &sSharePath;
for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath )
{
INetURLObject aPath( *pS );
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 010f21d29341..248dbfd9799e 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -836,7 +836,7 @@ namespace editeng
if ( m_pConversionDialog )
{
- String sCurrentUnit = m_pConversionDialog->GetCurrentString();
+ OUString sCurrentUnit = m_pConversionDialog->GetCurrentString();
DBG_ASSERT( m_sIgnoreList.end() == m_sIgnoreList.find( sCurrentUnit ),
"HangulHanjaConversion_Impl, OnIgnoreAll: shouldn't this have been ignored before" );
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 5d6ac6c6c626..9256b1c7ea12 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -112,14 +112,14 @@ void SvxSpellWrapper::ShowLanguageErrors()
if (SVX_LANG_MISSING_DO_WARN == nTmpSpell)
{
- String aErr( SvtLanguageTable::GetLanguageString( nLang ) );
+ OUString aErr( SvtLanguageTable::GetLanguageString( nLang ) );
ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) );
nTmpSpell = SVX_LANG_MISSING;
}
if (SVX_LANG_MISSING_DO_WARN == nTmpHyph)
{
- String aErr( SvtLanguageTable::GetLanguageString( nLang ) );
+ OUString aErr( SvtLanguageTable::GetLanguageString( nLang ) );
ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) );
nTmpHyph = SVX_LANG_MISSING;
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 79d0906ed3ee..c334e1e43f67 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -122,7 +122,7 @@ void ThesDummy_Impl::GetCfgLocales()
if (!pLocaleSeq)
{
SvtLinguConfig aCfg;
- String aNode("ServiceManager/ThesaurusList");
+ OUString aNode("ServiceManager/ThesaurusList");
Sequence < OUString > aNodeNames( aCfg.GetNodeNames( aNode ) );
const OUString *pNodeNames = aNodeNames.getConstArray();
sal_Int32 nLen = aNodeNames.getLength();
@@ -678,7 +678,7 @@ uno::Reference< XDictionary > LinguMgr::GetChangeAll()
_xDicList->createDictionary(
"ChangeAllList",
LanguageTag::convertToLocale( LANGUAGE_NONE ),
- DictionaryType_NEGATIVE, String() ), UNO_QUERY );
+ DictionaryType_NEGATIVE, OUString() ), UNO_QUERY );
}
return xChangeAll;
}