diff options
| author | Brennan Vincent <brennanv@email.arizona.edu> | 2012-08-14 20:58:49 -0700 |
|---|---|---|
| committer | Brennan Vincent <brennanv@email.arizona.edu> | 2012-08-14 20:58:49 -0700 |
| commit | 83f57ce2247c41e915b5b749ffc0e02e8c9fe982 (patch) | |
| tree | dde497d8a95268c190d3feca43814533b7234fe3 | |
| parent | b01c8df7fd5ed062c246c71e77b960e68cbcc531 (diff) | |
stylize
| -rw-r--r-- | src/lib/MSPUBCollector.cpp | 14 | ||||
| -rw-r--r-- | src/lib/MSPUBParser.cpp | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp index 8c8d28b..27e245c 100644 --- a/src/lib/MSPUBCollector.cpp +++ b/src/lib/MSPUBCollector.cpp @@ -995,7 +995,7 @@ WPXPropertyList libmspub::MSPUBCollector::getParaStyleProps(const ParagraphStyle const ParagraphStyle &defaultStyle = defaultParaStyleIndex.is_initialized() && defaultParaStyleIndex.get() < m_defaultParaStyles.size() ? m_defaultParaStyles[defaultParaStyleIndex.get()] : _nothing; WPXPropertyList ret; Alignment align = style.m_align.get_value_or( - defaultStyle.m_align.get_value_or(LEFT)); + defaultStyle.m_align.get_value_or(LEFT)); switch (align) { case RIGHT: @@ -1013,7 +1013,7 @@ WPXPropertyList libmspub::MSPUBCollector::getParaStyleProps(const ParagraphStyle break; } LineSpacingInfo info = style.m_lineSpacing.get_value_or( - defaultStyle.m_lineSpacing.get_value_or(LineSpacingInfo())); + defaultStyle.m_lineSpacing.get_value_or(LineSpacingInfo())); LineSpacingType lineSpacingType = info.m_type; double lineSpacing = info.m_amount; if (!(lineSpacingType == LINE_SPACING_SP && lineSpacing == 1)) @@ -1028,15 +1028,15 @@ WPXPropertyList libmspub::MSPUBCollector::getParaStyleProps(const ParagraphStyle } } unsigned spaceAfterEmu = style.m_spaceAfterEmu.get_value_or( - defaultStyle.m_spaceAfterEmu.get_value_or(0)); + defaultStyle.m_spaceAfterEmu.get_value_or(0)); unsigned spaceBeforeEmu = style.m_spaceBeforeEmu.get_value_or( - defaultStyle.m_spaceBeforeEmu.get_value_or(0)); + defaultStyle.m_spaceBeforeEmu.get_value_or(0)); unsigned firstLineIndentEmu = style.m_firstLineIndentEmu.get_value_or( - defaultStyle.m_firstLineIndentEmu.get_value_or(0)); + defaultStyle.m_firstLineIndentEmu.get_value_or(0)); unsigned leftIndentEmu = style.m_leftIndentEmu.get_value_or( - defaultStyle.m_leftIndentEmu.get_value_or(0)); + defaultStyle.m_leftIndentEmu.get_value_or(0)); unsigned rightIndentEmu = style.m_rightIndentEmu.get_value_or( - defaultStyle.m_rightIndentEmu.get_value_or(0)); + defaultStyle.m_rightIndentEmu.get_value_or(0)); if (spaceAfterEmu != 0) { ret.insert("fo:margin-bottom", (double)spaceAfterEmu / EMUS_IN_INCH); diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp index b3281cb..49233a7 100644 --- a/src/lib/MSPUBParser.cpp +++ b/src/lib/MSPUBParser.cpp @@ -1110,8 +1110,8 @@ libmspub::ParagraphStyle libmspub::MSPUBParser::getParagraphStyle(WPXInputStream // line spacing expressed in points in the UI, // in eighths of an emu in the file format. // (WTF??) - ret.m_lineSpacing = LineSpacingInfo(LINE_SPACING_PT, - static_cast<double>(info.data - 1) / 8 * 72 / EMUS_IN_INCH); + ret.m_lineSpacing = LineSpacingInfo(LINE_SPACING_PT, + static_cast<double>(info.data - 1) / 8 * 72 / EMUS_IN_INCH); } else if (info.data & 2) { @@ -1119,7 +1119,7 @@ libmspub::ParagraphStyle libmspub::MSPUBParser::getParagraphStyle(WPXInputStream // in what would be EMUs if font size were 96pt in the file format // (WTF??) ret.m_lineSpacing = LineSpacingInfo(LINE_SPACING_SP, - static_cast<double>(info.data - 2) / EMUS_IN_INCH * 72 / 96); + static_cast<double>(info.data - 2) / EMUS_IN_INCH * 72 / 96); } break; case PARAGRAPH_SPACE_BEFORE: @@ -1174,7 +1174,7 @@ libmspub::ParagraphStyle libmspub::MSPUBParser::getParagraphStyle(WPXInputStream else { ret.m_listInfo = ListInfo(numberIfRestarted, numberingType, - numberingDelimiter); + numberingDelimiter); } } |