diff options
| author | Varun Dhall <varun.dhall@studentpartner.com> | 2017-07-07 20:16:06 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-07-07 18:29:44 +0200 |
| commit | 7878bcf5547ae4d111aa8e835529e501c4e23838 (patch) | |
| tree | 5f97cf38d3f6852e64f415af7855ad36f8cd1eb9 /xmloff | |
| parent | 7d876e48cb0292d94e193ea7da2538e018f0e07c (diff) | |
xmloff: Updated XMLTextListBlockContext to insert elements before NumRules
Change-Id: If81d55aef96af4b764b62dc53a1986b5f0739d1e
Reviewed-on: https://gerrit.libreoffice.org/39698
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLTextListBlockContext.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/text/txtlists.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
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; |