commit 5fc6a601d7a1978db291fd0f7dcec638a7c25651
author Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> Sun Nov 22 10:47:20 2020 +0100
committer Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> Mon Nov 23 08:59:35 2020 +0100
tree a5543f8d7bc4c8012e5b922335c841313bf9ea39
parent e4ee7fed48c540a857c49d2e32384981c9275083

section.cxx: Remove remaining SwClientNotifyCalls

Change-Id: I569c5952a7491c37c677ad6b6d5f803a50b2e701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106341
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>

sw/source/core/docnode/section.cxx

diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index a3dad12..00adf5a 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -66,13 +66,6 @@
using namespace ::com::sun::star;

namespace {

    void lcl_SwClientNotify(sw::BroadcastingModify& rModify, const SfxPoolItem* pOldNew)
    {
        const sw::LegacyModifyHint aHint(pOldNew, pOldNew);
        rModify.SwClientNotifyCall(rModify, aHint);
    }

    class SwIntrnlSectRefLink : public SwBaseLink
    {
        SwSectionFormat& m_rSectFormat;
@@ -318,8 +311,8 @@
            // This should be shown by the bHiddenFlag.

            // Tell all Children that they are hidden
            SwMsgPoolItem aMsgItem( RES_SECTION_HIDDEN );
            lcl_SwClientNotify(*pFormat, &aMsgItem);
            const SwMsgPoolItem aMsgItem( RES_SECTION_HIDDEN );
            pFormat->CallSwClientNotify(sw::LegacyModifyHint(&aMsgItem, &aMsgItem));

            // Delete all Frames
            pFormat->DelFrames();
@@ -333,8 +326,8 @@
        if( !pParentSect || !pParentSect->IsHiddenFlag() )
        {
            // Tell all Children that the Parent is not hidden anymore
            SwMsgPoolItem aMsgItem( RES_SECTION_NOT_HIDDEN );
            lcl_SwClientNotify(*pFormat, &aMsgItem);
            const SwMsgPoolItem aMsgItem( RES_SECTION_NOT_HIDDEN );
            pFormat->CallSwClientNotify(sw::LegacyModifyHint(&aMsgItem, &aMsgItem));

            pFormat->MakeFrames();
        }
@@ -719,8 +712,8 @@
    SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection( &aNextNd, true, false );
    if( pCNd )
    {
        const SfxPoolItem& rItem = pCNd->GetSwAttrSet().Get( RES_PAGEDESC );
        lcl_SwClientNotify(*pCNd, &rItem);
        const SfxPoolItem& rItem = pCNd->GetSwAttrSet().Get(RES_PAGEDESC);
        pCNd->CallSwClientNotify(sw::LegacyModifyHint(&rItem, &rItem));
    }
}

@@ -945,22 +938,19 @@
        bIsHidden = pPS->IsHiddenFlag();
    }
    SwIterator<SwSectionFormat,SwSectionFormat> aIter(*this);
    for(SwSectionFormat* pLast = aIter.First(); pLast; pLast = aIter.Next())
    if(!pProtect->IsContentProtected() != !pSection->IsProtectFlag())
        CallSwClientNotify(sw::LegacyModifyHint(pProtect, pProtect));

    // edit in readonly sections
    if(!pEditInReadonly->GetValue() != !pSection->IsEditInReadonlyFlag())
        CallSwClientNotify(sw::LegacyModifyHint(pEditInReadonly, pEditInReadonly));

    if(bIsHidden == pSection->IsHiddenFlag())
    {
        if(!pProtect->IsContentProtected() != !pSection->IsProtectFlag())
            lcl_SwClientNotify(*static_cast<sw::BroadcastingModify*>(pLast), static_cast<SfxPoolItem const *>(pProtect));

        // edit in readonly sections
        if(!pEditInReadonly->GetValue() != !pSection->IsEditInReadonlyFlag())
            lcl_SwClientNotify(*static_cast<sw::BroadcastingModify*>(pLast), static_cast<SfxPoolItem const *>(pEditInReadonly));

        if(bIsHidden == pSection->IsHiddenFlag())
        {
            SwMsgPoolItem aMsgItem( static_cast<sal_uInt16>(bIsHidden
                        ? RES_SECTION_HIDDEN
                        : RES_SECTION_NOT_HIDDEN ) );
            lcl_SwClientNotify(*static_cast<sw::BroadcastingModify*>(pLast), &aMsgItem);
        }
        SwMsgPoolItem aMsgItem(static_cast<sal_uInt16>(bIsHidden
                ? RES_SECTION_HIDDEN
                : RES_SECTION_NOT_HIDDEN));
        CallSwClientNotify(sw::LegacyModifyHint(&aMsgItem, &aMsgItem));
    }
}