desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 +++--- desktop/source/deployment/gui/dp_gui_dialog2.hxx | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit d39e1b0463de02f6a78712879d54e69e71b22b3b Author: Michael Weghorn <[email protected]> AuthorDate: Wed Apr 23 11:46:33 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Apr 23 13:53:44 2025 +0200 desktop: Use sal_Int32 instead of tools::Long for progress value And drop a static_cast to sal_uInt16 in ExtMgrDialog::updateProgress for which it's unclear to me why it was there. Change-Id: Iac204bc1139c4674925d4e42e22614d0cf069ece Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184480 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index cf53dddff48a..1a91ea99278f 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -837,7 +837,7 @@ void ExtMgrDialog::showProgress( bool _bStart ) } -void ExtMgrDialog::updateProgress( const tools::Long nProgress ) +void ExtMgrDialog::updateProgress(sal_Int32 nProgress) { SolarMutexGuard aGuard; if ( m_nProgress != nProgress ) @@ -973,7 +973,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Timer *, void) } if ( m_xProgressBar->get_visible() ) - m_xProgressBar->set_percentage( static_cast<sal_uInt16>(m_nProgress) ); + m_xProgressBar->set_percentage(m_nProgress); } } @@ -1128,7 +1128,7 @@ void UpdateRequiredDialog::showProgress( bool _bStart ) } -void UpdateRequiredDialog::updateProgress( const tools::Long nProgress ) +void UpdateRequiredDialog::updateProgress(sal_Int32 nProgress) { SolarMutexGuard aGuard; if ( m_nProgress != nProgress ) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 291b5c80981e..36c6dddb9c1d 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -65,7 +65,7 @@ public: virtual void showProgress( bool bStart ) = 0; virtual void updateProgress( const OUString &rText, const css::uno::Reference< css::task::XAbortChannel > &xAbortChannel) = 0; - virtual void updateProgress( const tools::Long nProgress ) = 0; + virtual void updateProgress(sal_Int32 nProgress) = 0; virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) = 0; virtual void addPackageToList( const css::uno::Reference< css::deployment::XPackage > &xPackage, @@ -100,7 +100,7 @@ class ExtMgrDialog : public weld::GenericDialogController bool m_bDisableWarning; bool m_bDeleteWarning; bool m_bClosed; - tools::Long m_nProgress; + sal_Int32 m_nProgress; Idle m_aIdle; TheExtensionManager *m_pManager; @@ -144,7 +144,7 @@ public: virtual void showProgress( bool bStart ) override; virtual void updateProgress( const OUString &rText, const css::uno::Reference< css::task::XAbortChannel > &xAbortChannel) override; - virtual void updateProgress( const tools::Long nProgress ) override; + virtual void updateProgress(sal_Int32 nProgress) override; virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) override; @@ -188,7 +188,7 @@ class UpdateRequiredDialog : public weld::GenericDialogController bool m_bStartProgress; bool m_bStopProgress; bool m_bHasLockedEntries; - tools::Long m_nProgress; + sal_Int32 m_nProgress; Idle m_aIdle; TheExtensionManager *m_pManager; @@ -223,7 +223,7 @@ public: virtual void showProgress( bool bStart ) override; virtual void updateProgress( const OUString &rText, const css::uno::Reference< css::task::XAbortChannel > &xAbortChannel) override; - virtual void updateProgress( const tools::Long nProgress ) override; + virtual void updateProgress(sal_Int32 nProgress) override; virtual void updatePackageInfo( const css::uno::Reference< css::deployment::XPackage > &xPackage ) override;
