dbaccess/source/ui/app/AppDetailPageHelper.cxx | 5 -----
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 1 -
dbaccess/source/ui/control/dbtreelistbox.cxx | 1 -
dbaccess/source/ui/inc/dbtreelistbox.hxx | 3 ---
4 files changed, 10 deletions(-)
New commits:
commit 869bbe7419e15196ea8f28ce3a3d5ef5c8dd3a6f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jan 18 14:05:40 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 19 15:53:05 2021 +0100
tdf#139040 return already activates double-click handler for row
Change-Id: I95f6c5eaaa28eeb327b57ec25fff2899fbfd91a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109550
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Tested-by: Jenkins
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 502ad243cd76..7cbbe97c3a1c 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -723,7 +723,6 @@ DBTreeListBox* OAppDetailPageHelper::createTree(
DBTreeListBox* _pTreeView, cons
_pTreeView->SetDefaultExpandedEntryBmp( _rImage );
_pTreeView->SetDoubleClickHdl(LINK(this, OAppDetailPageHelper,
OnEntryDoubleClick));
- _pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper,
OnEntryEnterKey));
_pTreeView->SetSelChangeHdl(LINK(this, OAppDetailPageHelper,
OnEntrySelChange));
_pTreeView->setCopyHandler(LINK(this, OAppDetailPageHelper, OnCopyEntry));
@@ -858,10 +857,6 @@ void OAppDetailPageHelper::elementRemoved( ElementType
_eType,const OUString& _r
showPreview(nullptr);
}
-IMPL_LINK(OAppDetailPageHelper, OnEntryEnterKey, DBTreeListBox*, _pTree, void )
-{
- OnEntryDoubleClick(_pTree);
-}
IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree,
bool)
{
OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid
callback!" );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 1dd89d84a28a..4d61a5456ddf 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -147,7 +147,6 @@ namespace dbaui
DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image&
_rImage);
DECL_LINK( OnEntryDoubleClick, SvTreeListBox*, bool );
- DECL_LINK( OnEntryEnterKey, DBTreeListBox*, void );
DECL_LINK( OnEntrySelChange, LinkParamNone*, void );
DECL_LINK( OnCopyEntry, LinkParamNone*, void );
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 549a27c392e7..336074015ed4 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -340,7 +340,6 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
if ( KEY_RETURN == nCode )
{
bHandled = false;
- m_aEnterKeyHdl.Call(this);
// this is a HACK. If the data source browser is opened in the
"beamer", while the main frame
//
// contains a writer document, then pressing enter in the DSB would be
rerouted to the writer
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx
b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index c1678108f1e5..ab55496cf42e 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -64,7 +64,6 @@ namespace dbaui
Link<LinkParamNone*,void> m_aCopyHandler; // called when
someone press CTRL+C
Link<LinkParamNone*,void> m_aPasteHandler; // called when
someone press CTRL+V
Link<LinkParamNone*,void> m_aDeleteHandler; // called when
someone press DELETE Key
- Link<DBTreeListBox*,void> m_aEnterKeyHdl;
private:
void init();
@@ -111,8 +110,6 @@ namespace dbaui
virtual VclPtr<PopupMenu> CreateContextMenu() override;
virtual void ExecuteContextMenuAction( sal_uInt16
nSelectedPopupEntry ) override;
- void SetEnterKeyHdl(const Link<DBTreeListBox*,void>&
rNewHdl) {m_aEnterKeyHdl = rNewHdl;}
-
void clearCurrentSelection() { m_aSelectedEntries.clear(); }
protected:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
