diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-11 15:39:37 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2018-10-13 20:45:02 +0200 |
| commit | f1e09253316d9db39b7adab6d31e759c09de3406 (patch) | |
| tree | 1a252a94e56ab792ba6da6d7943ff61d6cfb83a9 | |
| parent | 7ea7b86e7731f8cc1366ea632653fecc97267378 (diff) | |
Resolves: tdf#120487 postit losing focus triggering recreation of postit
Change-Id: Idde6b740bc94de62bbd528b656841ab37e3f3786
Reviewed-on: https://gerrit.libreoffice.org/61682
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 2cd8d420db70..4565d4843ac7 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -309,8 +309,11 @@ void SwPostItMgr::RemoveItem( SfxBroadcaster* pBroadcast ) SwSidebarItem* p = (*i); if (GetActiveSidebarWin() == p->pPostIt) SetActiveSidebarWin(nullptr); - p->pPostIt.disposeAndClear(); + // tdf#120487 remove from list before dispose, so comment window + // won't be recreated due to the entry still in the list if focus + // transferring from the pPostIt triggers relayout of postits mvPostItFields.erase(i); + p->pPostIt.disposeAndClear(); delete p; break; } |