sw/source/uibase/docvw/PostItMgr.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 759dcc107cb7740ec4242634a19631d9ed70cb0f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 11 15:39:37 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 11 20:44:29 2018 +0200
Resolves: tdf#120487 postit losing focus triggering recreation of postit
Change-Id: Idde6b740bc94de62bbd528b656841ab37e3f3786
Reviewed-on: https://gerrit.libreoffice.org/61681
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 0a04f222a4c1..1d778cc4910c 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -306,8 +306,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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
