diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-08 21:25:28 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-19 10:18:55 +0100 |
| commit | d721d2ae422623d96663af8120dc575a43a812ff (patch) | |
| tree | f1a5da24427fff174c3bdbf2d23257791c307bce /writerfilter | |
| parent | 391a1f3629b649db457c9053427cb3deda5ace4b (diff) | |
forcepoint #21 pop on empty stack
Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
Change-Id: I25b1c6361fb0a3ae6b01f2be870c9e1b49bf5b84
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)
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 3791a7c44295..13f8c4313894 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3599,6 +3599,9 @@ void DomainMapper_Impl::handleToc pContext->SetTOC( xTOC ); m_bParaHadField = false; + if (m_aTextAppendStack.empty()) + return; + OUString const sMarker("Y"); //insert index uno::Reference< text::XTextContent > xToInsert( xTOC, uno::UNO_QUERY ); @@ -4429,7 +4432,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); |