summaryrefslogtreecommitdiffstats
path: root/svx/source/xoutdev
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r--svx/source/xoutdev/_xpoly.cxx23
-rw-r--r--svx/source/xoutdev/xattr.cxx8
2 files changed, 7 insertions, 24 deletions
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 881b6af78fad..ae5819ba0f2c 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -926,22 +926,15 @@ void XPolyPolygon::CheckReference()
}
}
-void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos )
+void XPolyPolygon::Insert( const XPolygon& rXPoly )
{
CheckReference();
XPolygon* pXPoly = new XPolygon( rXPoly );
- if ( nPos < pImpXPolyPolygon->aXPolyList.size() )
- {
- XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin();
- ::std::advance( it, nPos );
- pImpXPolyPolygon->aXPolyList.insert( it, pXPoly );
- }
- else
- pImpXPolyPolygon->aXPolyList.push_back( pXPoly );
+ pImpXPolyPolygon->aXPolyList.push_back( pXPoly );
}
/// insert all XPolygons of a XPolyPolygon
-void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos )
+void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly )
{
CheckReference();
@@ -949,15 +942,7 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos )
{
XPolygon* pXPoly = new XPolygon( rXPolyPoly[i] );
- if ( nPos < pImpXPolyPolygon->aXPolyList.size() )
- {
- XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin();
- ::std::advance( it, nPos );
- pImpXPolyPolygon->aXPolyList.insert( it, pXPoly );
- nPos++;
- }
- else
- pImpXPolyPolygon->aXPolyList.push_back( pXPoly );
+ pImpXPolyPolygon->aXPolyList.push_back( pXPoly );
}
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 3e80ccec62dc..73e2c41b4d25 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -330,12 +330,10 @@ SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
return rOut;
}
-const Color& XColorItem::GetColorValue(const XColorList* pTable) const
+const Color& XColorItem::GetColorValue() const
{
- if (!IsIndex())
- return aColor;
- else
- return pTable->GetColor(GetIndex())->GetColor();
+ assert(!IsIndex());
+ return aColor;
}