diff options
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/gdi/image.cxx | 35 | ||||
-rw-r--r-- | vcl/source/gdi/lineinfo.cxx | 7 |
2 files changed, 0 insertions, 42 deletions
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 |