Skip to content

C
core
Kaydet (Commit) 01f920f2 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

most casts and checks 

Change-Id: I8be1b8298f096791628d1f51d36ceeabdc804f9a
üst 80509545
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
lotuswordpro/source/filter/lwppara.cxx
Dosyayı görüntüle @ 01f920f2
...@@ -348,13 +348,14 @@ void LwpPara::RegisterStyle() ...@@ -348,13 +348,14 @@ void LwpPara::RegisterStyle()
//2 reg para style //2 reg para style
if (!m_pFoundry) if (!m_pFoundry)
return; return;
XFParaStyle* pBaseStyle = static_cast<XFParaStyle*>(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle)); XFParaStyle* pBaseStyle = dynamic_cast<XFParaStyle*>(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle));
if (pBaseStyle == nullptr) return; if (pBaseStyle == nullptr) return;
m_StyleName = pBaseStyle->GetStyleName();//such intf to be added m_StyleName = pBaseStyle->GetStyleName();//such intf to be added
m_ParentStyleName = m_StyleName; m_ParentStyleName = m_StyleName;
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
if (GetParaStyle()->GetIndent()) LwpParaStyle* pParaStyle = GetParaStyle();
if (pParaStyle && pParaStyle->GetIndent())
{ {
std::unique_ptr<LwpIndentOverride> pIndentOverride(GetParaStyle()->GetIndent()->clone()); std::unique_ptr<LwpIndentOverride> pIndentOverride(GetParaStyle()->GetIndent()->clone());
delete m_pIndentOverride; delete m_pIndentOverride;
...@@ -736,13 +737,13 @@ void LwpPara::RegisterStyle() ...@@ -736,13 +737,13 @@ void LwpPara::RegisterStyle()
//register tab style //register tab style
if(m_Fribs.HasFrib(FRIB_TAG_TAB)) if(m_Fribs.HasFrib(FRIB_TAG_TAB))
{ {
XFParaStyle* pParaStyle = new XFParaStyle; XFParaStyle* pNewParaStyle = new XFParaStyle;
*pParaStyle = *GetXFParaStyle(); *pNewParaStyle = *GetXFParaStyle();
//pOverStyle->SetStyleName(""); //pOverStyle->SetStyleName("");
this->RegisterTabStyle(pParaStyle); this->RegisterTabStyle(pNewParaStyle);
if (!m_ParentStyleName.isEmpty()) if (!m_ParentStyleName.isEmpty())
pParaStyle->SetParentStyleName(m_ParentStyleName); pNewParaStyle->SetParentStyleName(m_ParentStyleName);
m_StyleName = pXFStyleManager->AddStyle(pParaStyle).m_pStyle->GetStyleName(); m_StyleName = pXFStyleManager->AddStyle(pNewParaStyle).m_pStyle->GetStyleName();
} }
//register master page; //register master page;
......
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