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

[Michael Stahl]

 xmloff/source/text/txtimp.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 4368e050406ddfa09a4b42a8cecbfd9d662aaaab
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 28 15:42:26 2014 +0100

    xmloff: avoid assertion because AutoCorrect document doesn't ...
    
    ... have a proper outline numbering rule.
    
    Change-Id: I7f73176fae6d181ec398c81daf492f4de08e0ae8

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index efc6ca9..9d35a13 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -899,10 +899,12 @@ XMLTextImportHelper::XMLTextImportHelper(
 
     Reference< XChapterNumberingSupplier > xCNSupplier( rModel, UNO_QUERY );
 
-    if( xCNSupplier.is() )
+    if (xCNSupplier.is())
     {
+        // note: m_xChapterNumbering is accessed to import some fields
         m_pImpl->m_xChapterNumbering = xCNSupplier->getChapterNumberingRules();
-        if (m_pImpl->m_xChapterNumbering.is())
+        // the AutoCorrect document doesn't have a proper outline numbering
+        if (!IsBlockMode() && m_pImpl->m_xChapterNumbering.is())
         {
             Reference< XPropertySet > const xNumRuleProps(
                 m_pImpl->m_xChapterNumbering, UNO_QUERY);