[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Adam Co]

 sw/source/filter/ww8/docxattributeoutput.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 59d8dde3fc9a4dc653e43efb8552efc4ab3efc92
Author: Adam Co <rattles2013 at gmail.com>
Date:   Sun Jul 21 16:27:45 2013 +0300

    fdo#66145 DOCX export: fix not-well-formed output
    
    Reviewed-on: https://gerrit.libreoffice.org/5002
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    (partially cherry picked from commit 2d5978b22b402dea9dee5b468d2044ccc1208a15)
    
    Change-Id: Id8cc3829ccd5806295b0f240a570dc1d66ed0c87
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0e2ee5e8..d7c008f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -419,7 +419,9 @@ void DocxAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
     if ( aNextIndex.GetNode().IsTxtNode() )
     {
         const SwTxtNode* pTxtNode = static_cast< SwTxtNode* >( &aNextIndex.GetNode() );
-        m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode );
+        // If next node has no string - it is an empty node, so no need to output the section break
+        if (!pTxtNode->GetTxt().isEmpty())
+            m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode );
     }
     else if ( aNextIndex.GetNode().IsTableNode() )
     {