diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2015-12-18 18:10:44 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2015-12-18 18:10:44 +0100 |
commit | 3c23f01aa8947f7fc43db98f8b2987b1e1b87637 (patch) | |
tree | 6e39e8b2a228504214423b94fabeb1b8b4767d5a | |
parent | 0766a97602f3dd8e68b47fd838d3897f20dc58da (diff) |
Disable bullets for vsd5 for the while
Change-Id: Iac61f5d477b2d732785b6bfbb4b8a9a152f7b281
-rw-r--r-- | src/lib/VSD5Parser.cpp | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp index 1c116f6..58d62b3 100644 --- a/src/lib/VSD5Parser.cpp +++ b/src/lib/VSD5Parser.cpp @@ -220,7 +220,7 @@ void libvisio::VSD5Parser::readLine(librevenge::RVNGInputStream *input) void libvisio::VSD5Parser::readParaIX(librevenge::RVNGInputStream *input) { - long startPosition = input->tell(); + // long startPosition = input->tell(); unsigned charCount = readU16(input); input->seek(1, librevenge::RVNG_SEEK_CUR); double indFirst = readDouble(input); @@ -235,37 +235,39 @@ void libvisio::VSD5Parser::readParaIX(librevenge::RVNGInputStream *input) input->seek(1, librevenge::RVNG_SEEK_CUR); double spAfter = readDouble(input); unsigned char align = readU8(input); - unsigned char bullet = readU8(input); + unsigned char bullet = 0; + readU8(input); input->seek(1, librevenge::RVNG_SEEK_CUR); - long remainingData = m_header.dataLength - input->tell() + startPosition; - unsigned blockLength = 0; VSDName bulletStr; + /* + long remainingData = m_header.dataLength - input->tell() + startPosition; + unsigned blockLength = 0; - while (remainingData >= 2 && (blockLength = readU16(input))) - { - long blockEnd = blockLength-2 + input->tell(); - unsigned char blockType = readU8(input); - unsigned char blockIdx = readU8(input); - if (blockType == 2 && blockIdx == 8) + while (remainingData >= 2 && (blockLength = readU16(input))) { - input->seek(1, librevenge::RVNG_SEEK_CUR); - unsigned long numBytes = readU8(input); - unsigned long numBytesRead = 0; - const unsigned char *tmpBuffer = input->read(numBytes, numBytesRead); - if (tmpBuffer && numBytesRead) + long blockEnd = blockLength-2 + input->tell(); + unsigned char blockType = readU8(input); + unsigned char blockIdx = readU8(input); + if (blockType == 2 && blockIdx == 8) { - librevenge::RVNGBinaryData tmpBulletString(tmpBuffer, numBytesRead); - bulletStr = VSDName(tmpBulletString, libvisio::VSD_TEXT_ANSI); + input->seek(1, librevenge::RVNG_SEEK_CUR); + unsigned long numBytes = readU8(input); + unsigned long numBytesRead = 0; + const unsigned char *tmpBuffer = input->read(numBytes, numBytesRead); + if (tmpBuffer && numBytesRead) + { + librevenge::RVNGBinaryData tmpBulletString(tmpBuffer, numBytesRead); + bulletStr = VSDName(tmpBulletString, libvisio::VSD_TEXT_ANSI); + } } + else if (blockType == 2 && blockIdx == 3) + { + }; + input->seek(blockEnd, librevenge::RVNG_SEEK_SET); + remainingData -= blockLength; } - else if (blockType == 2 && blockIdx == 3) - { - }; - input->seek(blockEnd, librevenge::RVNG_SEEK_SET); - remainingData -= blockLength; - } - + */ if (m_isInStyles) m_collector->collectParaIXStyle(m_header.id, m_header.level, charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter, align, bullet, bulletStr, 0.0, 0); |