diff options
| author | ALONSO Laurent <laurent.alonso@inria.fr> | 2019-04-04 13:04:31 +0200 |
|---|---|---|
| committer | ALONSO Laurent <laurent.alonso@inria.fr> | 2019-04-04 13:04:31 +0200 |
| commit | 5c6ac8940546c18878ccff1ab26bc89b921ea4a3 (patch) | |
| tree | dd7001ca8d8d7144b24d480b67c6c3d6840a1e67 | |
| parent | 921877e614d03820fbd51d7a6c5689cde72304c9 (diff) | |
key[.xml]: do not add uneeded empty lines + astyle
Change-Id: I5a705c2ca1825e941ca017b5733a9139fb65cff1
| -rw-r--r-- | src/lib/IWAParser.cpp | 4 | ||||
| -rw-r--r-- | src/lib/IWORKText.cpp | 1 | ||||
| -rw-r--r-- | src/lib/KEY2ParserState.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp index b275a0c..c471301 100644 --- a/src/lib/IWAParser.cpp +++ b/src/lib/IWAParser.cpp @@ -395,7 +395,8 @@ void IWAParser::readStroke(const IWAMessage &msg, IWORKStroke &stroke) stroke.m_pattern.m_type = IWORK_STROKE_TYPE_SOLID; if (msg.message(6).uint32(1)) { - switch(get(msg.message(6).uint32(1))) { + switch (get(msg.message(6).uint32(1))) + { default : ETONYEK_DEBUG_MSG(("IWAParser::readStroke: unknown stroke value: %u", get(msg.message(6).uint32(1)))); ETONYEK_FALLTHROUGH; @@ -417,6 +418,7 @@ void IWAParser::readStroke(const IWAMessage &msg, IWORKStroke &stroke) for (auto it = elements.begin(); it != elements.end() && remaining != 0; ++it) stroke.m_pattern.m_values.push_back(*it); } + // todo: check also if there is a picture frame msg.message(8), if yes, use it as border } bool IWAParser::readFill(const IWAMessage &msg, IWORKFill &fill) diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp index d4129aa..140bded 100644 --- a/src/lib/IWORKText.cpp +++ b/src/lib/IWORKText.cpp @@ -696,7 +696,6 @@ void IWORKText::flushParagraph() closeSpan(); if (m_inPara) closePara(); - m_ignoreEmptyPara = false; } void IWORKText::setSpanStyle(const IWORKStylePtr_t &style) diff --git a/src/lib/KEY2ParserState.cpp b/src/lib/KEY2ParserState.cpp index 37826d2..85c1dc9 100644 --- a/src/lib/KEY2ParserState.cpp +++ b/src/lib/KEY2ParserState.cpp @@ -84,13 +84,13 @@ void KEY2ParserState::openHeadline(int depth) if (depth==0) { if (!m_titleText) - m_titleText=m_collector.createText(m_langManager, false); + m_titleText=m_collector.createText(m_langManager, true); m_currentText=m_titleText; } else { if (!m_bodyText) - m_bodyText=m_collector.createText(m_langManager, false); + m_bodyText=m_collector.createText(m_langManager, true); m_currentText=m_bodyText; } } |