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

Caolán McNamara caolanm at redhat.com
Tue Jul 25 21:05:00 UTC 2017


 svtools/source/misc/ehdl.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 46bfe17e2bceced4ceffe82ba98d8687b31d9ce8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 25 21:23:41 2017 +0100

    Resolves: tdf#109331 stupid looking cast was relied upon to do useful thing
    
    originally as...
    
    sal_uInt32 nErrIdx = aEr.FindIndex((sal_uInt16)(sal_uInt32)lErrId);
    
    prior to
    
    commit 00657aef09d854c74fb426a935a3e8b1fc390bb0
    Date:   Sun Jun 11 20:56:30 2017 +0100
    
        migrate to boost::gettext
    
    Change-Id: I283f5398ebb81c7183c9013589c326c129787840

diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index a6be046e4647..6e38437f79ac 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -221,9 +221,11 @@ bool SfxErrorHandler::GetErrorString(ErrCode lErrId, OUString &rStr) const
     bool bRet = false;
     rStr = RID_ERRHDL_CLASS;
 
+    ErrCode nErrId((sal_uInt16)(sal_uInt32)lErrId);
+
     for (const ErrMsgCode* pItem = pIds; pItem->second; ++pItem)
     {
-        if (pItem->second == lErrId)
+        if (pItem->second == nErrId)
         {
             rStr = rStr.replaceAll("$(ERROR)", Translate::get(pItem->first, *pResLocale));
             bRet = true;


More information about the Libreoffice-commits mailing list