This is an automated email from the ASF dual-hosted git repository. damjan pushed a commit to branch windows-amd64 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d5088e2def0f87fbfd37d4bad7b0f744c8592e1e Author: Damjan Jovanovic <dam...@apache.org> AuthorDate: Fri Jan 3 07:01:21 2025 +0200 Fix the return type of Get10ThSec(), so it's Win64 compatible. Patch by: me --- main/sfx2/source/bastyp/progress.cxx | 2 +- main/sfx2/source/view/sfxbasecontroller.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/sfx2/source/bastyp/progress.cxx b/main/sfx2/source/bastyp/progress.cxx index 6dea6bd400..a49729b047 100644 --- a/main/sfx2/source/bastyp/progress.cxx +++ b/main/sfx2/source/bastyp/progress.cxx @@ -110,7 +110,7 @@ struct SfxProgress_Impl #define aTypeLibInfo aProgressTypeLibImpl //======================================================================== -extern sal_uIntPtr Get10ThSec(); +extern clock_t Get10ThSec(); // ----------------------------------------------------------------------- diff --git a/main/sfx2/source/view/sfxbasecontroller.cxx b/main/sfx2/source/view/sfxbasecontroller.cxx index 908e07419a..db5d190626 100644 --- a/main/sfx2/source/view/sfxbasecontroller.cxx +++ b/main/sfx2/source/view/sfxbasecontroller.cxx @@ -220,9 +220,9 @@ sal_Bool SupportsCommandGroup( sal_Int16 nCommandGroup ) return sal_False; } -sal_uInt32 Get10ThSec() +clock_t Get10ThSec() { - sal_uInt32 n10Ticks = 10 * (sal_uInt32)clock(); + clock_t n10Ticks = 10 * clock(); return n10Ticks / CLOCKS_PER_SEC; } @@ -246,7 +246,7 @@ friend class SfxBaseController; SfxWorkWindow* pWorkWindow; sal_Int32 _nRange; sal_Int32 _nValue; - long _nStartTime; + clock_t _nStartTime; public: SfxStatusIndicator(SfxBaseController* pController, SfxWorkWindow* pWork) : xOwner( pController )