diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 12:59:11 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-08-16 21:52:32 +0200 |
| commit | 47e2fd0dc8d88af120508e463decf5b15563a629 (patch) | |
| tree | 55ca49e099c6401643772db012fae6e3ec15c501 /svx/source/customshapes | |
| parent | df159d3cd0bce255e14839a81d921e73771ca886 (diff) | |
Consistently use size_t and SAL_MAX_SIZE
Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec
Diffstat (limited to 'svx/source/customshapes')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 15 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 9f542539913b..7496eab48568 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2185,7 +2185,6 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) } SdrObject* pRet = NULL; - sal_uInt32 i; if ( !vObjectList.empty() ) { @@ -2198,7 +2197,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) { std::vector< SdrPathObj* > vTempList; - for(i = 0L; i < vObjectList.size(); i++) + for(size_t i = 0; i < vObjectList.size(); ++i) { SdrPathObj* pObj(vObjectList[i]); const XLineStyle eLineStyle = ((const XLineStyleItem&)pObj->GetMergedItem(XATTR_LINESTYLE)).GetValue(); @@ -2225,7 +2224,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) sal_Int32 nAreaObjectCount = 0; // correct some values and collect content data - for ( i = 0; i < vObjectList.size(); i++ ) + for ( size_t i = 0; i < vObjectList.size(); ++i ) { SdrPathObj* pObj( vObjectList[ i ] ); @@ -2250,7 +2249,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) { std::vector< SdrPathObj* > vTempList; - for ( i = 0; i < vObjectList.size(); i++ ) + for ( size_t i = 0; i < vObjectList.size(); ++i ) { SdrPathObj* pObj( vObjectList[ i ] ); @@ -2260,7 +2259,7 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) } } - for ( i = 0; i < vObjectList.size(); i++ ) + for ( size_t i = 0; i < vObjectList.size(); ++i ) { SdrPathObj* pObj( vObjectList[ i ] ); @@ -2279,17 +2278,17 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) if(!vObjectList.empty()) { // copy remaining objects to pRet - if(vObjectList.size() > 1L) + if(vObjectList.size() > 1) { pRet = new SdrObjGroup; - for (i = 0L; i < vObjectList.size(); i++) + for (size_t i = 0; i < vObjectList.size(); ++i) { SdrObject* pObj(vObjectList[i]); pRet->GetSubList()->NbcInsertObject(pObj); } } - else if(1L == vObjectList.size()) + else if(1 == vObjectList.size()) { pRet = vObjectList[0L]; } diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 6175f6e405b1..b0bd2a3375d3 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -239,7 +239,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom pRenderedShape = new SdrObjGroup(); ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTmp ); } - ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTextObj, CONTAINER_APPEND ); + ((SdrObjGroup*)pRenderedShape)->GetSubList()->NbcInsertObject( pTextObj ); } else pRenderedShape = pTextObj; |