From 00762c0a7c1f9ba1e94ed1d56ed323d75d18b199 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 23 Jan 2007 07:33:04 +0000 Subject: INTEGRATION: CWS swqbf90 (1.74.40); FILE MERGED 2007/01/03 13:54:39 od 1.74.40.1: #i73079# method - use correct matrix type to set translation to transformation matrix --- sw/source/core/unocore/unodraw.cxx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'sw') diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 8d1612d4f360..625cb956d1a1 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unodraw.cxx,v $ * - * $Revision: 1.74 $ + * $Revision: 1.75 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 15:12:05 $ + * last change: $Author: obo $ $Date: 2007-01-23 08:33:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -154,8 +154,9 @@ #endif // <-- // --> OD 2005-03-10 #i44334#, #i44681# -#ifndef _BGFX_MATRIX_B3DHOMMATRIX_HXX -#include +// --> OD 2007-01-03 #i73079# - use correct matrix type +#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX +#include #endif // <-- @@ -2468,7 +2469,9 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir( // apply translation difference to transformation matrix. if ( aTranslateDiff.X != 0 || aTranslateDiff.Y != 0 ) { - ::basegfx::B3DHomMatrix aTempMatrix; + // --> OD 2007-01-03 #i73079# - use correct matrix type + ::basegfx::B2DHomMatrix aTempMatrix; + // <-- aTempMatrix.set(0, 0, aMatrix.Line1.Column1 ); aTempMatrix.set(0, 1, aMatrix.Line1.Column2 ); @@ -2480,7 +2483,9 @@ drawing::HomogenMatrix3 SwXShape::_ConvertTransformationToLayoutDir( aTempMatrix.set(2, 1, aMatrix.Line3.Column2 ); aTempMatrix.set(2, 2, aMatrix.Line3.Column3 ); - aTempMatrix.translate( aTranslateDiff.X, aTranslateDiff.Y, 0.0 ); + // --> OD 2007-01-03 #i73079# + aTempMatrix.translate( aTranslateDiff.X, aTranslateDiff.Y ); + // <-- aMatrix.Line1.Column1 = aTempMatrix.get(0, 0); aMatrix.Line1.Column2 = aTempMatrix.get(0, 1); -- cgit v1.2.3