[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source
Matúš Kukan
matus.kukan at collabora.com
Fri Jul 25 02:27:14 PDT 2014
oox/source/drawingml/textparagraph.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 078d191f9bac43c5c52def4f35e6259520b94f13
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.
Change-Id: I55e66aeaa7176fbd3f64dcdf075d411f460947d4
(cherry picked from commit d60cec0e60c5c0880f8098d39443c391abed80b2)
Reviewed-on: https://gerrit.libreoffice.org/10516
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 e220966..8dcd8b5 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 );
More information about the Libreoffice-commits
mailing list