diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-10 13:46:47 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-12 08:45:13 +0000 |
| commit | 03be54fd1cdb9319c2898100423507781d2ce7cb (patch) | |
| tree | 097eccec1f2fce5379deed75446c338232acd014 /writerfilter | |
| parent | 68be1d3a8964d548a0113fe28a70e09349ddd0d7 (diff) | |
fftester: no table manager
Change-Id: I033454670d1ee662bc80bc07578690155d97ce28
Reviewed-on: https://gerrit.libreoffice.org/28806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf | bin | 0 -> 2417 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf Binary files differnew file mode 100644 index 000000000000..67a0ea1750f1 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-6.rtf diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 6bbef8dc406d..24049b19a2fd 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1221,7 +1221,7 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper if( pPropertyMap == m_pTopContext && !deferredCharacterProperties.empty() && (GetTopContextType() == CONTEXT_CHARACTER) ) processDeferredCharacterProperties(); uno::Reference< text::XTextAppend > xTextAppend = m_aTextAppendStack.top().xTextAppend; - if(xTextAppend.is() && ! getTableManager( ).isIgnore()) + if (xTextAppend.is() && hasTableManager() && !getTableManager().isIgnore()) { try { |