writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit 08a54e148d56542cdb3603234dc72f2620969a4f Author: Miklos Vajna <vmik...@suse.cz> Date: Tue Apr 10 15:42:23 2012 +0200 fdo#47802 fix crash on RTF import of shapes inside tables We already ignore textframes inside tables, the same should be done with textboxes till they can be handled properly. Signed-off-by: Petr Mladek <pmla...@suse.cz> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 84e2b48..9633176 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1164,7 +1164,11 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_aStates.top().nDestinationState = DESTINATION_SHAPE; break; case RTF_SHPINST: - m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION; + // Don't try to support shapes inside tables for now. + if (m_pCurrentBuffer != &m_aTableBuffer) + m_aStates.top().nDestinationState = DESTINATION_SHAPEINSTRUCTION; + else + m_aStates.top().nDestinationState = DESTINATION_SKIP; break; case RTF_NESTTABLEPROPS: m_aStates.top().nDestinationState = DESTINATION_NESTEDTABLEPROPERTIES; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits