diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-21 09:31:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-10-21 09:36:33 +0200 |
| commit | a35fa8d8b127cb23ebff3952291742bf28477c74 (patch) | |
| tree | 68a2172f2221708cb0de9508ff40670ef01d90f5 /writerfilter | |
| parent | 8831afd5d7a0a7177df00929c9bed6a05d721851 (diff) | |
fdo#70221 fix RTF import of multi-group pictures
Pictures typically have a single RTF group, so we imported them at the
end of that group. Though multiple inner groups are also allowed, so
make sure we only do the import at the very end, instead of at the end
of all inner groups as well, resulting in multiple (fake) pictures.
Regression from 13c00ce322e78eb4e0f50ab84ded19cd6aae1ded (Enable the
writerfilter-based RTF import in non-experimental mode, 2011-08-18).
Change-Id: Id895b2c6d3b824d09d89bfa01ce59aba76c55d42
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d3614b92cb05..cedf5cef31ba 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3779,6 +3779,7 @@ int RTFDocumentImpl::pushState() case DESTINATION_SHAPETEXT: case DESTINATION_FORMFIELD: case DESTINATION_FIELDINSTRUCTION: + case DESTINATION_PICT: m_aStates.top().nDestinationState = DESTINATION_NORMAL; break; case DESTINATION_MNUM: |