diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/utlui/content.cxx | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index a12b334dddc9..65e5d0395c40 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -740,10 +740,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) case ContentTypeId::POSTIT: { nMemberCount = 0; - if(!pMember) - pMember.reset( new SwContentArr ); - else - pMember->clear(); + pMember->clear(); SwPostItMgr* aMgr = pWrtShell->GetView().GetPostItMgr(); if (aMgr) { @@ -772,10 +769,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) case ContentTypeId::DRAWOBJECT: { nMemberCount = 0; - if(!pMember) - pMember.reset( new SwContentArr ); - else - pMember->clear(); + pMember->clear(); IDocumentDrawModelAccess& rIDDMA = pWrtShell->getIDocumentDrawModelAccess(); SwDrawModel* pModel = rIDDMA.GetDrawModel(); @@ -2865,9 +2859,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) const size_t nCount = pPage->GetObjCount(); bool hasObjectMarked = false; - SdrObject* pObject = nullptr; - pObject = GetDrawingObjectsByContent( pCnt ); - if( pObject ) + if (SdrObject* pObject = GetDrawingObjectsByContent(pCnt)) { SdrPageView* pPV = pDrawView->GetSdrPageView/*GetPageViewPvNum*/(/*0*/); if( pPV ) |