loplugin:buriedassign in sw

limited this only fixing assignments inside "if" statements, since other
things are harder to change

Change-Id: If3188a3e3d5fcd94123211c97fee097ece5e2797
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95990
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 11 insertions, 10 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 4d077fe401b4..54e931ac3821 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -181,10 +181,11 @@ SwContact* GetUserCall( const SdrObject* pObj )
 /// Returns true if the SrdObject is a Marquee-Object (scrolling text)
 bool IsMarqueeTextObj( const SdrObject& rObj )
 {
-    SdrTextAniKind eTKind;
-    return SdrInventor::Default == rObj.GetObjInventor() &&
-        OBJ_TEXT == rObj.GetObjIdentifier() &&
-        ( SdrTextAniKind::Scroll == ( eTKind = static_cast<const SdrTextObj&>(rObj).GetTextAniKind())
+    if (SdrInventor::Default != rObj.GetObjInventor() ||
+        OBJ_TEXT != rObj.GetObjIdentifier())
+        return false;
+    SdrTextAniKind eTKind = static_cast<const SdrTextObj&>(rObj).GetTextAniKind();
+    return ( SdrTextAniKind::Scroll == eTKind
          || SdrTextAniKind::Alternate == eTKind || SdrTextAniKind::Slide == eTKind );
 }
 
@@ -518,8 +519,8 @@ SwVirtFlyDrawObj* SwFlyDrawContact::CreateNewRef(SwFlyFrame* pFly, SwFlyFrameFor
     // order to transport the z-order.
     // After creating the first Reference the Masters are removed from the
     // List and are not important anymore.
-    SdrPage* pPg(nullptr);
-    if(nullptr != (pPg = pContact->GetMaster()->getSdrPageFromSdrObject()))
+    SdrPage* pPg = pContact->GetMaster()->getSdrPageFromSdrObject();
+    if(nullptr != pPg)
     {
         const size_t nOrdNum = pContact->GetMaster()->GetOrdNum();
         pPg->ReplaceObject(pDrawObj, nOrdNum);
@@ -2222,9 +2223,9 @@ void SwDrawVirtObj::AddToDrawingPage()
     SdrObject* pOrgMasterSdrObj = mrDrawContact.GetMaster();
 
     // insert 'virtual' drawing object into page, set layer and user call.
-    SdrPage* pDrawPg;
+    SdrPage* pDrawPg = pOrgMasterSdrObj->getSdrPageFromSdrObject();
     // #i27030# - apply order number of referenced object
-    if ( nullptr != ( pDrawPg = pOrgMasterSdrObj->getSdrPageFromSdrObject() ) )
+    if ( nullptr != pDrawPg )
     {
         // #i27030# - apply order number of referenced object
         pDrawPg->InsertObject( this, GetReferencedObj().GetOrdNum() );
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index fd69be2ca96a..155339cbcc5d 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -224,8 +224,8 @@ void SwDrawView::AddCustomHdl()
     if (RndStdIds::FLY_AS_CHAR == rAnchor.GetAnchorId())
         return;
 
-    const SwFrame* pAnch;
-    if(nullptr == (pAnch = CalcAnchor()))
+    const SwFrame* pAnch = CalcAnchor();
+    if(nullptr == pAnch)
         return;
 
     Point aPos(m_aAnchorPoint);