Kaydet (Commit) 24aeeb01 authored tarafından Felix Zhang's avatar Felix Zhang Kaydeden (comit) Muthu Subramanian

bnc#793414: Fixed the left margin of bullet

Change-Id: I4726ab00a6e2700407ffcf5258d3736ed0161514
üst 0c814ad1
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/style/TabStop.hpp>
#include <com/sun/star/text/PositionAndSpaceMode.hpp>
#include "oox/helper/helper.hxx" #include "oox/helper/helper.hxx"
#include "oox/helper/propertyset.hxx" #include "oox/helper/propertyset.hxx"
...@@ -416,6 +417,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p ...@@ -416,6 +417,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
{ {
if ( noParaLeftMargin ) if ( noParaLeftMargin )
{ {
aPropSet.setProperty( PROP_ParaLeftMargin, static_cast< sal_Int32 >(0));
rioBulletMap[ PROP_LeftMargin ] <<= static_cast< sal_Int32 >( *noParaLeftMargin ); rioBulletMap[ PROP_LeftMargin ] <<= static_cast< sal_Int32 >( *noParaLeftMargin );
noParaLeftMargin = boost::none; noParaLeftMargin = boost::none;
} }
...@@ -423,7 +425,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p ...@@ -423,7 +425,7 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p
{ {
// Force Paragraph property as zero - impress seems to use the value from previous // Force Paragraph property as zero - impress seems to use the value from previous
// (non) bullet line if not set to zero explicitly :( // (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 ); rioBulletMap[ PROP_FirstLineOffset ] <<= static_cast< sal_Int32 >( *noFirstLineIndentation );
noFirstLineIndentation = boost::none; noFirstLineIndentation = boost::none;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment