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

[Nikhil Walvekar]

 sw/source/filter/ww8/ww8atr.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 828113d2293638e33ffe9e2737e09d2cd6c3b0e9
Author: Nikhil Walvekar <nikhil.walvekar at synerzip.com>
Date:   Mon Dec 16 12:22:02 2013 +0530

    FILESAVE: DOCX. Added null check to avoid crash.
    
    Change-Id: I6f61d69702f77f0291ad25f5c39974d263d273e8
    Reviewed-on: https://gerrit.libreoffice.org/7096
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c2f3d58..0c407ee 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2229,11 +2229,14 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                                         if( !sStyle.isEmpty() )
                                         {
                                             SwTxtFmtColl* pColl = GetExport().pDoc->FindTxtFmtCollByName(sStyle);
-                                            if (!pColl->IsAssignedToListLevelOfOutlineStyle() || pColl->GetAssignedOutlineStyleLevel() < nTOXLvl)
+                                            if (pColl)
                                             {
-                                                if( !sTOption.isEmpty() )
-                                                    sTOption += ",";
-                                                sTOption += sStyle + sLvl;
+                                                if (!pColl->IsAssignedToListLevelOfOutlineStyle() || pColl->GetAssignedOutlineStyleLevel() < nTOXLvl)
+                                                {
+                                                    if( !sTOption.isEmpty() )
+                                                        sTOption += ",";
+                                                    sTOption += sStyle + sLvl;
+                                                }
                                             }
                                         }
                                     } while( -1 != nPos );