diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-08 21:25:28 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:33:42 +0200 |
| commit | 4ea292f8448d71fe0a038d85b76eb68dc41f5ecf (patch) | |
| tree | 76adb8da3134d5b897ad02193cd04c21583e085d /writerfilter | |
| parent | 360b8d1c88c8ca83a69e062f615c70cd60c16c7e (diff) | |
forcepoint #21 pop on empty stack
Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
Reviewed-on: https://gerrit.libreoffice.org/51115
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3686a3fc1b2eaee53b1ab32f33455b2b37aa8c6e)
Change-Id: I25b1c6361fb0a3ae6b01f2be870c9e1b49bf5b84
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 0eef1be53d00..a618de29df6a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3651,6 +3651,9 @@ void DomainMapper_Impl::handleToc pContext->SetTOC( xTOC ); m_bParaHadField = false; + if (m_aTextAppendStack.empty()) + return; + OUString sMarker("Y"); //insert index uno::Reference< text::XTextContent > xToInsert( xTOC, uno::UNO_QUERY ); @@ -4438,7 +4441,7 @@ void DomainMapper_Impl::CloseFieldCommand() */ OUString aCode( pContext->GetCommand().trim() ); // Don't waste resources on wrapping shapes inside a fieldmark. - if (aCode != "SHAPE" && m_xTextFactory.is()) + if (aCode != "SHAPE" && m_xTextFactory.is() && !m_aTextAppendStack.empty()) { xFieldInterface = m_xTextFactory->createInstance("com.sun.star.text.Fieldmark"); const uno::Reference<text::XTextContent> xTextContent(xFieldInterface, uno::UNO_QUERY_THROW); |