strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sfx2: simplify SetCommonStorageEncryptionData() calls

Browse source 
Some of these look redundant, as SfxMedium::GetStorage() already does
this earlier.

Change-Id: Iba178196898adfd4ee260da908c7298f3f2c1734
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160408
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl 2023-12-06 20:19:15 +01:00
parent 3b347664b2
commit 7101c62085
2 changed files with 17 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sfx2/source/doc/docfile.cxx
View file

@ -1869,6 +1869,11 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempFile )
} }
} }
if (GetErrorCode()) // decryption failed?
{
pImpl->xStorage.clear();
}
// TODO/LATER: Get versionlist on demand // TODO/LATER: Get versionlist on demand
if ( pImpl->xStorage.is() ) if ( pImpl->xStorage.is() )
{ {

66
sfx2/source/doc/objstor.cxx
View file

@ -1012,26 +1012,17 @@ bool SfxObjectShell::DoSave()
} }
} }
uno::Sequence< beans::NamedValue > aEncryptionData;
if ( IsPackageStorageFormat_Impl( *GetMedium() ) ) if ( IsPackageStorageFormat_Impl( *GetMedium() ) )
{ {
if ( GetEncryptionData_Impl( &GetMedium()->GetItemSet(), aEncryptionData ) ) GetMedium()->GetStorage(); // sets encryption properties if necessary
if (GetMedium()->GetErrorCode())
{ {
try SetError(ERRCODE_IO_GENERAL);
{
//TODO/MBA: GetOutputStorage?! Special mode, because it's "Save"?!
::comphelper::OStorageHelper::SetCommonStorageEncryptionData( GetMedium()->GetStorage(), aEncryptionData );
bOk = true;
}
catch( uno::Exception& )
{
SetError(ERRCODE_IO_GENERAL);
}
DBG_ASSERT( bOk, "The root storage must allow to set common password!\n" );
} }
else else
{
bOk = true; bOk = true;
}
#if HAVE_FEATURE_SCRIPTING #if HAVE_FEATURE_SCRIPTING
if ( HasBasic() ) if ( HasBasic() )
{ {
@ -1471,12 +1462,12 @@ bool SfxObjectShell::SaveTo_Impl
bCopyTo = GetCreateMode() == SfxObjectCreateMode::EMBEDDED || bCopyTo = GetCreateMode() == SfxObjectCreateMode::EMBEDDED ||
(pSaveToItem && pSaveToItem->GetValue()); (pSaveToItem && pSaveToItem->GetValue());
bool bOk = false; bool bOk = true;
// TODO/LATER: get rid of bOk // TODO/LATER: get rid of bOk
if (bOwnTarget && pFilter && !(pFilter->GetFilterFlags() & SfxFilterFlags::STARONEFILTER)) if (bOwnTarget && pFilter && !(pFilter->GetFilterFlags() & SfxFilterFlags::STARONEFILTER))
{ {
uno::Reference< embed::XStorage > xMedStorage = rMedium.GetStorage(); uno::Reference< embed::XStorage > xMedStorage = rMedium.GetStorage();
if ( !xMedStorage.is() ) if (!xMedStorage.is() || rMedium.GetErrorCode())
{ {
// no saving without storage // no saving without storage
pImpl->bForbidReload = bOldStat; pImpl->bForbidReload = bOldStat;
@ -1484,31 +1475,7 @@ bool SfxObjectShell::SaveTo_Impl
} }
// transfer password from the parameters to the storage // transfer password from the parameters to the storage
bool bPasswdProvided = false; bool const bPasswdProvided(aEncryptionData.getLength() != 0);
if (aEncryptionData.getLength() != 0)
{
bPasswdProvided = true;
if (xODFDecryptedInnerPackageStream.is())
{
bOk = true;
}
else
{
// TODO: GetStorage() already did that?
try {
::comphelper::OStorageHelper::SetCommonStorageEncryptionData( xMedStorage, aEncryptionData );
bOk = true;
}
catch( uno::Exception& )
{
SAL_WARN( "sfx.doc", "Setting of common encryption key failed!" );
SetError(ERRCODE_IO_GENERAL);
}
}
}
else
bOk = true;
pFilter = rMedium.GetFilter(); pFilter = rMedium.GetFilter();
const SfxStringItem *pVersionItem = !rMedium.IsInCheckIn()? SfxItemSet::GetItem<SfxStringItem>(pSet, SID_DOCINFO_COMMENTS, false): nullptr; const SfxStringItem *pVersionItem = !rMedium.IsInCheckIn()? SfxItemSet::GetItem<SfxStringItem>(pSet, SID_DOCINFO_COMMENTS, false): nullptr;
@ -1777,22 +1744,10 @@ bool SfxObjectShell::SaveTo_Impl
// now create the outer storage // now create the outer storage
uno::Reference<embed::XStorage> const xOuterStorage(rMedium.GetOutputStorage()); uno::Reference<embed::XStorage> const xOuterStorage(rMedium.GetOutputStorage());
assert(xOuterStorage.is()); assert(xOuterStorage.is());
assert(!rMedium.GetErrorCode());
// the outer storage needs the same properties as the inner one // the outer storage needs the same properties as the inner one
SetupStorage(xOuterStorage, SOFFICE_FILEFORMAT_CURRENT, false); SetupStorage(xOuterStorage, SOFFICE_FILEFORMAT_CURRENT, false);
#if 0
// does this need to happen here? - GetStorage already did it
try {
::comphelper::OStorageHelper::SetCommonStorageEncryptionData(xOuterStorage, aEncryptionData);
}
catch (uno::Exception&)
{
SAL_WARN("sfx.doc", "Setting of common encryption key failed!");
SetError(ERRCODE_IO_GENERAL);
bOk = false;
}
#endif
uno::Reference<io::XStream> const xEncryptedInnerPackage = uno::Reference<io::XStream> const xEncryptedInnerPackage =
xOuterStorage->openStreamElement( xOuterStorage->openStreamElement(
"encrypted-package", embed::ElementModes::WRITE); "encrypted-package", embed::ElementModes::WRITE);
@ -3310,6 +3265,9 @@ bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
const SfxStringItem* pPasswdItem = rMedium.GetItemSet().GetItem(SID_PASSWORD, false); const SfxStringItem* pPasswdItem = rMedium.GetItemSet().GetItem(SID_PASSWORD, false);
if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, pMedium ) ) if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, pMedium ) )
{ {
// note: this could be needed in case no interaction handler is
// provided (which CheckPasswd_Impl needs) but a password item is,
// but it could be done in a better way
uno::Sequence< beans::NamedValue > aEncryptionData; uno::Sequence< beans::NamedValue > aEncryptionData;
if ( GetEncryptionData_Impl(&pMedium->GetItemSet(), aEncryptionData) ) if ( GetEncryptionData_Impl(&pMedium->GetItemSet(), aEncryptionData) )
{ {