diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-03 15:23:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-06 07:13:10 +0100 |
| commit | 26e8b589b3f7716a80df7f3a9273e4967d9b0991 (patch) | |
| tree | 1cccb3b6eca4d09edb78d2ca31350a7234119257 | |
| parent | d7817c54fc9d2b688e8c5b15935adb06e6f47197 (diff) | |
convert various vcl system fields from unsigned long -> sal_uInt32
Change-Id: Iaa08ecb3a9a17f384267f2b685a4b672277db1ca
Reviewed-on: https://gerrit.libreoffice.org/44317
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/vcl/sysdata.hxx | 8 | ||||
| -rw-r--r-- | vcl/source/outdev/text.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
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; |