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

[Stephan Bergmann]

 sfx2/source/bastyp/bitset.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9602e63c818722c3910343b7af53917d031861c8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 22 15:49:30 2018 +0100

    USHRT_MAX -> SAL_MAX_UINT16 in IndexBitSet
    
    ...which is based on sal_uInt16 instead of USHORT since
    c5b727675460581258489d3bd569a61184ad69cd "removetooltypes: #i112600# remove
    tooltypes"
    
    Change-Id: I6b937961a69cc904226b05fe9679ac62e2f01c0a
    Reviewed-on: https://gerrit.libreoffice.org/48333
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 8a49a02661c9..f13461c32de1 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <sal/log.hxx>
+#include <sal/types.h>
 
 #include <bitset.hxx>
 
 #include <string.h>
-#include <limits.h>
 
 // creates the asymmetric difference with another bitset
 
@@ -97,13 +97,13 @@ IndexBitSet::~IndexBitSet()
 
 sal_uInt16 IndexBitSet::GetFreeIndex()
 {
-  for(int i=0;i<USHRT_MAX;i++)
+  for(sal_uInt16 i=0;i<SAL_MAX_UINT16;i++)
     if(!Contains(i))
       {
         *this|=i;
         return i;
       }
-  SAL_WARN( "sfx", "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
+  SAL_WARN( "sfx", "IndexBitSet enthaelt mehr als SAL_MAX_UINT16 Eintraege");
   return 0;
 }