[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - writerfilter/source

[László Németh (via logerrit)]

 writerfilter/source/dmapper/SettingsTable.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit d56be0923966deab3f49bc460a5d233d1301430f
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Thu Jun 13 08:44:04 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Jun 18 15:34:29 2019 +0200

    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 at sil.org>
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 8b3c861c46ae12d21b7b3a550e2daa21d2006b77)
    Reviewed-on: https://gerrit.libreoffice.org/74274
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 609173eefd0b..8be0c6c0f114 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -236,6 +236,7 @@ struct SettingsTable_Impl
     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 @@ struct SettingsTable_Impl
       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 @@ void SettingsTable::lcl_attribute(Id nName, Value & val)
     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 @@ void SettingsTable::ApplyProperties(uno::Reference<text::XTextDocument> const& x
 
     // 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())