diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-10 14:56:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-10 15:00:17 +0100 |
| commit | 61a98b7bb14986f6c7c218effacabbe4b925f6b6 (patch) | |
| tree | 0725f416415c3e2cb8eecf6886fcd6326fa499b0 | |
| parent | 702b58945b51e738cdcc3d383ca38881f9f1338d (diff) | |
Resolves: tdf#100275 makeMark may return null under some circumstances
Change-Id: If3b83413c028c6cd1c055e632b6f050ec7f2475d
(cherry picked from commit 5c1a1d1c66aff497702abc20df5832fa348f1008)
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index eab114b71ee7..e5218f415295 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -254,9 +254,12 @@ namespace aTmpPam, pMark->GetName(), IDocumentMarkAccess::GetType(*pMark)); - // Explicitly try to get exactly the same name as in the source - // because NavigatorReminders, DdeBookmarks etc. ignore the proposed name - pDestDoc->getIDocumentMarkAccess()->renameMark(pNewMark, pMark->GetName()); + if (pNewMark) + { + // Explicitly try to get exactly the same name as in the source + // because NavigatorReminders, DdeBookmarks etc. ignore the proposed name + pDestDoc->getIDocumentMarkAccess()->renameMark(pNewMark, pMark->GetName()); + } // copying additional attributes for bookmarks or fieldmarks ::sw::mark::IBookmark* const pNewBookmark = |