diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 19:09:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 07:31:08 +0000 |
| commit | 2b70fb58be039fbd05ea833a40b1b3e9f922e45c (patch) | |
| tree | 76a80a96d8c3270159f54dbb27bb6139f433365e /tools/source/rc/resmgr.cxx | |
| parent | ed8773a201bc4954050b87f6d2952525831d3499 (diff) | |
Use o3tl::strong_int on RESOURCE_TYPE
Change-Id: I42690c07a611e031963ff41942f530af4a5c672a
Reviewed-on: https://gerrit.libreoffice.org/34220
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools/source/rc/resmgr.cxx')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index d810bd2a9cc4..7c4827c2b9d0 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -544,7 +544,7 @@ bool InternalResMgr::IsGlobalAvailable( RESOURCE_TYPE nRT, sal_uInt32 nId ) cons { // Anfang der Strings suchen ImpContent aValue; - aValue.nTypeAndId = ((sal_uInt64(nRT) << 32) | nId); + aValue.nTypeAndId = ((sal_uInt64(sal_uInt32(nRT)) << 32) | nId); ImpContent * pFind = ::std::lower_bound(pContent, pContent + nEntries, aValue, @@ -558,11 +558,11 @@ void* InternalResMgr::LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId, { #ifdef DBG_UTIL if( pResUseDump ) - pResUseDump->erase( (sal_uInt64(nRT) << 32) | nId ); + pResUseDump->erase( (sal_uInt64(sal_uInt32(nRT)) << 32) | nId ); #endif // search beginning of string ImpContent aValue; - aValue.nTypeAndId = ((sal_uInt64(nRT) << 32) | nId); + aValue.nTypeAndId = ((sal_uInt64(sal_uInt32(nRT)) << 32) | nId); ImpContent* pEnd = (pContent + nEntries); ImpContent* pFind = ::std::lower_bound( pContent, pEnd, @@ -578,9 +578,9 @@ void* InternalResMgr::LoadGlobalRes( RESOURCE_TYPE nRT, sal_uInt32 nId, // search beginning of string ImpContent * pFirst = pFind; ImpContent * pLast = pFirst; - while( pFirst > pContent && ((pFirst -1)->nTypeAndId >> 32) == RSC_STRING ) + while( pFirst > pContent && RESOURCE_TYPE((pFirst -1)->nTypeAndId >> 32) == RSC_STRING ) --pFirst; - while( pLast < pEnd && (pLast->nTypeAndId >> 32) == RSC_STRING ) + while( pLast < pEnd && RESOURCE_TYPE(pLast->nTypeAndId >> 32) == RSC_STRING ) ++pLast; nOffCorrection = pFirst->nOffset; sal_uInt32 nSize; |