[Libreoffice-commits] core.git: include/svx svx/source

Takeshi Abe tabe at fixedpoint.jp
Sat Sep 30 09:25:11 UTC 2017


 include/svx/xpoly.hxx         |    2 +-
 svx/source/xoutdev/_xpoly.cxx |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 6a9d90fd4d89359ec11711e581010011fd25807b
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Sep 29 10:16:56 2017 +0900

    svx: Stop returning unused XPolygon
    
    Change-Id: I2cbd98f788a6b68365e094449f8f7e6d5e7426f4
    Reviewed-on: https://gerrit.libreoffice.org/42930
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index ac5dbd8ac812..a42f1410f79d 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -125,7 +125,7 @@ public:
 
     void            Insert( const XPolygon& rXPoly );
     void            Insert( const XPolyPolygon& rXPoly );
-    XPolygon        Remove( sal_uInt16 nPos );
+    void            Remove( sal_uInt16 nPos );
     const XPolygon& GetObject( sal_uInt16 nPos ) const;
 
     void            Clear();
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index e319397ed2f0..57c850e67d6b 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -921,15 +921,13 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly )
     }
 }
 
-XPolygon XPolyPolygon::Remove( sal_uInt16 nPos )
+void XPolyPolygon::Remove( sal_uInt16 nPos )
 {
     XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin();
     ::std::advance( it, nPos );
     XPolygon* pTmpXPoly = *it;
     pImpXPolyPolygon->aXPolyList.erase( it );
-    XPolygon  aXPoly( *pTmpXPoly );
     delete pTmpXPoly;
-    return aXPoly;
 }
 
 const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const


More information about the Libreoffice-commits mailing list