mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#2340 null deferences on close redlines

Browse Source 
Change-Id: I5e270f160f51b7ffa7059dfd17f31d8ec5919a3e
This commit is contained in:
Caolán McNamara
2017-06-21 16:06:03 +01:00
parent 2534ec3639
commit 05e82f9e97
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sw/source/filter/ww8/writerhelper.cxx
View File

@@ -754,8 +754,8 @@ namespace sw
nIndex - 1); nIndex - 1);
sw::mark::IFieldmark *const pFieldMark( sw::mark::IFieldmark *const pFieldMark(
rPos.GetDoc()->getIDocumentMarkAccess()->getFieldmarkFor(end)); rPos.GetDoc()->getIDocumentMarkAccess()->getFieldmarkFor(end));
assert(pFieldMark); SAL_WARN_IF(!pFieldMark, "sw.ww8", "expected a field mark");
if (pFieldMark->GetMarkPos().nNode.GetIndex() == (*aResult)->m_aMkPos.m_nNode.GetIndex()+1 if (pFieldMark && pFieldMark->GetMarkPos().nNode.GetIndex() == (*aResult)->m_aMkPos.m_nNode.GetIndex()+1
&& pFieldMark->GetMarkPos().nContent.GetIndex() < (*aResult)->m_aMkPos.m_nContent) && pFieldMark->GetMarkPos().nContent.GetIndex() < (*aResult)->m_aMkPos.m_nContent)
{ {
(*aResult)->SetEndPos(end); (*aResult)->SetEndPos(end);