[Libreoffice-commits] libcdr.git: src/lib

[Dave McKellar]

 src/lib/CDRParser.cpp |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

New commits:
commit a727df96747c093a00bd7562353fa9d9488a9313
Author: Dave McKellar <dmckellar at gmail.com>
Date:   Thu Aug 29 10:19:12 2013 -0400

    Made my udta change only apply to Corel Draw X4

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 49c6ddd..9308ff3 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -3285,17 +3285,20 @@ void libcdr::CDRParser::readTxsm5(WPXInputStream *input)
 void libcdr::CDRParser::readUdta(WPXInputStream *input)
 {
   CDR_DEBUG_MSG(("libcdr::CDRParser::readUdta\n"));
-  input->seek(6, WPX_SEEK_CUR); // Not sure what these 6 bytes are for.  Font id?
-  std::vector<unsigned char> name;
-  unsigned short c;
-  for (;;)
+  if (m_version == 1400)
   {
-    if ((c = readU16(input)) == 0) break;
-    name.push_back((unsigned char)(c & 0xff));
-    name.push_back((unsigned char)(c >> 8));
+    input->seek(6, WPX_SEEK_CUR); // Not sure what these bytes are for.  Field id?
+    std::vector<unsigned char> name;
+    unsigned short c;
+    for (;;)
+    {
+      if ((c = readU16(input)) == 0) break;
+      name.push_back((unsigned char)(c & 0xff));
+      name.push_back((unsigned char)(c >> 8));
+    }
+    WPXString fieldName;
+    appendCharacters(fieldName, name);
   }
-  WPXString fieldName;
-  appendCharacters(fieldName, name);
 }
 
 void libcdr::CDRParser::readStyd(WPXInputStream *input)