diff options
| author | Frank Meies <fme@openoffice.org> | 2001-08-17 10:08:09 +0000 |
|---|---|---|
| committer | Frank Meies <fme@openoffice.org> | 2001-08-17 10:08:09 +0000 |
| commit | 070c65adbfa320d292f7401af2f2796e394d7dfc (patch) | |
| tree | 76fdad746e6b1c6eba070cb0cc38d325f9d865e2 /sw/source/core/text/txthyph.cxx | |
| parent | 98bdcd109cd8a27c06efe802908dfc41913fc2ee (diff) | |
Fix #90905#: Hyphenation and softhyphens at alternative spelling positions
Diffstat (limited to 'sw/source/core/text/txthyph.cxx')
| -rw-r--r-- | sw/source/core/text/txthyph.cxx | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx index 0867d8ab337f..c364bf1b644b 100644 --- a/sw/source/core/text/txthyph.cxx +++ b/sw/source/core/text/txthyph.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txthyph.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: tl $ $Date: 2001-03-29 08:07:29 $ + * last change: $Author: fme $ $Date: 2001-08-17 11:05:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -272,6 +272,7 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) && ( !pPos->IsSoftHyphPortion() || ((SwSoftHyphPortion*)pPos)->IsExpand() ) ) { + nWrdStart += pPos->GetLen(); break; } @@ -316,19 +317,22 @@ sal_Bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf ) { XubString aSelTxt( rInf.GetTxt().Copy(nWrdStart, nLen) ); xub_StrLen nCnt = 0; - for( xub_StrLen i = 0; i < nLen; ++i ) - { - sal_Unicode cCh = aSelTxt.GetChar(i); - if( (CH_TXTATR_BREAKWORD == cCh || CH_TXTATR_INWORD == cCh ) - && rInf.HasHint( nWrdStart + i ) ) - { - aSelTxt.Erase( i , 1 ); - nCnt++; - --nLen; - if( i ) - --i; - } - } + +// these things should be handled by the dialog +// for( xub_StrLen i = 0; i < nLen; ++i ) +// { +// sal_Unicode cCh = aSelTxt.GetChar(i); +// if( (CH_TXTATR_BREAKWORD == cCh || CH_TXTATR_INWORD == cCh ) +// && rInf.HasHint( nWrdStart + i ) ) +// { +// aSelTxt.Erase( i , 1 ); +// nCnt++; +// --nLen; +// if( i ) +// --i; +// } +// } + { MSHORT nMinTrail = 0; if( nWrdStart + nLen > nEnd ) |