diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-24 16:21:51 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-25 09:34:43 +0200 |
| commit | 6b7239855d8babdc1bcc7742f79ce2df64d1e476 (patch) | |
| tree | 216d7181c8b08931cc5b9041000528723896783b | |
| parent | 6c10db81dedd906a45c72254b422f748739dc9c0 (diff) | |
fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrame
Change-Id: I687fa609559f0484fe6bb804265243de154c3760
| -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 fcb5b9c37b82..df1c1850f5af 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -824,7 +824,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap aPropertyValue.Value <<= aPath.getAsConstList(); aGeometry.push_back(aPropertyValue); } - if (!aGeometry.empty() && xPropertySet.is()) + if (!aGeometry.empty() && xPropertySet.is() && !m_bTextFrame) xPropertySet->setPropertyValue("CustomShapeGeometry", uno::Any(aGeometry.getAsConstList())); // Set position and size |