summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2015-12-16 10:31:08 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2015-12-16 10:31:08 +0100
commit577575d95a81777156639c8831cffcd20c335c8e (patch)
tree28fb8407aa8da0fe643d6143ef435d690095779d
parentecd9ebd303cda2dd4ca9fac85823d69e2f24e93b (diff)
Add some variables to VSDXMLParserBase
Change-Id: Iaeb3444d0fb9cc256744f8df6ac725b06ceffeec
-rw-r--r--src/lib/VSDXMLParserBase.cpp5
-rw-r--r--src/lib/VSDXMLParserBase.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index 89e09d4..f95ac87 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -31,7 +31,8 @@ libvisio::VSDXMLParserBase::VSDXMLParserBase()
m_currentShapeLevel(0), m_colours(), m_fieldList(), m_shapeList(),
m_currentBinaryData(), m_shapeStack(), m_shapeLevelStack(),
m_isShapeStarted(false), m_isPageStarted(false), m_currentGeometryList(0),
- m_currentGeometryListIndex(MINUS_ONE), m_fonts(), m_watcher(0)
+ m_currentGeometryListIndex(MINUS_ONE), m_fonts(), m_currentTabSet(0),
+ m_watcher(0)
{
initColours();
}
@@ -973,7 +974,9 @@ void libvisio::VSDXMLParserBase::readShape(xmlTextReaderPtr reader)
m_shape.m_geometries = tmpShape->m_geometries;
m_shape.m_charList = tmpShape->m_charList;
m_shape.m_paraList = tmpShape->m_paraList;
+ m_shape.m_tabSets = tmpShape->m_tabSets;
m_shape.m_text = tmpShape->m_text;
+ m_shape.m_textFormat = tmpShape->m_textFormat;
m_shape.m_misc = tmpShape->m_misc;
}
}
diff --git a/src/lib/VSDXMLParserBase.h b/src/lib/VSDXMLParserBase.h
index 6116584..2ee13ec 100644
--- a/src/lib/VSDXMLParserBase.h
+++ b/src/lib/VSDXMLParserBase.h
@@ -60,6 +60,8 @@ protected:
std::map<unsigned, VSDName> m_fonts;
+ std::map<unsigned, VSDTabStop> *m_currentTabSet;
+
XMLErrorWatcher *m_watcher;
// Helper functions