commit d56be0923966deab3f49bc460a5d233d1301430f
author László Németh <nemeth@numbertext.org> Thu Jun 13 08:44:04 2019 +0200
committer Xisco Faulí <xiscofauli@libreoffice.org> Tue Jun 18 15:34:29 2019 +0200
tree 2f89571fe857284fbc59072c576faf4164541ab6
parent c928f35216be0f9bdfc5874b4e5a05fd42acb4d2

tdf#89991 DOCX: import Show changes from older formats

w:formatting is optional, w:markup can be instead of w:insDel, too.

Change-Id: Ic689499a880dcc7c97497e4381dff31610f745bf
Reviewed-on: https://gerrit.libreoffice.org/73943
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 8b3c861c46ae12d21b7b3a550e2daa21d2006b77)
Reviewed-on: https://gerrit.libreoffice.org/74274
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

writerfilter/source/dmapper/SettingsTable.cxx

diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 609173e..8be0c6c 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -236,6 +236,7 @@
    bool                m_bRecordChanges;
    bool                m_bShowInsDelChanges;
    bool                m_bShowFormattingChanges;
    bool                m_bShowMarkupChanges;
    bool                m_bLinkStyles;
    sal_Int16           m_nZoomFactor;
    sal_Int16 m_nZoomType = 0;
@@ -266,7 +267,8 @@
      m_nDefaultTabStop( 720 ) //default is 1/2 in
    , m_bRecordChanges(false)
    , m_bShowInsDelChanges(true)
    , m_bShowFormattingChanges(true)
    , m_bShowFormattingChanges(false)
    , m_bShowMarkupChanges(true)
    , m_bLinkStyles(false)
    , m_nZoomFactor(0)
    , m_nView(0)
@@ -383,6 +385,9 @@
    case NS_ooxml::LN_CT_TrackChangesView_formatting:
        m_pImpl->m_bShowFormattingChanges = (nIntValue != 0);
        break;
    case NS_ooxml::LN_CT_TrackChangesView_markup:
        m_pImpl->m_bShowMarkupChanges = (nIntValue != 0);
        break;
    default:
    {
#ifdef DBG_UTIL
@@ -648,7 +653,10 @@

    // Show changes value
    if (xDocProps.is())
        xDocProps->setPropertyValue("ShowChanges", uno::makeAny( m_pImpl->m_bShowInsDelChanges || m_pImpl->m_bShowFormattingChanges ) );
    {
        bool bHideChanges = !m_pImpl->m_bShowInsDelChanges || !m_pImpl->m_bShowMarkupChanges;
        xDocProps->setPropertyValue("ShowChanges", uno::makeAny( !bHideChanges || m_pImpl->m_bShowFormattingChanges ) );
    }

    // Record changes value
    if (xDocProps.is())