Kaydet (Commit) e8fad045 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

tdf#121005 forcepoint#44 merge into isDeleteForbidden

Reviewed-on: https://gerrit.libreoffice.org/55355Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit c6222fb6)

Change-Id: If7ce44786975c5f9bdc9e64d16274728b03bed32
Reviewed-on: https://gerrit.libreoffice.org/62629
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit ba4861a0)
üst c0f4f855
This diff was suppressed by a .gitattributes entry.
......@@ -1217,6 +1217,8 @@ namespace
{
bool isDeleteForbidden(const SwPageFrame *pDel)
{
if (pDel->IsDeleteForbidden())
return true;
const SwLayoutFrame* pBody = pDel->FindBodyCont();
const SwFrame* pBodyContent = pBody ? pBody->Lower() : nullptr;
return pBodyContent && pBodyContent->IsDeleteForbidden();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment