[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - writerfilter/qa writerfilter/source

[Caolán McNamara]

 writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx                |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cff184a4528c9c0e7112fe6470c5c0d2d4bfe41d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 31 19:58:18 2016 +0100

    fftester: another table manager stack checks
    
    and a m_xTextFactory check too
    
    Change-Id: I9352410c42048b4dd7d6dbc3514351ab8f16790b
    (cherry picked from commit 8a6b2fb5b94de43316ab3ea95ff07cf5f46b6134)
    Reviewed-on: https://gerrit.libreoffice.org/27759
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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 0000000..28093f2
Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5959f6a..502f6ef 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1035,7 +1035,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
         {
@@ -4202,7 +4202,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);