[Libreoffice-commits] .: 3 commits - basegfx/inc basegfx/source unusedcode.easy
Michael Meeks
michael at kemper.freedesktop.org
Fri Jan 27 13:29:54 PST 2012
basegfx/inc/basegfx/polygon/b3dpolygon.hxx | 7 +---
basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx | 10 +-----
basegfx/source/polygon/b3dpolygon.cxx | 40 -------------------------
basegfx/source/polygon/b3dpolypolygon.cxx | 28 -----------------
unusedcode.easy | 20 ------------
5 files changed, 4 insertions(+), 101 deletions(-)
New commits:
commit b8f24c52c4d3c4ed562fe6c7ae8fa17218a66c1e
Author: Alexander Bergmann <myaddons at gmx.de>
Date: Fri Jan 27 12:50:05 2012 +0100
unusedcode.easy: Removed unused code (basegfx::B3DPolygon, basegfx::B3DPolyPolygon)
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
index 34181dd..359adf2 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
@@ -64,7 +64,6 @@ namespace basegfx
public:
B3DPolygon();
B3DPolygon(const B3DPolygon& rPolygon);
- B3DPolygon(const B3DPolygon& rPolygon, sal_uInt32 nIndex, sal_uInt32 nCount);
~B3DPolygon();
// assignment operator
@@ -84,8 +83,7 @@ namespace basegfx
B3DPoint getB3DPoint(sal_uInt32 nIndex) const;
void setB3DPoint(sal_uInt32 nIndex, const B3DPoint& rValue);
- // Coordinate insert/append
- void insert(sal_uInt32 nIndex, const B3DPoint& rPoint, sal_uInt32 nCount = 1);
+ // Coordinate append
void append(const B3DPoint& rPoint, sal_uInt32 nCount = 1);
// BColor interface
@@ -109,8 +107,7 @@ namespace basegfx
bool areTextureCoordinatesUsed() const;
void clearTextureCoordinates();
- // insert/append other 2D polygons
- void insert(sal_uInt32 nIndex, const B3DPolygon& rPoly, sal_uInt32 nIndex2 = 0, sal_uInt32 nCount = 0);
+ // append other 2D polygons
void append(const B3DPolygon& rPoly, sal_uInt32 nIndex = 0, sal_uInt32 nCount = 0);
// remove
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
index 1964e5f..98ba7cc 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
@@ -64,9 +64,6 @@ namespace basegfx
// assignment operator
B3DPolyPolygon& operator=(const B3DPolyPolygon& rPolyPolygon);
- /// unshare this poly-polygon (and all included polygons) with all internally shared instances
- void makeUnique();
-
// compare operators
bool operator==(const B3DPolyPolygon& rPolyPolygon) const;
bool operator!=(const B3DPolyPolygon& rPolyPolygon) const;
@@ -92,12 +89,10 @@ namespace basegfx
bool areTextureCoordinatesUsed() const;
void clearTextureCoordinates();
- // insert/append single polygon
- void insert(sal_uInt32 nIndex, const B3DPolygon& rPolygon, sal_uInt32 nCount = 1);
+ // append single polygon
void append(const B3DPolygon& rPolygon, sal_uInt32 nCount = 1);
- // insert/append multiple polygons
- void insert(sal_uInt32 nIndex, const B3DPolyPolygon& rPolyPolygon);
+ // append multiple polygons
void append(const B3DPolyPolygon& rPolyPolygon);
// remove
@@ -108,7 +103,6 @@ namespace basegfx
// closed state
bool isClosed() const;
- void setClosed(bool bNew);
// flip polygon direction
void flip();
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 5f62119..5e0ed37 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -1547,14 +1547,6 @@ namespace basegfx
{
}
- B3DPolygon::B3DPolygon(const B3DPolygon& rPolygon, sal_uInt32 nIndex, sal_uInt32 nCount) :
- mpPolygon(ImplB3DPolygon(*rPolygon.mpPolygon, nIndex, nCount))
- {
- // TODO(P2): one extra temporary here (cow_wrapper copies
- // given ImplB3DPolygon into its internal impl_t wrapper type)
- OSL_ENSURE(nIndex + nCount > rPolygon.mpPolygon->count(), "B3DPolygon constructor outside range (!)");
- }
-
B3DPolygon::~B3DPolygon()
{
}
@@ -1698,44 +1690,12 @@ namespace basegfx
mpPolygon->clearTextureCoordinates();
}
- void B3DPolygon::insert(sal_uInt32 nIndex, const ::basegfx::B3DPoint& rPoint, sal_uInt32 nCount)
- {
- OSL_ENSURE(nIndex <= mpPolygon->count(), "B3DPolygon Insert outside range (!)");
-
- if(nCount)
- mpPolygon->insert(nIndex, rPoint, nCount);
- }
-
void B3DPolygon::append(const basegfx::B3DPoint& rPoint, sal_uInt32 nCount)
{
if(nCount)
mpPolygon->insert(mpPolygon->count(), rPoint, nCount);
}
- void B3DPolygon::insert(sal_uInt32 nIndex, const B3DPolygon& rPoly, sal_uInt32 nIndex2, sal_uInt32 nCount)
- {
- OSL_ENSURE(nIndex <= mpPolygon->count(), "B3DPolygon Insert outside range (!)");
-
- if(rPoly.count())
- {
- if(!nCount)
- {
- nCount = rPoly.count();
- }
-
- if(0L == nIndex2 && nCount == rPoly.count())
- {
- mpPolygon->insert(nIndex, *rPoly.mpPolygon);
- }
- else
- {
- OSL_ENSURE(nIndex2 + nCount <= rPoly.mpPolygon->count(), "B3DPolygon Insert outside range (!)");
- ImplB3DPolygon aTempPoly(*rPoly.mpPolygon, nIndex2, nCount);
- mpPolygon->insert(nIndex, aTempPoly);
- }
- }
- }
-
void B3DPolygon::append(const B3DPolygon& rPoly, sal_uInt32 nIndex, sal_uInt32 nCount)
{
if(rPoly.count())
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index be1db5e..9291c4a 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -258,12 +258,6 @@ namespace basegfx
return *this;
}
- void B3DPolyPolygon::makeUnique()
- {
- mpPolyPolygon.make_unique();
- mpPolyPolygon->makeUnique();
- }
-
bool B3DPolyPolygon::operator==(const B3DPolyPolygon& rPolyPolygon) const
{
if(mpPolyPolygon.same_object(rPolyPolygon.mpPolyPolygon))
@@ -366,28 +360,12 @@ namespace basegfx
mpPolyPolygon->clearTextureCoordinates();
}
- void B3DPolyPolygon::insert(sal_uInt32 nIndex, const B3DPolygon& rPolygon, sal_uInt32 nCount)
- {
- OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B3DPolyPolygon Insert outside range (!)");
-
- if(nCount)
- mpPolyPolygon->insert(nIndex, rPolygon, nCount);
- }
-
void B3DPolyPolygon::append(const B3DPolygon& rPolygon, sal_uInt32 nCount)
{
if(nCount)
mpPolyPolygon->insert(mpPolyPolygon->count(), rPolygon, nCount);
}
- void B3DPolyPolygon::insert(sal_uInt32 nIndex, const B3DPolyPolygon& rPolyPolygon)
- {
- OSL_ENSURE(nIndex <= mpPolyPolygon->count(), "B3DPolyPolygon Insert outside range (!)");
-
- if(rPolyPolygon.count())
- mpPolyPolygon->insert(nIndex, rPolyPolygon);
- }
-
void B3DPolyPolygon::append(const B3DPolyPolygon& rPolyPolygon)
{
if(rPolyPolygon.count())
@@ -424,12 +402,6 @@ namespace basegfx
return bRetval;
}
- void B3DPolyPolygon::setClosed(bool bNew)
- {
- if(bNew != isClosed())
- mpPolyPolygon->setClosed(bNew);
- }
-
void B3DPolyPolygon::flip()
{
mpPolyPolygon->flip();
diff --git a/unusedcode.easy b/unusedcode.easy
index a4e746b..7b9b2c4 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -847,13 +847,6 @@ basegfx::B2DHomPoint::setY(double)
basegfx::B2DPolygon::insert(unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned int)
basegfx::B2DVector::isNormalized() const
basegfx::B2I64Tuple::getEmptyTuple()
-basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolyPolygon const&)
-basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int)
-basegfx::B3DPolyPolygon::makeUnique()
-basegfx::B3DPolyPolygon::setClosed(bool)
-basegfx::B3DPolygon::B3DPolygon(basegfx::B3DPolygon const&, unsigned int, unsigned int)
-basegfx::B3DPolygon::insert(unsigned int, basegfx::B3DPoint const&, unsigned int)
-basegfx::B3DPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int, unsigned int)
basegfx::B3DRange::B3DRange(basegfx::B3IRange const&)
basegfx::B3DTuple::B3DTuple(basegfx::B3ITuple const&)
basegfx::B3I64Tuple::getEmptyTuple()
commit 6cbf9907898026913ea49abfe6399ba3efa4bb58
Author: Alexander Bergmann <myaddons at gmx.de>
Date: Fri Jan 27 12:23:36 2012 +0100
unusedcode.easy: Removed unused code (basegfx::B2IVector)
diff --git a/unusedcode.easy b/unusedcode.easy
index 93477a7..a4e746b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -847,10 +847,6 @@ basegfx::B2DHomPoint::setY(double)
basegfx::B2DPolygon::insert(unsigned int, basegfx::B2DPolygon const&, unsigned int, unsigned int)
basegfx::B2DVector::isNormalized() const
basegfx::B2I64Tuple::getEmptyTuple()
-basegfx::B2IVector::angle(basegfx::B2IVector const&) const
-basegfx::B2IVector::cross(basegfx::B2IVector const&) const
-basegfx::B2IVector::getEmptyVector()
-basegfx::B2IVector::getLength() const
basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolyPolygon const&)
basegfx::B3DPolyPolygon::insert(unsigned int, basegfx::B3DPolygon const&, unsigned int)
basegfx::B3DPolyPolygon::makeUnique()
@@ -870,9 +866,6 @@ basegfx::exportToSvg(basegfx::B2DHomMatrix const&)
basegfx::fround(basegfx::B1DRange const&)
basegfx::fround(basegfx::B2DRange const&)
basegfx::fround(basegfx::B3DRange const&)
-basegfx::getContinuity(basegfx::B2IVector const&, basegfx::B2IVector const&)
-basegfx::getOrientation(basegfx::B2IVector const&, basegfx::B2IVector const&)
-basegfx::getPerpendicular(basegfx::B2IVector const&)
basegfx::interpolate(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&, double)
basegfx::maximum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
basegfx::minimum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
commit ec139b751ce85392327cb3eb3a495c27fa5546cd
Author: Alexander Bergmann <myaddons at gmx.de>
Date: Fri Jan 27 12:20:56 2012 +0100
unusedcode.easy: Removed unused code (basegfx::B2ITuple)
diff --git a/unusedcode.easy b/unusedcode.easy
index d75fd4f..93477a7 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -863,11 +863,8 @@ basegfx::B3DTuple::B3DTuple(basegfx::B3ITuple const&)
basegfx::B3I64Tuple::getEmptyTuple()
basegfx::B3ITuple::getEmptyTuple()
basegfx::absolute(basegfx::B2DHomPoint const&)
-basegfx::absolute(basegfx::B2ITuple const&)
basegfx::average(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&)
basegfx::average(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&, basegfx::B2DHomPoint&)
-basegfx::average(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
-basegfx::average(basegfx::B2ITuple const&, basegfx::B2ITuple const&, basegfx::B2ITuple const&)
basegfx::computeSetDifference(std::__debug::vector<basegfx::B2IBox, std::allocator<basegfx::B2IBox> >&, basegfx::B2IBox const&, basegfx::B2IBox const&)
basegfx::exportToSvg(basegfx::B2DHomMatrix const&)
basegfx::fround(basegfx::B1DRange const&)
@@ -877,11 +874,8 @@ basegfx::getContinuity(basegfx::B2IVector const&, basegfx::B2IVector const&)
basegfx::getOrientation(basegfx::B2IVector const&, basegfx::B2IVector const&)
basegfx::getPerpendicular(basegfx::B2IVector const&)
basegfx::interpolate(basegfx::B2DHomPoint&, basegfx::B2DHomPoint&, double)
-basegfx::interpolate(basegfx::B2ITuple const&, basegfx::B2ITuple const&, double)
basegfx::maximum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
-basegfx::maximum(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
basegfx::minimum(basegfx::B2DHomPoint const&, basegfx::B2DHomPoint const&)
-basegfx::minimum(basegfx::B2ITuple const&, basegfx::B2ITuple const&)
basegfx::tools::addPointsAtCuts(basegfx::B2DPolygon const&)
basegfx::tools::addPointsAtCutsAndTouches(basegfx::B2DPolyPolygon const&, basegfx::B2DPolygon const&)
basegfx::tools::applyLineDashing(basegfx::B3DPolyPolygon const&, std::__debug::vector<double, std::allocator<double> > const&, basegfx::B3DPolyPolygon*, basegfx::B3DPolyPolygon*, double)
More information about the Libreoffice-commits
mailing list