diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-01 16:47:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-02 09:00:13 +0200 |
| commit | 0265bdb92e5dbb5ba851a3d89eb8722bdaf081be (patch) | |
| tree | 46c8f87d626cb6c74e211f4dce2721ab5c9b9e14 /sd/source/filter/grf/sdgrffilter.cxx | |
| parent | cf0651fe736c1f411651ee2691ab009fe271be2f (diff) | |
convert GRFILTER constants to ERRCODE_GRFILTER_
since various code mixes these constants in with ErrCode values from
other code, let us just make it into real ErrCode values.
Change-Id: Ifa3d0f7526172609a44e6749bed9f730ab6b1a95
Reviewed-on: https://gerrit.libreoffice.org/38313
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/filter/grf/sdgrffilter.cxx')
| -rw-r--r-- | sd/source/filter/grf/sdgrffilter.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 7e668a0ab53f..93c80c101803 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -92,7 +92,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper< css::task: explicit SdGRFFilter_ImplInteractionHdl( css::uno::Reference< css::task::XInteractionHandler > const & xInteraction ) : m_xInter( xInteraction ), - nFilterError( GRFILTER_OK ) + nFilterError( ERRCODE_NONE ) {} sal_uInt16 GetErrorCode() const { return nFilterError; }; @@ -122,25 +122,25 @@ SdGRFFilter::~SdGRFFilter() { } -void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError ) +void SdGRFFilter::HandleGraphicFilterError( ErrCode nFilterError, sal_uLong nStreamError ) { sal_uInt16 nId; switch( nFilterError ) { - case GRFILTER_OPENERROR: + case ERRCODE_GRFILTER_OPENERROR: nId = STR_IMPORT_GRFILTER_OPENERROR; break; - case GRFILTER_IOERROR: + case ERRCODE_GRFILTER_IOERROR: nId = STR_IMPORT_GRFILTER_IOERROR; break; - case GRFILTER_FORMATERROR: + case ERRCODE_GRFILTER_FORMATERROR: nId = STR_IMPORT_GRFILTER_FORMATERROR; break; - case GRFILTER_VERSIONERROR: + case ERRCODE_GRFILTER_VERSIONERROR: nId = STR_IMPORT_GRFILTER_VERSIONERROR; break; - case GRFILTER_TOOBIG: + case ERRCODE_GRFILTER_TOOBIG: nId = STR_IMPORT_GRFILTER_TOOBIG; break; case 0 : @@ -148,7 +148,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n break; default: - case GRFILTER_FILTERERROR: + case ERRCODE_GRFILTER_FILTERERROR: nId = STR_IMPORT_GRFILTER_FILTERERROR; break; } |