diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-03-10 21:38:50 +0300 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-03-25 17:53:25 +0100 |
| commit | 21f2b8cfd9ec01f58b468c4c9a4d4d1f721d8bee (patch) | |
| tree | 5d3ba48abd9d3fb42795b59f634ccff596f52925 /writerfilter/source | |
| parent | dc78bbbdbe5aa3a7304607876231e01f17878eab (diff) | |
tdf#106843 docxexport: don't write double docProtect
regression from LO 6.4
commit 2756ed9317e3474003c11ffe7d1e2f087c1412bf
Change-Id: Iaf32974c7282d11bcd9572ed75cf1233ad3f0008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90321
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit b2471b8ab62abaa7f0c2c8342b4fa61c18f013c6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90953
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/SettingsTable.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 7852547945e7..58399cf0a151 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -357,6 +357,9 @@ void SettingsTable::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_DocProtect_edit: // 92037 m_pImpl->m_DocumentProtection.m_nEdit = nIntValue; + // multiple DocProtect_edits should not exist. If they do, last one wins + m_pImpl->m_bRedlineProtection = false; + m_pImpl->m_bProtectForm = false; switch (nIntValue) { case NS_ooxml::LN_Value_doc_ST_DocProtect_trackedChanges: |