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

[Noel Grandin]

 sc/source/ui/view/tabvwshb.cxx     |    2 +-
 svtools/source/misc/ehdl.cxx       |    2 +-
 uui/source/iahndl-errorhandler.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f1a896c71c495bdef5861eb664581507b6b9b5bb
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Sun Aug 13 08:34:14 2017 +0200

    fix some ErrCode IgnoreWarning() usage
    
    In some places I used the new IgnoreWarning() method, and that
    was not a faithful translation of the previous code.
    
    Regression from commit 528632660b72b105345945c13c5b68060d94a91b
    "convert ErrCode to strong typedef"
    
    Change-Id: Ie53f7a6b1830e5977510a0c32926e0c70c42dcd3
    Reviewed-on: https://gerrit.libreoffice.org/41105
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 1077f9c1aac9..5523b733b65a 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -156,7 +156,7 @@ void ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
         if ( !pClient )
             pClient = new ScClient( this, pWin, GetSdrView()->GetModel(), pObj );
 
-        if ( !nErr.IgnoreWarning() && xObj.is() )
+        if ( (sal_uInt32(nErr) & ERRCODE_ERROR_MASK) == 0 && xObj.is() )
         {
             tools::Rectangle aRect = pObj->GetLogicRect();
 
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 01498bb6ece5..429eb5957a10 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -158,7 +158,7 @@ bool SfxErrorHandler::CreateString(const ErrorInfo *pErr, OUString &rStr) const
     */
 
 {
-    ErrCode nErrCode = pErr->GetErrorCode().IgnoreWarning();
+    ErrCode nErrCode(sal_uInt32(pErr->GetErrorCode()) & ERRCODE_ERROR_MASK);
     if( nErrCode>=lEnd || nErrCode<=lStart )
         return false;
     if(GetErrorString(nErrCode, rStr))
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 260ad0b9aa01..d10437558d34 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -159,7 +159,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             = { getRID_ERRHDL(),
                 getRID_SVXERRCODE(),
                 RID_UUI_ERRHDL };
-        ErrCode nErrorId = nErrorCode.IgnoreWarning();
+        ErrCode nErrorId(sal_uInt32(nErrorCode) & ~ERRCODE_WARNING_MASK);
         Source eSource = nErrorId < ErrCode(ERRCODE_AREA_SVX) ?
             SOURCE_DEFAULT :
             nErrorId >= ErrCode(ERRCODE_AREA_SVX)