[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source

[Libreoffice Gerrit user]

 oox/source/vml/vmlshape.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 85c0eedf04a0b31b0896842bbdb240abb3389076
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 14 15:08:57 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 15 10:00:17 2018 +0200

    tdf#119234 OOXML Shapes from Word fail to render
    
    regression from
            commit 65e4a776e8315fd61fd67ad00d28985b11f0b79e
            simplify some OUString::copy calls
    I got the params switched around
    
    Change-Id: I68da0ae681f2b886e35f74bd72de0c482c843ae9
    Reviewed-on: https://gerrit.libreoffice.org/58986
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit df71ea1b01c3fd35d959053c84f615f661b69f8a)
    Reviewed-on: https://gerrit.libreoffice.org/58999

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 6b496b50e3a0..40a547a2efe2 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1015,7 +1015,7 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
 {
     // If we have an 'x' in the last part of the path it means it is closed...
     sal_Int32 nPos = maShapeModel.maVmlPath.lastIndexOf(',');
-    if ( nPos != -1 && maShapeModel.maVmlPath.indexOf(nPos, 'x') != -1 )
+    if ( nPos != -1 && maShapeModel.maVmlPath.indexOf('x', nPos) != -1 )
     {
         const_cast<BezierShape*>( this )->setService( "com.sun.star.drawing.ClosedBezierShape" );
     }