summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-11-15 16:55:31 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-11-15 17:01:36 +0100
commit9db943c50519b2a36f3eb144fda7f08abe13bdb2 (patch)
treed87459a69aa7e428bd59ee948c8e3ba849df84af
parent68e538ea6d6b2308de7c9390116fa06cd8c02d18 (diff)
DOCX export: fixes for para auto spacing roundtrip
- m_bParaBeforeAutoSpacing / m_bParaBeforeAutoSpacing was never set to false - m_iParaBeforeSpacing / m_iParaAfterSpacing was uninitialized Change-Id: I5c8ebd8e4f4c151059916397bc45e0c0ebcf5040
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6bfc91dbf243..70361fad9fa0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5656,6 +5656,7 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_before ),
OString::number( rULSpace.GetUpper() ) );
}
+ m_bParaBeforeAutoSpacing = false;
// check if after auto spacing was set during import and spacing we get from actual object is same
// that we set in import. If yes just write afterAutoSpacing tag.
if (m_bParaAfterAutoSpacing && m_iParaAfterSpacing == rULSpace.GetLower())
@@ -5668,6 +5669,7 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
m_pParagraphSpacingAttrList->add( FSNS( XML_w, XML_after ),
OString::number( rULSpace.GetLower()) );
}
+ m_bParaAfterAutoSpacing = false;
if (rULSpace.GetContext())
m_pSerializer->singleElementNS( XML_w, XML_contextualSpacing, FSEND );
@@ -6262,7 +6264,9 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_bFrameBtLr(false),
m_pTableStyleExport(new DocxTableStyleExport(rExport.pDoc, pSerializer)),
m_bParaBeforeAutoSpacing(false),
- m_bParaAfterAutoSpacing(false)
+ m_bParaAfterAutoSpacing(false),
+ m_iParaBeforeSpacing(0),
+ m_iParaAfterSpacing(0)
{
}