From 17aa2d99a0537f230aa1bc7f0df40937462441eb Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 9 May 2013 21:06:40 +0200 Subject: Related: #119477#, nBuStart is initialized as -1, an unsigned int is required Otherwise 65536 will be printed as the firt bullet Change-Id: Ie200c1c67a9b73321990a55940115ae30b9e7c37 --- filter/source/msfilter/svdfppt.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index c7cd534720a8..d8fa17d7f19d 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2207,7 +2207,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* rOutliner.SetStyleSheet( 0, pSheet ); } rOutliner.SetVertical( pTextObj->GetVertical() ); - sal_Int16 nLastStartNumbering = -1; const PPTParagraphObj* pPreviousParagraph = NULL; for ( PPTParagraphObj* pPara = pTextObj->First(); pPara; pPara = pTextObj->Next() ) { @@ -2303,7 +2302,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* if ( !nIsBullet2 ) aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, sal_False ) ); - pPreviousParagraph = pPara; if ( !aSelection.nStartPos ) // in PPT empty paragraphs never gets a bullet { @@ -3582,7 +3580,7 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rM sal_Int16 nBuStart = *rStartNumbering; //The Seventh bit of nBuFlags that specifies whether fBulletHasAutoNumber exists, //and fBulletHasAutoNumber that specifies whether this paragraph has an automatic numbering scheme. - if ( ( nBuFlags & 0x02000000 ) && ( nBuStart != 1 )) + if ( ( nBuFlags & 0x02000000 ) && ( nBuStart != -1 )) { rNumberFormat.SetStart( static_cast(nBuStart) ); } -- cgit