Hi, Attached is a trivial patch to remove the unused method canvas::tools::clipBlit. I seem to have contributed a a pair of changes to OpenOffice.org in the past, so I hereby declare that: All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Thanks, Jordi -- Jordi Mallach Pérez -- Debian developer http://www.debian.org/ jordi@sindominio.net jordi@debian.org http://www.sindominio.net/ GnuPG public key information available at http://oskuro.net/
From f6696c5f2cb5ae681c8ae52b498fb652fd4fb258 Mon Sep 17 00:00:00 2001
From: Jordi Mallach <jordi@sindominio.net>
Date: Thu, 3 May 2012 10:29:20 +0200
Subject: [PATCH] Remove unused method canvas::tools::clipBlit
---
canvas/inc/canvas/canvastools.hxx | 28 ----------------------------
canvas/source/tools/canvastools.cxx | 12 ------------
unusedcode.easy | 1 -
3 files changed, 0 insertions(+), 41 deletions(-)
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
index 1605b66..64fd84f 100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
@@ -314,34 +314,6 @@ namespace canvas
::std::vector< ::basegfx::B2IRange >& o_ClippedAreas,
const ::basegfx::B2IRange& rBounds );
- /** Clip a blit between two differently surfaces.
-
- This method clips source and dest rect for a clip between
- two differently clipped surfaces, such that the resulting
- blit rects are fully within both clip areas.
-
- @param io_rSourceArea
- Source area of the blit. Returned therein is the computed
- clipped source area.
-
- @param io_rDestPoint
- Dest area of the blit. Returned therein is the computed
- clipped dest area.
-
- @param rSourceBounds
- Clip bounds of the source surface
-
- @param rDestBounds
- Clip bounds of the dest surface
-
- @return false, if the resulting blit is empty, i.e. fully
- clipped away.
- */
- CANVASTOOLS_DLLPUBLIC bool clipBlit( ::basegfx::B2IRange& io_rSourceArea,
- ::basegfx::B2IPoint& io_rDestPoint,
- const ::basegfx::B2IRange& rSourceBounds,
- const ::basegfx::B2IRange& rDestBounds );
-
/** Return range of integer pixel, which will cover the sprite
given by the floating point range.
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 4a55ad5..d5220fd 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -794,18 +794,6 @@ namespace canvas
return true;
}
- bool clipBlit( ::basegfx::B2IRange& io_rSourceArea,
- ::basegfx::B2IPoint& io_rDestPoint,
- const ::basegfx::B2IRange& rSourceBounds,
- const ::basegfx::B2IRange& rDestBounds )
- {
- return clipAreaImpl( NULL,
- io_rSourceArea,
- io_rDestPoint,
- rSourceBounds,
- rDestBounds );
- }
-
::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange )
{
if( rRange.isEmpty() )
diff --git a/unusedcode.easy b/unusedcode.easy
index 00cd6fa..bd03a58 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -649,7 +649,6 @@ cairocanvas::CanvasHelper::getPalette()
cairocanvas::SpriteDeviceHelper::getSurface()
cairocanvas::TextLayout::draw(_cairo*)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
-canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&,
basegfx::B2IRange const&)
cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier>
const&)
cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>,
std::allocator<rtl::Reference<cmis::Content> > >&)
comphelper::OSelectionChangeListener::disposeAdapter()
--
1.7.1
Attachment:
signature.asc
Description: Digital signature