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

[Miklos Vajna]

 src/lib/VSDMetaData.cpp           |    4 ++++
 src/test/data/fdo86729-ms1252.vsd |binary
 src/test/importtest.cpp           |    2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 29dfeb9aee67f287a2c58c52084dca755e401df2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 23 18:41:28 2014 +0100

    VSD: import subject
    
    Change-Id: I6b28cf0570ead1c7acf8b6b8354f23945ca0fdd0

diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index 616bdcc..ffac751 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -94,6 +94,7 @@ void libvisio::VSDMetaData::readPropertyIdentifierAndOffset(librevenge::RVNGInpu
 #define VT_LPSTR 0x001E
 
 #define PIDSI_TITLE 0x00000002
+#define PIDSI_SUBJECT 0x00000003
 
 void libvisio::VSDMetaData::readTypedPropertyValue(librevenge::RVNGInputStream *input, uint32_t index, uint32_t offset)
 {
@@ -120,6 +121,9 @@ void libvisio::VSDMetaData::readTypedPropertyValue(librevenge::RVNGInputStream *
       case PIDSI_TITLE:
         m_metaData.insert("dc:title", string);
         break;
+      case PIDSI_SUBJECT:
+        m_metaData.insert("dc:subject", string);
+        break;
       }
     }
   }
diff --git a/src/test/data/fdo86729-ms1252.vsd b/src/test/data/fdo86729-ms1252.vsd
index d459406..e5fb12e 100644
Binary files a/src/test/data/fdo86729-ms1252.vsd and b/src/test/data/fdo86729-ms1252.vsd differ
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index 00ee34e..b98269a 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -151,6 +151,8 @@ void ImportTest::testVsdMetadataTitleMs1252()
   m_doc = parse("fdo86729-ms1252.vsd", m_buffer);
   // Test windows-1252 -> UTF-8 conversion, provided by ICU.
   assertXPath(m_doc, "/document/setDocumentMetaData", "title", "mytitle\xC3\xA9\xC3\xA1");
+
+  assertXPath(m_doc, "/document/setDocumentMetaData", "subject", "mysubject");
 }
 
 void ImportTest::testVsdMetadataTitleUtf8()