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

Noel Grandin noel at peralex.com
Thu Jan 15 01:48:39 PST 2015


 include/svx/galctrl.hxx         |    2 +-
 svx/source/gallery2/galctrl.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 313d7125eaf87f7af2af6bc1a6d1bac8fc7b2f0e
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Jan 15 11:35:05 2015 +0200

    convert sal_uIntPtr to long
    
    Change-Id: I662f51d8d7c88a6c6f7306c344d99841a3102bb4

diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 4abfde1..d1b6a39 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -121,7 +121,7 @@ private:
 
     Link                maSelectHdl;
     GalleryTheme*       mpTheme;
-    sal_uIntPtr               mnCurRow;
+    long                mnCurRow;
 
     void                InitSettings();
 
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 4665fd8..517b3a9 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -508,7 +508,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa
     rDev.Push( PushFlags::CLIPREGION );
     rDev.IntersectClipRegion( rRect );
 
-    if( mpTheme && ( mnCurRow < mpTheme->GetObjectCount() ) )
+    if( mpTheme && ( static_cast<size_t>(mnCurRow) < mpTheme->GetObjectCount() ) )
     {
         const Size aSize(rRect.GetHeight(), rRect.GetHeight());
         BitmapEx aBitmapEx;


More information about the Libreoffice-commits mailing list