[Libreoffice-commits] core.git: include/vcl toolkit/source

[Stephan Bergmann (via logerrit)]

 include/vcl/sysdata.hxx            |    2 +-
 toolkit/source/awt/vclxwindow1.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e8205f38c611cfc97ca0e32c911b3d373a94d230
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Oct 22 19:36:23 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Oct 23 08:04:49 2020 +0200

    Change SystemParentData::aWindow to sal_uIntPtr
    
    ...with similar reasoning as in 5d422c0348efd1df6b3d44dd6efcf5c5490fc321 "Revert
    'sal_uIntPtr->unsigned long in SystemEnvData'":  Prior to
    3aef606f2758172a27718a06fea0ff9080e4d80f "use tools::Long in vcl" this was long,
    but besides X11 window resource IDs (for whose appropriate type see the commit
    message of 5d422c0348efd1df6b3d44dd6efcf5c5490fc321), at least
    vcl/unx/gtk3/gtk3gtkframe.cxx uses it in combination with GdkNativeWindow (e.g.,
    GtkSalFrame::m_aForeignParentWindow and GtkSalFrame::findTopLevelSystemWindow),
    which itself is a typedef for sal_uIntPtr (vcl/inc/unx/gtk/gtkframe.hxx).
    
    Change-Id: I6d26ca7056da413d948215682425ee1ddb622326
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104695
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Jenkins

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 0957f5cc11a7..a792296581e9 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -109,7 +109,7 @@ struct SystemParentData
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
-    tools::Long            aWindow;          // the window of the object
+    sal_uIntPtr     aWindow;          // the window of the object
     bool            bXEmbedSupport:1; // decides whether the object in question
                                       // should support the XEmbed protocol
 #endif
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 8b0cbe1320b3..9a78589ded58 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.cxx
@@ -84,7 +84,7 @@ void VCLXWindow::SetSystemParent_Impl( const css::uno::Any& rHandle )
 #elif defined( IOS )
     // Nothing
 #elif defined( UNX )
-    aSysParentData.aWindow = static_cast<long>(nHandle);
+    aSysParentData.aWindow = nHandle;
     aSysParentData.bXEmbedSupport = bXEmbed;
 #endif