diff options
| author | Regina Henschel <regina@apache.org> | 2014-02-11 14:40:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-13 14:56:16 +0000 |
| commit | 17bb5abb6e0bc499c6a106b0140d31fc6d77328e (patch) | |
| tree | 6966cb496f405b0c83444fa9f89f9643eabef4c8 /xmloff | |
| parent | b21910c9caf4cc81fabe754f397778cd9da01d10 (diff) | |
Resolves: #i123879 dr3d rotation angle is degree in ODF1.2...
but radiant in AOO core
(cherry picked from commit 23b2b0b395537f4b5d0226f9ebb19dc38029ee55)
Conflicts:
xmloff/source/draw/xexptran.cxx
Change-Id: I66cd482b2b237ca008c31b7738f9ea21502f3d45
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/xexptran.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index ecdbdd21b36b..0d7b5a0e52cb 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -29,6 +29,7 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> +#include <basegfx/numeric/ftools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/tools/unotools.hxx> @@ -842,21 +843,21 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X : { aNewString += "rotatex ("; - Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX); + Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX) ); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y : { aNewString += "rotatey ("; - Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY); + Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY) ); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z : { aNewString += "rotatez ("; - Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ); + Imp_PutDoubleChar(aNewString, rConv, basegfx::rad2deg( ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ) ); aNewString += aClosingBrace; break; } @@ -998,7 +999,7 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen); fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue); if(fValue != 0.0) - maList.push_back(new ImpSdXMLExpTransObj3DRotateX(fValue)); + maList.push_back(new ImpSdXMLExpTransObj3DRotateX(basegfx::deg2rad(fValue))); Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen); } @@ -1010,7 +1011,7 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen); fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue); if(fValue != 0.0) - maList.push_back(new ImpSdXMLExpTransObj3DRotateY(fValue)); + maList.push_back(new ImpSdXMLExpTransObj3DRotateY(basegfx::deg2rad(fValue))); Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen); } @@ -1022,7 +1023,7 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen); fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue); if(fValue != 0.0) - maList.push_back(new ImpSdXMLExpTransObj3DRotateZ(fValue)); + maList.push_back(new ImpSdXMLExpTransObj3DRotateZ(basegfx::deg2rad(fValue))); Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen); } |