core.git: toolkit/source

[anish.deshpande (via logerrit)]

 toolkit/source/awt/vclxtabpagecontainer.cxx |    2 +-
 toolkit/source/awt/vclxwindows.cxx          |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7d384d63105af039cd0246395d005f337073eac6
Author:     anish.deshpande <anishmdeshpa...@gmail.com>
AuthorDate: Mon Mar 4 16:17:06 2024 +0530
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Mar 22 11:12:35 2024 +0100

    tdf#114441 change use of sal_uLong to better integer types in toolkit
    
    nPageID is referenced as sal_uInt16 in TabControl::SelectTabPage.
    
    Change-Id: I11e518a0c9be5eecb9e8b2472f4df356da5a93e3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164330
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index afd3d843b7ef..f9f4779a2603 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -148,7 +148,7 @@ void VCLXTabPageContainer::ProcessWindowEvent( const 
VclWindowEvent& _rVclWindow
     {
         case VclEventId::TabpageActivate:
         {
-            sal_uLong page = 
reinterpret_cast<sal_uLong>(_rVclWindowEvent.GetData());
+            sal_uInt16 page = 
static_cast<sal_uInt16>(reinterpret_cast<sal_uIntPtr>(_rVclWindowEvent.GetData()));
             awt::tab::TabPageActivatedEvent aEvent(nullptr,page);
             m_aTabPageListeners.tabPageActivated(aEvent);
             break;
diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index d6ba5e48a6e8..73f1920e59d0 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2602,14 +2602,14 @@ void VCLXMultiPage::ProcessWindowEvent( const 
VclWindowEvent& rVclWindowEvent )
     {
         case VclEventId::TabpageDeactivate:
         {
-            sal_uLong nPageID = reinterpret_cast<sal_uLong>( 
rVclWindowEvent.GetData() );
+            sal_uInt16 nPageID = 
static_cast<sal_uInt16>(reinterpret_cast<sal_uIntPtr>( 
rVclWindowEvent.GetData() ));
             maTabListeners.deactivated( nPageID );
             break;
 
         }
         case VclEventId::TabpageActivate:
         {
-            sal_uLong nPageID = reinterpret_cast<sal_uLong>( 
rVclWindowEvent.GetData() );
+            sal_uInt16 nPageID = 
static_cast<sal_uInt16>(reinterpret_cast<sal_uIntPtr>( 
rVclWindowEvent.GetData() ));
             maTabListeners.activated( nPageID );
             break;
         }