fftester: another table manager stack checks

and a m_xTextFactory check too Change-Id: I9352410c42048b4dd7d6dbc3514351ab8f16790b

fftester: another table manager stack checks
and a m_xTextFactory check too Change-Id: I9352410c42048b4dd7d6dbc3514351ab8f16790b
8a6b2fb5 · Caolán McNamara · d5f4bcb2 · 8a6b2fb5 · 8a6b2fb5
Kaydet (Commit) 8a6b2fb5 authored Tem 31, 2016 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

tablemanager-4.rtf ...ilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf +0 -0

DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx +2 -2

No files found.
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf
--- 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);