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

[Fridrich Štrba]

 src/lib/VSDParser.cpp  |    5 -----
 src/lib/VSDXParser.cpp |   15 +++++----------
 2 files changed, 5 insertions(+), 15 deletions(-)

New commits:
commit 68cee16b2d7f8e5d9f9c4699822542664bbf492f
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Tue Dec 15 18:21:06 2015 +0100

    Free and return in one place
    
    Change-Id: Ib0a38c4f9103b25f174a7b34830bff307fa6c9be

diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 1460f88..b8ef91b 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -581,30 +581,25 @@ int libvisio::VSDXParser::getElementToken(xmlTextReaderPtr reader)
         else if (!strncmp((char *)stringValue, "Alignment", 9))
           tokenId = XML_ALIGNMENT;
       }
-      xmlFree(stringValue);
     }
-    return tokenId;
+    break;
   case XML_ROW:
     stringValue = xmlTextReaderGetAttribute(reader, BAD_CAST("N"));
     if (!stringValue)
       stringValue = xmlTextReaderGetAttribute(reader, BAD_CAST("T"));
     if (stringValue)
-    {
       tokenId = VSDXMLTokenMap::getTokenId(stringValue);
-      xmlFree(stringValue);
-    }
-    return tokenId;
+    break;
   case XML_SECTION:
     stringValue = xmlTextReaderGetAttribute(reader, BAD_CAST("N"));
     if (stringValue)
-    {
       tokenId = VSDXMLTokenMap::getTokenId(stringValue);
-      xmlFree(stringValue);
-    }
-    return tokenId;
+    break;
   default:
     break;
   }
+  if (stringValue)
+    xmlFree(stringValue);
   return tokenId;
 }
 
commit 88e98e505666d953aa2ccee1633107226bf98e07
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Tue Dec 15 18:20:30 2015 +0100

    Let me decrease and Him increase
    
    Change-Id: Id92728267eb383d70e77204273f6458fae5277cc

diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index 019b27a..c332963 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -979,13 +979,8 @@ void libvisio::VSDParser::readTabsDataList(librevenge::RVNGInputStream *input)
     input->seek(subHeaderLength, librevenge::RVNG_SEEK_CUR);
     std::vector<unsigned> tabsOrder;
     tabsOrder.reserve(childrenListLength / sizeof(uint32_t));
-    printf("Fridrich");
     for (unsigned i = 0; i < (childrenListLength / sizeof(uint32_t)); i++)
-    {
       tabsOrder.push_back(readU32(input));
-      printf(" %i", tabsOrder.back());
-    }
-    printf("\n");
   }
 }