diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-24 16:21:51 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 14:30:33 +0100 |
| commit | 65d66f4f4a7f4f9a228f9cc157f2c2ce63ea7c6b (patch) | |
| tree | 17f2aa91f22b1de1e0052ba0c66dd11cc2235d07 /writerfilter | |
| parent | 61c1b9aee73b718fb73ada5c7393c478a6e21efd (diff) | |
fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrame
(cherry picked from commit 6b7239855d8babdc1bcc7742f79ce2df64d1e476)
Conflicts:
writerfilter/source/rtftok/rtfsdrimport.cxx
Change-Id: I687fa609559f0484fe6bb804265243de154c3760
Reviewed-on: https://gerrit.libreoffice.org/12122
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 3d62a44741c2..7afcfb0f0740 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -793,7 +793,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap beans::PropertyValue* pGeomValues = aGeomPropSeq.getArray(); for (std::vector<beans::PropertyValue>::iterator i = aGeomPropVec.begin(); i != aGeomPropVec.end(); ++i) *pGeomValues++ = *i; - if (aGeomPropSeq.getLength() && xPropertySet.is()) + if (aGeomPropSeq.getLength() && xPropertySet.is() && !m_bTextFrame) xPropertySet->setPropertyValue("CustomShapeGeometry", uno::Any(aGeomPropSeq)); // Set position and size |