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

Oliver Specht oliver.specht at cib.de
Thu Dec 10 22:43:26 PST 2015


 sw/source/ui/fldui/DropDownFieldDialog.cxx   |    7 +++++++
 sw/source/uibase/inc/DropDownFieldDialog.hxx |    1 +
 2 files changed, 8 insertions(+)

New commits:
commit bd05eec9e30647394c0624c94b97e46bf8b7533f
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Thu Dec 10 17:02:05 2015 +0100

    tdf#34774: enabled double click in input list field dialog
    
    Change-Id: I4a08016859b0afa95d8bf3a42be41bbe72c31570
    Reviewed-on: https://gerrit.libreoffice.org/20623
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>
    Tested-by: Oliver Specht <oliver.specht at cib.de>

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index a4a0036..7423d16 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -43,6 +43,8 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r
     get(m_pOKPB, "ok");
     get(m_pNextPB, "next");
     get(m_pEditPB, "edit");
+    Link<ListBox&, void> aDoubleLk = LINK(this, DropDownFieldDialog, DoubleClickHdl);
+    m_pListItemsLB->SetDoubleClickHdl( aDoubleLk );
 
     Link<Button*,void> aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl);
     m_pEditPB->SetClickHdl(aButtonLk);
@@ -111,4 +113,9 @@ IMPL_LINK_TYPED(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void)
     EndDialog(m_pNextPB == pButton ? RET_OK : RET_YES );
 }
 
+IMPL_LINK_NOARG_TYPED(sw::DropDownFieldDialog, DoubleClickHdl, ListBox&, void)
+{
+    EndDialog(RET_OK);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx
index 90138b4..0a801d3 100644
--- a/sw/source/uibase/inc/DropDownFieldDialog.hxx
+++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx
@@ -45,6 +45,7 @@ class DropDownFieldDialog : public SvxStandardDialog
 
     DECL_LINK_TYPED(ButtonHdl, Button*, void);
     virtual void    Apply() override;
+    DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void);
 public:
     DropDownFieldDialog(   vcl::Window *pParent, SwWrtShell &rSh,
                                 SwField* pField, bool bNextButton = false );


More information about the Libreoffice-commits mailing list