[Libreoffice-commits] core.git: sw/inc sw/source

[Bjoern Michaelsen]

 sw/inc/frmfmt.hxx                |    3 ++-
 sw/source/core/draw/dcontact.cxx |    1 +
 sw/source/core/layout/atrfrm.cxx |    4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8725c011de34206a91aa4d422a0b67a845cf2e1c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 5 01:22:45 2016 +0100

    use proper message passing
    
    Change-Id: Ibf02e22d7dcca2338da34376a70e9383e366920d
    Reviewed-on: https://gerrit.libreoffice.org/31614
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 2f17bc6..b273f44 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -242,7 +242,8 @@ namespace sw
         PREP_INSERT_FLY,
         PREP_DELETE_FLY,
         PAGE_OUT_OF_BOUNDS,
-        MAKE_FRAMES
+        MAKE_FRAMES,
+        DELETE_FRAMES
     };
     struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint
     {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 4bee3cc..1ee4787 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1549,6 +1549,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
                 RemoveMasterFromDrawPage();
                 break;
             case sw::DrawFrameFormatHintId::PAGE_OUT_OF_BOUNDS:
+            case sw::DrawFrameFormatHintId::DELETE_FRAMES:
                 DisconnectFromLayout();
                 break;
             case sw::DrawFrameFormatHintId::MAKE_FRAMES:
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index fb6fa17..d199be3 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3344,9 +3344,7 @@ void SwDrawFrameFormat::MakeFrames()
 
 void SwDrawFrameFormat::DelFrames()
 {
-    SwDrawContact *pContact = static_cast<SwDrawContact *>(FindContactObj());
-    if ( pContact ) //for the reader and other unpredictable things.
-        pContact->DisconnectFromLayout();
+    CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::DELETE_FRAMES));
 }
 
 // #i31698#