4 files changed, 12 insertions, 20 deletions
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index 3c610ff..4b60754 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -32,6 +32,7 @@
 #include <locale.h>
 #include <sstream>
 #include <string>
+#include <stack>
 #include "libvisio_utils.h"
 #include "VSD5Parser.h"
 #include "VSDInternalStream.h"
@@ -113,22 +114,4 @@ bool libvisio::VSD5Parser::getChunkHeader(WPXInputStream *input)
   return true;
 }
 
-void libvisio::VSD5Parser::handleChunks(WPXInputStream *input, unsigned level)
-{
-  long endPos = 0;
-
-  while (!input->atEOS())
-  {
-    getChunkHeader(input);
-    m_header.level += level;
-    endPos = m_header.dataLength+m_header.trailer+input->tell();
-
-    _handleLevelChange(m_header.level);
-    VSD_DEBUG_MSG(("VSD5Parser::handleChunks - parsing chunk type 0x%x\n", m_header.chunkType));
-    handleChunk(input);
-    input->seek(endPos, WPX_SEEK_SET);
-  }
-}
-
-
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h
index 187f7eb..972ebfa 100644
--- a/src/lib/VSD5Parser.h
+++ b/src/lib/VSD5Parser.h
@@ -51,7 +51,6 @@ protected:
   virtual void readPointer(WPXInputStream *input, Pointer &ptr);
   virtual bool getChunkHeader(WPXInputStream *input);
   virtual void readPointerInfo(WPXInputStream *input, unsigned ptrType, unsigned shift, unsigned &listSize, unsigned &pointerCount);
-  virtual void handleChunks(WPXInputStream *input, unsigned level);
 
   virtual void readGeomList(WPXInputStream * /* input */) {}
   virtual void readCharList(WPXInputStream * /* input */) {}
diff --git a/src/lib/VSDDocumentStructure.h b/src/lib/VSDDocumentStructure.h
index 77eba00..ee9296f 100644
--- a/src/lib/VSDDocumentStructure.h
+++ b/src/lib/VSDDocumentStructure.h
@@ -58,12 +58,23 @@
 
 #define VSD_STYLE_SHEET 0x4a
 
+#define VSD_SCRATCH_LIST 0x64
 #define VSD_SHAPE_LIST 0x65
 #define VSD_FIELD_LIST 0x66
 #define VSD_PROP_LIST 0x68
 #define VSD_CHAR_LIST 0x69
 #define VSD_PARA_LIST 0x6a
+#define VSD_TABS_DATA_LIST 0x6b
 #define VSD_GEOM_LIST 0x6c
+#define VSD_CUST_PROPS_LIST 0x6d
+#define VSD_ACT_ID_LIST 0x6e
+#define VSD_LAYER_LIST 0x6f
+#define VSD_CTRL_LIST 0x70
+#define VSD_C_PNTS_LIST 0x71
+#define VSD_CONNECT_LIST 0x72
+#define VSD_HYPER_LNK_LIST 0x73
+
+#define VSD_SMART_TAG_LIST 0x76
 
 #define VSD_SHAPE_ID 0x83
 #define VSD_EVENT 0x84
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 8470d19..14ea3fb 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -156,7 +156,6 @@ void libvisio::VSDParser::handleStreams(WPXInputStream *input, unsigned ptrType,
         FontFaces[i] = ptr;
       else if (ptr.Type != 0)
         PtrList[i] = ptr;
-      VSD_DEBUG_MSG(("--> Pointer #%u type 0x%x\n", i, ptr.Type));
     }
     for (i = 0; i < listSize && listSize > 1; ++i)
       pointerOrder.push_back(readU32(input));