mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rtf image import ( causing wrong image sometimes displayed ) fdo#42640

Browse Source
This commit is contained in:
Noel Power
2011-11-09 14:36:28 +00:00
parent de56b0f22d
commit 02c6f5c74b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View File

@@ -44,6 +44,8 @@
#include <svl/lngmisc.hxx> #include <svl/lngmisc.hxx>
#include <unotools/ucbstreamhelper.hxx> #include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx> #include <unotools/streamwrap.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <doctok/sprmids.hxx> // NS_sprm namespace #include <doctok/sprmids.hxx> // NS_sprm namespace
#include <doctok/resourceids.hxx> // NS_rtf namespace #include <doctok/resourceids.hxx> // NS_rtf namespace
@@ -590,6 +592,13 @@ int RTFDocumentImpl::resolvePict(bool bInline)
if (m_xModelFactory.is()) if (m_xModelFactory.is())
xShape.set(m_xModelFactory->createInstance(aService), uno::UNO_QUERY); xShape.set(m_xModelFactory->createInstance(aService), uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPageSupplier> xDrawSupplier( m_xDstDoc, uno::UNO_QUERY);
if ( xDrawSupplier.is() )
{
uno::Reference< drawing::XShapes > xShapes( xDrawSupplier->getDrawPage(), uno::UNO_QUERY );
if ( xShapes.is() )
xShapes->add( xShape );
}
if (m_bObject) if (m_bObject)
{ {
// Set bitmap // Set bitmap