diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-05-30 23:25:51 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-05-30 23:28:57 +0200 |
commit | 4618d15cb73d0f0c15e0f4d2a6ce9cdbe6eeef24 (patch) | |
tree | 079e0e8e08555b3d7f8b155cc0566143b6c95c6f | |
parent | 824cda403206b61af20ed86aead59cfaddb6ac83 (diff) |
Simplify
Change-Id: Iafeed40abb3228c00c5490692c9f2f4d526c1dee
-rw-r--r-- | sw/source/uibase/utlui/content.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index c13e95ca9e32..5e3ca2be83ae 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1480,14 +1480,13 @@ bool SwContentTree::Expand( SvTreeListEntry* pParent ) bool SwContentTree::Collapse( SvTreeListEntry* pParent ) { - bool bRet(false); if(!bIsRoot || (static_cast<SwContentType*>(pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || (nRootType == CONTENT_TYPE_OUTLINE)) { if(lcl_IsContentType(pParent)) { if(bIsRoot) - return bRet = false; + return false; SwContentType* pCntType = static_cast<SwContentType*>(pParent->GetUserData()); const sal_Int32 nAnd = ~(1 << pCntType->GetType()); if(bIsActive || bIsConstant) @@ -1505,11 +1504,9 @@ bool SwContentTree::Collapse( SvTreeListEntry* pParent ) void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos ); mOutLineNodeMap[key] = false; } - bRet = SvTreeListBox::Collapse(pParent); } - else - bRet = SvTreeListBox::Collapse(pParent); - return bRet; + + return SvTreeListBox::Collapse(pParent); } // Also on double click will be initially opened only. |