Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2015-04-15 10:32:32 +05:30
parent 1dacfc5709
commit 54d2effa5a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/docx/writer/styles.py
View File

@ -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: 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))) 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: 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: if self is not normal_style and self.next_style is not None:
style.append(makeelement(style, 'next', val=self.next_style)) style.append(makeelement(style, 'next', val=self.next_style))

2
src/calibre/ebooks/docx/writer/tables.py
View File

@ -111,7 +111,7 @@ class Cell(object):
b = makeelement(tcPr, 'w:tcBorders', append=False) b = makeelement(tcPr, 'w:tcBorders', append=False)
for edge, border in self.borders.iteritems(): 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) makeelement(b, 'w:' + edge, w_val=border.style, w_sz=str(border.width), w_color=border.color)
if len(b) > 0: if len(b) > 0:
tcPr.append(b) tcPr.append(b)