summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@libreoffice.org>2018-06-15 01:05:09 +0200
committerBjörn Michaelsen <bjoern.michaelsen@libreoffice.org>2018-06-15 08:53:06 +0200
commitd8142da066b6ee80444694e0eb6b0da9375a89c7 (patch)
tree6cdf65590fc4b695b0e492c6b6bf97ea22741244
parent82fc1fdebc622507d4220fefa72b9b4bda0f55d8 (diff)
tdf#117723: nullcheck the ContentAnchor before deref
Change-Id: I4043efc204c8e3af8463ecd325313c99a9d61128 Reviewed-on: https://gerrit.libreoffice.org/55839 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org> Tested-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
-rw-r--r--sw/source/core/layout/frmtool.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 3713439f3f53..dd70e6160d3f 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1171,8 +1171,9 @@ void AppendAllObjs(const SwFrameFormats* pTable, const SwFrame* pSib)
// frames nor objects which are anchored to character bounds.
if ((rAnch.GetAnchorId() != RndStdIds::FLY_AT_PAGE) && (rAnch.GetAnchorId() != RndStdIds::FLY_AS_CHAR))
{
+ auto pContentAnchor = rAnch.GetContentAnchor();
// formats in header/footer have no dependencies
- if(pFormat->GetDoc()->IsInHeaderFooter(rAnch.GetContentAnchor()->nNode))
+ if(pContentAnchor && pFormat->GetDoc()->IsInHeaderFooter(pContentAnchor->nNode))
pFormat->MakeFrames();
else
vFormatsToConnect.push_back(pFormat);