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

i#98430: Import at least the shape.

Browse Source 
The image that is inside is dropped though, we do not have support for that in
editeng.

Change-Id: I16dc1656e6f71fd80136bc39233decef4e1d4069
This commit is contained in:
Jan Holesovsky 2013-04-12 13:06:52 +02:00
parent e7808c250f
commit bebf8ccfba
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
svx/source/unodraw/unomod.cxx
View File

@ -49,6 +49,7 @@
#include <svx/svdobj.hxx>
#include <svx/svdpage.hxx>
#include <svx/unoshape.hxx>
#include <svx/xmlgrhlp.hxx>
#include <com/sun/star/text/textfield/Type.hpp>
@ -183,6 +184,13 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(
return uno::Reference< uno::XInterface >( (drawing::XShape*) SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI ) );
}
}
else if ( rServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" )
{
SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ );
uno::Reference< uno::XInterface> xRet( static_cast< ::cppu::OWeakObject* >( pGraphicHelper ) );
pGraphicHelper->release();
return xRet;
}
uno::Reference< uno::XInterface > xRet( createTextField( rServiceSpecifier ) );
if( !xRet.is() )

8
xmloff/source/text/txtimp.cxx
View File

@ -1167,8 +1167,12 @@ void XMLTextImportHelper::InsertTextContent(
DBG_ASSERT(m_pImpl->m_xCursorAsRange.is(), "no range");
if (m_pImpl->m_xText.is())
{
m_pImpl->m_xText->insertTextContent(
m_pImpl->m_xCursorAsRange, xContent, sal_False);
try {
m_pImpl->m_xText->insertTextContent( m_pImpl->m_xCursorAsRange, xContent, sal_False);
} catch ( const lang::IllegalArgumentException & )
{
SAL_WARN( "xmloff", "Cannot import part of the text - probably an image in the text frame?" );
}
}
}