Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2025-12-24 05:06:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix #941134 (LibreOffice 3.5 odt to conversion mobi problem)

Browse source
This commit is contained in:
Kovid Goyal 2012-03-11 19:02:12 +05:30
parent eaf96d2807
commit 35ddd44a89
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/odf/odf2xhtml.py
View file

@ -937,8 +937,21 @@ def s_style_handle_properties(self, tag, attrs):
"""
if self.currentstyle is None: # Added by Kovid
return
# Added by Kovid
names = {x[1]:x for x in attrs.iterkeys()}
ignore_keys = set()
if ('margin' in names and 'margin-top' in names and 'margin-left' in
names and 'margin-right' in names and 'margin-bottom' in
names):
# These come from XML and we cannot preserve XML attribute order so
# we assume that margin is to be overriden
# See https://bugs.launchpad.net/calibre/+bug/941134
ignore_keys.add(names['margin'])
for key,attr in attrs.items():
self.styledict[self.currentstyle][key] = attr
if key not in ignore_keys:
self.styledict[self.currentstyle][key] = attr
familymap = {'frame':'frame', 'paragraph':'p', 'presentation':'presentation',