diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-06-13 20:01:02 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2017-06-14 05:45:51 +0200 |
| commit | 06ea26ce3ff3d809ca7e318abdabc633910f2946 (patch) | |
| tree | 60fc1881b00e22c06d1987bef87c3a2115694d23 /starmath/source/mathmlimport.cxx | |
| parent | 458fadbaf7b7f816a01304b48c0938407e65f060 (diff) | |
starmath: Use sal_uInt32 for ERRCODE instead of sal_uLong
Change-Id: I9fab0cdc29cf10551b31619cbcbf7f304eeb3b69
Reviewed-on: https://gerrit.libreoffice.org/38729
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'starmath/source/mathmlimport.cxx')
| -rw-r--r-- | starmath/source/mathmlimport.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index b97ec1be70f6..f426f42a76fe 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -97,9 +97,9 @@ SmNode* popOrZero(SmNodeStack& rStack) } -sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) +sal_uInt32 SmXMLImportWrapper::Import(SfxMedium &rMedium) { - sal_uLong nError = ERRCODE_SFX_DOLOADFAILED; + sal_uInt32 nError = ERRCODE_SFX_DOLOADFAILED; uno::Reference<uno::XComponentContext> xContext( comphelper::getProcessComponentContext() ); @@ -200,7 +200,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) if (xStatusIndicator.is()) xStatusIndicator->setValue(nSteps++); - sal_uLong nWarn = ReadThroughComponent( + auto nWarn = ReadThroughComponent( rMedium.GetStorage(), xModelComp, "meta.xml", "Meta.xml", xContext, xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaImporter" @@ -251,7 +251,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium) /// read a component (file + filter version) -sal_uLong SmXMLImportWrapper::ReadThroughComponent( +sal_uInt32 SmXMLImportWrapper::ReadThroughComponent( const Reference<io::XInputStream>& xInputStream, const Reference<XComponent>& xModelComponent, Reference<uno::XComponentContext> & rxContext, @@ -259,7 +259,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent( const sal_Char* pFilterName, bool bEncrypted ) { - sal_uLong nError = ERRCODE_SFX_DOLOADFAILED; + sal_uInt32 nError = ERRCODE_SFX_DOLOADFAILED; OSL_ENSURE(xInputStream.is(), "input stream missing"); OSL_ENSURE(xModelComponent.is(), "document missing"); OSL_ENSURE(rxContext.is(), "factory missing"); @@ -347,7 +347,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent( } -sal_uLong SmXMLImportWrapper::ReadThroughComponent( +sal_uInt32 SmXMLImportWrapper::ReadThroughComponent( const uno::Reference< embed::XStorage >& xStorage, const Reference<XComponent>& xModelComponent, const sal_Char* pStreamName, |