diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:14:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 13:14:54 +0000 |
| commit | 4beebe21c38a393f4640d9947a26b6b3ce3f5096 (patch) | |
| tree | f2b6bdca3e50f71f17940015753ede5615c48bd5 /xmloff | |
| parent | 8e9b2c29e1185834c02f99eedf0c5fd588c25a03 (diff) | |
INTEGRATION: CWS aw024 (1.4.26); FILE MERGED
2006/11/10 04:53:11 aw 1.4.26.9: RESYNC: (1.12-1.13); FILE MERGED
2006/09/22 17:26:10 aw 1.4.26.8: chagnes after resync to m185
2006/09/21 21:51:25 aw 1.4.26.7: RESYNC: (1.11-1.12); FILE MERGED
2006/09/08 18:39:42 aw 1.4.26.6: RESYNC: (1.10-1.11); FILE MERGED
2006/07/04 14:17:21 aw 1.4.26.5: RESYNC: (1.9-1.10); FILE MERGED
2005/09/17 07:12:18 aw 1.4.26.4: RESYNC: (1.8-1.9); FILE MERGED
2005/05/13 14:08:47 aw 1.4.26.3: RESYNC: (1.7-1.8); FILE MERGED
2005/03/23 19:14:11 aw 1.4.26.2: RESYNC: (1.4-1.7); FILE MERGED
2004/12/28 15:24:44 aw 1.4.26.1: #i39528
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/shapeexport4.cxx | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index c788899fe73f..6a1f57d66cde 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shapeexport4.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:42:02 $ + * last change: $Author: ihi $ $Date: 2006-11-14 14:14:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,10 +36,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _B3D_HMATRIX_HXX -#include <goodies/hmatrix.hxx> -#endif - #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ #include <com/sun/star/drawing/HomogenMatrix.hpp> #endif @@ -146,6 +142,14 @@ #include <rtl/math.hxx> #endif +#ifndef _STRING_HXX +#include <tools/string.hxx> +#endif + +#ifndef _BGFX_VECTOR_B3DVECTOR_HXX +#include <basegfx/vector/b3dvector.hxx> +#endif + #include "xmlnmspe.hxx" using namespace ::rtl; @@ -710,9 +714,9 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean drawing::Direction3D aExtrusionFirstLightDirection; if ( rProp.Value >>= aExtrusionFirstLightDirection ) { - Vector3D aVec3D( aExtrusionFirstLightDirection.DirectionX, aExtrusionFirstLightDirection.DirectionY, + ::basegfx::B3DVector aVec3D( aExtrusionFirstLightDirection.DirectionX, aExtrusionFirstLightDirection.DirectionY, aExtrusionFirstLightDirection.DirectionZ ); - rUnitConverter.convertVector3D( aStrBuffer, aVec3D ); + rUnitConverter.convertB3DVector( aStrBuffer, aVec3D ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_FIRST_LIGHT_DIRECTION, aStr ); } @@ -723,9 +727,9 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean drawing::Direction3D aExtrusionSecondLightDirection; if ( rProp.Value >>= aExtrusionSecondLightDirection ) { - Vector3D aVec3D( aExtrusionSecondLightDirection.DirectionX, aExtrusionSecondLightDirection.DirectionY, + ::basegfx::B3DVector aVec3D( aExtrusionSecondLightDirection.DirectionX, aExtrusionSecondLightDirection.DirectionY, aExtrusionSecondLightDirection.DirectionZ ); - rUnitConverter.convertVector3D( aStrBuffer, aVec3D ); + rUnitConverter.convertB3DVector( aStrBuffer, aVec3D ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_SECOND_LIGHT_DIRECTION, aStr ); } @@ -779,9 +783,9 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean drawing::Direction3D aExtrusionRotationCenter; if ( rProp.Value >>= aExtrusionRotationCenter ) { - Vector3D aVec3D( aExtrusionRotationCenter.DirectionX, aExtrusionRotationCenter.DirectionY, + ::basegfx::B3DVector aVec3D( aExtrusionRotationCenter.DirectionX, aExtrusionRotationCenter.DirectionY, aExtrusionRotationCenter.DirectionZ ); - rUnitConverter.convertVector3D( aStrBuffer, aVec3D ); + rUnitConverter.convertB3DVector( aStrBuffer, aVec3D ); aStr = aStrBuffer.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_ROTATION_CENTER, aStr ); } |