diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-31 19:58:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-31 20:13:51 +0100 |
| commit | 8a6b2fb5b94de43316ab3ea95ff07cf5f46b6134 (patch) | |
| tree | fe3fea8dd98c122ae33218dd1c61daf51311b92c | |
| parent | d5f4bcb2c10ca40ce853b96398e60aead8809621 (diff) | |
fftester: another table manager stack checks
and a m_xTextFactory check too
Change-Id: I9352410c42048b4dd7d6dbc3514351ab8f16790b
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf | bin | 0 -> 324 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf Binary files differnew file mode 100644 index 000000000000..28093f25a6c5 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf 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); |