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

[Stephan Bergmann (via logerrit)]

 filter/source/msfilter/msdffimp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a0b8bcf088e23bec930f91faa23975e132ece793
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Nov 19 14:12:40 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Nov 19 21:00:02 2020 +0100

    nChain should presumably be sal_uInt32 here
    
    ...given that SvxMSDffShapeInfo::nTxBxComp it interacts with is sal_uInt32, too
    
    Change-Id: I38d9bc9c467d10644bddedcd873b14b1b4c3d1ae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106175
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 30d08a3e6d34..0af775d32df3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 
 #include <math.h>
+#include <limits>
 #include <limits.h>
 #include <vector>
 
@@ -5836,7 +5837,7 @@ void SvxMSDffManager::CheckTxBxStoryChain()
 {
     m_xShapeInfosById.reset(new SvxMSDffShapeInfos_ById);
     // mangle old Info array, sorted by nTxBxComp
-    sal_uLong nChain    = ULONG_MAX;
+    sal_uInt32 nChain = std::numeric_limits<sal_uInt32>::max();
     bool bSetReplaceFALSE = false;
     for (SvxMSDffShapeInfos_ByTxBxComp::iterator iter =
                 m_xShapeInfosByTxBxComp->begin(),