diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-07 16:58:22 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-08-15 10:29:00 +0200 |
| commit | eeccb464806ccf039a42f97ebed7b56657e7bfcf (patch) | |
| tree | 7c7a3d9fc39d3696ce07d738d5894cc7ac6bfc3c /writerfilter | |
| parent | c388a3032ebf2d04f84ccdb5e354ac07f2f4d50f (diff) | |
fftester: guard against empty table manager stack
(cherry picked from commit 145e2dfc4501cb3fa01a1771cb6829b5945df4a6)
Reviewed-on: https://gerrit.libreoffice.org/27938
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 329f8d8b96d8abdaed31b8a5bcc417604d388931)
Change-Id: Ibb4cadb58aa17eacfc9741f7f13c780be347cd8b
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf | bin | 0 -> 1941 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
2 files changed, 1 insertions, 3 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf Binary files differnew file mode 100644 index 000000000000..a03be130d1f8 --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5afc5d7d0ba6..b8e888398e7e 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1297,7 +1297,6 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, PropertyMapP } } - void DomainMapper_Impl::appendTextContent( const uno::Reference< text::XTextContent >& xContent, const uno::Sequence< beans::PropertyValue >& xPropertyValues @@ -1308,7 +1307,7 @@ void DomainMapper_Impl::appendTextContent( return; uno::Reference< text::XTextAppendAndConvert > xTextAppendAndConvert( m_aTextAppendStack.top().xTextAppend, uno::UNO_QUERY ); OSL_ENSURE( xTextAppendAndConvert.is(), "trying to append a text content without XTextAppendAndConvert" ); - if(xTextAppendAndConvert.is() && ! getTableManager( ).isIgnore()) + if (xTextAppendAndConvert.is() && hasTableManager() && !getTableManager().isIgnore()) { try { @@ -1326,7 +1325,6 @@ void DomainMapper_Impl::appendTextContent( } } - void DomainMapper_Impl::appendOLE( const OUString& rStreamName, OLEHandlerPtr pOLEHandler ) { static const char sEmbeddedService[] = "com.sun.star.text.TextEmbeddedObject"; |