[Libreoffice-commits] core.git: oox/source

[Muthu Subramanian]

 oox/source/drawingml/textparagraphproperties.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3770a6a3f3bd3e9c3f71a346b9db895e5bf0df31
Author: Muthu Subramanian <muthusuba at gmail.com>
Date:   Sun Oct 30 23:47:33 2016 +0530

    tdf#103477 buClrTx => use text color instead
    
    Change-Id: I82d9231d2d0ea95cadc803f9a8dab9c23b88a677
    Reviewed-on: https://gerrit.libreoffice.org/30403
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 4d281c0..aa62253 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() ));
     }
 }