[Libreoffice-commits] core.git: include/vcl vcl/source

Jan Holesovsky kendy at suse.cz
Sun Jul 28 13:11:23 PDT 2013


 include/vcl/image.hxx    |    1 -
 vcl/source/gdi/image.cxx |   15 ---------------
 2 files changed, 16 deletions(-)

New commits:
commit 5132017d86809c99a1af8ac0c0e0a72d00de3674
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Sun Jul 28 15:56:36 2013 +0200

    ImageList::AddImage(sal_uInt16, ...) is unused again, kill.
    
    Change-Id: I58be12e7cbf1b97b4d52f398853074ad135780a0

diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 0d28bc0..dc027f4 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -103,7 +103,6 @@ public:
     Size            GetImageSize() const;
 
     void            AddImage( const OUString& rImageName, const Image& rImage );
-    void            AddImage( sal_uInt16 nNewId, const Image& rImage );
 
     void            ReplaceImage( const OUString& rImageName, const Image& rImage );
 
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 0e33a63..32bd324 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -504,21 +504,6 @@ sal_uInt16 ImageList::ImplGetImageId( const OUString& rImageName ) const
         return 0;
 }
 
-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 OUString& rImageName, const Image& rImage )
 {
     DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND, "ImageList::AddImage() - ImageName already exists" );


More information about the Libreoffice-commits mailing list