diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 13:34:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 13:34:48 +0000 |
| commit | 46fa648cfabdca05394097b770be529d3472d909 (patch) | |
| tree | 7143723c1befaf03025c281eaf5dc4091e11f88d /svx/source | |
| parent | 0d9efdf00e67ad91ef4f56defa3ea06f1ac8c8ee (diff) | |
INTEGRATION: CWS pchfix04 (1.15.40); FILE MERGED
2007/02/05 12:13:50 os 1.15.40.1: #i73604# usage of ITEMID_* removed
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index b27bb9881c..e76dd6506a 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -4,9 +4,9 @@ * * $RCSfile: EnhancedCustomShapeFontWork.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 13:14:19 $ + * last change: $Author: kz $ $Date: 2007-05-10 14:34:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -81,11 +81,6 @@ #ifndef _EEITEM_HXX //autogen #include <eeitem.hxx> #endif -#define ITEMID_FONT EE_CHAR_FONTINFO -#define ITEMID_CHARSCALE_W EE_CHAR_FONTWIDTH -#define ITEMID_FRAMEDIR EE_PARA_WRITINGDIR -#define ITEMID_POSTURE EE_CHAR_ITALIC -#define ITEMID_WEIGHT EE_CHAR_WEIGHT #ifndef _SVX_FRMDIRITEM_HXX #include <frmdiritem.hxx> #endif @@ -254,7 +249,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape, if ( nOutlinesCount2d & 1 ) bSingleLineMode = sal_True; - + std::vector< FWTextArea >::iterator aTextAreaIter = rFWData.vTextAreas.begin(); std::vector< FWTextArea >::iterator aTextAreaIEnd = rFWData.vTextAreas.end(); while( aTextAreaIter != aTextAreaIEnd ) @@ -423,7 +418,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F FontMetric aFontMetric( aVirDev.GetFontMetric() ); aFont.SetWidth( (sal_Int32)( (double)aFontMetric.GetWidth() * ( (double)100 / (double)nCharScaleWidth ) ) ); aVirDev.SetFont( aFont ); - } + } FWCharacterData aCharacterData; if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) ) { @@ -571,9 +566,9 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) { switch( eHorzAdjust ) { - case SDRTEXTHORZADJUST_RIGHT : + case SDRTEXTHORZADJUST_RIGHT : case SDRTEXTHORZADJUST_CENTER: - { + { std::vector< FWParagraphData >::iterator aParagraphIter( aTextAreaIter->vParagraphs.begin() ); std::vector< FWParagraphData >::iterator aParagraphIEnd( aTextAreaIter->vParagraphs.end() ); while ( aParagraphIter != aParagraphIEnd ) @@ -711,7 +706,7 @@ void GetPoint( const Polygon& rPoly, const std::vector< double >& rDistances, co nIdx--; const Point& rPt = rPoly[ nIdx ]; fx1 = rPt.X(); - fy1 = rPt.Y(); + fy1 = rPt.Y(); if ( nIdx && ( aIter != rDistances.end() ) && ( *aIter != fX ) ) { nIdx = sal::static_int_cast<sal_uInt16>( std::distance( rDistances.begin(), aIter ) ); @@ -843,7 +838,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW // create local polygon copy to work on Polygon aLocalPoly(aCandidate); - + InsertMissingOutlinePoints( rOutlinePoly, vDistances, rTextAreaBoundRect, aLocalPoly ); InsertMissingOutlinePoints( rOutlinePoly2, vDistances2, rTextAreaBoundRect, aLocalPoly ); @@ -855,7 +850,7 @@ void FitTextOutlinesToShapeOutlines( const PolyPolygon& aOutlines2d, FWData& rFW rPoint.Y() -= nTop; double fX = (double)rPoint.X() / (double)nWidth; double fY = (double)rPoint.Y() / (double)nHeight; - + double fx1, fy1, fx2, fy2; GetPoint( rOutlinePoly, vDistances, fX, fx1, fy1 ); GetPoint( rOutlinePoly2, vDistances2, fX, fx2, fy2 ); |