diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
| commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
| tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/inc/impoct.hxx | |
| parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'vcl/inc/impoct.hxx')
| -rw-r--r-- | vcl/inc/impoct.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx index 543ab19d6a57..8b0e85021db9 100644 --- a/vcl/inc/impoct.hxx +++ b/vcl/inc/impoct.hxx @@ -120,9 +120,9 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad ) inline BitmapColor ImpErrorQuad::ImplGetColor() { - return BitmapColor( (BYTE) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ), - (BYTE) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5L ), - (BYTE) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) ); + return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ), + (sal_uInt8) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5L ), + (sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) ); } // ------------- @@ -132,14 +132,14 @@ inline BitmapColor ImpErrorQuad::ImplGetColor() class ImpNodeCache { OctreeNode* pActNode; - ULONG nNew; - ULONG nDelete; - ULONG nGet; - ULONG nRelease; + sal_uLong nNew; + sal_uLong nDelete; + sal_uLong nGet; + sal_uLong nRelease; public: - ImpNodeCache( const ULONG nInitSize ); + ImpNodeCache( const sal_uLong nInitSize ); ~ImpNodeCache(); inline OctreeNode* ImplGetFreeNode(); |