oox/source/drawingml/textparagraph.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit d60cec0e60c5c0880f8098d39443c391abed80b2
Author: Matúš Kukan <matus.ku...@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.
Change-Id: I55e66aeaa7176fbd3f64dcdf075d411f460947d4
diff --git a/oox/source/drawingml/textparagraph.cxx
b/oox/source/drawingml/textparagraph.cxx
index f76631c..098a941 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
