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

[Noel Grandin]

 include/vcl/sysdata.hxx    |    8 ++++----
 vcl/source/outdev/text.cxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 26e8b589b3f7716a80df7f3a9273e4967d9b0991
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Nov 3 15:23:46 2017 +0200

    convert various vcl system fields from unsigned long -> sal_uInt32
    
    Change-Id: Iaa08ecb3a9a17f384267f2b685a4b672277db1ca
    Reviewed-on: https://gerrit.libreoffice.org/44317
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index fba387e01b87..e427e3a1b435 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -52,7 +52,7 @@ typedef struct CGContext *CGContextRef;
 
 struct SystemEnvData
 {
-    unsigned long       nSize;          // size in bytes of this structure
+    sal_uInt32          nSize;          // size in bytes of this structure
 #if defined(_WIN32)
     HWND                hWnd;           // the window hwnd
 #elif defined( MACOSX )
@@ -100,7 +100,7 @@ struct SystemEnvData
 
 struct SystemParentData
 {
-    unsigned long   nSize;            // size in bytes of this structure
+    sal_uInt32      nSize;            // size in bytes of this structure
 #if defined(_WIN32)
     HWND            hWnd;             // the window hwnd
 #elif defined( MACOSX )
@@ -127,7 +127,7 @@ struct SystemMenuData
 
 struct SystemGraphicsData
 {
-    unsigned long   nSize;          // size in bytes of this structure
+    sal_uInt32      nSize;          // size in bytes of this structure
 #if defined(_WIN32)
     HDC             hDC;            // handle to a device context
     HWND            hWnd;           // optional handle to a window
@@ -182,7 +182,7 @@ struct SystemWindowData
 
 struct SystemGlyphData
 {
-    unsigned long        index;
+    sal_uInt32           index;
     double               x;
     double               y;
     int                  fallbacklevel;
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 095243aec23e..7b1a8f957d38 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -2339,7 +2339,7 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c
     while (pLayout->GetNextGlyphs(1, &pGlyph, aPos, nStart))
     {
         SystemGlyphData aSystemGlyph;
-        aSystemGlyph.index = static_cast<unsigned long> (pGlyph->maGlyphId);
+        aSystemGlyph.index = pGlyph->maGlyphId;
         aSystemGlyph.x = aPos.X();
         aSystemGlyph.y = aPos.Y();
         int nLevel = pGlyph->mnFallbackLevel;