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

guard against null Foundry

Change-Id: I8aabc68e8dfb9376cafe4cc709b18344da083a01
(cherry picked from commit 2f0fba49)
üst 2a46bd51
......@@ -246,14 +246,14 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
m_StyleName.clear();
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
XFTextStyle* pNamedStyle = nullptr;
if (m_pModifiers->HasCharStyle)
if (m_pModifiers->HasCharStyle && pFoundry)
{
pNamedStyle = static_cast<XFTextStyle*>
(pFoundry->GetStyleManager()->GetStyle(m_pModifiers->CharStyleID));
}
if (pNamedStyle)
{
if (m_pModifiers->FontID)
if (m_pModifiers->FontID && pFoundry)
{
pStyle = new XFTextStyle();
*pStyle = *pNamedStyle;
......@@ -273,7 +273,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
}
else
{
if (m_pModifiers->FontID)
if (m_pModifiers->FontID && pFoundry)
{
pStyle = new XFTextStyle();
pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
......
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