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

[David Tardon]

 src/lib/VSDXMetaData.cpp |    3 ---
 src/lib/tokens.txt       |    1 -
 src/test/importtest.cpp  |    1 -
 3 files changed, 5 deletions(-)

New commits:
commit bec680b235f06b439340fbc25b20b2f5a131300f
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jan 1 09:30:56 2015 +0100

    Revert "VSDX: import <cp:category>"
    
    We do not want "multi-level" property names.
    
    This reverts commit 5753f7e98d02bde80d9e712d298372933c4a28e6.

diff --git a/src/lib/VSDXMetaData.cpp b/src/lib/VSDXMetaData.cpp
index b7e485d..8516690 100644
--- a/src/lib/VSDXMetaData.cpp
+++ b/src/lib/VSDXMetaData.cpp
@@ -82,9 +82,6 @@ void libvisio::VSDXMetaData::readCoreProperties(xmlTextReaderPtr reader)
     case XML_CP_LASTMODIFIEDBY:
       m_metaData.insert("dc:creator", readString(reader, XML_CP_LASTMODIFIEDBY));
       break;
-    case XML_CP_CATEGORY:
-      m_metaData.insert("meta:user-defined:category", readString(reader, XML_CP_CATEGORY));
-      break;
     default:
       break;
     }
diff --git a/src/lib/tokens.txt b/src/lib/tokens.txt
index 6b01690..2d0022b 100644
--- a/src/lib/tokens.txt
+++ b/src/lib/tokens.txt
@@ -235,4 +235,3 @@ dcterms:created
 dcterms:modified
 dc:description
 cp:lastModifiedBy
-cp:category
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index 3e20d7a..ad3722b 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -174,7 +174,6 @@ void ImportTest::testVsdxMetadataTitle()
   assertXPath(m_doc, "/document/setDocumentMetaData", "keyword", "mytag");
   assertXPath(m_doc, "/document/setDocumentMetaData", "description", "mycomment");
   assertXPath(m_doc, "/document/setDocumentMetaData", "creator", "vmiklos modifier");
-  assertXPathContent(m_doc, "/document/setDocumentMetaData/user-defined[@name='category']", "mycategory");
 }
 
 void ImportTest::testVsdMetadataTitleMs1252()