File bullet-color-pptx-import.diff of Package libreoffice

Overview Repositories Revisions Requests Users Attributes Meta

File bullet-color-pptx-import.diff of Package libreoffice

From fedca0261a9fc615ddcd9c12f9cc39e6c4d693b6 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Fri, 2 Mar 2012 18:17:29 +0800
Subject: [PATCH] n719988, n734733: Bullet should have same color as following
 text by default

missing part of the fix
---
 oox/source/drawingml/textcharacterproperties.cxx |    2 +-
 oox/source/drawingml/textparagraphproperties.cxx |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index fb4b069..471fcd1 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -69,7 +69,7 @@ void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSource
     moUnderlineFillFollowText.assignIfUsed( rSourceProps.moUnderlineFillFollowText );
 }
 
-    void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter, bool bUseOptional ) const
+void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter, bool bUseOptional ) const
 {
     OUString aFontName;
     sal_Int16 nFontPitch = 0;
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 7fe9729c..53628d4 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -434,6 +434,8 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
             rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( *noFirstLineIndentation );
             noFirstLineIndentation = boost::optional< sal_Int32 >( 0 );
         }
+        if ( nNumberingType != NumberingType::BITMAP && !rioBulletMap.hasProperty( PROP_BulletColor ))
+            rioBulletMap[ PROP_BulletColor ] <<= static_cast< sal_Int32 >( maTextCharacterProperties.maCharColor.getColor( pFilterBase->getGraphicHelper()));
     }
 
     if ( bApplyBulletMap )
-- 
1.7.8.3

Places

File bullet-color-pptx-import.diff of Package libreoffice

Places