summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-07-27 14:03:09 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-07-27 14:04:29 +0200
commitc4c54573c6ae5e57fa7eb7d41e155997b829c2be (patch)
tree08d7756a31751c7a58564ad821e067e9a1efc1ff /sc
parent49bf4745fdde38278e0cd8b8bc6288bfd3c80594 (diff)
unify return type in this method
Change-Id: I8db70cff48ce900db0710b30f94090ebd7d77c0a
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/scerrors.hxx2
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx4
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 <tools/errcode.hxx>
+#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::Reference<lang::XMultiSe
sStream = sOldDocName;
}
else
- return false;
+ return SCERR_NONE;
aParserInput.aInputStream = xDocStream->getInputStream();
uno::Reference < beans::XPropertySet > xSet( xDocStream, uno::UNO_QUERY );
@@ -170,7 +170,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
xInfoSet->setPropertyValue( 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<xml::sax::XDocumentHandler> xDocHandler(