summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2017-09-29 10:16:56 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2017-09-30 11:24:44 +0200
commit6a9d90fd4d89359ec11711e581010011fd25807b (patch)
treefef09574d79a719b8ecda795e9b26256a5f1428a
parent362a21d3a129b90149f6ef645c127f5e86e0ba61 (diff)
svx: Stop returning unused XPolygon
Change-Id: I2cbd98f788a6b68365e094449f8f7e6d5e7426f4 Reviewed-on: https://gerrit.libreoffice.org/42930 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
-rw-r--r--include/svx/xpoly.hxx2
-rw-r--r--svx/source/xoutdev/_xpoly.cxx4
2 files changed, 2 insertions, 4 deletions
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