[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - oox/source

[Felix Zhang]

 oox/source/drawingml/textparagraphproperties.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 97e888fc212276de19ec8158a5e778f942c6b7d1
Author: Felix Zhang <fezhang at suse.com>
Date:   Thu Apr 18 18:20:18 2013 +0800

    bnc#793414: Fix the mis-displayed bullet char
    
    The bullet char is mistakenly set to Level 0
    without setting the correct NumberingLevel
    
    Change-Id: Ie72abac83f91e9a047578d0e8334d98a358e2aee

diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 3a0d67e..fdf78ee 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -389,6 +389,7 @@ void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps
         moParaLeftMargin = rSourceProps.moParaLeftMargin;
     if ( rSourceProps.moFirstLineIndentation )
         moFirstLineIndentation = rSourceProps.moFirstLineIndentation;
+    mnLevel = rSourceProps.mnLevel;
 }
 
 void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase,
commit 22c511b1fcf7a4178e23c136be3d30a7734d855d
Author: Felix Zhang <fezhang at suse.com>
Date:   Thu Mar 28 21:00:11 2013 +0800

    bnc#793414: Fixed the left margin of bullet
    
    Change-Id: I4726ab00a6e2700407ffcf5258d3736ed0161514

diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 87091c1..3a0d67e 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/style/TabStop.hpp>
+#include <com/sun/star/text/PositionAndSpaceMode.hpp>
 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertyset.hxx"
@@ -427,6 +428,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
     {
         if ( noParaLeftMargin )
         {
+            aPropSet.setProperty( PROP_ParaLeftMargin, static_cast< sal_Int32 >(0));
             rioBulletMap[ PROP_LeftMargin ] <<= static_cast< sal_Int32 >( *noParaLeftMargin );
             noParaLeftMargin = boost::none;
         }
@@ -434,7 +436,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
         {
             // Force Paragraph property as zero - impress seems to use the value from previous
             // (non) bullet line if not set to zero explicitly :(
-            aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32>(0) );
+            aPropSet.setProperty( PROP_ParaFirstLineIndent, static_cast< sal_Int32 >(0) );
             rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( *noFirstLineIndentation );
             noFirstLineIndentation = boost::none;
         }