summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtfbin0 -> 1941 bytes
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx5
2 files changed, 1 insertions, 4 deletions
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 000000000000..a03be130d1f8
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf
Binary files differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5c81c097fe50..e27e17e6ef47 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";