[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

Caolán McNamara caolanm at redhat.com
Wed Dec 9 08:35:43 PST 2015


 lotuswordpro/source/filter/lwpfribsection.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0b1d57211c171c8d650b73036608df4cb2b3f9b8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 9 16:31:40 2015 +0000

    guard against missing paragraph story
    
    Change-Id: I217c0aedca4eadc347c103899d96c70cf9606038
    (cherry picked from commit dbc830aecc722d34971d773470da478ef4c38714)
    Reviewed-on: https://gerrit.libreoffice.org/20538
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx
index bafaefc..899461a 100644
--- a/lotuswordpro/source/filter/lwpfribsection.cxx
+++ b/lotuswordpro/source/filter/lwpfribsection.cxx
@@ -161,9 +161,8 @@ void LwpFribSection::ParseSection()
             m_pMasterPage->ParseSection(this);
         }
     }
-    else
+    else if (LwpStory* pStory = static_cast<LwpStory*>(m_pPara->GetStoryID().obj().get()))
     {
-        LwpStory* pStory = static_cast<LwpStory*> ( m_pPara->GetStoryID().obj().get() );
         rtl::Reference<LwpObject> xObj(m_Section.obj());
         if (xObj.is() && xObj->GetTag() == VO_INDEXSECTION)
         {


More information about the Libreoffice-commits mailing list