|
 |
f085be |
From 41ed9c8e761b69987c978d41fd89aa1a169f60dd Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@collabora.com>
|
|
|
f085be |
Date: Thu, 24 Jul 2014 15:46:13 +0200
|
|
|
f085be |
Subject: [PATCH 059/137] bnc#862510: PPTX import: bullets have color as
|
|
|
f085be |
following text by default.
|
|
|
f085be |
MIME-Version: 1.0
|
|
|
f085be |
Content-Type: text/plain; charset=UTF-8
|
|
|
f085be |
Content-Transfer-Encoding: 8bit
|
|
|
f085be |
|
|
|
f085be |
aTextCharacterStyle contains font theme color set in Shape::createAndInsert.
|
|
|
f085be |
|
|
|
f085be |
(cherry picked from commit d60cec0e60c5c0880f8098d39443c391abed80b2)
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I55e66aeaa7176fbd3f64dcdf075d411f460947d4
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10514
|
|
|
f085be |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f085be |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f085be |
---
|
|
|
f085be |
oox/source/drawingml/textparagraph.cxx | 2 ++
|
|
|
f085be |
1 file changed, 2 insertions(+)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
|
|
|
f085be |
index 7bb719a..79c1664 100644
|
|
|
f085be |
--- a/oox/source/drawingml/textparagraph.cxx
|
|
|
f085be |
+++ b/oox/source/drawingml/textparagraph.cxx
|
|
|
f085be |
@@ -113,6 +113,8 @@ void TextParagraph::insertAt(
|
|
|
f085be |
if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0
|
|
|
f085be |
&& (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() )
|
|
|
f085be |
aioBulletList[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() );
|
|
|
f085be |
+ if( !aioBulletList.hasProperty( PROP_BulletColor ) && aTextCharacterStyle.maCharColor.isUsed() )
|
|
|
f085be |
+ aioBulletList[ PROP_BulletColor ] <<= aTextCharacterStyle.maCharColor.getColor( rFilterBase.getGraphicHelper() );
|
|
|
f085be |
|
|
|
f085be |
float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 18 );
|
|
|
f085be |
aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|