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

coverity#1343626 Unchecked dynamic_cast

Change-Id: I52e6d6c9cb48880185293fb9825d7a6530ee767d
üst 9e83e310
...@@ -245,9 +245,12 @@ LwpMasterPage::LwpMasterPage(LwpPara* pPara, LwpPageLayout* pLayout) ...@@ -245,9 +245,12 @@ LwpMasterPage::LwpMasterPage(LwpPara* pPara, LwpPageLayout* pLayout)
bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
{ {
//if there is no other frib after current frib, register master page in starting para of next page //if there is no other frib after current frib, register master page in starting para of next page
if(IsNextPageType()&&(!pFrib->HasNextFrib())) LwpStory* pStory = nullptr;
if (IsNextPageType()&&(!pFrib->HasNextFrib()))
pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get());
if (pStory)
{ {
LwpStory* pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get());
pStory->SetCurrentLayout(m_pLayout); pStory->SetCurrentLayout(m_pLayout);
RegisterFillerPageStyle(); RegisterFillerPageStyle();
return false; return false;
...@@ -278,7 +281,9 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) ...@@ -278,7 +281,9 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
case LwpLayout::StartOnOddPage: //fall through case LwpLayout::StartOnOddPage: //fall through
case LwpLayout::StartOnEvenPage: case LwpLayout::StartOnEvenPage:
{ {
LwpStory* pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get()); pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get());
if (pStory)
{
pStory->SetCurrentLayout(m_pLayout); pStory->SetCurrentLayout(m_pLayout);
//get odd page layout when the current pagelayout is mirror //get odd page layout when the current pagelayout is mirror
m_pLayout = pStory->GetCurrentLayout(); m_pLayout = pStory->GetCurrentLayout();
...@@ -286,6 +291,7 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) ...@@ -286,6 +291,7 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
//bSectionColumns = m_bNewSection; //bSectionColumns = m_bNewSection;
pOverStyle->SetMasterPage( m_pLayout->GetStyleName()); pOverStyle->SetMasterPage( m_pLayout->GetStyleName());
RegisterFillerPageStyle(); RegisterFillerPageStyle();
}
break; break;
} }
default: default:
...@@ -293,7 +299,10 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) ...@@ -293,7 +299,10 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
} }
//register tab style; //register tab style;
LwpStory* pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get()); pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get());
if (!pStory)
return false;
pStory->SetTabLayout(m_pLayout); pStory->SetTabLayout(m_pLayout);
m_pPara->RegisterTabStyle(pOverStyle); m_pPara->RegisterTabStyle(pOverStyle);
...@@ -305,7 +314,7 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) ...@@ -305,7 +314,7 @@ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib)
XFSectionStyle* pSectStyle= new XFSectionStyle(); XFSectionStyle* pSectStyle= new XFSectionStyle();
//set margin //set margin
pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get()); pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get());
if(pStory) if (pStory)
{ {
LwpPageLayout* pCurrentLayout = pStory->GetCurrentLayout(); LwpPageLayout* pCurrentLayout = pStory->GetCurrentLayout();
double fLeft = m_pLayout->GetMarginsValue(MARGIN_LEFT)- pCurrentLayout->GetMarginsValue(MARGIN_LEFT); double fLeft = m_pLayout->GetMarginsValue(MARGIN_LEFT)- pCurrentLayout->GetMarginsValue(MARGIN_LEFT);
......
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