diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-04 09:17:26 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-04 11:28:37 +0000 |
| commit | a47417fcacc1648187da3c34bc5be7560ab2ca77 (patch) | |
| tree | da50bd69c3cfe48cf30add67bb8a77f7ed1ad9d9 | |
| parent | d8c7521f5ad9c952b3d6e154f158061073261750 (diff) | |
handle edge case of layouting random text
| -rw-r--r-- | sw/source/core/text/pormulti.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 6cea9cb0ee72..96d125c168c9 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -2288,6 +2288,9 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine, pCreate = GetInfo().GetMultiCreator( --nMultiPos, 0 ); } + if (!pCreate) + return pRest; + if( pRest || nMultiPos > nPosition || ( pHelpMulti->IsRuby() && ((SwRubyPortion*)pHelpMulti)->GetRubyOffset() < STRING_LEN ) ) { |