diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-04-10 15:42:23 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-04-16 17:59:41 +0200 |
| commit | 08a54e148d56542cdb3603234dc72f2620969a4f (patch) | |
| tree | 2ce592bbc0efe8f1eed3221fbb4d6066a9aedbc7 | |
| parent | bbbe092e29ed1d44bc782d07522db1c5d646f6c5 (diff) | |
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 <pmladek@suse.cz>
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 84e2b48c16cd..9633176478b5 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; |