diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-06-15 15:14:45 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-06-15 15:14:45 +0200 |
| commit | d942e9501032ef5934058d0ad1e278f40516b093 (patch) | |
| tree | f5add5fb1ca52bf9ce6a4121949573667790ca68 /writerfilter/source/filter | |
| parent | 5336ea8f1e7b2a50741f1b82c94de45f8d1798c3 (diff) | |
pass XFrame to the implementation to avoid assertion failures
Diffstat (limited to 'writerfilter/source/filter')
| -rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index a840b3cc70d2..9f04f1bec8cf 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -35,6 +35,7 @@ #include <comphelper/mediadescriptor.hxx> #include <dmapper/DomainMapper.hxx> #include <rtftok/RTFDocument.hxx> +#include <com/sun/star/frame/XFrame.hpp> using namespace ::rtl; using namespace ::cppu; @@ -87,10 +88,13 @@ sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescri aMediaDesc.addInputStream(); aMediaDesc[ MediaDescriptor::PROP_INPUTSTREAM() ] >>= xInputStream; + uno::Reference<frame::XFrame> xFrame = aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_FRAME(), + uno::Reference<frame::XFrame>()); + writerfilter::Stream::Pointer_t pStream( new writerfilter::dmapper::DomainMapper(m_xContext, xInputStream, m_xDstDoc, writerfilter::dmapper::DOCUMENT_RTF)); writerfilter::rtftok::RTFDocument::Pointer_t const pDocument( - writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc) ); + writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc, xFrame)); pDocument->resolve(*pStream); #ifdef DEBUG_IMPORT dmapperLogger->endDocument(); |