diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-04-12 13:06:52 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-04-12 13:09:16 +0200 |
| commit | bebf8ccfba37f77d6a43c7874249b31736467b17 (patch) | |
| tree | 26c7e289be78b2bf77ed672202f1093f1eb5a77a /xmloff | |
| parent | e7808c250f1b82ca9566fc12c4d7de33c58fcb1b (diff) | |
i#98430: Import at least the shape.
The image that is inside is dropped though, we do not have support for that in
editeng.
Change-Id: I16dc1656e6f71fd80136bc39233decef4e1d4069
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index fb457b6cf76c..1a4bb7a0adc6 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -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?" ); + } } } |