diff options
| -rw-r--r-- | include/svx/EnhancedCustomShape2d.hxx | 2 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 26a9c86246cb..6d092febb635 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -132,7 +132,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SAL_DLLPRIVATE Point GetPoint( const css::drawing::EnhancedCustomShapeParameterPair&, const bool bScale = true, const bool bReplaceGeoSize = false ) const; - SAL_DLLPRIVATE void CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList, + SAL_DLLPRIVATE void CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmentInd, std::vector< SdrPathObj* >& rObjectList, bool bLineGeometryNeededOnly, bool bSortFilledObjectsToBack, sal_Int32 nIndex ); SAL_DLLPRIVATE SdrObject* CreatePathObj( bool bLineGeometryNeededOnly ); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index d8b324beb1ad..b8accf9367c3 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1440,7 +1440,7 @@ static basegfx::B2DPolygon CreateArc( const Rectangle& rRect, const Point& rStar return aRetval; } -void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegmentInd, std::vector< SdrPathObj* >& rObjectList, +void EnhancedCustomShape2d::CreateSubPath( sal_Int32& rSrcPt, sal_Int32& rSegmentInd, std::vector< SdrPathObj* >& rObjectList, const bool bLineGeometryNeededOnly, const bool bSortFilledObjectsToBack, sal_Int32 nIndex ) @@ -2219,14 +2219,13 @@ SdrObject* EnhancedCustomShape2d::CreatePathObj( bool bLineGeometryNeededOnly ) if ( !nCoordSize ) return nullptr; - sal_uInt16 nSrcPt = 0; - sal_uInt16 nSegmentInd = 0; - std::vector< SdrPathObj* > vObjectList; bool bSortFilledObjectsToBack = SortFilledObjectsToBackByDefault( eSpType ); sal_Int32 nSubPathIndex = 0; + sal_Int32 nSrcPt = 0; + sal_Int32 nSegmentInd = 0; while( nSegmentInd <= seqSegments.getLength() ) { CreateSubPath( nSrcPt, nSegmentInd, vObjectList, bLineGeometryNeededOnly, bSortFilledObjectsToBack, nSubPathIndex ); |