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

[Miklos Vajna]

 src/lib/VSDMetaData.cpp  |    1 +
 src/lib/VSDXMetaData.cpp |    2 ++
 src/lib/tokens.txt       |    1 +
 src/test/importtest.cpp  |    3 +++
 4 files changed, 7 insertions(+)

New commits:
commit 86ad7206b1d617817ac8699db740b613f3ed19a2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 30 22:18:33 2014 +0100

    VSD: Visio doesn't write separate author and last modifier fields
    
    So author always equals to the last modifier. This is consistent with
    how the single timestamp is imported both as a creation and modification
    time, too.
    
    Change-Id: I65233316f412166dfd82c720c830cf625e1275b5

diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index 0288392..d1db01e 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -129,6 +129,7 @@ void libvisio::VSDMetaData::readTypedPropertyValue(librevenge::RVNGInputStream *
         break;
       case PIDSI_AUTHOR:
         m_metaData.insert("meta:initial-creator", string);
+        m_metaData.insert("dc:creator", string);
         break;
       case PIDSI_KEYWORDS:
         m_metaData.insert("meta:keyword", string);
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index a69bcef..85a7175 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -158,6 +158,8 @@ void ImportTest::testVsdMetadataTitleMs1252()
 
   assertXPath(m_doc, "/document/setDocumentMetaData", "subject", "mysubject");
   assertXPath(m_doc, "/document/setDocumentMetaData", "initial-creator", "vmiklos creator");
+  // There is only one author/last-modifier field in the file, so make sure creator is the same as initial-creator.
+  assertXPath(m_doc, "/document/setDocumentMetaData", "creator", "vmiklos creator");
   assertXPath(m_doc, "/document/setDocumentMetaData", "keyword", "mytag");
   assertXPath(m_doc, "/document/setDocumentMetaData", "description", "mycomment");
 }
commit 9cbe861b8f5e53a0aa83b863b1bf42224139dcfc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 30 22:15:29 2014 +0100

    VSDX: import lastModifiedBy
    
    Change-Id: I5136c53cbca0b3dc1300e49bf82f290d8ff86ed8

diff --git a/src/lib/VSDXMetaData.cpp b/src/lib/VSDXMetaData.cpp
index 7a0ff83..fd38811 100644
--- a/src/lib/VSDXMetaData.cpp
+++ b/src/lib/VSDXMetaData.cpp
@@ -77,6 +77,8 @@ void libvisio::VSDXMetaData::readCoreProperties(xmlTextReaderPtr reader)
       m_metaData.insert("meta:keyword", readString(reader, XML_CP_KEYWORDS));
     case XML_DC_DESCRIPTION:
       m_metaData.insert("dc:description", readString(reader, XML_DC_DESCRIPTION));
+    case XML_CP_LASTMODIFIEDBY:
+      m_metaData.insert("dc:creator", readString(reader, XML_CP_LASTMODIFIEDBY));
     default:
       break;
     }
diff --git a/src/lib/tokens.txt b/src/lib/tokens.txt
index 617fb1a..2d0022b 100644
--- a/src/lib/tokens.txt
+++ b/src/lib/tokens.txt
@@ -234,3 +234,4 @@ dc:title
 dcterms:created
 dcterms:modified
 dc:description
+cp:lastModifiedBy
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index bb3388e..a69bcef 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -147,6 +147,7 @@ void ImportTest::testVsdxMetadataTitle()
   assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-24T10:41:22Z");
   assertXPath(m_doc, "/document/setDocumentMetaData", "keyword", "mytag");
   assertXPath(m_doc, "/document/setDocumentMetaData", "description", "mycomment");
+  assertXPath(m_doc, "/document/setDocumentMetaData", "creator", "vmiklos modifier");
 }
 
 void ImportTest::testVsdMetadataTitleMs1252()