[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sfx2/source

Caolán McNamara caolanm at redhat.com
Mon Jun 8 06:40:35 PDT 2015


 sfx2/source/doc/templatedlg.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 55cc8a0210a7f93b6b2893a781a2456ea18b5434
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 7 17:51:31 2015 +0100

    Resolves: tdf#79780 use SelectHdl instead of ClickHdl
    
    ClickHdl happens on the "down" of the click, not the
    "up" of the click, so the up gets lost and control
    isn't returned to the parent widget, so extra clicks
    are needed to give control back to it
    
    Change-Id: I79023d2959377ff70aa890690dde5ce852c9549e
    (cherry picked from commit 6aee70ec9075b19fdbaccd10522552e3d1d4aeb0)
    (cherry picked from commit 4b84c8a46875c14640c51dbb66b22e010850402c)
    Reviewed-on: https://gerrit.libreoffice.org/16140
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 04202c7..1ce1075 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -229,11 +229,11 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent)
     mpTemplateBar->SetItemBits(mpTemplateBar->GetItemId(TEMPLATEBAR_MOVE), ToolBoxItemBits::DROPDOWNONLY);
 
     // Set toolbox handlers
-    mpViewBar->SetClickHdl(LINK(this,SfxTemplateManagerDlg,TBXViewHdl));
+    mpViewBar->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,TBXViewHdl));
     mpViewBar->SetDropdownClickHdl(LINK(this,SfxTemplateManagerDlg,TBXDropdownHdl));
-    mpActionBar->SetClickHdl(LINK(this,SfxTemplateManagerDlg,TBXActionHdl));
+    mpActionBar->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,TBXActionHdl));
     mpActionBar->SetDropdownClickHdl(LINK(this,SfxTemplateManagerDlg,TBXDropdownHdl));
-    mpTemplateBar->SetClickHdl(LINK(this,SfxTemplateManagerDlg,TBXTemplateHdl));
+    mpTemplateBar->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,TBXTemplateHdl));
     mpTemplateBar->SetDropdownClickHdl(LINK(this,SfxTemplateManagerDlg,TBXDropdownHdl));
     mpSearchEdit->SetUpdateDataHdl(LINK(this,SfxTemplateManagerDlg,SearchUpdateHdl));
     mpSearchEdit->EnableUpdateData();


More information about the Libreoffice-commits mailing list