diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-07-24 15:46:13 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-25 09:26:47 +0000 |
| commit | 078d191f9bac43c5c52def4f35e6259520b94f13 (patch) | |
| tree | 23f3d0d5377deeeaaea472b2d11fcf44e4ab7a3d /oox/source/drawingml | |
| parent | 2b2d1bbaf9af0ec177e27fd930cd63c6bfdc2ab9 (diff) | |
bnc#862510: PPTX import: bullets have color as following text by default.
aTextCharacterStyle contains font theme color set in Shape::createAndInsert.
Change-Id: I55e66aeaa7176fbd3f64dcdf075d411f460947d4
(cherry picked from commit d60cec0e60c5c0880f8098d39443c391abed80b2)
Reviewed-on: https://gerrit.libreoffice.org/10516
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox/source/drawingml')
| -rw-r--r-- | oox/source/drawingml/textparagraph.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index e22096619745..8dcd8b562763 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -113,6 +113,8 @@ void TextParagraph::insertAt( if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0 && (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() ) aioBulletList.setProperty( PROP_BulletColor, (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() )); + if( !aioBulletList.hasProperty( PROP_BulletColor ) && aTextCharacterStyle.maCharColor.isUsed() ) + aioBulletList.setProperty( PROP_BulletColor, aTextCharacterStyle.maCharColor.getColor( rFilterBase.getGraphicHelper() )); float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 12 ); aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), true, fCharacterSize, true ); |