diff options
| author | Eike Rathke <erack@redhat.com> | 2018-07-12 14:29:38 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-07-13 10:29:10 +0200 |
| commit | ff0e7e5427c2851341d01e8917a1b5df0c08e557 (patch) | |
| tree | bd66656814fa38fe7bdf3b97fa188c5adad588fe | |
| parent | 48c6375458d09378b404e2ab5153f2ef2cc0630e (diff) | |
SvTreeListBox::DoubleClickHdl: SwContentTree more, tdf#115950 related
This is a combination of 2 commits.
SvTreeListBox::DoubleClickHdl: SwContentTree more, tdf#115950 related
(cherry picked from commit 60c2f6d7f167cc313b33d29531f8c7320903e78d)
SvTreeListBox::DoubleClickHdl: SwContentTree more, tdf#115950 related
(cherry picked from commit 446f9cf176038881af166e46489bb1880b22174d)
86b5275484754b222698fb8c4540ff66bd6c962a
Change-Id: Id3d1e070467bdb681919b380c0d2ace78ebd388d
Reviewed-on: https://gerrit.libreoffice.org/57342
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins
| -rw-r--r-- | sw/source/uibase/utlui/content.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 1eeb25ef635f..b6d5946c9b23 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1541,7 +1541,9 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) if(pEntry) { if(lcl_IsContentType(pEntry) && !pEntry->HasChildren()) + { RequestingChildren(pEntry); + } else if (!lcl_IsContentType(pEntry) && (State::HIDDEN != m_eState)) { if (State::CONSTANT == m_eState) @@ -1555,7 +1557,9 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) GotoContent(pCnt); if(pCnt->GetParent()->GetType() == ContentTypeId::FRAME) m_pActiveShell->EnterStdMode(); + return false; // treelist processing finished } + return true; // signal more to be done, i.e. expand/collapse children } return false; } |