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

[Bjoern Michaelsen]

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

New commits:
commit 47203f2cff8afb2d4e57be479089f39d36160bb4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 5 01:06:12 2016 +0100

    use proper message passing
    
    Change-Id: Ie516712b3474a0eb800e2d9e3e41921b10059fe8
    Reviewed-on: https://gerrit.libreoffice.org/31613
    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 0dd00dc..2f17bc6 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -242,6 +242,7 @@ namespace sw
         PREP_INSERT_FLY,
         PREP_DELETE_FLY,
         PAGE_OUT_OF_BOUNDS,
+        MAKE_FRAMES
     };
     struct SW_DLLPUBLIC DrawFrameFormatHint final: SfxHint
     {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 82425a0..4bee3cc 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1551,6 +1551,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
             case sw::DrawFrameFormatHintId::PAGE_OUT_OF_BOUNDS:
                 DisconnectFromLayout();
                 break;
+            case sw::DrawFrameFormatHintId::MAKE_FRAMES:
+                 ConnectToLayout();
+                 break;
             default:
                 SAL_WARN("sw.core", "unhandled DrawFrameFormatHintId");
         }
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 4d5cd195..fb6fa17 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3339,9 +3339,7 @@ SwDrawFrameFormat::~SwDrawFrameFormat()
 
 void SwDrawFrameFormat::MakeFrames()
 {
-    SwDrawContact *pContact = static_cast<SwDrawContact*>(FindContactObj());
-    if ( pContact )
-         pContact->ConnectToLayout();
+    CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::MAKE_FRAMES));
 }
 
 void SwDrawFrameFormat::DelFrames()