diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-06-14 18:49:32 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-06-14 18:49:32 +0200 |
| commit | 60d09eb4c408aef689e4e1519da28f686d59cab6 (patch) | |
| tree | 37a3d1c5e0663a62053760c03e517be60a877605 /filter | |
| parent | 1f4a5d96da42928176c86bc7b29423b63dbaefc9 (diff) | |
| parent | d730f6bd0a1478f03311642b490918f2b1a6f844 (diff) | |
cws impress190: rebase m82
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 8d8e48832dc9..73868d3a9f55 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5087,6 +5087,10 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport& rIn >> nCharCount >> aParaPropSet.pParaSet->mnDepth; // Einruecktiefe + aParaPropSet.pParaSet->mnDepth = + std::min(sal_uInt16(9), + aParaPropSet.pParaSet->mnDepth); + nCharCount--; rIn >> nMask; @@ -5320,8 +5324,8 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con DffRecordHeader aTextHd; rIn >> aTextHd; sal_uInt32 nMaxLen = aTextHd.nRecLen; - if ( nMaxLen > 0xFFFF ) - nMaxLen = 0xFFFF; + if ( nMaxLen >= 0xFFFF ) + nMaxLen = 0xFFFE; if( aTextHd.nRecType == PPT_PST_TextCharsAtom ) { |