basebmp/source/debug.cxx | 4 ++
basebmp/test/bmpdemo.cxx | 1
basegfx/inc/basegfx/polygon/b2dpolygontools.hxx | 4 --
basegfx/inc/basegfx/polygon/b3dpolygontools.hxx | 4 --
basegfx/source/polygon/b2dpolygontools.cxx | 44 ------------------------
basegfx/source/polygon/b3dpolygontools.cxx | 26 --------------
unusedcode.easy | 3 -
vcl/headless/svptext.cxx | 4 --
8 files changed, 4 insertions(+), 86 deletions(-)
New commits:
commit 7327195602e7870e20a4eebb8ea26ae7294f065b
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri May 11 10:56:12 2012 +0200
put debugDump behind #if OSL_DEBUG_LEVEL > 2
basebmp/source/debug.cxx is only for vcl/headless/svpgdi.cxx
Change-Id: I I Ib0624d919d7c0c5ce54dbef62fa0b49fd6eb0ab1
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
index 5491715..53e7bf7 100644
--- a/basebmp/source/debug.cxx
+++ b/basebmp/source/debug.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#if OSL_DEBUG_LEVEL > 2
+
#include <osl/diagnose.h>
#include <basegfx/point/b2ipoint.hxx>
@@ -106,4 +108,6 @@ namespace basebmp
}
}
+#endif // OSL_DEBUG_LEVEL > 2
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 6b94921..02b392a 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -62,7 +62,6 @@
#include <basebmp/color.hxx>
#include <basebmp/scanlineformats.hxx>
#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/debug.hxx>
#include <rtl/bootstrap.hxx>
diff --git a/unusedcode.easy b/unusedcode.easy
index 379de29..6a71b43 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -300,7 +300,6 @@ _SwPamRanges_SAR::_ForEach(unsigned short, unsigned short,
unsigned char (*)(SwP
_SwRedlineTbl::Insert(SwRedline* const*, unsigned short)
_SwRedlineTbl::Insert(_SwRedlineTbl const*, unsigned short, unsigned short)
_SwRedlineTbl::Remove(SwRedline* const&, unsigned short)
-basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&,
std::basic_ostream<char, std::char_traits<char> >&)
binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr
const*, unsigned short, unsigned short, unsigned short)
binfilter::B3dEdgeEntryBucketMemArr::Replace(char const*&, unsigned short)
binfilter::B3dEdgeEntryBucketMemArr::Replace(char const**, unsigned short,
unsigned short)
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 26abf38..2eecfbd 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -34,10 +34,6 @@
#include <tools/debug.hxx>
-#if OSL_DEBUG_LEVEL > 2
-#include <basebmp/debug.hxx>
-#endif
-
#include <outfont.hxx>
#include <impfont.hxx>
#include <rtl/instance.hxx>
commit 5c3615c1152eabfda508504c8a4c5727868acbc8
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Fri May 11 10:50:01 2012 +0200
unusedcode: basegfx::tools::equal
Change-Id: I I579fd3de05f78f06af06c53afab1cc70fc700082
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
index d26475e..0c106cb 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
@@ -426,10 +426,6 @@ namespace basegfx
*/
BASEGFX_DLLPUBLIC B2DPolygon createWaveline(const B2DPolygon&
rCandidate, double fWaveWidth, double fWaveHeight);
- //////////////////////////////////////////////////////////////////////
- // comparators with tolerance for 2D Polygons
- BASEGFX_DLLPUBLIC bool equal(const B2DPolygon& rCandidateA, const
B2DPolygon& rCandidateB, const double& rfSmallValue);
-
/** snap some polygon coordinates to discrete coordinates
This method allows to snap some polygon points to discrete
(integer) values
diff --git a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
index 1ff1e6e..8ebead8 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
@@ -122,10 +122,6 @@ namespace basegfx
// and a line given by start and end point
BASEGFX_DLLPUBLIC bool getCutBetweenLineAndPlane(const B3DVector&
rPlaneNormal, const B3DPoint& rPlanePoint, const B3DPoint& rEdgeStart, const
B3DPoint& rEdgeEnd, double& fCut);
- //////////////////////////////////////////////////////////////////////
- // comparators with tolerance for 3D Polygons
- BASEGFX_DLLPUBLIC bool equal(const B3DPolygon& rCandidateA, const
B3DPolygon& rCandidateB, const double& rfSmallValue);
-
/** snap some polygon coordinates to discrete coordinates
This method allows to snap some polygon points to discrete
(integer) values
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx
b/basegfx/source/polygon/b2dpolygontools.cxx
index cfe9f3a..babc779 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3121,50 +3121,6 @@ namespace basegfx
return aRetval;
}
- //////////////////////////////////////////////////////////////////////
- // comparators with tolerance for 2D Polygons
-
- bool equal(const B2DPolygon& rCandidateA, const B2DPolygon&
rCandidateB, const double& rfSmallValue)
- {
- const sal_uInt32 nPointCount(rCandidateA.count());
-
- if(nPointCount != rCandidateB.count())
- return false;
-
- const bool bClosed(rCandidateA.isClosed());
-
- if(bClosed != rCandidateB.isClosed())
- return false;
-
- const bool
bAreControlPointsUsed(rCandidateA.areControlPointsUsed());
-
- if(bAreControlPointsUsed != rCandidateB.areControlPointsUsed())
- return false;
-
- for(sal_uInt32 a(0); a < nPointCount; a++)
- {
- const B2DPoint aPoint(rCandidateA.getB2DPoint(a));
-
- if(!aPoint.equal(rCandidateB.getB2DPoint(a), rfSmallValue))
- return false;
-
- if(bAreControlPointsUsed)
- {
- const basegfx::B2DPoint
aPrev(rCandidateA.getPrevControlPoint(a));
-
- if(!aPrev.equal(rCandidateB.getPrevControlPoint(a),
rfSmallValue))
- return false;
-
- const basegfx::B2DPoint
aNext(rCandidateA.getNextControlPoint(a));
-
- if(!aNext.equal(rCandidateB.getNextControlPoint(a),
rfSmallValue))
- return false;
- }
- }
-
- return true;
- }
-
// snap points of horizontal or vertical edges to discrete values
B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon&
rCandidate)
{
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx
b/basegfx/source/polygon/b3dpolygontools.cxx
index bcec720..e367b8e 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -740,32 +740,6 @@ namespace basegfx
return false;
}
- //////////////////////////////////////////////////////////////////////
- // comparators with tolerance for 3D Polygons
-
- bool equal(const B3DPolygon& rCandidateA, const B3DPolygon&
rCandidateB, const double& rfSmallValue)
- {
- const sal_uInt32 nPointCount(rCandidateA.count());
-
- if(nPointCount != rCandidateB.count())
- return false;
-
- const bool bClosed(rCandidateA.isClosed());
-
- if(bClosed != rCandidateB.isClosed())
- return false;
-
- for(sal_uInt32 a(0); a < nPointCount; a++)
- {
- const B3DPoint aPoint(rCandidateA.getB3DPoint(a));
-
- if(!aPoint.equal(rCandidateB.getB3DPoint(a), rfSmallValue))
- return false;
- }
-
- return true;
- }
-
// snap points of horizontal or vertical edges to discrete values
B3DPolygon snapPointsOfHorizontalOrVerticalEdges(const B3DPolygon&
rCandidate)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 0f841e9..379de29 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -301,8 +301,6 @@ _SwRedlineTbl::Insert(SwRedline* const*, unsigned short)
_SwRedlineTbl::Insert(_SwRedlineTbl const*, unsigned short, unsigned short)
_SwRedlineTbl::Remove(SwRedline* const&, unsigned short)
basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&,
std::basic_ostream<char, std::char_traits<char> >&)
-basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&,
double const&)
-basegfx::tools::equal(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&,
double const&)
binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr
const*, unsigned short, unsigned short, unsigned short)
binfilter::B3dEdgeEntryBucketMemArr::Replace(char const*&, unsigned short)
binfilter::B3dEdgeEntryBucketMemArr::Replace(char const**, unsigned short,
unsigned short)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
