diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-10-06 08:48:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-10-06 09:53:07 +0200 |
| commit | 66123b319da98c6ecabcd9635eb2ed9c3de99f35 (patch) | |
| tree | 9abe2f1a2b350e5788ec03cb47ec90f6cd48dfa8 /svtools | |
| parent | 48c0ada1745be2cd817d5bd8a912530028fa8419 (diff) | |
use more ErrCodeMsg
instead of a sideband mechanism to convey extra error message around
Change-Id: Ibd1fc8629c5b10bc6f9e6cbd30e8a20156ac13b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157630
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index ab602be60aaf..59613089a514 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -283,19 +283,11 @@ bool SfxErrorContext::GetString(const ErrCodeMsg& nErr, OUString &rStr) } } - if (bRet) - if (auto it = m_extMessages.find(sal_uInt32(nErr.GetCode())); it != m_extMessages.end()) - rStr += "\n" + it->second; + // SfxInPlaceClient::DoVerb adds some extra info to report + if (bRet && nErr.GetCode() == ERRCODE_SO_GENERALERROR && !nErr.GetArg1().isEmpty()) + rStr += "\n" + nErr.GetArg1(); return bRet; } -void SfxErrorContext::SetExtendedMessage(ErrCode nErrId, const OUString& rStr) -{ - if (rStr.isEmpty()) - m_extMessages.erase(sal_uInt32(nErrId)); - else - m_extMessages[sal_uInt32(nErrId)] = rStr; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |