From 41ed9c8e761b69987c978d41fd89aa1a169f60dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Thu, 24 Jul 2014 15:46:13 +0200 Subject: [PATCH 059/137] bnc#862510: PPTX import: bullets have color as following text by default. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Caolán McNamara --- oox/source/drawingml/textparagraph.cxx | 2 ++ 1 file changed, 2 insertions(+) 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 ); -- 1.9.3