summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-08-18 11:44:06 +0200
committerAndras Timar <atimar@suse.com>2012-08-23 08:12:37 +0000
commitc564fdfe298d8f93e3f09f61dc01a152f57b6506 (patch)
treeb006b8acd1ac521b1ed20c5fc249e590ab20589b
parent52755d6d2cf1c6addaf3c91b93bb86d66b730409 (diff)
unusedcode.easy: remove recently unused code
Change-Id: Ia33e933d9c15c2afa25915b7e8d6a13b0c740d1c Reviewed-on: https://gerrit.libreoffice.org/426 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
-rwxr-xr-xunusedcode.easy4
-rw-r--r--vcl/inc/unx/salgdi.h13
-rw-r--r--vcl/inc/vcl/alpha.hxx5
-rw-r--r--vcl/source/gdi/alpha.cxx31
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx80
5 files changed, 0 insertions, 133 deletions
diff --git a/unusedcode.easy b/unusedcode.easy
index 136657f89fbb..e541859b975f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,3 @@
-AlphaMask::Scale(Size const&, unsigned long)
-AlphaMask::Scale(double const&, double const&, unsigned long)
-AlphaMask::ScaleCropRotate(double const&, double const&, Rectangle const&, long, Color const&, unsigned long)
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
PopupMenu::SetSelectedEntry(unsigned short)
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
@@ -20,7 +17,6 @@ VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
-X11SalGraphics::Clip(int&, int&, unsigned int&, unsigned int&, int&, int&) const
XclExpPivotCache::GetFieldAcc(rtl::OUString const&)
binfilter::ImpSvtData::~ImpSvtData()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer()
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 359d274ba79e..494a1dcd2783 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -173,19 +173,6 @@ protected:
inline GC GetCopyGC();
inline GC GetStippleGC();
- int Clip ( XLIB_Region pRegion,
- int &nX,
- int &nY,
- unsigned int &nDX,
- unsigned int &nDY,
- int &nSrcX,
- int &nSrcY ) const;
- int Clip ( int &nX,
- int &nY,
- unsigned int &nDX,
- unsigned int &nDY,
- int &nSrcX,
- int &nSrcY ) const;
using SalGraphics::DrawBitmap;
void DrawBitmap( const SalTwoRect *pPosAry,
SalGraphics *pThis,
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx
index d0ceb92b1a24..f25cde58e655 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/vcl/inc/vcl/alpha.hxx
@@ -123,11 +123,6 @@ public:
sal_Bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency,
sal_uLong nTol = 0UL );
- sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag );
- sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_DEFAULT );
- sal_Bool ScaleCropRotate( const double& rScaleX, const double& rScaleY, const Rectangle& rRectPixel, long nAngle10,
- const Color& rFillColor, sal_uLong nScaleFlag = BMP_SCALE_DEFAULT );
-
BitmapReadAccess* AcquireReadAccess()
{
return Bitmap::AcquireReadAccess();
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index 0c2ad3677dee..985b13be0748 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -287,35 +287,4 @@ void AlphaMask::ReleaseAccess( BitmapReadAccess* pAccess )
}
}
-sal_Bool AlphaMask::Scale( const Size& rNewSize, sal_uLong nScaleFlag )
-{
- sal_Bool bRet = Bitmap::Scale( rNewSize, nScaleFlag );
-
- if( bRet )
- Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS );
-
- return bRet;
-}
-
-sal_Bool AlphaMask::Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag )
-{
- sal_Bool bRet = Bitmap::Scale( rScaleX, rScaleY, nScaleFlag );
-
- if( bRet )
- Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS );
-
- return bRet;
-}
-
-sal_Bool AlphaMask::ScaleCropRotate(
- const double& rScaleX, const double& rScaleY, const Rectangle& rRectPixel, long nAngle10,
- const Color& rFillColor, sal_uLong nScaleFlag )
-{
- sal_Bool bRet = Bitmap::ScaleCropRotate( rScaleX, rScaleY, rRectPixel, nAngle10, rFillColor, nScaleFlag );
- if( bRet )
- Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS );
-
- return bRet;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 40f35991cd68..22cfb604b61e 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -242,86 +242,6 @@ inline GC X11SalGraphics::GetStippleGC()
return pStippleGC_;
}
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-int X11SalGraphics::Clip( XLIB_Region pRegion,
- int &nX,
- int &nY,
- unsigned int &nDX,
- unsigned int &nDY,
- int &nSrcX,
- int &nSrcY ) const
-{
- XRectangle aRect;
- XClipBox( pRegion, &aRect );
-
- if( int(nX + nDX) <= int(aRect.x) || nX >= int(aRect.x + aRect.width) )
- return RectangleOut;
- if( int(nY + nDY) <= int(aRect.y) || nY >= int(aRect.y + aRect.height) )
- return RectangleOut;
-
- if( nX < aRect.x )
- {
- nSrcX += aRect.x - nX;
- nDX -= aRect.x - nX;
- nX = aRect.x;
- }
- else if( int(nX + nDX) > int(aRect.x + aRect.width) )
- nDX = aRect.x + aRect.width - nX;
-
- if( nY < aRect.y )
- {
- nSrcY += aRect.y - nY;
- nDY -= aRect.y - nY;
- nY = aRect.y;
- }
- else if( int(nY + nDY) > int(aRect.y + aRect.height) )
- nDY = aRect.y + aRect.height - nY;
-
- return RectangleIn;
-}
-
-// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-int X11SalGraphics::Clip( int &nX,
- int &nY,
- unsigned int &nDX,
- unsigned int &nDY,
- int &nSrcX,
- int &nSrcY ) const
-
-{
- if( pPaintRegion_
- && RectangleOut == Clip( pPaintRegion_, nX, nY, nDX, nDY, nSrcX, nSrcY ) )
- return RectangleOut;
-
- if( mpClipRegion
- && RectangleOut == Clip( mpClipRegion, nX, nY, nDX, nDY, nSrcX, nSrcY ) )
- return RectangleOut;
-
- int nPaint;
- if( pPaintRegion_ )
- {
- nPaint = XRectInRegion( pPaintRegion_, nX, nY, nDX, nDY );
- if( RectangleOut == nPaint )
- return RectangleOut;
- }
- else
- nPaint = RectangleIn;
-
- int nClip;
- if( mpClipRegion )
- {
- nClip = XRectInRegion( mpClipRegion, nX, nY, nDX, nDY );
- if( RectangleOut == nClip )
- return RectangleOut;
- }
- else
- nClip = RectangleIn;
-
- return RectangleIn == nClip && RectangleIn == nPaint
- ? RectangleIn
- : RectanglePart;
-}
-
// -=-= SalGraphics =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=