[Libreoffice-commits] core.git: include/vcl vcl/source

[Noel Grandin]

 include/vcl/graphicfilter.hxx       |    1 -
 vcl/source/filter/graphicfilter.cxx |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit 844b3c067ccef7c8fcd38f4456689065dee5a447
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Wed Aug 23 20:30:39 2017 +0200

    remove unused error code in vcl
    
    ever since
    
        commit 920d4463f6e59b815852c173e2974ffc7b4bb284
        Date:   Thu Jun 23 13:13:28 2016 +0200
        loplugin:singlevalfields in vcl(part1)
    
    Change-Id: I3691d03dadff10585a119ca8db8aa193b5a01702
    Reviewed-on: https://gerrit.libreoffice.org/41492
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 62ed0745a3d9..7f15760ee786 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -41,7 +41,6 @@ struct ConvertData;
 #define ERRCODE_GRFILTER_FORMATERROR  ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 3)
 #define ERRCODE_GRFILTER_VERSIONERROR ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 4)
 #define ERRCODE_GRFILTER_FILTERERROR  ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 5)
-#define ERRCODE_GRFILTER_ABORT        ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 6)
 #define ERRCODE_GRFILTER_TOOBIG       ErrCode(ErrCodeArea::Vcl, ERRCODE_CLASS_GENERAL | 7)
 
 #define GRFILTER_OUTHINT_GREY       1
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index a5a4c53ebc5d..47f755b368b3 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2449,8 +2449,6 @@ ErrCode GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilt
             aReturnString="version error";
     else if (nRes == ERRCODE_GRFILTER_FILTERERROR)
             aReturnString="filter error";
-    else if (nRes == ERRCODE_GRFILTER_ABORT)
-            aReturnString="import aborted";
     else if (nRes == ERRCODE_GRFILTER_TOOBIG)
             aReturnString="graphic is too big";