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

[Caolán McNamara]

 include/vcl/image.hxx            |    2 +-
 svtools/source/misc/imagemgr.cxx |    2 +-
 vcl/source/image/ImageList.cxx   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2dc821572e23dd0ac553e49244179e1e19d0df37
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 24 16:31:05 2016 +0000

    HasImageAtPos takes an id not a pos
    
    so rename it
    
    Change-Id: Id83a11d31d1d51f414e6a98ebb71a227c7fe448f

diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 7c4bd09..a571fab 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -101,7 +101,7 @@ public:
     Image           GetImage( const OUString& rImageName ) const;
 
     sal_uInt16      GetImagePos( sal_uInt16 nId ) const;
-    bool            HasImageAtPos( sal_uInt16 nId ) const;
+    bool            HasImageForId( sal_uInt16 nId ) const;
     sal_uInt16      GetImagePos( const OUString& rImageName ) const;
 
     sal_uInt16      GetImageId( sal_uInt16 nPos ) const;
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 6405b68..0db8c6f 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -517,7 +517,7 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig )
         pList = xSmallImageList.get();
     }
 
-    if ( pList->HasImageAtPos( nImageId ) )
+    if ( pList->HasImageForId( nImageId ) )
         return pList->GetImage( nImageId );
     return Image();
 }
diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx
index 572bc6b..57eaf89 100644
--- a/vcl/source/image/ImageList.cxx
+++ b/vcl/source/image/ImageList.cxx
@@ -287,7 +287,7 @@ sal_uInt16 ImageList::GetImagePos( sal_uInt16 nId ) const
     return IMAGELIST_IMAGE_NOTFOUND;
 }
 
-bool ImageList::HasImageAtPos( sal_uInt16 nId ) const
+bool ImageList::HasImageForId( sal_uInt16 nId ) const
 {
     return GetImagePos( nId ) != IMAGELIST_IMAGE_NOTFOUND;
 }