From 900b0b3e0909cc76eeb537bcf72a1e153063a7f2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 7 Feb 2022 17:26:32 +0100 Subject: tdf#147206 writerfilter: fix end position of hyperlink in ToX (regression from commit 58a86af36295b4fc1e07c0bd38f74530a2ce0f08) Change-Id: Ied4c26255b60f4320f38432ef5e2e27882b7a135 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129681 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 9d30e168112bc5c3c7f2dfc029f293c540ebb280) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129618 Reviewed-by: Miklos Vajna --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 6080f2a70ae1..4b0f3f6c4e75 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -7042,7 +7042,14 @@ void DomainMapper_Impl::PopFieldContext() } else if (!pContext->GetHyperlinkURL().isEmpty() && xCrsr.is()) { - xCrsr->gotoEnd( true ); + if (m_aTextAppendStack.top().xInsertPosition.is()) + { + xCrsr->gotoRange(m_aTextAppendStack.top().xInsertPosition, true); + } + else + { + xCrsr->gotoEnd(true); + } // Draw components (like comments) need hyperlinks set differently SvxUnoTextRangeBase* pDrawText = dynamic_cast(xCrsr.get()); -- cgit