diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-07 16:58:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-07 17:01:10 +0100 |
| commit | 145e2dfc4501cb3fa01a1771cb6829b5945df4a6 (patch) | |
| tree | 3228a00c2bb4cbd01fa0a3239b536bb2708c19c3 /writerfilter/source | |
| parent | ff5beeeae6cc40a21ba7b41a36286318348b77ab (diff) | |
fftester: guard against empty table manager stack
Change-Id: Ibb4cadb58aa17eacfc9741f7f13c780be347cd8b
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 64e650a8741b..98a9900c2cb8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1306,7 +1306,6 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper } } - void DomainMapper_Impl::appendTextContent( const uno::Reference< text::XTextContent >& xContent, const uno::Sequence< beans::PropertyValue >& xPropertyValues @@ -1317,7 +1316,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 { @@ -1335,7 +1334,6 @@ void DomainMapper_Impl::appendTextContent( } } - void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const OLEHandlerPtr& pOLEHandler ) { static const char sEmbeddedService[] = "com.sun.star.text.TextEmbeddedObject"; |