diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-03-01 11:56:08 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-03-01 11:56:58 +0100 |
| commit | 456a59b24d4ba5ac341f76b4302e82b687e97f69 (patch) | |
| tree | 9ccedcab43164031540053034a36abdbb3417204 | |
| parent | f87e486d298d98beb3aa9bd1c4884877117cbdcc (diff) | |
fix RTF import of drawing objects when there is no shape to send
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index fbe257c68fbe..ad45d96a2343 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3245,7 +3245,7 @@ int RTFDocumentImpl::popState() aFrame = m_aStates.top().aFrame; bPopFrame = true; } - else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT) + else if (m_aStates.top().nDestinationState == DESTINATION_DRAWINGOBJECT && m_aStates.top().aDrawingObject.xShape.is()) { RTFDrawingObject& rDrawing = m_aStates.top().aDrawingObject; uno::Reference<drawing::XShape> xShape(rDrawing.xShape); |