diff options
| author | Sun Ying <sunying@apache.org> | 2012-09-19 07:09:20 +0000 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-05-09 21:04:04 +0200 |
| commit | 3ba0e7ad7ad1c85a87acbef354fb423470472017 (patch) | |
| tree | f500b13e5a774e4af76cb3fa53bd41410c3ef29e /filter | |
| parent | ab907dfb25fd8c1e145696dcd0180a6627aac072 (diff) | |
#119477# fix bullet's start with error when save .ppt file
Reported by: Liu Ping Tan
Patch by: Ying Sun
Review by: Steve Yin.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 1914c5538a70..c7cd534720a8 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2303,19 +2303,6 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* if ( !nIsBullet2 ) aParagraphAttribs.Put( SfxBoolItem( EE_PARA_BULLETSTATE, sal_False ) ); - if ( oStartNumbering ) - { - if ( *oStartNumbering != nLastStartNumbering ) - rOutliner.SetNumberingStartValue( nParaIndex, *oStartNumbering ); - else - rOutliner.SetNumberingStartValue( nParaIndex, -1 ); - nLastStartNumbering = *oStartNumbering; - } - else - { - nLastStartNumbering = -1; - rOutliner.SetNumberingStartValue( nParaIndex, nLastStartNumbering ); - } pPreviousParagraph = pPara; if ( !aSelection.nStartPos ) // in PPT empty paragraphs never gets a bullet @@ -3592,6 +3579,13 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport& rM break; } rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 ); + 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 )) + { + rNumberFormat.SetStart( static_cast<sal_uInt16>(nBuStart) ); + } } return bHardAttribute; } |