diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-21 16:06:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-06-21 16:13:46 +0100 |
| commit | 05e82f9e97d7f44e5eeec68b9d9bc42124624d33 (patch) | |
| tree | 6b28f9ecbe5ffc52b82e6dd83a20f0b55da9dc06 /sw | |
| parent | 2534ec3639c39384f0879488c235911ab2bef9b9 (diff) | |
ofz#2340 null deferences on close redlines
Change-Id: I5e270f160f51b7ffa7059dfd17f31d8ec5919a3e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/writerhelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 0737ec419497..c12f5ef6817a 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -754,8 +754,8 @@ namespace sw nIndex - 1); sw::mark::IFieldmark *const pFieldMark( rPos.GetDoc()->getIDocumentMarkAccess()->getFieldmarkFor(end)); - assert(pFieldMark); - if (pFieldMark->GetMarkPos().nNode.GetIndex() == (*aResult)->m_aMkPos.m_nNode.GetIndex()+1 + SAL_WARN_IF(!pFieldMark, "sw.ww8", "expected a field mark"); + if (pFieldMark && pFieldMark->GetMarkPos().nNode.GetIndex() == (*aResult)->m_aMkPos.m_nNode.GetIndex()+1 && pFieldMark->GetMarkPos().nContent.GetIndex() < (*aResult)->m_aMkPos.m_nContent) { (*aResult)->SetEndPos(end); |