From 25b918a931131f392ec337c79b318d6ca2420355 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 14 May 2015 18:31:24 +0530 Subject: [PATCH] ... --- src/calibre/ebooks/docx/writer/styles.py | 7 +++++-- src/calibre/ebooks/docx/writer/tables.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/docx/writer/styles.py b/src/calibre/ebooks/docx/writer/styles.py index 6a29b21403..e6c4f302d8 100644 --- a/src/calibre/ebooks/docx/writer/styles.py +++ b/src/calibre/ebooks/docx/writer/styles.py @@ -405,8 +405,11 @@ class BlockStyle(DOCXStyle): except (TypeError, ValueError): self.line_height = max(0, int(1.2 * css.fontSize * 20)) self.background_color = None if is_table_cell else convert_color(css['background-color']) - self.text_align = {'start':'left', 'left':'left', 'end':'right', 'right':'right', 'center':'center', 'justify':'both', 'centre':'center'}.get( - css['text-align'].lower(), 'left') + try: + self.text_align = {'start':'left', 'left':'left', 'end':'right', 'right':'right', 'center':'center', 'justify':'both', 'centre':'center'}.get( + css['text-align'].lower(), 'left') + except AttributeError: + self.text_align = 'left' DOCXStyle.__init__(self, namespace) diff --git a/src/calibre/ebooks/docx/writer/tables.py b/src/calibre/ebooks/docx/writer/tables.py index 9fb9389763..f2e40193e0 100644 --- a/src/calibre/ebooks/docx/writer/tables.py +++ b/src/calibre/ebooks/docx/writer/tables.py @@ -301,8 +301,8 @@ class Table(object): except Exception: tcell = None if tcell is None: - nrow.extend([SpannedCell(nrow[-1], horizontal=True) for i in xrange(idx - len(nrow))]) - nrow.append(sc) + nrow.cells.extend([SpannedCell(nrow.cells[-1], horizontal=True) for i in xrange(idx - len(nrow.cells))]) + nrow.cells.append(sc) else: if isinstance(tcell, SpannedCell): # Conflict between rowspan and colspan