sw/inc/section.hxx | 2 +-
sw/source/core/docnode/section.cxx | 23 +++--------------------
2 files changed, 4 insertions(+), 21 deletions(-)
New commits:
commit 840cc7883849a10eea11a02a743848238723a3de
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Jan 10 12:12:52 2022 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Jan 10 19:03:21 2022 +0100
sw: stop inheriting SwSectionData::m_bProtectFlag from parent section
This is actually no longer inherited by accident since commit
2e32f4ed5af16a68c97a50806a42ffa2d10f1d7a because it replaced the
SwSectionFormat::Modify()->ModifyBroadcast()->CallSwClientNotify()->CallSwClientNotify()
with a call to GetNotifier()->Broadcast(), and apparently SwSection
is a SwClient of SwSectionFormat but not a SvtListener.
But some consider the new behaviour useful, as previously there was no
way to un-protect a section inside an outer protected section at all,
while in this way every section can have its own independent protection
flag. (The m_bEditInReadonlyFlag is not used for this purpose, as it is
only for the case when the document was loaded ReadOnly.)
So make it more explicit by removing the SwSection inheritance code.
A similar change was made for hidden flag in commit
91b0024965908c692bea40f47c58ea9d1bf8a596
Change-Id: I29d3c84309a84267573950775f2a1c6353623724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128221
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 6e32cd41f5e7..65591f216ee1 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -73,7 +73,7 @@ private:
/// may have different value than format attribute:
/// format attr has value for this section, while flag is
/// effectively ORed with parent sections!
- bool m_bProtectFlag : 1;
+ bool m_bProtectFlag : 1; ///< protect flag is no longer inherited
// Edit in readonly sections.
bool m_bEditInReadonlyFlag : 1;
diff --git a/sw/source/core/docnode/section.cxx
b/sw/source/core/docnode/section.cxx
index 86c1d4546f47..12feba3c3eb6 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -201,15 +201,11 @@ SwSection::SwSection(
SwSection *const pParentSect = GetParent();
if( pParentSect )
{
- m_Data.SetProtectFlag( pParentSect->IsProtectFlag() );
// edit in readonly sections
m_Data.SetEditInReadonlyFlag( pParentSect->IsEditInReadonlyFlag() );
}
- if (!m_Data.IsProtectFlag())
- {
- m_Data.SetProtectFlag( rFormat.GetProtect().IsContentProtected() );
- }
+ m_Data.SetProtectFlag( rFormat.GetProtect().IsContentProtected() );
if (!m_Data.IsEditInReadonlyFlag()) // edit in readonly sections
{
@@ -457,21 +453,8 @@ void SwSection::SwClientNotify(const SwModify&, const
SfxHint& rHint)
{
bool bNewFlag =
static_cast<const SvxProtectItem*>(pNew)->IsContentProtected();
- if( !bNewFlag )
- {
- // Switching off: See if there is protection transferred
- // by the Parents
- const SwSection* pSect = this;
- do {
- if( pSect->IsProtect() )
- {
- bNewFlag = true;
- break;
- }
- pSect = pSect->GetParent();
- } while (pSect);
- }
-
+ // this used to inherit the flag from the parent, but then there is
+ // no way to turn it off in an inner section
m_Data.SetProtectFlag( bNewFlag );
}
return;
