From 3ba0e7ad7ad1c85a87acbef354fb423470472017 Mon Sep 17 00:00:00 2001 From: Sun Ying Date: Wed, 19 Sep 2012 07:09:20 +0000 Subject: #119477# fix bullet's start with error when save .ppt file Reported by: Liu Ping Tan Patch by: Ying Sun Review by: Steve Yin. --- editeng/source/outliner/outliner.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'editeng/source') diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 8029501ff011..c28ca8099b6e 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1888,10 +1888,16 @@ sal_uInt16 Outliner::ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* if( pFmt == 0 ) continue; // ignore paragraphs without bullets - // check if numbering is the same - if( !isSameNumbering( *pFmt, *pParaFmt ) ) + // check if numbering less than or equal to pParaFmt + if( !isSameNumbering( *pFmt, *pParaFmt ) || ( pFmt->GetStart() < pParaFmt->GetStart() ) ) break; + if ( pFmt->GetStart() > pParaFmt->GetStart() ) + { + nNumber += pFmt->GetStart() - pParaFmt->GetStart(); + pParaFmt = pFmt; + } + const SfxBoolItem& rBulletState = (const SfxBoolItem&) pEditEngine->GetParaAttrib( nPara, EE_PARA_BULLETSTATE ); if( rBulletState.GetValue() ) -- cgit