diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-18 13:51:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-18 15:06:21 +0100 |
| commit | 163975fd413be1751b8624f8724af441433039d4 (patch) | |
| tree | 3e25fe7670720b6841f2a876c23fdf103fa26ff8 /sw | |
| parent | 5b6dcac8dca72583e25213331bbadc5ec1973646 (diff) | |
convert SvxAutoCorrect::DoAutoCorrect to OUString
which makes autocorrect in the editengine work again
Change-Id: I97d56448e4abd6e563479ffee706b86cb04199ec
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/edit/acorrect.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/edit/autofmt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/edit/edws.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/inc/acorrect.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 4eb19c7bb90e..4599e752b158 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -293,7 +293,7 @@ OUString SwAutoCorrDoc::GetPrevPara( sal_Bool bAtNormalPos ) return aStr; } -sal_Bool SwAutoCorrDoc::ChgAutoCorrWord( xub_StrLen & rSttPos, xub_StrLen nEndPos, +bool SwAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, SvxAutoCorrect& rACorrect, OUString* pPara ) { diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 9b4dae95fc3a..8d4571a80abd 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1827,7 +1827,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) SwTxtFrmInfo aFInfo( 0 ); - xub_StrLen nSttPos, nLastBlank = nPos; + sal_Int32 nSttPos, nLastBlank = nPos; sal_Bool bFirst = aFlags.bCptlSttSntnc, bFirstSent = bFirst; sal_Unicode cChar = 0; diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index e006f56176f5..437189b2d59a 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -254,7 +254,7 @@ void SwEditShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsert, SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, cChar ); // FIXME: this _must_ be called with reference to the actual node text! - String const& rNodeText(reinterpret_cast<String const&>(pTNd->GetTxt())); + OUString const& rNodeText(pTNd->GetTxt()); rACorr.DoAutoCorrect( aSwAutoCorrDoc, rNodeText, pCrsr->GetPoint()->nContent.GetIndex(), cChar, bInsert, GetWin() ); diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx index a7a5e6b3d152..6b6d5a0b7eaf 100644 --- a/sw/source/core/inc/acorrect.hxx +++ b/sw/source/core/inc/acorrect.hxx @@ -74,7 +74,7 @@ public: // (does not need to be the same paragraph) virtual OUString GetPrevPara( sal_Bool bAtNormalPos ); - virtual sal_Bool ChgAutoCorrWord( xub_StrLen& rSttPos, xub_StrLen nEndPos, + virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos, SvxAutoCorrect& rACorrect, OUString* pPara ); |