From 8a6b2fb5b94de43316ab3ea95ff07cf5f46b6134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sun, 31 Jul 2016 19:58:18 +0100
Subject: [PATCH] fftester: another table manager stack checks

and a m_xTextFactory check too

Change-Id: I9352410c42048b4dd7d6dbc3514351ab8f16790b
---
 .../rtftok/data/pass/tablemanager-4.rtf           | Bin 0 -> 324 bytes
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf

diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf
new file mode 100644
index 0000000000000000000000000000000000000000..28093f25a6c5d8e477a8593f9e0fa644f9a2d6c3
GIT binary patch
literal 324
zcmb<EoYYWKA0yCOG_QgG|NrXxn37}$28Kxt3=9ITZS(5?|F0-X%E^gINhql(Nh-=I
zi%BV{Ff=yEODU)*Hmr`(ib*LbsYt3QNv$Y}Nh!$OxqbWgO(%~iZ{J>$Tsw(@fsx^b
zX2_>Z=a?9-n3z}w`DCUxi0RBPG()~s#DK-4zsn~x^)oOq?5v21Dd7SM!URx^197gh
z{{PPkGP?+i;}{qiQwkU=N>XE#gNv?izZ?Tn$iTn=vkbS{TW~m)VJE}`AUDOt#6Ug3
O0QTlpkT<t)-wpsPT!JJ3

literal 0
HcmV?d00001

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1d22fa4fb274..64e650a8741b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1034,7 +1034,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap )
     TagLogger::getInstance().attribute("isTextAppend", sal_uInt32(xTextAppend.is()));
 #endif
 
-    if (xTextAppend.is() && pParaContext != nullptr && !getTableManager().isIgnore())
+    if (xTextAppend.is() && pParaContext && hasTableManager() && !getTableManager().isIgnore())
     {
         try
         {
@@ -4198,7 +4198,7 @@ void DomainMapper_Impl::CloseFieldCommand()
                  */
                 OUString aCode( pContext->GetCommand().trim() );
                 // Don't waste resources on wrapping shapes inside a fieldmark.
-                if (aCode != "SHAPE")
+                if (aCode != "SHAPE" && m_xTextFactory.is())
                 {
                     xFieldInterface = m_xTextFactory->createInstance("com.sun.star.text.Fieldmark");
                     const uno::Reference<text::XTextContent> xTextContent(xFieldInterface, uno::UNO_QUERY_THROW);