Kaydet (Commit) 11667a8d authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#114231 do not mask ErrCode with GetRest()

Regression from

    commit 7ca950ec
    Date:   Wed Aug 23 19:25:02 2017 +0200

	no need to use ERRCODE_RES_MASK here

	the relevant usage sites already call GetRest() before comparing

which exactly is the reason that it didn't work anymore.

Old StringArray ItemList resources stored only 16-bit values,
hence ERRCODE_RES_MASK was used to mask the ErrCode values in the
resource for which code had to mask ERRCODE_RES_MASK as well to
compare values. Now the full ErrCode is stored, so code must not
use GetRest() on a value to compare against, or use GetRest() on
both values (which theoretically could lead to ambiguities, but
probably doesn't in resources that are restricted to one module).

Change-Id: I835e47424bb008bc680dc4f8c502c9558397db36
(cherry picked from commit d915cb41)
Reviewed-on: https://gerrit.libreoffice.org/45882Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 4963ea48
...@@ -1573,7 +1573,7 @@ void StarBASIC::MakeErrorText( ErrCode nId, const OUString& aMsg ) ...@@ -1573,7 +1573,7 @@ void StarBASIC::MakeErrorText( ErrCode nId, const OUString& aMsg )
const char* pErrorMsg = nullptr; const char* pErrorMsg = nullptr;
for (ErrMsgCode* pItem = RID_BASIC_START; pItem->second; ++pItem) for (ErrMsgCode* pItem = RID_BASIC_START; pItem->second; ++pItem)
{ {
if (ErrCode(nId.GetRest()) == pItem->second) if (nId == pItem->second)
{ {
pErrorMsg = pItem->first; pErrorMsg = pItem->first;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment