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

[Noel Grandin]

 include/svx/galtheme.hxx       |    4 ++--
 include/svx/svdundo.hxx        |    4 ++--
 include/vcl/sysdata.hxx        |    2 +-
 svx/source/svdraw/svdundo.cxx  |    6 +++---
 vcl/source/window/syschild.cxx |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c0f1d211eff5f89f5c9298743f6e7d91d187b799
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Dec 13 12:18:43 2017 +0200

    sal_uIntPtr->unsigned long in SystemEnvData
    
    to match the type used by X11
    
    Change-Id: I5fe043e33602be21c84b81780c89df751c3bc96c
    Reviewed-on: https://gerrit.libreoffice.org/46393
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index e427e3a1b435..794f424b4448 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -64,7 +64,7 @@ struct SystemEnvData
     // Nothing
 #elif defined( UNX )
     void*               pDisplay;       // the relevant display connection
-    sal_uIntPtr         aWindow;        // the window of the object
+    unsigned long       aWindow;        // the window of the object
     void*               pSalFrame;      // contains a salframe, if object has one
     void*               pWidget;        // the corresponding widget
     void*               pVisual;        // the visual in use
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 8424f82937d6..3be9ffe7ca6b 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -184,7 +184,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle()
 #elif defined IOS
     // Nothing
 #elif defined UNX
-    nRet = (sal_IntPtr) GetSystemData()->aWindow;
+    nRet = GetSystemData()->aWindow;
 #endif
 
     return nRet;
commit b4940db58257de07797abaf51d087ae040b9c9ef
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Dec 13 12:21:28 2017 +0200

    sal_uIntPtr->sal_uInt32 in GalleryTheme
    
    Change-Id: Ib409eb4b3bb9cf006612211f43e4115fdaa4b0aa
    Reviewed-on: https://gerrit.libreoffice.org/46394
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index cf021b7758fe..5b258c305c22 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -83,8 +83,8 @@ private:
     tools::SvRef<SotStorage>    aSvDrawStorageRef;
     Gallery*                    pParent;
     GalleryThemeEntry*          pThm;
-    sal_uIntPtr                 mnThemeLockCount;
-    sal_uIntPtr                 mnBroadcasterLockCount;
+    sal_uInt32                  mnThemeLockCount;
+    sal_uInt32                  mnBroadcasterLockCount;
     sal_uIntPtr                 nDragPos;
     bool                        bDragging;
     bool                        bAbortActualize;
commit e9cef371fe73d3b6b08a2c3cc19fdac1863d02fa
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Dec 13 12:10:13 2017 +0200

    sal_uIntPtr->sal_Int32 in SdrUndoGroup
    
    Change-Id: I286f3cb1362d033d797fdbb4cab35c8e6a30eab3
    Reviewed-on: https://gerrit.libreoffice.org/46392
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index d14eb77d9e36..5fd24db225d5 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -98,8 +98,8 @@ public:
     virtual ~SdrUndoGroup() override;
 
     void Clear();
-    sal_uIntPtr GetActionCount() const { return aBuf.size(); }
-    SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return aBuf[nNum]; }
+    sal_Int32 GetActionCount() const { return aBuf.size(); }
+    SdrUndoAction* GetAction(sal_Int32 nNum) const { return aBuf[nNum]; }
     void AddAction(SdrUndoAction* pAct);
 
     void SetComment(const OUString& rStr) { aComment=rStr; }
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index ba26e624d777..1fd2aca90d1d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -120,7 +120,7 @@ SdrUndoGroup::~SdrUndoGroup()
 
 void SdrUndoGroup::Clear()
 {
-    for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
+    for (sal_Int32 nu=0; nu<GetActionCount(); nu++) {
         SdrUndoAction* pAct=GetAction(nu);
         delete pAct;
     }
@@ -134,7 +134,7 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct)
 
 void SdrUndoGroup::Undo()
 {
-    for (sal_uIntPtr nu=GetActionCount(); nu>0;) {
+    for (sal_Int32 nu=GetActionCount(); nu>0;) {
         nu--;
         SdrUndoAction* pAct=GetAction(nu);
         pAct->Undo();
@@ -143,7 +143,7 @@ void SdrUndoGroup::Undo()
 
 void SdrUndoGroup::Redo()
 {
-    for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
+    for (sal_Int32 nu=0; nu<GetActionCount(); nu++) {
         SdrUndoAction* pAct=GetAction(nu);
         pAct->Redo();
     }