summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-31 19:58:18 +0100
committerAndras Timar <andras.timar@collabora.com>2016-08-15 10:25:50 +0200
commitf9f9cb968200c01903f077c043c9e199971f1919 (patch)
treefc87f01be60001af87ee7afa579cde84c3fc9955
parent21992c256231ae21a5aea6da3b34b98bf2c0ab62 (diff)
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/27760 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit fbed48db0b09cfed8070d7644b0922c79d3d7512)
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtfbin0 -> 324 bytes
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx4
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
new file mode 100644
index 000000000000..28093f25a6c5
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/tablemanager-4.rtf
Binary files differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7567d079fb47..5afc5d7d0ba6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1035,7 +1035,7 @@ void DomainMapper_Impl::finishParagraph( 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);