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

[Bugra (via logerrit)]

 dbaccess/source/ui/app/AppIconControl.cxx |    4 ++--
 editeng/source/editeng/editobj.cxx        |    2 +-
 editeng/source/editeng/editobj2.hxx       |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 337049d4642be4349dd8af3021e05165572d0bfa
Author:     Bugra <bugrakurt26 at gmail.com>
AuthorDate: Wed Mar 4 15:36:04 2020 +0300
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Mar 20 17:57:09 2020 +0100

    tdf#114441: Convert use of sal_uLong to better integer types
    
    Change-Id: I9b062372f394021140bedc65e7f2e3827eb84716
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89964
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 2eb3b6c4ce38..831d20cf4a1f 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -65,8 +65,8 @@ OApplicationIconControl::~OApplicationIconControl()
 
 void OApplicationIconControl::dispose()
 {
-    sal_uLong nCount = GetEntryCount();
-    for ( sal_uLong i = 0; i < nCount; ++i )
+    sal_Int32 nCount = GetEntryCount();
+    for ( sal_Int32 i = 0; i < nCount; ++i )
     {
         SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
         if ( pEntry )
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index a0f46f0329ee..ec4e964f83fd 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -79,7 +79,7 @@ void XEditAttribute::SetItem(const SfxPoolItem& rNew)
 }
 
 XParaPortionList::XParaPortionList(
-    OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY)
+    OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY)
     : pRefDevPtr(pRefDev)
     , nStretchX(_nStretchX)
     , nStretchY(_nStretchY)
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index b7d045d459f4..41bbc5404e50 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -97,16 +97,16 @@ class XParaPortionList
     VclPtr<OutputDevice> pRefDevPtr;
     sal_uInt16  nStretchX;
     sal_uInt16  nStretchY;
-    sal_uLong   nPaperWidth;
+    sal_uInt32  nPaperWidth;
 
 public:
-    XParaPortionList(OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY);
+    XParaPortionList(OutputDevice* pRefDev, sal_uInt32 nPW, sal_uInt16 _nStretchX, sal_uInt16 _nStretchY);
 
     void push_back(XParaPortion* p);
     const XParaPortion& operator[](size_t i) const;
 
     OutputDevice*       GetRefDevPtr() const        { return pRefDevPtr; }
-    sal_uLong           GetPaperWidth() const       { return nPaperWidth; }
+    sal_uInt32          GetPaperWidth() const       { return nPaperWidth; }
     bool                RefDevIsVirtual() const {return pRefDevPtr->IsVirtual();}
     const MapMode&  GetRefMapMode() const       { return pRefDevPtr->GetMapMode(); }
     sal_uInt16  GetStretchX() const         { return nStretchX; }