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

[Xisco Fauli]

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

New commits:
commit 967ec79447aad739a2b861bb1bf784bf55b22d9d
Author: Xisco Fauli <aniste...@gmail.com>
Date:   Mon Apr 8 23:37:32 2013 +0200

    Fix again n719988, n734733
    
    Bullet should have same color as following text by default
    Regression from bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8
    
    Change-Id: I007088db5bcb71e8d90d287b21762dca0dda9573

diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 1119652f..3256f3b 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -111,13 +111,14 @@ void TextParagraph::insertAt(
             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() );
+
+            aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, 
&pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );
         }
 
         // empty paragraphs do not have bullets in ppt
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits