writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf |binary writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 +---- 2 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 329f8d8b96d8abdaed31b8a5bcc417604d388931 Author: Caolán McNamara <[email protected]> Date: Sun Aug 7 16:58:22 2016 +0100 fftester: guard against empty table manager stack (cherry picked from commit 145e2dfc4501cb3fa01a1771cb6829b5945df4a6) Change-Id: Ibb4cadb58aa17eacfc9741f7f13c780be347cd8b Reviewed-on: https://gerrit.libreoffice.org/27938 Tested-by: Jenkins <[email protected]> Reviewed-by: David Tardon <[email protected]> diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf new file mode 100644 index 0000000..a03be13 Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf differ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5c81c09..e27e17e 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,8 +1325,6 @@ void DomainMapper_Impl::appendTextContent( } } - - void DomainMapper_Impl::appendOLE( const OUString& rStreamName, OLEHandlerPtr pOLEHandler ) { static const char sEmbeddedService[] = "com.sun.star.text.TextEmbeddedObject";
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
