From 3247394f9244212aadff733692e2c9ba76fc30e5 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Thu, 1 Nov 2012 03:05:09 +0100
Subject: implement icon set import/export from odf

Change-Id: I7fb265194811ef8ba0b7aed04d4bd28181612ebc
---
 xmloff/inc/xmloff/xmltoken.hxx  | 3 +++
 xmloff/source/core/xmltoken.cxx | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'xmloff')

diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 4ade92824a5f..f97d1e305bdc 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -852,6 +852,7 @@ namespace xmloff { namespace token {
         XML_FOREIGN_OBJECT,
         XML_FORMAT_CHANGE,
         XML_FORMAT_SOURCE,
+        XML_FORMATTING_ENTRY,
         XML_FORMS,
         XML_FORMULA,
         XML_FORMULA_HIDDEN,
@@ -971,6 +972,8 @@ namespace xmloff { namespace token {
         XML_HYPHENATION_REMAIN_CHAR_COUNT,
         XML_I,
         XML_ICON,
+        XML_ICON_SET,
+        XML_ICON_SET_TYPE,
         XML_ID,
         XML_IDENT,
         XML_IDENTIFIER,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index cbbd48b21b0c..be8d9ce742a2 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -856,6 +856,7 @@ namespace xmloff { namespace token {
         TOKEN( "foreign-object",                  XML_FOREIGN_OBJECT ),
         TOKEN( "format-change",                   XML_FORMAT_CHANGE ),
         TOKEN( "format-source",                   XML_FORMAT_SOURCE ),
+        TOKEN( "formatting-entry",                XML_FORMATTING_ENTRY ),
         TOKEN( "forms",                           XML_FORMS ),
         TOKEN( "formula",                         XML_FORMULA ),
         TOKEN( "formula-hidden",                  XML_FORMULA_HIDDEN ),
@@ -976,6 +977,8 @@ namespace xmloff { namespace token {
         TOKEN( "hyphenation-remain-char-count",       XML_HYPHENATION_REMAIN_CHAR_COUNT ),
         TOKEN( "i",                               XML_I ),
         TOKEN( "icon",                            XML_ICON ),
+        TOKEN( "icon-set",                        XML_ICON_SET ),
+        TOKEN( "icon-set-type",                   XML_ICON_SET_TYPE ),
         TOKEN( "id",                              XML_ID ),
         TOKEN( "ident",                           XML_IDENT ),
         TOKEN( "identifier",                      XML_IDENTIFIER ),
-- 
cgit