sw/source/core/doc/docbm.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 22950a9b008e1bb22fa9e54b5d45715e25fee764
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed May 10 10:49:56 2023 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Tue May 16 01:36:10 2023 +0200
tdf#154956 sw: delete bookmarks at end: fix crashtesting
This fixes LO 7.6 commit 21b1dd42e9a817ae9b68e9e13ea57ce2491940c6
wget https://bugs.documentfoundation.org/attachment.cgi?id=124859 \
-O ~/tdf99692-1.odt
./instdir/program/soffice --headless --convert-to odt ~/tdf99692-1.odt
sw/source/core/crsr/pam.cxx:268: void SwPosition::SetContent(sal_Int32):
Assertion `nNode.GetNode().GetContentNode()
&& "only valid to call this if we point to an SwContentNode"' failed.
Change-Id: Ic8280bf56f1e7f339fdff3e9591470bc74aa0d5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151639
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ab5e544c2358..2d8a411a9c5d 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -2063,7 +2063,7 @@ void DelBookmarks(
if( lcl_Greater( *pREnd, rStt, oStartContentIdx ) && lcl_Lower(
*pREnd, rEnd, oEndContentIdx ))
{
pREnd->Assign( rStt );
- if( oStartContentIdx )
+ if (oStartContentIdx && rStt.IsContentNode())
pREnd->SetContent( *oStartContentIdx );
else
{
