diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-05-18 13:21:15 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-08 21:51:28 +0200 |
| commit | ee1ad2c2537513c83120999fa766cdb9fdc2d36a (patch) | |
| tree | d44c7a8b896ec40590127bbeb62c66fb27bc4ff2 /sw | |
| parent | 2a73b15a66837213a4d3fa8b96f3d9389d31d0f4 (diff) | |
sw_redlinehide: dump the MergedPara to layout.xml
Change-Id: I211a92823e7b949fe55e50e6b172a0883056a189
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/dbg_lay.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/xmldump.cxx | 22 |
2 files changed, 22 insertions, 2 deletions
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 4a5062639056..203f07893296 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -773,7 +773,7 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, PROT nFunction, DbgAction n { aOut.append(" "); while (aOut.getLength() < 140) aOut.append(" "); - const OUString& text = static_cast<const SwTextFrame*>(pFrame)->GetTextNode()->GetText(); + const OUString& text = static_cast<const SwTextFrame*>(pFrame)->GetText(); OString o = OUStringToOString(text, RTL_TEXTENCODING_ASCII_US); aOut.append(o); } diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 0f951cd6f033..d29d7abdbd7a 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -328,6 +328,26 @@ void SwFrame::dumpAsXml( xmlTextWriterPtr writer ) const xmlTextWriterEndElement(writer); } + if (IsTextFrame()) + { + const SwTextFrame *pTextFrame = static_cast<const SwTextFrame *>(this); + sw::MergedPara const*const pMerged(pTextFrame->GetMergedPara()); + if (pMerged) + { + xmlTextWriterStartElement( writer, BAD_CAST( "merged" ) ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "paraPropsNodeIndex" ), "%" SAL_PRIuUINTPTR, pMerged->pParaPropsNode->GetIndex() ); + for (auto const& e : pMerged->extents) + { + xmlTextWriterStartElement( writer, BAD_CAST( "extent" ) ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "txtNodeIndex" ), "%" SAL_PRIuUINTPTR, e.pNode->GetIndex() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "start" ), "%" SAL_PRIdINT32, e.nStart ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "end" ), "%" SAL_PRIdINT32, e.nEnd ); + xmlTextWriterEndElement( writer ); + } + xmlTextWriterEndElement( writer ); + } + } + xmlTextWriterStartElement( writer, BAD_CAST( "infos" ) ); dumpInfosAsXml( writer ); xmlTextWriterEndElement( writer ); @@ -426,7 +446,7 @@ void SwFrame::dumpAsXmlAttributes( xmlTextWriterPtr writer ) const if ( IsTextFrame( ) ) { const SwTextFrame *pTextFrame = static_cast<const SwTextFrame *>(this); - const SwTextNode *pTextNode = pTextFrame->GetTextNode(); + const SwTextNode *pTextNode = pTextFrame->GetTextNodeFirst(); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "txtNodeIndex" ), TMP_FORMAT, pTextNode->GetIndex() ); } if (IsHeaderFrame() || IsFooterFrame()) |