summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2019-05-02 21:59:33 +0300
committerJustin Luth <justin_luth@sil.org>2019-05-25 07:36:25 +0200
commitd57735bad093d028d69d131672c71308acf02f74 (patch)
tree3d4a01a6d37c571c41ebc631ae990bb96e0ea792 /sw/source/filter
parent4b893906984a4620fda7e1914f0d1ea3416ef42c (diff)
revert tdf#123912 ww8 export: re-protect implicit section
Revert LO 6.3 bugfix d9a6eab15a747cf4c8a3d04f4b21fe1a1c3d0721 because LO has changed the behaviour of implicit sections when Protect Forms is enabled. Now they are editable, making the Protect Form compatibility option nearly useless. (tdf#122201 commit d9a6eab15a747cf4c8a3d04f4b21fe1a1c3d0721 which was backported to LO 6.2). Since implicit sections are now editable in LO, they should export as editable. See tdf#124451 for a one-sided discussion about this. Since many people may have used this switch as a simple way to create a protected form in the past, document this change and point to sections as the way to set protection natively. Protect Form is now only good for protecting the form field itself from being deleted while the user is filling out the form, and that is true only for legacy sw::mark::IFieldmark form fields which have no UI in LO for adding them (.doc compatibility forms). Change-Id: I938f015fe63c22e831654e96de77b5809bb924ff Reviewed-on: https://gerrit.libreoffice.org/71716 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 8725e7474278..1ec391a298b8 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1520,11 +1520,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
AttrOutput().SectFootnoteEndnotePr();
// forms
- bool bFormProtection = rSepInfo.IsProtected();
- // use document settings when SepInfo has no protect settings (last section fragment or no sections at all)
- if ( !rSepInfo.pSectionFormat || (reinterpret_cast<SwSectionFormat*>(sal_IntPtr(-1)) == rSepInfo.pSectionFormat) )
- bFormProtection |= m_pDoc->getIDocumentSettingAccess().get( DocumentSettingId::PROTECT_FORM );
- AttrOutput().SectionFormProtection( bFormProtection );
+ AttrOutput().SectionFormProtection( rSepInfo.IsProtected() );
// line numbers
const SwLineNumberInfo& rLnNumInfo = m_pDoc->GetLineNumberInfo();