diff options
Diffstat (limited to 'sw/source/filter/ww8/wrtw8nds.cxx')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 3b91af45d4d4..a43db5d01869 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -871,7 +871,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/, FieldFlags::Start | FieldFlags::CmdStart ); } -void WW8AttributeOutput::EndRuby() +void WW8AttributeOutput::EndRuby(const SwTextNode& /*rNode*/, sal_Int32 /*nPos*/) { m_rWW8Export.WriteChar( ')' ); m_rWW8Export.OutputField( nullptr, ww::eEQ, OUString(), FieldFlags::End | FieldFlags::Close ); @@ -1219,7 +1219,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt FieldVanish( sText, eType ); } -int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) +int SwWW8AttrIter::OutAttrWithRange(const SwTextNode& rNode, sal_Int32 nPos) { int nRet = 0; if ( const SwpHints* pTextAttrs = rNd.GetpSwpHints() ) @@ -1253,7 +1253,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) pEnd = pHt->End(); if (nPos == *pEnd && nPos != pHt->GetStart()) { - m_rExport.AttrOutput().EndRuby(); + m_rExport.AttrOutput().EndRuby(rNode, nPos); --nRet; } break; @@ -1307,7 +1307,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) pEnd = pHt->End(); if (nPos == *pEnd && nPos == pHt->GetStart()) { // special case: empty must be handled here - m_rExport.AttrOutput().EndRuby(); + m_rExport.AttrOutput().EndRuby( rNd, nPos ); --nRet; } break; @@ -2156,7 +2156,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) { if( AttrOutput().FootnoteEndnoteRefTag() ) { - AttrOutput().EndRun(); + AttrOutput().EndRun( &rNode, nAktPos ); AttrOutput().StartRun( pRedlineData, bSingleEmptyRun ); } } @@ -2193,7 +2193,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) AppendSmartTags(rNode); bool bTextAtr = aAttrIter.IsTextAttr( nAktPos ); - nOpenAttrWithRange += aAttrIter.OutAttrWithRange(nAktPos); + nOpenAttrWithRange += aAttrIter.OutAttrWithRange( rNode, nAktPos ); sal_Int32 nLen = nNextAttr - nAktPos; if ( !bTextAtr && nLen ) @@ -2381,7 +2381,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) bool bAttrWithRange = (nOpenAttrWithRange > 0); if ( nAktPos != nEnd ) { - nOpenAttrWithRange += aAttrIter.OutAttrWithRange(nEnd); + nOpenAttrWithRange += aAttrIter.OutAttrWithRange( rNode, nEnd ); OSL_ENSURE(nOpenAttrWithRange == 0, "odd to see this happening, expected 0"); } @@ -2430,7 +2430,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) if( bPostponeWritingText && FLY_PROCESSED == nStateOfFlyFrame ) { - AttrOutput().EndRun(); + AttrOutput().EndRun(&rNode, nAktPos); //write the postponed text run AttrOutput().StartRun( pRedlineData, bSingleEmptyRun ); AttrOutput().SetAnchorIsLinkedToNode( false ); @@ -2442,16 +2442,16 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) AttrOutput().EndRunProperties( pRedlineData ); } AttrOutput().RunText( aSavedSnippet, eChrSet ); - AttrOutput().EndRun(); + AttrOutput().EndRun(&rNode, nAktPos); } else if( bPostponeWritingText && !aSavedSnippet.isEmpty() ) { //write the postponed text run AttrOutput().RunText( aSavedSnippet, eChrSet ); - AttrOutput().EndRun(); + AttrOutput().EndRun(&rNode, nAktPos); } else - AttrOutput().EndRun(); + AttrOutput().EndRun(&rNode, nAktPos); nAktPos = nNextAttr; UpdatePosition( &aAttrIter, nAktPos ); |