src/lib/VSD6Parser.cpp | 4 +++-
src/lib/VSDContentCollector.cpp | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 037e82fcaaacb3b6b68e54f424398e7260d64a62
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Dec 14 03:22:58 2015 +0100
Improved handling of stencil text
Change-Id: I8fdae37eec051998b9e4b88b0a6116167da71eae
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index a9e91fa..d38454e 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -78,8 +78,10 @@ void
libvisio::VSD6Parser::readText(librevenge::RVNGInputStream *input)
}
textStream.append(tmpBuffer, numBytesRead);
m_shape.m_text = textStream;
- m_shape.m_textFormat = libvisio::VSD_TEXT_ANSI;
}
+ else
+ m_shape.m_text.clear();
+ m_shape.m_textFormat = libvisio::VSD_TEXT_ANSI;
}
void libvisio::VSD6Parser::readLayerMem(librevenge::RVNGInputStream *input)
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 0037bd2..79d351f 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -1977,8 +1977,8 @@ void libvisio::VSDContentCollector::collectShape(unsigned
id, unsigned level, un
_handleForeignData(m_stencilShape->m_foreign->data);
}
- m_textStream = m_stencilShape->m_text;
- m_textFormat = m_stencilShape->m_textFormat;
+ // m_textStream = m_stencilShape->m_text;
+ // m_textFormat = m_stencilShape->m_textFormat;
for (std::map< unsigned, VSDName>::const_iterator iterData =
m_stencilShape->m_names.begin(); iterData != m_stencilShape->m_names.end();
++iterData)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
