diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-24 16:21:51 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-30 14:04:09 +0000 |
| commit | 22f307bc19d5acd0c4cb71e8e122e57bd6afc568 (patch) | |
| tree | 09219524e74bcb58fe84aaaf1c3460d149159cb8 | |
| parent | d7d4a6bf1e96be723a09add106ce6d261509b1c8 (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>
| -rw-r--r-- | sw/qa/core/data/rtf/pass/fdo82859.rtf | 25 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/sw/qa/core/data/rtf/pass/fdo82859.rtf b/sw/qa/core/data/rtf/pass/fdo82859.rtf new file mode 100644 index 000000000000..72b1576e0f8c --- /dev/null +++ b/sw/qa/core/data/rtf/pass/fdo82859.rtf @@ -0,0 +1,25 @@ +{\rtf1 +{\field +{\*\fldinst SHAPE } +{\fldrslt +{\shp +{\*\shpinst\shpleft-90\shptop720\shpright9404\shpbottom2939\shpwr2\shpbxignore\shpbyignore +{\sp +{\sn shapeType} +{\sv 1} +} +{\sp +{\sn pVerticies} +{\sv 8;4;(0,0);(-2147483645,0);(-2147483645,-2147483646);(0,-2147483646)} +} +{\sp +{\sn pSegmentInfo} +{\sv 2;4;16384;3;24577;32768} +} +{\shptxt hello} +} +} +} +} +\par +} 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 |