Kaydet (Commit) ad0fc224 authored tarafından Julien Nabet's avatar Julien Nabet

Disabled slot with Put leaks entry (tabvwsha/sc)

Same as https://cgit.freedesktop.org/libreoffice/core/commit/?id=21dde7a09e2cfe7b48d2fec1edc7a94fa94af5c3

Change-Id: Ie4e3fcf097a6aa7b9a019947a677701723f98bf3
Reviewed-on: https://gerrit.libreoffice.org/45052Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst a8e83ce1
......@@ -425,18 +425,18 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
break;
case FID_CHG_ACCEPT:
{
rSet.Put(SfxBoolItem(FID_CHG_ACCEPT,
pThisFrame->HasChildWindow(FID_CHG_ACCEPT)));
if(pDoc->GetChangeTrack()==nullptr)
if(
( !pDoc->GetChangeTrack() && !pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
||
( pDocShell && pDocShell->IsDocShared() )
)
{
if ( !pThisFrame->HasChildWindow(FID_CHG_ACCEPT) )
{
rSet.DisableItem( nWhich);
}
rSet.DisableItem( nWhich);
}
if ( pDocShell && pDocShell->IsDocShared() )
else
{
rSet.DisableItem( nWhich );
rSet.Put(SfxBoolItem(FID_CHG_ACCEPT,
pThisFrame->HasChildWindow(FID_CHG_ACCEPT)));
}
}
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment