diff options
author | Sun Ying <sunying@apache.org> | 2012-08-16 04:20:44 +0000 |
---|---|---|
committer | Sun Ying <sunying@apache.org> | 2012-08-16 04:20:44 +0000 |
commit | 6fa2e38b9cd3ce0df5876d849bcba7d879a6e329 (patch) | |
tree | 03a34320c21ce948fa06db578ce09a020de26627 /sd | |
parent | a19ed1cba504e1531df54de9131960f9dc2c94f9 (diff) |
#119523# fix the indent and left margin attribute lost when save .ppt file and open .ppt file
Reported by: liupingtan
Patch by: Ying Sun
Review by: Jian Yuan Li
Notes
Notes:
merged as: 844e62d5ab9ddc77a1ea859653549ea71bcb6656
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 7380482ab9b1..2645e9842cda 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -1406,6 +1406,13 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) nPropertyFlags |= 1; // turn off bullet explicit nBulletFlags = 0; } + + // Write nTextOfs and nBullets + if ( mpStyleSheet->IsHardAttribute( nInstance, nDepth, ParaAttr_TextOfs, pPara->nTextOfs ) ) + nPropertyFlags |= 0x100; + if ( mpStyleSheet->IsHardAttribute( nInstance, nDepth, ParaAttr_BulletOfs, pPara->nBulletOfs )) + nPropertyFlags |= 0x400; + FontCollectionEntry aFontDescEntry( pPara->aFontDesc.Name, pPara->aFontDesc.Family, pPara->aFontDesc.Pitch, pPara->aFontDesc.CharSet ); sal_uInt16 nFontId = (sal_uInt16)maFontCollection.GetId( aFontDescEntry ); @@ -1444,6 +1451,10 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) rOut << (sal_uInt16)( pPara->mnLineSpacingTop ); if ( nPropertyFlags & 0x00004000 ) rOut << (sal_uInt16)( pPara->mnLineSpacingBottom ); + if ( nPropertyFlags & 0x100 ) + rOut << (sal_uInt16)(pPara->nTextOfs); + if ( nPropertyFlags & 0x400 ) + rOut << (sal_uInt16)(pPara->nBulletOfs); if ( nPropertyFlags & 0x000e0000 ) { sal_uInt16 nAsianSettings = 0; |