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

[David Tardon]

 src/lib/VSDMetaData.cpp |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit bff49703c8dbb7bbae77537a0e783ca27755dc66
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jul 25 09:15:22 2015 +0200

    C++11 syntax is not allowed
    
    Change-Id: Id42b64c2ce7016874c6d55ab92f120c0d4d0e5e6

diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index 08e38fe..32d8fcb 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -140,7 +140,7 @@ uint32_t libvisio::VSDMetaData::getCodePage()
 {
   for (size_t i = 0; i < m_idsAndOffsets.size(); ++i)
   {
-    if (m_idsAndOffsets[i].first == PIDSI::CODEPAGE_PROPERTY_IDENTIFIER)
+    if (m_idsAndOffsets[i].first == CODEPAGE_PROPERTY_IDENTIFIER)
     {
       if (i >= m_typedPropertyValues.size())
         break;
@@ -188,23 +188,23 @@ void libvisio::VSDMetaData::readTypedPropertyValue(librevenge::RVNGInputStream *
       {
         switch (m_idsAndOffsets[index].first)
         {
-        case PIDSI::PIDSI_TITLE:
+        case PIDSI_TITLE:
           m_metaData.insert("dc:title", string);
           break;
-        case PIDSI::PIDSI_SUBJECT:
+        case PIDSI_SUBJECT:
           m_metaData.insert("dc:subject", string);
           break;
-        case PIDSI::PIDSI_AUTHOR:
+        case PIDSI_AUTHOR:
           m_metaData.insert("meta:initial-creator", string);
           m_metaData.insert("dc:creator", string);
           break;
-        case PIDSI::PIDSI_KEYWORDS:
+        case PIDSI_KEYWORDS:
           m_metaData.insert("meta:keyword", string);
           break;
-        case PIDSI::PIDSI_COMMENTS:
+        case PIDSI_COMMENTS:
           m_metaData.insert("dc:description", string);
           break;
-        case PIDSI::PIDSI_TEMPLATE:
+        case PIDSI_TEMPLATE:
           std::string templateHref(string.cstr());
           size_t found = templateHref.find_last_of("/\\");
           if (found != std::string::npos)
commit c8aa2de59a473d95374a7a1beac2aff8ee5c371e
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jul 25 09:12:40 2015 +0200

    add missing include
    
    Change-Id: Ibd003515271ad6211189e12b85eeddd980319770

diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index e8d4919..08e38fe 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -9,6 +9,7 @@
 
 #include "VSDMetaData.h"
 #include <cmath>
+#include <cstdio>
 #include <cstring>
 #include <string>
 #include <unicode/ucnv.h>