Skip to content

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

tweak for future null deref warning 

Change-Id: I38590e08a6bd03a2ddfeda466b9cee7128c62aa7
üst b759504c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
lotuswordpro/source/filter/lwpfrib.cxx
Dosyayı görüntüle @ 5c339be4
...@@ -263,8 +263,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) ...@@ -263,8 +263,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
pFont = pFoundry->GetFontManger().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID); pFont = pFoundry->GetFontManger().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID);
pStyle->SetFont(pFont); pStyle->SetFont(pFont);
IXFStyleRet aNewStyle = pXFStyleManager->AddStyle(pStyle); IXFStyleRet aNewStyle = pXFStyleManager->AddStyle(pStyle);
m_StyleName = aNewStyle.m_pStyle->GetStyleName();
pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle); pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle);
m_StyleName = pStyle->GetStyleName();
if (aNewStyle.m_bOrigDeleted) if (aNewStyle.m_bOrigDeleted)
pStyle = NULL; pStyle = NULL;
} }
...@@ -279,8 +279,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry) ...@@ -279,8 +279,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID); pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
pStyle->SetFont(pFont); pStyle->SetFont(pFont);
IXFStyleRet aNewStyle = pXFStyleManager->AddStyle(pStyle); IXFStyleRet aNewStyle = pXFStyleManager->AddStyle(pStyle);
m_StyleName = aNewStyle.m_pStyle->GetStyleName();
pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle); pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle);
m_StyleName = pStyle->GetStyleName();
if (aNewStyle.m_bOrigDeleted) if (aNewStyle.m_bOrigDeleted)
pStyle = NULL; pStyle = NULL;
} }
......
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