do not set BulletChar for numbered lists (#5780)

This commit is contained in:
Frédéric Péters 2014-10-22 16:39:43 +02:00
parent c01dfafdea
commit 996b4a112f
2 changed files with 3 additions and 3 deletions

View File

@ -772,14 +772,14 @@ class ListStyleApply(unohelper.Base, XJobExecutor):
found_bullet_fontname_prop = False found_bullet_fontname_prop = False
log.append('style level %s as %s' % (level, style)) log.append('style level %s as %s' % (level, style))
for i, prop in enumerate(props): for i, prop in enumerate(props):
log.append(' initial prop: %s: %s' % (prop.Name, prop.Value)) log.append(' initial prop: %s: %r' % (prop.Name, prop.Value))
if prop.Name == 'CharStyleName': if prop.Name == 'CharStyleName':
if style in ('DASH', 'BULLET'): if style in ('DASH', 'BULLET'):
prop.Value = 'Bullet Symbols' prop.Value = 'Bullet Symbols'
else: else:
prop.Value = 'Numbering Symbols' prop.Value = 'Numbering Symbols'
log.append(' -> changed to %r' % prop.Value) log.append(' -> changed to %r' % prop.Value)
elif prop.Name == 'BulletChar': elif prop.Name == 'BulletChar' and style in ('DASH', 'BULLET'):
found_bullet_char_prop = True found_bullet_char_prop = True
if style == 'DASH': if style == 'DASH':
prop.Value = '-' prop.Value = '-'

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006" <description xmlns="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink"> xmlns:xlink="http://www.w3.org/1999/xlink">
<version value="0.9.43"/> <version value="0.9.45"/>
<identifier value="org.tabellio.openoffice"/> <identifier value="org.tabellio.openoffice"/>
<update-information> <update-information>
<src xlink:href="http://tabellio.entrouvert.com/update.xml" /> <src xlink:href="http://tabellio.entrouvert.com/update.xml" />