diff options
| author | Muthu Subramanian <muthusuba@gmail.com> | 2016-10-30 23:47:33 +0530 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-12-01 07:40:11 +0000 |
| commit | 3770a6a3f3bd3e9c3f71a346b9db895e5bf0df31 (patch) | |
| tree | 6c3ad52e62b83d0b7a747e0fd48485223c5a4739 | |
| parent | 985e93ecb44aef97995099d4fd5915afd3cab282 (diff) | |
tdf#103477 buClrTx => use text color instead
Change-Id: I82d9231d2d0ea95cadc803f9a8dab9c23b88a677
Reviewed-on: https://gerrit.libreoffice.org/30403
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
| -rw-r--r-- | oox/source/drawingml/textparagraphproperties.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 4d281c052bd1..aa6225359387 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -356,7 +356,9 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P if ( maStyleName.hasValue() ) rPropMap.setAnyProperty( PROP_CharStyleName, maStyleName); if (pFilterBase ) { - if ( maBulletColorPtr->isUsed() ) + bool bFollowTextColor = false; + mbBulletColorFollowText >>= bFollowTextColor; + if ( maBulletColorPtr->isUsed() && !bFollowTextColor ) rPropMap.setProperty( PROP_BulletColor, maBulletColorPtr->getColor( pFilterBase->getGraphicHelper() )); } } |