diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-12 09:52:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-26 07:35:36 +0100 |
| commit | 4fbd63860500b2db76df4d5aedbe5e3aa31fac69 (patch) | |
| tree | 5fa96dc262ba651e82244b0f9e508f79e88ea2df /vbahelper | |
| parent | 62fa5bb8c1299469eacc21cb35ee670b65120713 (diff) | |
switching long to a 64-bit type on 64-bit windows
(*) create a rewriting plugin to do most of the work, heavily
based on the fakebool plugin
(*) but there are still a number of "long"s in the codebase
that will need to be done by hand
(*) the plugin needs lots of handholding, due to needing to
add #include and update macros
Change-Id: I8184d7000ca482c0469514bb73178c3a1123b1e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104203
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 8 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbaapplicationbase.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index af21ad4bfa01..66165d9c7ba7 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -436,7 +436,7 @@ namespace { struct PointerStyles { - long msoPointerStyle; + tools::Long msoPointerStyle; PointerStyle loPointStyle; }; @@ -463,9 +463,9 @@ PointerStyles const styles[] = { }; -static long lcl_loPointerToMsoPointer( PointerStyle eType ) +static tools::Long lcl_loPointerToMsoPointer( PointerStyle eType ) { - long nRet = msforms::fmMousePointer::fmMousePointerDefault; + tools::Long nRet = msforms::fmMousePointer::fmMousePointerDefault; for ( int i = 0; i < int(SAL_N_ELEMENTS( styles )); ++i ) { if ( styles[ i ].loPointStyle == eType ) @@ -477,7 +477,7 @@ static long lcl_loPointerToMsoPointer( PointerStyle eType ) return nRet; } -static PointerStyle lcl_msoPointerToLOPointer( long msoPointerStyle ) +static PointerStyle lcl_msoPointerToLOPointer( tools::Long msoPointerStyle ) { PointerStyle aPointer( PointerStyle::Arrow ); for ( int i = 0; i < int(SAL_N_ELEMENTS( styles )); ++i ) diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 924396a962da..7edfd56a2732 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -75,10 +75,10 @@ public: { DateTime aNow( DateTime::SYSTEM ); Date aRefDate( 1,1,1900 ); - long nDiffDays = aNow - aRefDate; + tools::Long nDiffDays = aNow - aRefDate; nDiffDays += 2; // Change VisualBasic: 1.Jan.1900 == 2 - long nDiffSeconds = aNow.GetHour() * 3600 + aNow.GetMin() * 60 + aNow.GetSec(); + tools::Long nDiffSeconds = aNow.GetHour() * 3600 + aNow.GetMin() * 60 + aNow.GetSec(); return static_cast<double>(nDiffDays) + static_cast<double>(nDiffSeconds)/double(24*3600); } |