sw/source/uibase/utlui/content.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit ff0e7e5427c2851341d01e8917a1b5df0c08e557
Author: Eike Rathke <er...@redhat.com>
Date: Thu Jul 12 14:29:38 2018 +0200
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 <er...@redhat.com>
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jenkins
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
