diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-10-05 12:06:32 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-10-05 12:06:32 +0000 |
commit | aec413946d35a1657767031dffc98f5f5ef024e1 (patch) | |
tree | d8c8440e5a5b8fba58a8372bb423e9ffb1240a35 /goodies | |
parent | 6603bae56275bdbf13daef50ac51ba42248a3784 (diff) |
INTEGRATION: CWS dxarray (1.13.2); FILE MERGED
2005/09/19 11:41:28 kendy 1.13.2.1: #i54697#
"long *pDXArray" -> "sal_Int32 *pDXArray" patches extracted from ooo64bit02 to conform the declaration in VCL.
Diffstat (limited to 'goodies')
-rw-r--r-- | goodies/source/filter.vcl/epict/epict.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/goodies/source/filter.vcl/epict/epict.cxx b/goodies/source/filter.vcl/epict/epict.cxx index 6d080acec2f8..c09c1ef64ab2 100644 --- a/goodies/source/filter.vcl/epict/epict.cxx +++ b/goodies/source/filter.vcl/epict/epict.cxx @@ -4,9 +4,9 @@ * * $RCSfile: epict.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-09-09 02:40:18 $ + * last change: $Author: kz $ $Date: 2005-10-05 13:06:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -188,7 +188,7 @@ private: void SetAttrForFrame(); void SetAttrForText(); - void WriteTextArray(Point & rPoint, const String& rString, const long * pDXAry); + void WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry); void WriteOpcodes(const GDIMetaFile & rMTF); @@ -1377,7 +1377,7 @@ void PictWriter::SetAttrForText() } -void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const long * pDXAry) +void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry) { USHORT i,nLen; sal_Unicode c; @@ -1735,7 +1735,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) Point aPt( pA->GetPoint() ); String aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() ); VirtualDevice aVirDev; - long* pDXAry = new long[ aStr.Len() ]; + sal_Int32* pDXAry = new sal_Int32[ aStr.Len() ]; sal_Int32 nNormSize( aVirDev.GetTextArray( aStr,pDXAry ) ); USHORT i; |