summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2019-01-01 03:42:10 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-01-11 18:00:11 +0100
commit0515ffdb2e4c975f1d19257dfed2a24ff3cbfdb4 (patch)
tree283965a22b522aa975f496c63836ee8117eb7785 /include
parent46f2c64eee2213e2921f28645c4ba907d6b83885 (diff)
tdf#114441 Convert use of sal_uLong to sal_uInt32
Convert the return type of GetScanlineSize to sal_uInt32 since the type of the mnScanlineSize member of the BitmapBuffer struct is "long" Convert places that are using the value returned by this method Change-Id: I222ce30b8e8f88402ddfd25286ca3b7548a8e8fb Reviewed-on: https://gerrit.libreoffice.org/65779 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/bitmapaccess.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 47eb8cabb31e..cb4c8cb6ad0e 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_BMPACC_HXX
#define INCLUDED_VCL_BMPACC_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/salbtype.hxx>
#include <vcl/bitmap.hxx>
@@ -71,11 +70,11 @@ public:
return mpBuffer ? RemoveScanline(mpBuffer->mnFormat) : ScanlineFormat::NONE;
}
- sal_uLong GetScanlineSize() const
+ sal_uInt32 GetScanlineSize() const
{
assert(mpBuffer && "Access is not valid!");
- return mpBuffer ? mpBuffer->mnScanlineSize : 0UL;
+ return mpBuffer ? mpBuffer->mnScanlineSize : 0;
}
sal_uInt16 GetBitCount() const