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/ui/func/fuinsert.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/ui/func/fuinsert.cxx')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index d8f9d04a7fb6..d7077b57ed8c 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -121,7 +121,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) Graphic aGraphic; bool bAsLink = false; - int nError = GRFILTER_OPENERROR; + ErrCode nError = ERRCODE_GRFILTER_OPENERROR; const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; @@ -143,7 +143,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) { SvxOpenGraphicDialog aDlg(SdResId(STR_INSERTGRAPHIC)); - if( aDlg.Execute() != GRFILTER_OK ) + if( aDlg.Execute() != ERRCODE_NONE ) return; // cancel dialog nError = aDlg.GetGraphic(aGraphic); @@ -152,7 +152,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) aFilterName = aDlg.GetCurrentFilter(); } - if( nError == GRFILTER_OK ) + if( nError == ERRCODE_NONE ) { if( mpViewShell && dynamic_cast< DrawViewShell *>( mpViewShell ) != nullptr) { @@ -213,7 +213,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq ) } else { - SdGRFFilter::HandleGraphicFilterError( (sal_uInt16)nError, GraphicFilter::GetGraphicFilter().GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( nError, GraphicFilter::GetGraphicFilter().GetLastError().nStreamError ); } } |