sfx2/source/doc/objstor.cxx | 12 +++---------
sfx2/source/doc/sfxbasemodel.cxx | 6 +++---
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 69670381ef2ff9c673c430ace8e36b1940e099bf
Author: Samuel Mehrbrodt <samuel.mehrbr...@collabora.com>
AuthorDate: Thu Aug 7 11:04:13 2025 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@collabora.com>
CommitDate: Thu Aug 7 13:27:49 2025 +0200
Simplify code: Use IsBasedOnTemplate method
Change-Id: I13389c10d07b0ac85ca572508c870151b5970dfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189054
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@collabora.com>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 59fa65c02ac2..b23396599240 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -610,9 +610,8 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
SfxItemSet& rSet = pMedium->GetItemSet();
if( pImpl->nEventId == SfxEventHintId::NONE )
{
- const SfxBoolItem* pTemplateItem = rSet.GetItem(SID_TEMPLATE, false);
SetActivateEvent_Impl(
- ( pTemplateItem && pTemplateItem->GetValue() )
+ ( IsBasedOnTemplate() )
? SfxEventHintId::CreateDoc : SfxEventHintId::OpenDoc );
}
@@ -713,9 +712,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed )
if ( bOk )
{
// the document loaded from template has no name
- const SfxBoolItem* pTemplateItem =
rSet.GetItem(SID_TEMPLATE, false);
- if ( !pTemplateItem || !pTemplateItem->GetValue() )
- bHasName = true;
+ bHasName = !IsBasedOnTemplate();
}
else
SetError(ERRCODE_ABORT);
@@ -2479,12 +2476,9 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium*
pNewMed, bool bRegisterRecent )
{}
}
- const SfxBoolItem* pTemplateItem =
pMedium->GetItemSet().GetItem(SID_TEMPLATE, false);
- bool bTemplate = pTemplateItem && pTemplateItem->GetValue();
-
// before the title regenerated the document must lose the
signatures
pImpl->nDocumentSignatureState = SignatureState::NOSIGNATURES;
- if (!bTemplate)
+ if (!IsBasedOnTemplate())
{
pImpl->nScriptingSignatureState =
pNewMed->GetCachedSignatureState_Impl();
OSL_ENSURE( pImpl->nScriptingSignatureState !=
SignatureState::BROKEN, "The signature must not be broken at this place" );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 1d4547e12da2..603757f882e0 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3866,9 +3866,9 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const
Reference< embed::XStorage >&
// allow to use an interactionhandler (if there is one)
pMedium->UseInteractionHandler( true );
- const SfxBoolItem* pTemplateItem = aSet.GetItem<SfxBoolItem>(SID_TEMPLATE,
false);
- bool bTemplate = pTemplateItem && pTemplateItem->GetValue();
- m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ?
SfxEventHintId::CreateDoc : SfxEventHintId::OpenDoc );
+
m_pData->m_pObjectShell->SetActivateEvent_Impl(m_pData->m_pObjectShell->IsBasedOnTemplate()
+ ?
SfxEventHintId::CreateDoc
+ :
SfxEventHintId::OpenDoc);
m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = false;
// load document
