diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-01 16:45:03 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-14 15:28:09 +0200 |
| commit | 5afd4d219c1c99254ad362aa3b8b34effd6729f9 (patch) | |
| tree | 635bcf9cc02e3d5b4a039759793073ae2ffd239b /writerfilter | |
| parent | 48ed58398c0ca11935770b057a9fadf1a20ec673 (diff) | |
fdo#84536 RTF import: don't try to rotate TextFrames
Regression from 818d80eb0cee65d1bcc4fdb74b32a7c42cc1336e (RTF import:
support shapes inside tables, 2013-06-28).
(cherry picked from commit 53b9a9bc7c84738545b5c7b791cea1e3d6a16c72)
Change-Id: I05eb2f4f2e3467e35f96b280e3a79f69906a56de
Reviewed-on: https://gerrit.libreoffice.org/11746
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 19353fbe60ff..3d62a44741c2 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> @@ -195,7 +196,9 @@ void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> xShape, const O // 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()) |