Kaydet (Commit) 17aa2d99 authored tarafından Xisco Fauli's avatar Xisco Fauli

Related: #119477#, nBuStart is initialized as -1, an unsigned int is required

Otherwise 65536 will be printed as the firt bullet

Change-Id: Ie200c1c67a9b73321990a55940115ae30b9e7c37
üst 3ba0e7ad
...@@ -2207,7 +2207,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* ...@@ -2207,7 +2207,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
rOutliner.SetStyleSheet( 0, pSheet ); rOutliner.SetStyleSheet( 0, pSheet );
} }
rOutliner.SetVertical( pTextObj->GetVertical() ); rOutliner.SetVertical( pTextObj->GetVertical() );
sal_Int16 nLastStartNumbering = -1;
const PPTParagraphObj* pPreviousParagraph = NULL; const PPTParagraphObj* pPreviousParagraph = NULL;
for ( PPTParagraphObj* pPara = pTextObj->First(); pPara; pPara = pTextObj->Next() ) for ( PPTParagraphObj* pPara = pTextObj->First(); pPara; pPara = pTextObj->Next() )
{ {
...@@ -2303,7 +2302,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* ...@@ -2303,7 +2302,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
if ( !nIsBullet2 ) if ( !nIsBullet2 )
aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, sal_False ) ); aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, sal_False ) );
pPreviousParagraph = pPara; pPreviousParagraph = pPara;
if ( !aSelection.nStartPos ) // in PPT empty paragraphs never gets a bullet if ( !aSelection.nStartPos ) // in PPT empty paragraphs never gets a bullet
{ {
...@@ -3582,7 +3580,7 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rM ...@@ -3582,7 +3580,7 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rM
sal_Int16 nBuStart = *rStartNumbering; sal_Int16 nBuStart = *rStartNumbering;
//The Seventh bit of nBuFlags that specifies whether fBulletHasAutoNumber exists, //The Seventh bit of nBuFlags that specifies whether fBulletHasAutoNumber exists,
//and fBulletHasAutoNumber that specifies whether this paragraph has an automatic numbering scheme. //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<sal_uInt16>(nBuStart) ); rNumberFormat.SetStart( static_cast<sal_uInt16>(nBuStart) );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment