diff options
| author | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-03-17 17:18:08 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-28 20:08:46 +0100 |
| commit | 061130bd6d60c648991afb83bc0befb48a68f34e (patch) | |
| tree | 45960c905e6456296614cff0ab32f284bdf074fe /basic/source/runtime/methods.cxx | |
| parent | 018652591d0e2a0fc740a16200bc887a9acc93a3 (diff) | |
fdo#75280 Started cleaning up of sal_uIntPtr usage.
Converted wrong usage of sal_uIntPtr to appropriate other types in basic
module.
The bug is not fully fixed with this since many other occurences of sal_uIntPtr remain.
Update due to code review comments:
Fixed forgetting to change some declarations in iosys.cxx.
Cleaned up the one remaining sal_uIntPtr in iosys.cxx
Fixed adding a sal_uInt64 to a Date (uses long now instead) in methods.cxx
Fixed the VarDecFromUI4 call in sbxdec.cxx from sal_uLong to ULONG .
Conflicts:
basic/source/runtime/iosys.cxx
Change-Id: Ia6460be04967deb68b92eb62d945da8814fae605
Diffstat (limited to 'basic/source/runtime/methods.cxx')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index b35d8d626ddd..7544946240b1 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -1828,12 +1828,12 @@ sal_Int16 implGetDateDay( double aDate ) if ( aDate >= 0.0 ) { aDate = floor( aDate ); - aRefDate += (sal_uIntPtr)aDate; + aRefDate += static_cast<long>(aDate); } else { aDate = ceil( aDate ); - aRefDate -= (sal_uIntPtr)(-1.0 * aDate); + aRefDate -= static_cast<long>(-1.0 * aDate); } sal_Int16 nRet = (sal_Int16)( aRefDate.GetDay() ); |
