Kaydet (Commit) 7de5ffbf authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1264391 help coverity out wrt Logically dead code

also

coverity#1264392 Logically dead code

Change-Id: I37c542a6d088a2aca4cf09a341d389efd34f423a
üst 67443651
...@@ -212,12 +212,29 @@ static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest, ...@@ -212,12 +212,29 @@ static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest,
rDest.SetPoolHlpFileId( rSource.GetPoolHlpFileId() ); rDest.SetPoolHlpFileId( rSource.GetPoolHlpFileId() );
} }
namespace
{
SwFrmFmt& getFrmFmt(SwPageDesc &rDesc, bool bLeft, bool bFirst)
{
if (bFirst)
{
if (bLeft)
return rDesc.GetFirstLeft();
rDesc.GetFirstMaster();
}
return rDesc.GetLeft();
}
const SwFrmFmt& getConstFrmFmt(const SwPageDesc &rDesc, bool bLeft, bool bFirst)
{
return getFrmFmt(const_cast<SwPageDesc&>(rDesc), bLeft, bFirst);
}
}
void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc &rDesc, bool bLeft, bool bFirst) void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc &rDesc, bool bLeft, bool bFirst)
{ {
assert(bLeft || bFirst); assert(bLeft || bFirst);
SwFrmFmt& rDescFrmFmt = (bFirst) SwFrmFmt& rDescFrmFmt = getFrmFmt(rDesc, bLeft, bFirst);
? (bLeft) ? rDesc.GetFirstLeft() : rDesc.GetFirstMaster()
: rDesc.GetLeft();
if (bFirst && bLeft) if (bFirst && bLeft)
{ {
// special case: always shared with something // special case: always shared with something
...@@ -252,9 +269,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, ...@@ -252,9 +269,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
if (!aCnt.GetCntntIdx()) if (!aCnt.GetCntntIdx())
{ {
const SwFrmFmt& rChgedFrmFmt = (bFirst) const SwFrmFmt& rChgedFrmFmt = getConstFrmFmt(rChged, bLeft, bFirst);
? (bLeft) ? rChged.GetFirstLeft() : rChged.GetFirstMaster()
: rChged.GetLeft();
rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetHeader() ); rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetHeader() );
} }
else if ((*aRCnt.GetCntntIdx() == *aCnt.GetCntntIdx()) || else if ((*aRCnt.GetCntntIdx() == *aCnt.GetCntntIdx()) ||
...@@ -292,9 +307,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, ...@@ -292,9 +307,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc &rDesc, bool bLeft, bool bFirst) void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc &rDesc, bool bLeft, bool bFirst)
{ {
assert(bLeft || bFirst); assert(bLeft || bFirst);
SwFrmFmt& rDescFrmFmt = (bFirst) SwFrmFmt& rDescFrmFmt = getFrmFmt(rDesc, bLeft, bFirst);
? (bLeft) ? rDesc.GetFirstLeft() : rDesc.GetFirstMaster()
: rDesc.GetLeft();
if (bFirst && bLeft) if (bFirst && bLeft)
{ {
// special case: always shared with something // special case: always shared with something
...@@ -328,9 +341,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, ...@@ -328,9 +341,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
const SwFmtCntnt &aLCnt = rFmtFoot.GetFooterFmt()->GetCntnt(); const SwFmtCntnt &aLCnt = rFmtFoot.GetFooterFmt()->GetCntnt();
if( !aLCnt.GetCntntIdx() ) if( !aLCnt.GetCntntIdx() )
{ {
const SwFrmFmt& rChgedFrmFmt = (bFirst) const SwFrmFmt& rChgedFrmFmt = getConstFrmFmt(rChged, bLeft, bFirst);
? (bLeft) ? rChged.GetFirstLeft() : rChged.GetFirstMaster()
: rChged.GetLeft();
rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetFooter() ); rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetFooter() );
} }
else if ((*aRCnt.GetCntntIdx() == *aLCnt.GetCntntIdx()) || else if ((*aRCnt.GetCntntIdx() == *aLCnt.GetCntntIdx()) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment