sw/source/core/layout/frmtool.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ce2fce9a41729774689080c8b5552b60c2e6ee2d
Author: Bjoern Michaelsen <bjoern.michael...@libreoffice.org>
Date: Tue Sep 19 00:38:54 2017 +0200
tdf#112447: connect all objects
- fixes regression from 575e222a1742918be052f2b716ddf57ce0008404
Change-Id: I686ce41c87e5b421e0382658404cf7bb153a4812
Reviewed-on: https://gerrit.libreoffice.org/42439
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michael...@libreoffice.org>
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index c7589de9426f..5a238580ac42 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1108,9 +1108,10 @@ void AppendAllObjs(const SwFrameFormats* pTable, const
SwFrame* pSib)
auto& pFormat = vFormatsToConnect.front();
const bool bAlreadyConnected(lcl_ObjConnected(pFormat, pSib));
if(!bAlreadyConnected || lcl_InHeaderOrFooter(*pFormat))
+ {
pFormat->MakeFrames();
- if(bAlreadyConnected || lcl_ObjConnected(pFormat, pSib))
pFirstRequeued = nullptr;
+ }
else
{
if(pFirstRequeued == pFormat)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
