[Libreoffice-commits] core.git: dbaccess/source

[shivammore (via logerrit)]

 dbaccess/source/ui/querydesign/querydlg.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f4dfbba277bcfc418cb49fdc94b153c15e1ac30b
Author:     shivammore <shivamkm1692000 at gmail.com>
AuthorDate: Fri Mar 27 19:52:20 2020 +0530
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Apr 9 11:21:45 2020 +0200

    tdf#75280 Clean up usage of sal_uIntPtr.
    
    Change-Id: I671fbca67846f7f105c06a2423e7c7ee5c8d6894
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91223
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 8c994510fd80..72b1edb27006 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -120,7 +120,7 @@ DlgQryJoin::DlgQryJoin(const OQueryTableView* pParent,
     {
         for (sal_Int32 i = 0; i < m_xLB_JoinType->get_count();)
         {
-            const sal_IntPtr nJoinTyp = m_xLB_JoinType->get_id(i).toInt32();
+            const sal_Int32 nJoinTyp = m_xLB_JoinType->get_id(i).toInt32();
             if ( !bSupportFullJoin && nJoinTyp == ID_FULL_JOIN )
                 m_xLB_JoinType->remove(i);
             else if ( !bSupportOuterJoin && (nJoinTyp == ID_LEFT_JOIN || nJoinTyp == ID_RIGHT_JOIN) )
@@ -153,7 +153,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, weld::ComboBox&, void )
     const EJoinType eOldJoinType = eJoinType;
     const char* pResId = nullptr;
     const sal_Int32 nPos = m_xLB_JoinType->get_active();
-    const sal_IntPtr nJoinType = m_xLB_JoinType->get_id(nPos).toInt32();
+    const sal_Int32 nJoinType = m_xLB_JoinType->get_id(nPos).toInt32();
     bool bAddHint = true;
     switch ( nJoinType )
     {
@@ -277,7 +277,7 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType)
     eJoinType = _eNewJoinType;
     m_xCBNatural->set_sensitive(eJoinType != CROSS_JOIN);
 
-    sal_IntPtr nJoinType = 0;
+    sal_Int32 nJoinType = 0;
     switch ( eJoinType )
     {
         default: