diff options
| author | Sven Jacobi <sj@openoffice.org> | 2001-06-20 09:50:29 +0000 |
|---|---|---|
| committer | Sven Jacobi <sj@openoffice.org> | 2001-06-20 09:50:29 +0000 |
| commit | 52ee7dde2091b30df4907afb6958614b28c2dd35 (patch) | |
| tree | 01c8ff77d4a753802f90e3a428f11d9726aa9e28 /svx | |
| parent | 35e7954139e255a49a880a947c6283e7f72bc2fd (diff) | |
#88358# importing header/footer just once, no loop when reading corrupt SpecInfoAtom
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdfppt.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx index 841922cafe8c..02bc0d6733a8 100644 --- a/svx/source/svdraw/svdfppt.cxx +++ b/svx/source/svdraw/svdfppt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdfppt.cxx,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: sj $ $Date: 2001-06-14 17:34:43 $ + * last change: $Author: sj $ $Date: 2001-06-20 10:50:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -5047,7 +5047,7 @@ sal_Bool PPTTextSpecInfoAtomInterpreter::Read( SvStream& rIn, case 4 : rIn >> nVal2; break; default : { - rIn.Seek( 2 ); + rIn.SeekRel( 2 ); DBG_ERROR( "SdrTextSpecInfoAtomInterpreter::Ctor(): parsing error, this document needs to be analysed (SJ)" ); } } @@ -5949,8 +5949,9 @@ void PPTParagraphObj::UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const { if ( pPortion->pCharSet->mnAttrSet & ( 1 << PPT_CharAttr_FontHeight ) ) { - nBulletRelSize *= pPortion->pCharSet->mnFontHeight; - nBulletRelSize /= mrStyleSheet.mpCharSheet[ mnInstance ]->maCharLevel[ pParaSet->mnDepth ].mnFontHeight; + sal_uInt32 nFontHeight = mrStyleSheet.mpCharSheet[ mnInstance ]->maCharLevel[ pParaSet->mnDepth ].mnFontHeight; + if ( nFontHeight ) + nBulletRelSize = ( nBulletRelSize * pPortion->pCharSet->mnFontHeight ) / nFontHeight; } } } @@ -6855,13 +6856,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport pSet->mpFieldItem = pFE->pField1, pFE->pField1 = NULL; } else if ( pFE->pString ) - { - String aString( *pFE->pString ); - if ( aString.Len() ) - pSet->maString = aString; - else - delete (PPTCharPropSet*)aCharPropList.Remove( n ); - } + pSet->maString = *pFE->pString; } else { |