summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/misc/svxacorr.cxx22
-rw-r--r--include/editeng/svxacorr.hxx8
-rw-r--r--sw/inc/editsh.hxx2
-rw-r--r--sw/source/core/edit/edws.cxx2
-rw-r--r--sw/source/ui/docvw/edtwin.cxx4
5 files changed, 19 insertions, 19 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index ee0083c9a2e4..5fb981455c86 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1473,7 +1473,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
}
// Adds a single word. The list will immediately be written to the file!
-sal_Bool SvxAutoCorrect::AddCplSttException( const String& rNew,
+sal_Bool SvxAutoCorrect::AddCplSttException( const OUString& rNew,
LanguageType eLang )
{
SvxAutoCorrectLanguageLists* pLists = 0;
@@ -1495,7 +1495,7 @@ sal_Bool SvxAutoCorrect::AddCplSttException( const String& rNew,
}
// Adds a single word. The list will immediately be written to the file!
-sal_Bool SvxAutoCorrect::AddWrtSttException( const String& rNew,
+sal_Bool SvxAutoCorrect::AddWrtSttException( const OUString& rNew,
LanguageType eLang )
{
SvxAutoCorrectLanguageLists* pLists = 0;
@@ -1517,8 +1517,8 @@ sal_Bool SvxAutoCorrect::AddWrtSttException( const String& rNew,
}
sal_Bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
- const String& rTxt, xub_StrLen nPos,
- String& rWord ) const
+ const OUString& rTxt, xub_StrLen nPos,
+ OUString& rWord ) const
{
if( !nPos )
return sal_False;
@@ -1526,21 +1526,21 @@ sal_Bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
xub_StrLen nEnde = nPos;
// it must be followed by a blank or tab!
- if( ( nPos < rTxt.Len() &&
- !IsWordDelim( rTxt.GetChar( nPos ))) ||
- IsWordDelim( rTxt.GetChar( --nPos )))
+ if( ( nPos < rTxt.getLength() &&
+ !IsWordDelim( rTxt[ nPos ])) ||
+ IsWordDelim( rTxt[ --nPos ]))
return sal_False;
- while( nPos && !IsWordDelim( rTxt.GetChar( --nPos )))
+ while( nPos && !IsWordDelim( rTxt[ --nPos ]))
;
// Found a Paragraph-start or a Blank, search for the word shortcut in
// auto.
xub_StrLen nCapLttrPos = nPos+1; // on the 1st Character
- if( !nPos && !IsWordDelim( rTxt.GetChar( 0 )))
+ if( !nPos && !IsWordDelim( rTxt[ 0 ]))
--nCapLttrPos; // Beginning of pargraph and no Blank!
- while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt.GetChar( nCapLttrPos )) )
+ while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt[ nCapLttrPos ]) )
if( ++nCapLttrPos >= nEnde )
return sal_False;
@@ -1557,7 +1557,7 @@ sal_Bool SvxAutoCorrect::GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc,
if( lcl_IsSymbolChar( rCC, rTxt, nCapLttrPos, nEnde ))
return sal_False;
- rWord = rTxt.Copy( nCapLttrPos, nEnde - nCapLttrPos );
+ rWord = rTxt.copy( nCapLttrPos, nEnde - nCapLttrPos );
return sal_True;
}
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index a3378f1f0b14..846e15f29a32 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -297,8 +297,8 @@ public:
// Return for the autotext expansion the previous word,
// AutoCorrect - corresponding algorithm
- sal_Bool GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const String& rTxt,
- xub_StrLen nPos, String& rWord ) const;
+ sal_Bool GetPrevAutoCorrWord( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
+ xub_StrLen nPos, OUString& rWord ) const;
// Search for or or the words in the replacement table.
// rText - check in this text the words of the list
@@ -373,7 +373,7 @@ public:
{ return _GetLanguageList( eLang ).GetCplSttExceptList(); }
// Adds a single word. The list will be immediately written to the file!
- sal_Bool AddCplSttException( const String& rNew,
+ sal_Bool AddCplSttException( const OUString& rNew,
LanguageType eLang = LANGUAGE_SYSTEM );
// Load, Set, Get the exception list for 2 Capital letters at the
@@ -386,7 +386,7 @@ public:
LanguageType eLang = LANGUAGE_SYSTEM )
{ return _GetLanguageList( eLang ).GetWrdSttExceptList(); }
// Adds a single word. The list will be immediately written to the file!
- sal_Bool AddWrtSttException( const String& rNew, LanguageType eLang = LANGUAGE_SYSTEM);
+ sal_Bool AddWrtSttException( const OUString& rNew, LanguageType eLang = LANGUAGE_SYSTEM);
// Search through the Languages for the entry
sal_Bool FindInWrdSttExceptList( LanguageType eLang, const OUString& sWord );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 4f5212e9205c..8174f674b4b1 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -785,7 +785,7 @@ public:
/// Call AutoCorrect
void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True,
sal_Unicode cChar = ' ' );
- sal_Bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord );
+ sal_Bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord );
/// Set our styles according to the respective rules.
void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 );
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 437189b2d59a..c42ed840193c 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -268,7 +268,7 @@ void SwEditShell::SetNewDoc(sal_Bool bNew)
GetDoc()->SetNewDoc(bNew);
}
-sal_Bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord )
+sal_Bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord )
{
SET_CURR_SHELL( this );
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 85f4c727d7c3..50ba16c6aa1d 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2638,7 +2638,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
bFlushCharBuffer = bSave;
// maybe show Tip-Help
- String sWord;
+ OUString sWord;
if( bNormalChar && pACfg && pACorr &&
( pACfg->IsAutoTextTip() ||
pACorr->GetSwFlags().bAutoCompleteWords ) &&
@@ -5110,7 +5110,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
if( m_pQuickHlpData->m_bIsDisplayed )
m_pQuickHlpData->Stop( rSh );
- String sWord;
+ OUString sWord;
if( rSh.HasDrawView() && rSh.GetDrawView()->IsTextEdit() )
{
bCallBase = false;
generated by cgit (git 2.34.1) at 2025-02-15 01:24:31 +0000