diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-11-19 20:10:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-20 15:36:12 +0100 |
| commit | 21f8b386e07702e375abd8000e7583f25a0804cf (patch) | |
| tree | 82567ff9d1c9ed2abb730152715881cac50e3f30 /sw | |
| parent | eb55a2cf1acf188b1ce640d7d01a573c5e8c45bb (diff) | |
Disabled slot with Put leaks entry (StateFormatPaintbrush/sw)
Same as https://cgit.freedesktop.org/libreoffice/core/commit/?id=21dde7a09e2cfe7b48d2fec1edc7a94fa94af5c3
Change-Id: I670c01eb5e5e747ceb77995ad855ee448faa054f
Reviewed-on: https://gerrit.libreoffice.org/44931
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/uiview/view1.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index dd3547b64b22..4f3650a6e7dc 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -168,12 +168,14 @@ void SwView::StateFormatPaintbrush(SfxItemSet &rSet) return; bool bHasContent = m_pFormatClipboard && m_pFormatClipboard->HasContent(); - rSet.Put(SfxBoolItem(SID_FORMATPAINTBRUSH, bHasContent)); - if(!bHasContent) + if( !bHasContent && + !SwFormatClipboard::CanCopyThisType( GetWrtShell().GetSelectionType()) + ) { - if( !SwFormatClipboard::CanCopyThisType( GetWrtShell().GetSelectionType() ) ) - rSet.DisableItem( SID_FORMATPAINTBRUSH ); + rSet.DisableItem( SID_FORMATPAINTBRUSH ); } + else + rSet.Put(SfxBoolItem(SID_FORMATPAINTBRUSH, bHasContent)); } void SwView::UpdateWordCount(SfxShell* pShell, sal_uInt16 nSlot) |