diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2015-03-25 12:01:04 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-26 14:27:31 +0000 |
| commit | ed1605c1ea01c8b8d7809e3682d5c2104c16fa41 (patch) | |
| tree | 12ff6492690d8efb8bb25ef9f232eff17da94718 /writerfilter/source/rtftok | |
| parent | 77cb94613be6315b618783b2aa76226ad3107163 (diff) | |
tdf#89496 fixed crash on rtf shape group parsing
Fix is actually partial revert of my changes done for tdf#49893
(commit 2c411e4487f24968d6a62958fec85e4e3e1fda93): shape groups
were not taken into account
Change-Id: Ieb442265ac7c0087c3a402a9f1b09e6b3dcbcac1
Reviewed-on: https://gerrit.libreoffice.org/14997
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter/source/rtftok')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 2c278c426ffd..c3f240544879 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -791,6 +791,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap { m_xShape = xShape; // store it for later resolvePict call } + return; } if (bCustom && xShape.is() && !bPib) |