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

no need to queue formats in header and footer ...

- we can call MakeFrames on them right away
- as there had been performance issues on mail merge here before, this
  might a bit quicker for suoer large documents.

Change-Id: Idd84d7e6a962d00d59e2981f63ed9db60377fa01
Reviewed-on: https://gerrit.libreoffice.org/42442Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarBjörn Michaelsen <bjoern.michaelsen@libreoffice.org>
üst ce2fce9a
...@@ -1100,14 +1100,18 @@ void AppendAllObjs(const SwFrameFormats* pTable, const SwFrame* pSib) ...@@ -1100,14 +1100,18 @@ void AppendAllObjs(const SwFrameFormats* pTable, const SwFrame* pSib)
// Formats can still remain, because we neither use character bound // Formats can still remain, because we neither use character bound
// frames nor objects which are anchored to character bounds. // frames nor objects which are anchored to character bounds.
if ((rAnch.GetAnchorId() != RndStdIds::FLY_AT_PAGE) && (rAnch.GetAnchorId() != RndStdIds::FLY_AS_CHAR)) if ((rAnch.GetAnchorId() != RndStdIds::FLY_AT_PAGE) && (rAnch.GetAnchorId() != RndStdIds::FLY_AS_CHAR))
{
if(lcl_InHeaderOrFooter(*pFormat))
pFormat->MakeFrames();
else
vFormatsToConnect.push_back(pFormat); vFormatsToConnect.push_back(pFormat);
} }
}
const SwFrameFormat* pFirstRequeued(nullptr); const SwFrameFormat* pFirstRequeued(nullptr);
while(!vFormatsToConnect.empty()) while(!vFormatsToConnect.empty())
{ {
auto& pFormat = vFormatsToConnect.front(); auto& pFormat = vFormatsToConnect.front();
const bool bAlreadyConnected(lcl_ObjConnected(pFormat, pSib)); if(!lcl_ObjConnected(pFormat, pSib))
if(!bAlreadyConnected || lcl_InHeaderOrFooter(*pFormat))
{ {
pFormat->MakeFrames(); pFormat->MakeFrames();
pFirstRequeued = nullptr; pFirstRequeued = nullptr;
......
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