diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-03-12 20:29:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-14 06:08:20 +0000 |
| commit | b24a9f8b3537ee5c200c1d52fc51157f1ac55e9d (patch) | |
| tree | ce5a92947fdc7c93732652b5c69c9d932b1270f6 /tools/source/rc | |
| parent | 41c7ee5f0a3d0e128134665d709fd46e663fd373 (diff) | |
make o3tl::strong_int constructor explicit
Could have sworn I did this originally, somehow it got lost.
Also fix a thinko in tools::ResId I introduced in commit
2b70fb58be039fbd05ea833a40b1b3e9f922e45c
"Use o3tl::strong_int on RESOURCE_TYPE"
Change-Id: Id3b39962255297010cd1feaaca6d822168311081
Reviewed-on: https://gerrit.libreoffice.org/35108
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools/source/rc')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 29e3751f6e42..55f50ece4c69 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -671,7 +671,7 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, aStr.append('\n'); aStr.append(" Class: "); - aStr.append(OUStringToOString(GetTypeRes_Impl(ResId(nRT, *pNewResMgr)), + aStr.append(OUStringToOString(GetTypeRes_Impl(ResId((sal_uInt32)nRT, *pNewResMgr)), RTL_TEXTENCODING_UTF8)); aStr.append(", Id: "); aStr.append(static_cast<sal_Int32>(nId)); @@ -682,7 +682,7 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr, { aStr.append(" [ Class: "); aStr.append(OUStringToOString(GetTypeRes_Impl( - ResId(rResStack[nDepth].pResource->GetRT(), *pNewResMgr)), + ResId((sal_uInt32)rResStack[nDepth].pResource->GetRT(), *pNewResMgr)), RTL_TEXTENCODING_UTF8)); aStr.append(", Id: "); aStr.append(static_cast<sal_Int32>( |