diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:02:19 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:02:19 +0000 |
| commit | 6c1461998874d3867c9ebb4ec91792b0ffef96d9 (patch) | |
| tree | 7e51542b4975b7aaa449f1b0c233a09f66017ba4 /svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | |
| parent | 6dc56a77c213bebfd6bdf9243a4eb8749ece1bc8 (diff) | |
INTEGRATION: CWS sb59 (1.12.60); FILE MERGED
2006/08/10 11:37:39 thb 1.12.60.2: #i67535# Added virtual destructor to ExpressionNode interface; added various static_int_casts for accessibility; corrected using <method> declarations in unoshape.hxx; removed dead code from EnhancedCustomShape3d; fixed ugly infinite recursion in _contdlg (induced by removing a warning via method renaming)
2006/08/03 13:51:25 cl 1.12.60.1: removed compiler warnings
Diffstat (limited to 'svx/source/customshapes/EnhancedCustomShapeFontWork.cxx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 70f9e802b2..3a7b30955f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -4,9 +4,9 @@ * * $RCSfile: EnhancedCustomShapeFontWork.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:06:54 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:02:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -186,14 +186,14 @@ sal_Bool InitializeFontWorkData( const SdrObject* pCustomShape, const sal_uInt16 if ( pParaObj ) { const EditTextObject& rTextObj = pParaObj->GetTextObject(); - sal_Int16 nParagraphsLeft = rTextObj.GetParagraphCount(); + sal_Int32 nParagraphsLeft = rTextObj.GetParagraphCount(); rFWData.nMaxParagraphsPerTextArea = ( ( nParagraphsLeft - 1 ) / nTextAreaCount ) + 1; sal_Int16 j = 0; while( nParagraphsLeft && nTextAreaCount ) { FWTextArea aTextArea; - sal_Int16 i, nParagraphs = ( ( nParagraphsLeft - 1 ) / nTextAreaCount ) + 1; + sal_Int32 i, nParagraphs = ( ( nParagraphsLeft - 1 ) / nTextAreaCount ) + 1; for ( i = 0; i < nParagraphs; i++, j++ ) { FWParagraphData aParagraphData; @@ -672,7 +672,7 @@ void CalcDistances( const Polygon& rPoly, std::vector< double >& rDistances ) void InsertMissingOutlinePoints( const Polygon& /*rOutlinePoly*/, const std::vector< double >& rDistances, const Rectangle& rTextAreaBoundRect, Polygon& rPoly ) { sal_uInt16 i = 0; - double fLastDistance; + double fLastDistance = 0.0; for ( i = 0; i < rPoly.GetSize(); i++ ) { Point& rPoint = rPoly[ i ]; @@ -719,7 +719,7 @@ void GetPoint( const Polygon& rPoly, const std::vector< double >& rDistances, co if ( rPoly.GetSize() ) { std::vector< double >::const_iterator aIter = std::lower_bound( rDistances.begin(), rDistances.end(), fX ); - sal_uInt16 nIdx = std::distance( rDistances.begin(), aIter ); + sal_uInt16 nIdx = sal::static_int_cast<sal_uInt16>( std::distance( rDistances.begin(), aIter ) ); if ( aIter == rDistances.end() ) nIdx--; const Point& rPt = rPoly[ nIdx ]; @@ -727,7 +727,7 @@ void GetPoint( const Polygon& rPoly, const std::vector< double >& rDistances, co fy1 = rPt.Y(); if ( nIdx && ( aIter != rDistances.end() ) && ( *aIter != fX ) ) { - nIdx = std::distance( rDistances.begin(), aIter ); + nIdx = sal::static_int_cast<sal_uInt16>( std::distance( rDistances.begin(), aIter ) ); double fDist0 = *( aIter - 1 ); double fd = ( 1.0 / ( *aIter - fDist0 ) ) * ( fX - fDist0 ); const Point& rPt2 = rPoly[ nIdx - 1 ]; |