From 54d2effa5ae38e16d3f990b4374a2c2f21904573 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 15 Apr 2015 10:32:32 +0530 Subject: [PATCH] ... --- src/calibre/ebooks/docx/writer/styles.py | 2 +- src/calibre/ebooks/docx/writer/tables.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/docx/writer/styles.py b/src/calibre/ebooks/docx/writer/styles.py index cc98ca5861..e52fe1ba05 100644 --- a/src/calibre/ebooks/docx/writer/styles.py +++ b/src/calibre/ebooks/docx/writer/styles.py @@ -384,7 +384,7 @@ class BlockStyle(DOCXStyle): if (self is normal_style and self.page_break_before) or self.page_break_before != normal_style.page_break_before: style.append(makeelement(style, 'pageBreakBefore', val=bmap(self.page_break_before))) if (self is normal_style and self.keep_lines) or self.keep_lines != normal_style.keep_lines: - style.append(makeelement(style, 'keepLines', bmap(self.keep_lines))) + style.append(makeelement(style, 'keepLines', val=bmap(self.keep_lines))) if self is not normal_style and self.next_style is not None: style.append(makeelement(style, 'next', val=self.next_style)) diff --git a/src/calibre/ebooks/docx/writer/tables.py b/src/calibre/ebooks/docx/writer/tables.py index 75d970e2c3..544a79e2ab 100644 --- a/src/calibre/ebooks/docx/writer/tables.py +++ b/src/calibre/ebooks/docx/writer/tables.py @@ -111,7 +111,7 @@ class Cell(object): b = makeelement(tcPr, 'w:tcBorders', append=False) for edge, border in self.borders.iteritems(): - if border.width > 0 and border.style != 'none': + if border is not None and border.width > 0 and border.style != 'none': makeelement(b, 'w:' + edge, w_val=border.style, w_sz=str(border.width), w_color=border.color) if len(b) > 0: tcPr.append(b)