[Libreoffice-commits] core.git: chart2/qa chart2/source vcl/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 23 12:47:28 UTC 2019
chart2/qa/extras/chart2dump/chart2dump.cxx | 22 +++++++++++-----------
chart2/source/view/diagram/VDiagram.cxx | 10 +++++-----
vcl/source/filter/GraphicNativeTransform.cxx | 6 +++---
3 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit d020273875e6e1f840d8c7e2b0d27402456925e8
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Dec 23 10:01:40 2019 +0100
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Dec 23 13:46:34 2019 +0100
Fix typo in code
Here it passed "make check" on Linux
Change-Id: I334509d22495e4cf8c49ed5d885bd85e938ff9aa
Reviewed-on: https://gerrit.libreoffice.org/85741
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index faf8ead6256a..50f4610e84af 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -195,22 +195,22 @@ protected:
writeActual(transformationToOneLineString(rTransform), sCheck);
}
- bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, const OUString& sCheck, const double fEPS, OUString& rExpectedTranform)
+ bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, const OUString& sCheck, const double fEPS, OUString& rExpectedTransform)
{
- rExpectedTranform = readExpected(sCheck); // Reference transformation string
+ rExpectedTransform = readExpected(sCheck); // Reference transformation string
// Convert string back to a transformation;
drawing::HomogenMatrix3 aExpectedTransform;
sal_Int32 nIdx {0};
- aExpectedTransform.Line1.Column1 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line1.Column2 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line1.Column3 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line2.Column1 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line2.Column2 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line2.Column3 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line3.Column1 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line3.Column2 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
- aExpectedTransform.Line3.Column3 = rExpectedTranform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line1.Column1 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line1.Column2 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line1.Column3 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line2.Column1 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line2.Column2 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line2.Column3 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line3.Column1 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line3.Column2 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
+ aExpectedTransform.Line3.Column3 = rExpectedTransform.getToken(0, ';', nIdx).toDouble();
// Check the equality of the two transformation
return (std::abs(aExpectedTransform.Line1.Column1 - rTransform.Line1.Column1) < fEPS &&
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index a3999441b081..a1fc30442898 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -578,19 +578,19 @@ void VDiagram::createShapes_3d()
//don't set a camera at all!
//the camera's rotation is incorporated into this matrix
- ::basegfx::B3DHomMatrix aEffectiveTranformation;
- aEffectiveTranformation.translate(-FIXED_SIZE_FOR_3D_CHART_VOLUME/2.0, -FIXED_SIZE_FOR_3D_CHART_VOLUME/2.0, -FIXED_SIZE_FOR_3D_CHART_VOLUME/2.0);
+ ::basegfx::B3DHomMatrix aEffectiveTransformation;
+ aEffectiveTransformation.translate(-FIXED_SIZE_FOR_3D_CHART_VOLUME/2.0, -FIXED_SIZE_FOR_3D_CHART_VOLUME/2.0, -FIXED_SIZE_FOR_3D_CHART_VOLUME/2.0);
if(!m_bRightAngledAxes)
- aEffectiveTranformation.rotate(m_fXAnglePi,m_fYAnglePi,m_fZAnglePi);
+ aEffectiveTransformation.rotate(m_fXAnglePi,m_fYAnglePi,m_fZAnglePi);
else
- aEffectiveTranformation.shearXY(m_fYAnglePi,-m_fXAnglePi);
+ aEffectiveTransformation.shearXY(m_fYAnglePi,-m_fXAnglePi);
//#i98497# 3D charts are rendered with wrong size
E3DModifySceneSnapRectUpdater aUpdater(lcl_getE3dScene(m_xOuterGroupShape));
xDestProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX,
- uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aEffectiveTranformation ) ) );
+ uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aEffectiveTransformation ) ) );
}
}
catch( const uno::Exception & )
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx b/vcl/source/filter/GraphicNativeTransform.cxx
index d53256acfff3..909795f45a90 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -143,9 +143,9 @@ void GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
}
SvMemoryStream aTargetStream;
- JpegTransform tranform(aSourceStream, aTargetStream);
- tranform.setRotate(aRotation);
- tranform.perform();
+ JpegTransform transform(aSourceStream, aTargetStream);
+ transform.setRotate(aRotation);
+ transform.perform();
aTargetStream.Seek( STREAM_SEEK_TO_BEGIN );
More information about the Libreoffice-commits
mailing list