diff options
| author | Adam Co <rattles2013@gmail.com> | 2013-07-10 19:12:45 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-07-24 15:08:03 +0200 |
| commit | 71e1927c78e3873c377d87feb64b33286138756b (patch) | |
| tree | f960abdef7d5c8573529061985cc58ab1168f841 /writerfilter | |
| parent | acf6241887bc919fa6a83dafe2bede780ed96be7 (diff) | |
fdo#66781 : fix bullets with level 0
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I14b0ce9ae096eae4759793a49865eefe16ec1afd
Reviewed-on: https://gerrit.libreoffice.org/4818
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/NumberingManager.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 587f8b3515b9..ecd70b59fda9 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -289,8 +289,18 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetLevelProperties( ) if( !isOutlineNumbering()) { // todo: this is not the bullet char - if( nNumberFormat == style::NumberingType::CHAR_SPECIAL && !m_sBulletChar.isEmpty() ) - aNumberingProperties.push_back( MAKE_PROPVAL(PROP_BULLET_CHAR, m_sBulletChar.copy(0,1))); + if( nNumberFormat == style::NumberingType::CHAR_SPECIAL ) + { + if (!m_sBulletChar.isEmpty()) + { + aNumberingProperties.push_back( MAKE_PROPVAL(PROP_BULLET_CHAR, m_sBulletChar.copy(0,1))); + } + else + { + // If w:lvlText's value is null - set bullet char to zero. + aNumberingProperties.push_back( MAKE_PROPVAL(PROP_BULLET_CHAR, sal_Unicode(0x0))); + } + } if (!m_sGraphicURL.isEmpty()) aNumberingProperties.push_back(MAKE_PROPVAL(PROP_GRAPHIC_URL, m_sGraphicURL)); if (m_sGraphicBitmap.is()) |