diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-10-11 14:59:33 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-10-11 14:59:33 +0530 |
| commit | bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8 (patch) | |
| tree | a8b90fe03a98327ff3c52f3e41cb168d126f9ecc /oox/source/drawingml/textparagraph.cxx | |
| parent | e2c481db7b905305128e733bb1fc8d0ad8cadbf5 (diff) | |
n#778854: Fixes quite some issues with bullet points.
* Properties needs to be combined before applyed.
Rather than applying them separately twice.
* ParaMargins set to zero wrongly rather than boost::none
This caused its own set of problems.
* Hack: Push default zero to tabstops. This makes impress
calculate proper values for tabstops using leftmargin.
Diffstat (limited to 'oox/source/drawingml/textparagraph.cxx')
| -rw-r--r-- | oox/source/drawingml/textparagraph.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 1b599a6668e0..1119652fb155 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -108,15 +108,16 @@ void TextParagraph::insertAt( float fCharacterSize = nCharHeight > 0 ? GetFontHeight( nCharHeight ) : 18; if ( pTextParagraphStyle.get() ) { - pTextParagraphStyle->pushToPropSet( &rFilterBase, xProps, aioBulletList, NULL, sal_True, fCharacterSize, true ); + TextParagraphProperties aParaProp; + aParaProp.apply( *pTextParagraphStyle ); + aParaProp.apply( maProperties ); + aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); fCharacterSize = pTextParagraphStyle->getCharHeightPoints( fCharacterSize ); // bullets have same color as following texts by default if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0 && (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() ) aioBulletList[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() ); - - maProperties.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize ); } // empty paragraphs do not have bullets in ppt |