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

[Varun Dhall]

 xmloff/source/text/XMLTextListBlockContext.cxx |    6 +++---
 xmloff/source/text/txtlists.cxx                |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7878bcf5547ae4d111aa8e835529e501c4e23838
Author: Varun Dhall <varun.dhall at studentpartner.com>
Date:   Fri Jul 7 20:16:06 2017 +0530

    xmloff: Updated XMLTextListBlockContext to insert elements before NumRules
    
    Change-Id: If81d55aef96af4b764b62dc53a1986b5f0739d1e
    Reviewed-on: https://gerrit.libreoffice.org/39698
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 0552d0197611..190840a3b7e9 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -125,6 +125,9 @@ XMLTextListBlockContext::XMLTextListBlockContext(
         }
     }
 
+    // Remember this list block.
+    mrTxtImport.GetTextListHelper().PushListContext( this );
+
     mxNumRules = XMLTextListsHelper::MakeNumRule(GetImport(), mxNumRules,
         sParentListStyleName, msListStyleName,
         mnLevel, &mbRestartNumbering, &mbSetDefaults );
@@ -224,9 +227,6 @@ XMLTextListBlockContext::XMLTextListBlockContext(
                 sListStyleDefaultListId );
         }
     }
-
-    // Remember this list block.
-    mrTxtImport.GetTextListHelper().PushListContext( this );
 }
 
 XMLTextListBlockContext::~XMLTextListBlockContext()
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 420563cf6b7b..f26df8acd606 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -451,7 +451,7 @@ XMLTextListsHelper::MakeNumRule(
 
         xNumRules =
             SvxXMLListStyleContext::CreateNumRule( i_rImport.GetModel() );
-        assert(xNumRules.is());
+        SAL_INFO_IF(xNumRules.is(), "xmloff.core", "cannot create numrules");
         if ( !xNumRules.is() )
             return xNumRules;