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

[Libreoffice Gerrit user]

 src/lib/VSD5Parser.cpp          |    2 +-
 src/lib/VSD6Parser.cpp          |   10 +++++-----
 src/lib/VSDContentCollector.cpp |    4 ++--
 src/lib/VSDParser.cpp           |   10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 187e3c83fe021267b913068432d1387ea140944a
Author:     Bartosz Kosiorek <gang65 at poczta.onet.pl>
AuthorDate: Mon Jul 8 22:06:47 2019 +0200
Commit:     Bartosz Kosiorek <gang65 at poczta.onet.pl>
CommitDate: Tue Jul 9 21:44:44 2019 +0200

    Replace magic numbers with defines
    
    Change-Id: I76211f335341c4ebc40c38766dc04969d3b420df
    Reviewed-on: https://gerrit.libreoffice.org/75245
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>
    Tested-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index cfc0d94..f16160e 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -464,7 +464,7 @@ void libvisio::VSD5Parser::readTextField(librevenge::RVNGInputStream *input)
   else
   {
     double numericValue = readDouble(input);
-    m_shape.m_fields.addNumericField(m_header.id, m_header.level, 0xffff, numericValue, 0xffff);
+    m_shape.m_fields.addNumericField(m_header.id, m_header.level, VSD_FIELD_FORMAT_Unknown, numericValue, 0xffff);
   }
 }
 
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index a41016b..d2dd941 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -336,8 +336,8 @@ void libvisio::VSD6Parser::readTextField(librevenge::RVNGInputStream *input)
 {
   unsigned long initialPosition = input->tell();
   input->seek(7, librevenge::RVNG_SEEK_CUR);
-  unsigned char tmpCode = readU8(input);
-  if (tmpCode == 0xe8)
+  unsigned char unit = readU8(input);
+  if (unit == 0xe8)
   {
     int nameId = readS32(input);
     input->seek(6, librevenge::RVNG_SEEK_CUR);
@@ -391,10 +391,10 @@ void libvisio::VSD6Parser::readTextField(librevenge::RVNGInputStream *input)
 
     if (blockIdx != 2)
     {
-      if (tmpCode == 0x28)
-        formatNumber = 200;
+      if (unit == 0x28)
+        formatNumber = VSD_FIELD_FORMAT_MsoDateShort;
       else
-        formatNumber = 0xffff;
+        formatNumber = VSD_FIELD_FORMAT_Unknown;
     }
 
     m_shape.m_fields.addNumericField(m_header.id, m_header.level, formatNumber, numericValue, formatStringId);
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 27b7195..e15b4d9 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -3446,13 +3446,13 @@ void libvisio::VSDContentCollector::collectNumericField(unsigned id, unsigned le
     if (element)
     {
       element->setValue(number);
-      if (format == 0xffff)
+      if (format == VSD_FIELD_FORMAT_Unknown)
       {
         std::map<unsigned, librevenge::RVNGString>::const_iterator iter = m_names.find(formatStringId);
         if (iter != m_names.end())
           parseFormatId(iter->second.cstr(), format);
       }
-      if (format != 0xffff)
+      if (format != VSD_FIELD_FORMAT_Unknown)
         element->setFormat(format);
 
       m_fields.push_back(element->getString(m_names));
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 71b56ce..cc0bb96 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -2172,8 +2172,8 @@ void libvisio::VSDParser::readTextField(librevenge::RVNGInputStream *input)
 {
   unsigned long initialPosition = input->tell();
   input->seek(7, librevenge::RVNG_SEEK_CUR);
-  unsigned char tmpCode = readU8(input);
-  if (tmpCode == 0xe8)
+  unsigned char unit = readU8(input);
+  if (unit == 0xe8)
   {
     int nameId = readS32(input);
     input->seek(6, librevenge::RVNG_SEEK_CUR);
@@ -2227,10 +2227,10 @@ void libvisio::VSDParser::readTextField(librevenge::RVNGInputStream *input)
 
     if (blockIdx != 2)
     {
-      if (tmpCode == 0x28)
-        formatNumber = 200;
+      if (unit == 0x28)
+        formatNumber = VSD_FIELD_FORMAT_MsoDateShort;
       else
-        formatNumber = 0xffff;
+        formatNumber = VSD_FIELD_FORMAT_Unknown;
     }
 
     m_shape.m_fields.addNumericField(m_header.id, m_header.level, formatNumber, numericValue, formatStringId);