From 526d9ca5e88acfa3f4020b5c360f0bc6427187fb Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 27 Jul 2012 14:03:09 +0200 Subject: unify return type in this method Change-Id: I8db70cff48ce900db0710b30f94090ebd7d77c0a --- sc/inc/scerrors.hxx | 2 ++ sc/source/filter/xml/xmlwrap.cxx | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx index 83636dc74f12..3115cc27a274 100644 --- a/sc/inc/scerrors.hxx +++ b/sc/inc/scerrors.hxx @@ -22,6 +22,8 @@ #include +#define SCERR_NONE 0 + // ERRCODE_CLASS_READ - file related, displays "Read-Error" in MsgBox #define SCERR_IMPORT_CONNECT ( 1 | ERRCODE_CLASS_READ | ERRCODE_AREA_SC ) #define SCERR_IMPORT_OPEN ( 2 | ERRCODE_CLASS_READ | ERRCODE_AREA_SC ) diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 22c4b64ae085..acbc1fa4380d 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -135,7 +135,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::ReferencegetInputStream(); uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY ); @@ -170,7 +170,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::ReferencesetPropertyValue( sPropName, uno::makeAny( sStream ) ); } - sal_uInt32 nReturn(0); + sal_uInt32 nReturn = SCERR_NONE; rDoc.SetRangeOverflowType(0); // is modified by the importer if limits are exceeded uno::Reference xDocHandler( -- cgit