From 804e86170ff2570fd3826b4ac26d1c927e751ac3 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 17 Jan 2012 15:28:11 +0100 Subject: remove unused methods --- vcl/generic/glyphs/glyphcache.cxx | 9 --------- vcl/inc/generic/glyphcache.hxx | 1 - vcl/inc/vcl/image.hxx | 2 -- vcl/inc/vcl/lineinfo.hxx | 3 --- vcl/source/gdi/image.cxx | 35 ----------------------------------- vcl/source/gdi/lineinfo.cxx | 7 ------- 6 files changed, 57 deletions(-) (limited to 'vcl') diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index c524c08673e4..b48b4158cf1e 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -438,15 +438,6 @@ ExtraKernInfo::ExtraKernInfo( sal_IntPtr nFontId ) //-------------------------------------------------------------------------- -bool ExtraKernInfo::HasKernPairs() const -{ - if( !mbInitialized ) - Initialize(); - return !maUnicodeKernPairs.empty(); -} - -//-------------------------------------------------------------------------- - int ExtraKernInfo::GetUnscaledKernPairs( ImplKernPairData** ppKernPairs ) const { if( !mbInitialized ) diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 7d46ff74ec12..1ab2a74eda45 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -400,7 +400,6 @@ public: ExtraKernInfo( sal_IntPtr nFontId ); virtual ~ExtraKernInfo() {} - bool HasKernPairs() const; int GetUnscaledKernPairs( ImplKernPairData** ) const; int GetUnscaledKernValue( sal_Unicode cLeft, sal_Unicode cRight ) const; diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index a28cc817eaa4..c76338a8ada0 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -127,11 +127,9 @@ public: sal_uInt16 GetImageCount() const; Size GetImageSize() const; - void AddImage( sal_uInt16 nNewId, const Image& rImage ); void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId ); void RemoveImage( sal_uInt16 nId ); diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx index 046257cbdd9f..069a1f015e9f 100644 --- a/vcl/inc/vcl/lineinfo.hxx +++ b/vcl/inc/vcl/lineinfo.hxx @@ -118,9 +118,6 @@ public: friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo ); - // helper to check if line width or DashDot is used - bool isDashDotOrFatLineUsed() const; - // helper to get decomposed polygon data with the LineInfo applied. The source // hairline polygon is given in io_rLinePolyPolygon. Both given polygons may // contain results; e.g. when no fat line but DasDot is defined, the resut will diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index cff57b850bd8..ce63d9dbf595 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -582,23 +582,6 @@ sal_uInt16 ImageList::ImplGetImageId( const ::rtl::OUString& rImageName ) const // ----------------------------------------------------------------------- -void ImageList::AddImage( sal_uInt16 nId, const Image& rImage ) -{ - DBG_CHKTHIS( ImageList, NULL ); - DBG_CHKOBJ( &rImage, Image, NULL ); - DBG_ASSERT( nId, "ImageList::AddImage(): ImageId == 0" ); - DBG_ASSERT( GetImagePos( nId ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageId already exists" ); - DBG_ASSERT( rImage.mpImplData, "ImageList::AddImage(): Wrong Size" ); - DBG_ASSERT( !mpImplData || (rImage.GetSizePixel() == mpImplData->maImageSize), "ImageList::AddImage(): Wrong Size" ); - - if( !mpImplData ) - ImplInit( 0, rImage.GetSizePixel() ); - - mpImplData->AddImage( rtl::OUString(), nId, rImage.GetBitmapEx()); -} - -// ----------------------------------------------------------------------- - void ImageList::AddImage( const ::rtl::OUString& rImageName, const Image& rImage ) { DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" ); @@ -628,24 +611,6 @@ void ImageList::ReplaceImage( const ::rtl::OUString& rImageName, const Image& rI // ----------------------------------------------------------------------- -void ImageList::ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId ) -{ - DBG_CHKTHIS( ImageList, NULL ); - DBG_ASSERT( GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND, "ImageList::ReplaceImage(): Unknown nId" ); - DBG_ASSERT( GetImagePos( nReplaceId ) != IMAGELIST_IMAGE_NOTFOUND, "ImageList::ReplaceImage(): Unknown nReplaceId" ); - - sal_uLong nPosDest = GetImagePos( nId ); - sal_uLong nPosSrc = GetImagePos( nReplaceId ); - if( nPosDest != IMAGELIST_IMAGE_NOTFOUND && - nPosSrc != IMAGELIST_IMAGE_NOTFOUND ) - { - ImplMakeUnique(); - mpImplData->maImages[nPosDest] = mpImplData->maImages[nPosSrc]; - } -} - -// ----------------------------------------------------------------------- - void ImageList::RemoveImage( sal_uInt16 nId ) { DBG_CHKTHIS( ImageList, NULL ); diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 96c518844dbb..234f37abf72d 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -294,13 +294,6 @@ SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo ) // ----------------------------------------------------------------------- -bool LineInfo::isDashDotOrFatLineUsed() const -{ - return (LINE_DASH == GetStyle() || GetWidth() > 1); -} - -// ----------------------------------------------------------------------- - void LineInfo::applyToB2DPolyPolygon( basegfx::B2DPolyPolygon& io_rLinePolyPolygon, basegfx::B2DPolyPolygon& o_rFillPolyPolygon) const -- cgit