sc/inc/scerrors.hxx | 2 --
sc/source/filter/xml/xmlwrap.cxx | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit e4ffd9388968c717fe4c21222f322fe1c375c434
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Mon Jun 5 15:52:38 2017 +0200
replace SCERR_NONE with ERRORCODE_NONE
since the first is #define'd to the second, and offers no extra value
Change-Id: I8268b4969ccdc090eeb8cd877e476bb32d2ddd1b
Reviewed-on: https://gerrit.libreoffice.org/38410
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx
index a1f7493605bd..3555a9f8a171 100644
--- a/sc/inc/scerrors.hxx
+++ b/sc/inc/scerrors.hxx
@@ -22,8 +22,6 @@
#include <vcl/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 8c6cd1b00bc3..0e702d0e5a13 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -122,7 +122,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const
uno::Reference<uno::XCo
sStream = sOldDocName;
}
else
- return SCERR_NONE;
+ return ERRCODE_NONE;
aParserInput.aInputStream = xDocStream->getInputStream();
uno::Reference < beans::XPropertySet > xSet( xDocStream,
uno::UNO_QUERY );
@@ -157,7 +157,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const
uno::Reference<uno::XCo
xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) );
}
- sal_uInt32 nReturn = SCERR_NONE;
+ sal_uInt32 nReturn = ERRCODE_NONE;
rDoc.SetRangeOverflowType(0); // is modified by the importer if limits
are exceeded
uno::Reference<xml::sax::XDocumentHandler> xDocHandler(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
