Kaydet (Commit) ce2fce9a authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen Kaydeden (comit) Björn Michaelsen

tdf#112447: connect all objects

- fixes regression from 575e222a

Change-Id: I686ce41c87e5b421e0382658404cf7bb153a4812
Reviewed-on: https://gerrit.libreoffice.org/42439Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@libreoffice.org>
üst 018f875c
...@@ -1108,9 +1108,10 @@ void AppendAllObjs(const SwFrameFormats* pTable, const SwFrame* pSib) ...@@ -1108,9 +1108,10 @@ void AppendAllObjs(const SwFrameFormats* pTable, const SwFrame* pSib)
auto& pFormat = vFormatsToConnect.front(); auto& pFormat = vFormatsToConnect.front();
const bool bAlreadyConnected(lcl_ObjConnected(pFormat, pSib)); const bool bAlreadyConnected(lcl_ObjConnected(pFormat, pSib));
if(!bAlreadyConnected || lcl_InHeaderOrFooter(*pFormat)) if(!bAlreadyConnected || lcl_InHeaderOrFooter(*pFormat))
{
pFormat->MakeFrames(); pFormat->MakeFrames();
if(bAlreadyConnected || lcl_ObjConnected(pFormat, pSib))
pFirstRequeued = nullptr; pFirstRequeued = nullptr;
}
else else
{ {
if(pFirstRequeued == pFormat) if(pFirstRequeued == pFormat)
......
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