diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-04 14:13:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-05 06:42:40 +0000 |
| commit | ff339c89b51ed571d55c762e43aa1a6ee9ada1cb (patch) | |
| tree | 5ed1c9a8353037745ce49e5a97e696157a0dcbca /basic | |
| parent | 3d6c84f2d9683b23c14fa5bf50ca4425cf4ceb04 (diff) | |
loplugin:constantparam part2
Change-Id: I7ec4c946be52a6b56aee908426f95ecacc7b0746
Reviewed-on: https://gerrit.libreoffice.org/36072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 13 | ||||
| -rw-r--r-- | basic/source/uno/scriptcont.cxx | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 79f210a7e9d0..c8a3389051fe 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1777,14 +1777,10 @@ bool SbModule::HasExeCode() } // Store only image, no source -void SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer ) +void SbModule::StoreBinaryData( SvStream& rStrm ) { if (!Compile()) return; - bool bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts - - if ( bFixup ) // save in old image format, fix up method starts - fixUpMethodStart( true ); if (!SbxObject::StoreData(rStrm)) return; @@ -1794,12 +1790,7 @@ void SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer ) pImage->aName = GetName(); rStrm.WriteUChar(1); - if (nVer) - pImage->Save(rStrm); - else - pImage->Save(rStrm, B_LEGACYVERSION); - if (bFixup) - fixUpMethodStart(false); // restore method starts + pImage->Save(rStrm); pImage->aOUSource = aOUSource; } diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index e18fe5cfa000..a574aa7f7996 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -627,7 +627,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons throw uno::RuntimeException("null returned from openStreamElement"); } SvMemoryStream aMemStream; - /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream, B_CURVERSION ); + /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream ); sal_Int32 const nSize = aMemStream.Tell(); if (nSize < 0) { abort(); } @@ -765,7 +765,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE ); SvMemoryStream aMemStream; - /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream, B_CURVERSION ); + /*sal_Bool bStore = */pMod->StoreBinaryData( aMemStream ); sal_Int32 const nSize = aMemStream.Tell(); if (nSize < 0) { abort(); } |