sw/source/core/doc/docbm.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b8a0289f89cda6b816c710f687f4a4735e0f2bf4
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 16 11:18:41 2017 +0000
assert on export of ooo59665-1.sxw to odt
rSecondStart.nContent in this case has no m_pIndexReg
just move on with our lives wrt this sorting
Change-Id: I9642c5d345dabd02f3feea83bc2ffbf3f7adb082
Reviewed-on: https://gerrit.libreoffice.org/34336
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 5d6b5bb57bb82a0dc480ca2ea17da5396f598af7)
Reviewed-on: https://gerrit.libreoffice.org/34593
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 4fd53d0..f75dd0e 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -84,9 +84,11 @@ namespace
{
return rFirstStart.nNode < rSecondStart.nNode;
}
- if (rFirstStart.nContent != 0 || rSecondStart.nContent != 0)
+ const sal_Int32 nFirstContent = rFirstStart.nContent.GetIndex();
+ const sal_Int32 nSecondContent = rSecondStart.nContent.GetIndex();
+ if (nFirstContent != 0 || nSecondContent != 0)
{
- return rFirstStart.nContent < rSecondStart.nContent;
+ return nFirstContent < nSecondContent;
}
auto *const pCRFirst (dynamic_cast<::sw::mark::CrossRefBookmark
const*>(rpFirst.get()));
auto *const pCRSecond(dynamic_cast<::sw::mark::CrossRefBookmark
const*>(rpSecond.get()));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
