diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-09-11 10:00:08 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-09-11 10:00:08 +0200 |
| commit | 97ebce2051a374be5e5dd908d40c69b21e12f61b (patch) | |
| tree | 352125c6b5f547980347972a2b59d10779dc9886 /writerfilter/source/rtftok/rtfsdrimport.cxx | |
| parent | tdf#136094 Handle background color in drawNativeControl (diff) | |
| parent | xmlsecurity: pdf incremental updates that are non-commenting are invalid (diff) | |
| download | core-97ebce2051a374be5e5dd908d40c69b21e12f61b.tar.gz core-97ebce2051a374be5e5dd908d40c69b21e12f61b.zip | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Change-Id: Ib3030257fb7c4eec5b910c0b49332be0dd8fa854
Diffstat (limited to 'writerfilter/source/rtftok/rtfsdrimport.cxx')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 85f61129b1f3..ddd2337a9945 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -1129,6 +1129,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap m_rImport.Mapper().endShape(); } } + + // If the shape has an inner shape, the inner object's properties should not be influenced by + // the outer one. + rShape.getProperties().clear(); + m_xShape = xShape; } |