[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source

[Matúš Kukan]

 oox/source/drawingml/textparagraph.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 41ed9c8e761b69987c978d41fd89aa1a169f60dd
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Jul 24 15:46:13 2014 +0200

    bnc#862510: PPTX import: bullets have color as following text by default.
    
    aTextCharacterStyle contains font theme color set in Shape::createAndInsert.
    
    (cherry picked from commit d60cec0e60c5c0880f8098d39443c391abed80b2)
    
    Change-Id: I55e66aeaa7176fbd3f64dcdf075d411f460947d4
    Reviewed-on: https://gerrit.libreoffice.org/10514
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index 7bb719a..79c1664 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[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() );
+            if( !aioBulletList.hasProperty( PROP_BulletColor ) && aTextCharacterStyle.maCharColor.isUsed() )
+                aioBulletList[ PROP_BulletColor ] <<= aTextCharacterStyle.maCharColor.getColor( rFilterBase.getGraphicHelper() );
 
             float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 18 );
             aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );