From cd3d26b7edbce67805259a71e4118223e02ebdd4 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 18 Jul 2014 18:21:12 +0200 Subject: vcl consitent use of long for corrdinate most of length in vcl are calculated in 'long' but array of X position tend to be in sal_Int32. As a prep work to be able to support 'double' as the base type of Device Coordinate, harmonize the use of 'long' for non-float coordinate. Change-Id: I7cb33301ff6a5e2c62247b36a4e07e168a58a323 --- svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svx/source/customshapes/EnhancedCustomShapeFontWork.cxx') diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 1f5aa6a5bcd5..72545295f665 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -267,7 +267,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F SvxCharScaleWidthItem& rCharScaleWidthItem = (SvxCharScaleWidthItem&)pCustomShape->GetMergedItem( EE_CHAR_FONTWIDTH ); sal_uInt16 nCharScaleWidth = rCharScaleWidthItem.GetValue(); - sal_Int32* pDXArry = NULL; + long* pDXArry = NULL; sal_Int32 nWidth = 0; // VERTICAL @@ -332,7 +332,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F { if ( ( nCharScaleWidth != 100 ) && nCharScaleWidth ) { // applying character spacing - pDXArry = new sal_Int32[ rText.getLength() ]; + pDXArry = new long[ rText.getLength() ]; aVirDev.GetTextArray( rText, pDXArry); FontMetric aFontMetric( aVirDev.GetFontMetric() ); aFont.SetWidth( (sal_Int32)( (double)aFontMetric.GetWidth() * ( (double)100 / (double)nCharScaleWidth ) ) ); -- cgit