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 --- xmloff/inc/MetaExportComponent.hxx | 2 +- xmloff/inc/SchXMLExport.hxx | 2 +- xmloff/inc/xmlversion.hxx | 2 +- xmloff/source/chart/SchXMLExport.cxx | 2 +- xmloff/source/core/xmlexp.cxx | 4 ++-- xmloff/source/meta/MetaExportComponent.cxx | 4 ++-- xmloff/source/meta/xmlversion.cxx | 4 ++-- xmloff/source/text/XMLAutoTextEventExport.cxx | 4 ++-- xmloff/source/text/XMLAutoTextEventExport.hxx | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) (limited to 'xmloff') diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx index 239f52ca67ce..34278d87631a 100644 --- a/xmloff/inc/MetaExportComponent.hxx +++ b/xmloff/inc/MetaExportComponent.hxx @@ -38,7 +38,7 @@ public: protected: // export the events off all autotexts - virtual sal_uInt32 exportDoc( + virtual ErrCode exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override; // accept XDocumentProperties in addition to XModel diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx index c06ad7ffedad..8792ea8acfc5 100644 --- a/xmloff/inc/SchXMLExport.hxx +++ b/xmloff/inc/SchXMLExport.hxx @@ -42,7 +42,7 @@ private: rtl::Reference maExportHelper; protected: - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; + virtual ErrCode exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; virtual void ExportAutoStyles_() override; virtual void ExportMasterStyles_() override; diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index 8c33b306a28c..8feb0cb5cec2 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -43,7 +43,7 @@ public: const OUString &rFileName, css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler ); - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; + ErrCode exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; void ExportAutoStyles_() override {} void ExportMasterStyles_ () override {} void ExportContent_() override {} diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index cec2ceeaf143..74ff16fb6d31 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -3527,7 +3527,7 @@ SchXMLExport::~SchXMLExport() } } -sal_uInt32 SchXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) +ErrCode SchXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) { maExportHelper->SetSourceShellID(GetSourceShellID()); maExportHelper->SetDestinationShellID(GetDestinationShellID()); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index f139fafbea65..d4f396c963ae 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1250,7 +1250,7 @@ void SvXMLExport::addChaffWhenEncryptedStorage() } } -sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) +ErrCode SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) { bool bOwnGraphicResolver = false; bool bOwnEmbeddedResolver = false; @@ -1452,7 +1452,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) xComp->dispose(); } - return 0; + return ERRCODE_NONE; } void SvXMLExport::ResetNamespaceMap() diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index cab4c928609c..1f939d99434d 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -69,7 +69,7 @@ void SAL_CALL XMLMetaExportComponent::setSourceDocument( const ::com::sun::star: } } -sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) +ErrCode XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) { uno::Reference< xml::sax::XDocumentHandler > xDocHandler = GetDocHandler(); @@ -155,7 +155,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) ExportMeta_(); } xDocHandler->endDocument(); - return 0; + return ERRCODE_NONE; } void XMLMetaExportComponent::ExportMeta_() diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index f71ee9c0ec87..7c66faac4e96 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -54,7 +54,7 @@ XMLVersionListExport::XMLVersionListExport( xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK ); } -sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum ) +ErrCode XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum ) { GetDocHandler()->startDocument(); @@ -96,7 +96,7 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum ) } } GetDocHandler()->endDocument(); - return 0; + return ERRCODE_NONE; } XMLVersionListImport::XMLVersionListImport( diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 2d409a48dca6..70d6ebf48a5e 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -99,7 +99,7 @@ void XMLAutoTextEventExport::initialize( } -sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) +ErrCode XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) { if( !(getExportFlags() & SvXMLExportFlags::OASIS) ) { @@ -149,7 +149,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) GetDocHandler()->endDocument(); } - return 0; + return ERRCODE_NONE; } bool XMLAutoTextEventExport::hasEvents() diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index 014ce926ee28..bea57fd47ddc 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -63,7 +63,7 @@ public: protected: /// export the events off all autotexts - virtual sal_uInt32 exportDoc( + virtual ErrCode exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = xmloff::token::XML_TOKEN_INVALID ) override; /// does the document have any events ? -- cgit