diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-05-26 15:52:51 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-05-26 15:52:51 +0200 |
| commit | 394385ef1745762e14445519557e2c2d59614273 (patch) | |
| tree | 5d3d27922f0af4fd2697b091bdd948576769a446 /filter | |
| parent | 17e7675fe6fccf5a0f084bb9f7bceb4f663f8e3b (diff) | |
| parent | 49e4ad75c4bca88d3da34510ff0a3f99337d676a (diff) | |
merging
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 8d8e48832dc9..e8c1693e0a4e 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; @@ -5321,7 +5325,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con rIn >> aTextHd; sal_uInt32 nMaxLen = aTextHd.nRecLen; if ( nMaxLen > 0xFFFF ) - nMaxLen = 0xFFFF; + nMaxLen = 0xFFFE; if( aTextHd.nRecType == PPT_PST_TextCharsAtom ) { |