mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid crash in 130+ odt export tests

Browse Source 
e.g. fdo44181-1.ott to odt

Change-Id: I23403415378ddf50ff007fb4b5d88b4009668bf6
This commit is contained in:
Caolán McNamara
2016-12-22 15:42:10 +00:00
parent 89d067775a
commit 2085d8203b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sw/source/core/text/inftxt.cxx
View File

@@ -1196,14 +1196,14 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
nLen = pPos->GetLen(); nLen = pPos->GetLen();
for ( int i = nIdx; i < (nIdx + nLen); ++i ) for ( int i = nIdx; i < (nIdx + nLen); ++i )
{ {
if ( GetText()[i] == CH_TXTATR_NEWLINE ) if (i < GetText().getLength() && GetText()[i] == CH_TXTATR_NEWLINE)
{ {
if ( i >= (GetIdx() + rPor.GetLen()) ) if ( i >= (GetIdx() + rPor.GetLen()) )
{ {
goto drawcontinue; goto drawcontinue;
} }
} }
if ( GetText()[i] != CH_BLANK ) if (i >= GetText().getLength() || GetText()[i] != CH_BLANK)
{ {
draw = true; draw = true;
if ( i >= (GetIdx() + rPor.GetLen()) ) if ( i >= (GetIdx() + rPor.GetLen()) )
@@ -1230,11 +1230,11 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
nLen = pPos->GetLen(); nLen = pPos->GetLen();
for ( int i = (nIdx + nLen - 1); i >= nIdx; --i ) for ( int i = (nIdx + nLen - 1); i >= nIdx; --i )
{ {
if ( GetText()[i] == CH_TXTATR_NEWLINE ) if (i < GetText().getLength() && GetText()[i] == CH_TXTATR_NEWLINE)
{ {
continue; continue;
} }
if ( GetText()[i] != CH_BLANK ) if (i >= GetText().getLength() || GetText()[i] != CH_BLANK)
{ {
sal_uInt16 nOldWidth = rPor.Width(); sal_uInt16 nOldWidth = rPor.Width();
sal_uInt16 nNewWidth = GetTextSize( m_pOut, nullptr, GetText(), nIdx, (i + 1 - nIdx) ).Width(); sal_uInt16 nNewWidth = GetTextSize( m_pOut, nullptr, GetText(), nIdx, (i + 1 - nIdx) ).Width();