summaryrefslogtreecommitdiff
path: root/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-10-05 12:23:02 +0000
committerKurt Zenker <kz@openoffice.org>2005-10-05 12:23:02 +0000
commitee92c607d99a2f5796177dc64309260e5dad4534 (patch)
treed1dc2c313ca9eaef5e5b6dbc81208d4052fead30 /svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
parent5f420b1e95df4fda614c33aee277228673e38481 (diff)
INTEGRATION: CWS dxarray (1.8.10); FILE MERGED
2005/09/19 11:41:33 kendy 1.8.10.1: #i54697# "long *pDXArray" -> "sal_Int32 *pDXArray" patches extracted from ooo64bit02 to conform the declaration in VCL.
Diffstat (limited to 'svx/source/customshapes/EnhancedCustomShapeFontWork.cxx')
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 18af4c57eb..97a941804f 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: EnhancedCustomShapeFontWork.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: hr $ $Date: 2005-09-23 13:49:43 $
+ * last change: $Author: kz $ $Date: 2005-10-05 13:23:01 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -333,7 +333,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
SvxCharScaleWidthItem& rCharScaleWidthItem = (SvxCharScaleWidthItem&)pCustomShape->GetMergedItem( EE_CHAR_FONTWIDTH );
sal_uInt16 nCharScaleWidth = rCharScaleWidthItem.GetValue();
- long* pDXArry = NULL;
+ sal_Int32* pDXArry = NULL;
sal_Int32 nWidth = 0;
// VERTICAL
@@ -398,7 +398,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
{
if ( ( nCharScaleWidth != 100 ) && nCharScaleWidth )
{ // applying character spacing
- pDXArry = new long[ rText.getLength() ];
+ pDXArry = new sal_Int32[ rText.getLength() ];
aVirDev.GetTextArray( rText, pDXArry, 0, STRING_LEN );
FontMetric aFontMetric( aVirDev.GetFontMetric() );
aFont.SetWidth( (sal_Int32)( (double)aFontMetric.GetWidth() * ( (double)100 / (double)nCharScaleWidth ) ) );