diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-09-23 00:44:04 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-10-27 13:59:09 +0100 |
| commit | 99628775132143936fcd00ca9e18a853616418e4 (patch) | |
| tree | 2ed016618c5616531c9f03ef2090549dbc4504b6 | |
| parent | d1eb389d7081276bb08f4cf3be16e5301a4c39cb (diff) | |
sal_uLong to ErrCode
Change-Id: I2b4b2673aa27de664f6c6780e67c70559ec61971
| -rw-r--r-- | filter/source/msfilter/svxmsbas2.cxx | 6 | ||||
| -rw-r--r-- | include/filter/msfilter/svxmsbas.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/excel/expop2.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/msfilter/svxmsbas2.cxx b/filter/source/msfilter/svxmsbas2.cxx index 42f343689a96..e2a4ce64af12 100644 --- a/filter/source/msfilter/svxmsbas2.cxx +++ b/filter/source/msfilter/svxmsbas2.cxx @@ -27,10 +27,10 @@ using namespace com::sun::star; -sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto, +ErrCode SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto, const OUString& rStorageName ) { - sal_uLong nRet = ERRCODE_NONE; + ErrCode nRet = ERRCODE_NONE; uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() ); OUString aDstStgName( GetMSBasicStorageName() ); tools::SvRef<SotStorage> xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, aDstStgName, @@ -62,7 +62,7 @@ sal_uLong SvxImportMSVBasic::SaveOrDelMSVBAStorage( bool bSaveInto, // check if the MS-VBA-Storage exists in the RootStorage of the DocShell. // If it exists, then return the WarningId for losing the information. -sal_uLong SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocSh) +ErrCode SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocSh) { uno::Reference < embed::XStorage > xSrcRoot( rDocSh.GetStorage() ); tools::SvRef<SotStorage> xVBAStg( SotStorage::OpenOLEStorage( xSrcRoot, GetMSBasicStorageName(), diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 5b549d29ac20..33b26b105fc9 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -58,11 +58,11 @@ public: // form the ObjectShell // - returns a warning code if a modified basic exist, in all other // cases return ERRCODE_NONE. - sal_uLong SaveOrDelMSVBAStorage( bool bSaveInto, const OUString& rStorageName ); + ErrCode SaveOrDelMSVBAStorage( bool bSaveInto, const OUString& rStorageName ); // check if the MS-VBA-Storage exist in the RootStorage of the DocShell. // If it exist, then return the WarningId for losing the information. - static sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); + static ErrCode GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); static OUString GetMSBasicStorageName(); private: diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index f169716533f6..eb2f567bf586 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -105,7 +105,7 @@ FltError ExportBiff5::Write() else if( pDocShell && xRootStrg.Is() && eVbaExportMode == VBAExportMode::REEXPORT_STREAM ) { SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); - sal_uLong nErr = aBasicImport.SaveOrDelMSVBAStorage( true, EXC_STORAGE_VBA_PROJECT ); + const ErrCode nErr = aBasicImport.SaveOrDelMSVBAStorage( true, EXC_STORAGE_VBA_PROJECT ); if( nErr != ERRCODE_NONE ) pDocShell->SetError( nErr, OUString( OSL_LOG_PREFIX ) ); } |