From d9f0c19edde7cb28086860ea6b3519be0d49a3e0 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 19 Nov 2014 17:25:04 +0100
Subject: DOCX import: handle <w:lvlOverride> without <w:lvlText>

Change-Id: I0b941bd7a733408655db192b8608ed3987b9c1fc
---
 writerfilter/source/dmapper/NumberingManager.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 2d5618d179ca..af2c2e3c1967 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -614,7 +614,8 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
                 // Get the prefix / suffix / Parent numbering
                 // and add them to the level properties
                 OUString sText = pAbsLevel->GetBulletChar( );
-                if ( pLevel.get( ) )
+                // Inherit <w:lvlText> from the abstract level in case the override would be empty.
+                if (pLevel.get() && !pLevel->GetBulletChar().isEmpty())
                     sText = pLevel->GetBulletChar( );
 
                 OUString sPrefix;
-- 
cgit