diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-10-05 12:20:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-10-05 12:20:45 +0000 |
| commit | 9a4c5027da26ff672ca795c34d6a5ce545824b14 (patch) | |
| tree | 7df71e4349bc1718a2cc06e7feef6f0bc3186cd8 /svtools | |
| parent | aec413946d35a1657767031dffc98f5f5ef024e1 (diff) | |
INTEGRATION: CWS dxarray (1.12.4); FILE MERGED
2005/09/19 11:41:25 kendy 1.12.4.1: #i54697#
"long *pDXArray" -> "sal_Int32 *pDXArray" patches extracted from ooo64bit02 to conform the declaration in VCL.
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/wmf/emfwr.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx index a46d8c64995f..2f9e8907045c 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.cxx +++ b/svtools/source/filter.vcl/wmf/emfwr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: emfwr.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2005-09-28 11:28:25 $ + * last change: $Author: kz $ $Date: 2005-10-05 13:20:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -744,26 +744,26 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, // ----------------------------------------------------------------------------- -void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, const long* pDXArray, UINT32 nWidth ) +void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, sal_uInt32 nWidth ) { UINT32 nLen = rText.Len(), i; if( nLen ) { - unsigned long nNormWidth; - long* pOwnArray; - long* pDX; + sal_uInt32 nNormWidth; + sal_Int32* pOwnArray; + sal_Int32* pDX; // get text sizes if( pDXArray ) { pOwnArray = NULL; nNormWidth = maVDev.GetTextWidth( rText ); - pDX = (long*) pDXArray; + pDX = (sal_Int32*) pDXArray; } else { - pOwnArray = new long[ nLen ]; + pOwnArray = new sal_Int32[ nLen ]; nNormWidth = maVDev.GetTextArray( rText, pOwnArray ); pDX = pOwnArray; } |