diff options
| -rw-r--r-- | sw/qa/core/data/rtf/pass/fdo84536.rtf | 16 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 5 |
2 files changed, 20 insertions, 1 deletions
diff --git a/sw/qa/core/data/rtf/pass/fdo84536.rtf b/sw/qa/core/data/rtf/pass/fdo84536.rtf new file mode 100644 index 000000000000..a8eaacf0d869 --- /dev/null +++ b/sw/qa/core/data/rtf/pass/fdo84536.rtf @@ -0,0 +1,16 @@ +{\rtf1 +{\shp +{\*\shpinst\shpleft0\shptop0\shpright10557\shpbottom2639\shpfhdr0\shpbxmargin\shpbxignore\shpbymargin\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz2\shplid2054 +{\sp +{\sn shapeType} +{\sv 202} +} +{\sp +{\sn rotation} +{\sv -2949120} +} +{\shptxt hello\par} +} +} +\par +} diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 3b530bfb2564..facae3feb8eb 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -15,6 +15,7 @@ #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> #include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> @@ -198,7 +199,9 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, // See DffPropertyReader::Fix16ToAngle(): in RTF, positive rotation angles are clockwise, we have them as counter-clockwise. // Additionally, RTF type is 0..360*2^16, our is 0..360*100. sal_Int32 nRotation = aValue.toInt32()*100/65536; - xPropertySet->setPropertyValue("RotateAngle", uno::makeAny(sal_Int32(NormAngle360(nRotation * -1)))); + uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY); + if (!xServiceInfo->supportsService("com.sun.star.text.TextFrame")) + xPropertySet->setPropertyValue("RotateAngle", uno::makeAny(sal_Int32(NormAngle360(nRotation * -1)))); } if (nHoriOrient != 0 && xPropertySet.is()) |