[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpfrib.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5c339be474c93c0bf42c593b48fd683ea4614250
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 18 09:11:06 2014 +0000

    tweak for future null deref warning
    
    Change-Id: I38590e08a6bd03a2ddfeda466b9cee7128c62aa7

diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx
index 1d614aa..bc404aa 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -263,8 +263,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
             pFont = pFoundry->GetFontManger().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID);
             pStyle->SetFont(pFont);
             IXFStyleRet aNewStyle = pXFStyleManager->AddStyle(pStyle);
+            m_StyleName = aNewStyle.m_pStyle->GetStyleName();
             pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle);
-            m_StyleName = pStyle->GetStyleName();
             if (aNewStyle.m_bOrigDeleted)
                 pStyle = NULL;
         }
@@ -279,8 +279,8 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
             pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
             pStyle->SetFont(pFont);
             IXFStyleRet aNewStyle = pXFStyleManager->AddStyle(pStyle);
+            m_StyleName = aNewStyle.m_pStyle->GetStyleName();
             pStyle = dynamic_cast<XFTextStyle*>(aNewStyle.m_pStyle);
-            m_StyleName = pStyle->GetStyleName();
             if (aNewStyle.m_bOrigDeleted)
                 pStyle = NULL;
         }