diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8par.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index b1174771c554..b2a0302c0b44 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -83,6 +83,7 @@ #include <IDocumentMarkAccess.hxx> #include <IDocumentStylePoolAccess.hxx> #include <IDocumentExternalData.hxx> +#include <../../core/inc/DocumentRedlineManager.hxx> #include <docufld.hxx> #include <swfltopt.hxx> #include <viewsh.hxx> @@ -4976,7 +4977,7 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) SwNodeIndex aSttNdIdx( m_rDoc.GetNodes() ); SwRelNumRuleSpaces aRelNumRule(m_rDoc, m_bNewDoc); - RedlineFlags eMode = RedlineFlags::ShowInsert; + RedlineFlags eMode = RedlineFlags::ShowInsert | RedlineFlags::ShowDelete; m_xSprmParser.reset(new wwSprmParser(*m_xWwFib)); @@ -5276,12 +5277,13 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) } } + bool isHideRedlines(false); + if (m_bNewDoc) { if( m_xWDop->fRevMarking ) eMode |= RedlineFlags::On; - if( m_xWDop->fRMView ) - eMode |= RedlineFlags::ShowDelete; + isHideRedlines = !m_xWDop->fRMView; } m_aInsertedTables.DelAndMakeTableFrames(); @@ -5415,6 +5417,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss) UpdatePageDescs(m_rDoc, nPageDescOffset); + // can't set it on the layout or view shell because it doesn't exist yet + m_rDoc.GetDocumentRedlineManager().SetHideRedlines(isHideRedlines); + return ERRCODE_NONE; } |