From 528632660b72b105345945c13c5b68060d94a91b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 9 Feb 2017 08:52:13 +0200 Subject: convert ErrCode to strong typedef would have preferred to re-use o3tl::strong_int, of which this is a modified copy, but there are lots of convenience accessors which are nice to define on the class. Change-Id: I301b807aaf02fbced3bf75de1e1692cde6c0340a Reviewed-on: https://gerrit.libreoffice.org/38497 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/source/ui/func/fuinsfil.cxx | 4 ++-- sd/source/ui/func/fupage.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index d8c620e6f7f6..711aa064351a 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -456,7 +456,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium) assert(pStream && "No InStream!"); pStream->Seek( 0 ); - sal_uLong nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() ); + ErrCode nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() ); if (nErr || pOutliner->GetEditEngine().GetText().isEmpty()) { @@ -600,7 +600,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) DBG_ASSERT( pStream, "No InStream!" ); pStream->Seek( 0 ); - sal_uLong nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes()); + ErrCode nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes()); if (nErr || pOutliner->GetEditEngine().GetText().isEmpty()) { diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 024afcc41ac4..fe040185b4e6 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -312,7 +312,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent ) if( aDlg.Execute() == ERRCODE_NONE ) { Graphic aGraphic; - int nError = aDlg.GetGraphic(aGraphic); + ErrCode nError = aDlg.GetGraphic(aGraphic); if( nError == ERRCODE_NONE ) { pTempSet.reset( new SfxItemSet( mpDoc->GetPool(), svl::Items{}) ); -- cgit