diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 08:52:13 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-21 08:42:30 +0200 |
commit | 528632660b72b105345945c13c5b68060d94a91b (patch) | |
tree | 860508d482959abeb9175f0ce6b9e65954269f95 /starmath | |
parent | aee66aa85e75f67135e5c6079a281e18402d261a (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/source/mathmlexport.cxx | 2 | ||||
-rw-r--r-- | starmath/source/mathmlexport.hxx | 2 | ||||
-rw-r--r-- | starmath/source/mathmlimport.cxx | 10 | ||||
-rw-r--r-- | starmath/source/mathmlimport.hxx | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 8aafc348ecb7..7c2109cf6d3a 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -421,7 +421,7 @@ Math_XMLContentExporter_get_implementation(css::uno::XComponentContext* context, return cppu::acquire(new SmXMLExport(context, "com.sun.star.comp.Math.XMLContentExporter", SvXMLExportFlags::OASIS|SvXMLExportFlags::CONTENT)); } -sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass) +ErrCode SmXMLExport::exportDoc(enum XMLTokenEnum eClass) { if ( !(getExportFlags() & SvXMLExportFlags::CONTENT) ) { diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index b0ebbe6d1aab..449f6c49763f 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -105,7 +105,7 @@ public: void ExportAutoStyles_() override {} void ExportMasterStyles_() override {} void ExportContent_() override; - 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; virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override; diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index c79d91295c98..093e72b3e690 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -96,9 +96,9 @@ SmNode* popOrZero(SmNodeStack& rStack) } -sal_uInt32 SmXMLImportWrapper::Import(SfxMedium &rMedium) +ErrCode SmXMLImportWrapper::Import(SfxMedium &rMedium) { - sal_uInt32 nError = ERRCODE_SFX_DOLOADFAILED; + ErrCode nError = ERRCODE_SFX_DOLOADFAILED; uno::Reference<uno::XComponentContext> xContext( comphelper::getProcessComponentContext() ); @@ -250,7 +250,7 @@ sal_uInt32 SmXMLImportWrapper::Import(SfxMedium &rMedium) /// read a component (file + filter version) -sal_uInt32 SmXMLImportWrapper::ReadThroughComponent( +ErrCode SmXMLImportWrapper::ReadThroughComponent( const Reference<io::XInputStream>& xInputStream, const Reference<XComponent>& xModelComponent, Reference<uno::XComponentContext> & rxContext, @@ -258,7 +258,7 @@ sal_uInt32 SmXMLImportWrapper::ReadThroughComponent( const sal_Char* pFilterName, bool bEncrypted ) { - sal_uInt32 nError = ERRCODE_SFX_DOLOADFAILED; + ErrCode nError = ERRCODE_SFX_DOLOADFAILED; OSL_ENSURE(xInputStream.is(), "input stream missing"); OSL_ENSURE(xModelComponent.is(), "document missing"); OSL_ENSURE(rxContext.is(), "factory missing"); @@ -346,7 +346,7 @@ sal_uInt32 SmXMLImportWrapper::ReadThroughComponent( } -sal_uInt32 SmXMLImportWrapper::ReadThroughComponent( +ErrCode SmXMLImportWrapper::ReadThroughComponent( const uno::Reference< embed::XStorage >& xStorage, const Reference<XComponent>& xModelComponent, const sal_Char* pStreamName, diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 94036043123e..c1fc11fb9863 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -48,9 +48,9 @@ public: explicit SmXMLImportWrapper(css::uno::Reference<css::frame::XModel> &rRef) : xModel(rRef) {} - sal_uInt32 Import(SfxMedium &rMedium); + ErrCode Import(SfxMedium &rMedium); - static sal_uInt32 ReadThroughComponent( + static ErrCode ReadThroughComponent( const css::uno::Reference< css::io::XInputStream >& xInputStream, const css::uno::Reference< css::lang::XComponent >& xModelComponent, css::uno::Reference< css::uno::XComponentContext > & rxContext, @@ -58,7 +58,7 @@ public: const sal_Char* pFilterName, bool bEncrypted ); - static sal_uInt32 ReadThroughComponent( + static ErrCode ReadThroughComponent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::lang::XComponent >& xModelComponent, const sal_Char* pStreamName, |