[Libreoffice-commits] core.git: sfx2/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Dec 19 21:43:51 UTC 2020


 sfx2/source/control/templatedlglocalview.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit cd6ddba3e15d2e586cd7b8593d5164aabbbd0dcb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 18 13:44:58 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Dec 19 22:43:13 2020 +0100

    tdf#138884 Crash when deleting template via context menu
    
    Change-Id: Ia332070d4d49ee697021d543c4eb6cec08994284
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107968
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/control/templatedlglocalview.cxx b/sfx2/source/control/templatedlglocalview.cxx
index a1419ab5c8d6..0949e684c414 100644
--- a/sfx2/source/control/templatedlglocalview.cxx
+++ b/sfx2/source/control/templatedlglocalview.cxx
@@ -123,8 +123,12 @@ void TemplateDlgLocalView::ContextMenuSelectHdl(std::string_view rIdent)
             return;
 
         maDeleteTemplateHdl.Call(maSelectedItem);
-        reload();
+        // this remove is probably redundant because reload would throw away
+        // the old contents anyway. Maybe there is an argument that removing it
+        // immediately means there is possibility to show it missing while the
+        // possibly slow reload is operating if a repaint could occur
         ListView::remove(OUString::number(maSelectedItem->mnId));
+        reload();
     }
     else if (rIdent == "default")
     {


More information about the Libreoffice-commits mailing list