summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaume Pujantell <jaume.pujantell@collabora.com>2023-04-27 14:54:55 +0200
committerAndras Timar <andras.timar@collabora.com>2023-05-04 09:27:04 +0200
commit08e111b488c7cddfcacbd66560cf40b060ec4b75 (patch)
tree6a117c708aaffdb66e694aed748b0f12e0b5ec2f
parentdb0b72abfba97d0ab17265741e15a22c7fd31102 (diff)
tdf#154478 fix comments empy after ToC
TOC creation entered a malformed state where it interfered with the creation of other elements (e.g. annotations and textboxes). This change is also a fix to tdf#154481, so the patch from 94de79e7d3c98 can be removed. Change-Id: I423f9d048b8c5b89fd38229c4f3ad41213d5ab67 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151103 Tested-by: Jenkins Reviewed-by: Ashod Nakashian <ash@collabora.com> (cherry picked from commit 5431b756d45bebe74beaba2026704552ee6891f0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151282 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8b8bff35e40e..e2c2475ecf9f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6030,7 +6030,13 @@ uno::Reference<beans::XPropertySet> DomainMapper_Impl::createSectionForRange(
if (stepLeft)
xCursor->goLeft(1, true);
uno::Reference< text::XTextContent > xSection( m_xTextFactory->createInstance(sObjectType), uno::UNO_QUERY_THROW );
- xSection->attach( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW) );
+ try
+ {
+ xSection->attach( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW) );
+ }
+ catch(const uno::Exception&)
+ {
+ }
xRet.set(xSection, uno::UNO_QUERY );
}
catch(const uno::Exception&)