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

[Noel Grandin]

 svtools/source/misc/ehdl.cxx |    2 +-
 uui/source/iahndl.cxx        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a1ad6ee008d5100fb256bba3134ba628afc32f88
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date:   Thu Apr 19 14:02:42 2018 +0200

    tdf#117103 Warning error is empty
    
    regression from
        commit e9c74a075c3c0809b993c017c11d1505bd244dc8
        drop ErrCode::GetRest
    
    Change-Id: I937478dbc9dd217255dc5cdecb6cf66d55394cba
    Reviewed-on: https://gerrit.libreoffice.org/53153
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 246b55ae4a24..45f538371b42 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -221,7 +221,7 @@ bool SfxErrorHandler::GetErrorString(ErrCode lErrId, 
OUString &rStr) const
 
     for (const ErrMsgCode* pItem = pIds; pItem->second; ++pItem)
     {
-        if (pItem->second == lErrId.StripWarningAndDynamic())
+        if (pItem->second.StripWarningAndDynamic() == 
lErrId.StripWarningAndDynamic())
         {
             rStr = rStr.replaceAll("$(ERROR)", Translate::get(pItem->first, 
aResLocale));
             bRet = true;
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index a7a6c8af7f93..63e3fbdea28a 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -1281,7 +1281,7 @@ bool ErrorResource::getString(ErrCode nErrorCode, 
OUString &rString) const
 {
     for (const std::pair<const char*, ErrCode>* pStringArray = m_pStringArray; 
pStringArray->first != nullptr; ++pStringArray)
     {
-        if (nErrorCode.StripWarningAndDynamic() == pStringArray->second)
+        if (nErrorCode.StripWarningAndDynamic() == 
pStringArray->second.StripWarningAndDynamic())
         {
             rString = Translate::get(pStringArray->first, m_rResLocale);
             return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits