diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 13 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 45abbf61e6ca..d69e2ccbb776 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -461,8 +461,9 @@ void DocxAttributeOutput::EndParagraphProperties() void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool /*bSingleEmptyRun*/ ) { - // if there is some redlining in the document, output it - StartRedline( pRedlineData ); + // Don't start redline data here, possibly there is a hyperlink later, and + // that has to be started first. + m_pRedlineData = pRedlineData; // postpone the output of the start of a run (there are elements that need // to be written before the start of the run, but we learn which they are @@ -539,6 +540,9 @@ void DocxAttributeOutput::EndRun() m_startedHyperlink = true; } + // if there is some redlining in the document, output it + StartRedline(); + DoWriteBookmarks( ); WriteCommentRanges(); @@ -1237,12 +1241,11 @@ void DocxAttributeOutput::Redline( const SwRedlineData* /*pRedline*/ ) OSL_TRACE( "TODO DocxAttributeOutput::Redline( const SwRedlineData* pRedline )" ); } -void DocxAttributeOutput::StartRedline( const SwRedlineData* pRedlineData ) +void DocxAttributeOutput::StartRedline() { - m_pRedlineData = pRedlineData; - if ( !m_pRedlineData ) return; + const SwRedlineData* pRedlineData = m_pRedlineData; // FIXME check if it's necessary to travel over the Next()'s in pRedlineData diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index b1302b69fd30..f42ffdf71ee1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -132,7 +132,7 @@ public: /// /// Start of the tag that encloses the run, fills the info according to /// the value of m_pRedlineData. - void StartRedline( const SwRedlineData* pRedlineData ); + void StartRedline(); /// Output redlining. /// |