include/xmloff/txtimp.hxx | 2 +-
include/xmloff/xmltoken.hxx | 2 +-
xmloff/source/core/xmltoken.cxx | 2 +-
xmloff/source/text/txtflde.cxx | 2 +-
xmloff/source/text/txtfldi.cxx | 2 +-
xmloff/source/text/txtimp.cxx | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e43e830eeeddc4be276a8d4b272d72005efe9432
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Nov 11 13:58:15 2014 +0100
xmloff: XML_DROPDOWN should be XML_DROP_DOWN
Change-Id: I47247289bb4367faa9a07f3568270718b5423353
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 892fd75..592c834 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -216,7 +216,7 @@ enum XMLTextPElemTokens
XML_TOK_TEXT_NAME,
XML_TOK_TEXT_SCRIPT,
XML_TOK_TEXT_TABLE_FORMULA,
- XML_TOK_TEXT_DROPDOWN,
+ XML_TOK_TEXT_DROP_DOWN,
// RDF metadata
XML_TOK_TEXT_META,
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index e03dcfd..45f30f3 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2209,7 +2209,7 @@ namespace xmloff { namespace token {
XML_CLOSE_FRONT,
XML_CLOSE_BACK,
- XML_DROPDOWN,
+ XML_DROP_DOWN,
XML_CURRENT_SELECTED,
XML_JOIN_BORDER,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 6c4c098..7a483ef 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2220,7 +2220,7 @@ namespace xmloff { namespace token {
TOKEN( "close-front", XML_CLOSE_FRONT ),
TOKEN( "close-back", XML_CLOSE_BACK ),
- TOKEN( "drop-down", XML_DROPDOWN ),
+ TOKEN( "drop-down", XML_DROP_DOWN ),
TOKEN( "current-selected", XML_CURRENT_SELECTED ),
TOKEN( "join-border", XML_JOIN_BORDER ),
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 13072a5..36c5516 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1820,7 +1820,7 @@ void XMLTextFieldExport::ExportFieldHelper(
ProcessString(XML_HINT,
GetStringProperty(sPropertyTooltip, rPropSet), true);
SvXMLElementExport aElem( GetExport(),
- XML_NAMESPACE_TEXT, XML_DROPDOWN,
+ XML_NAMESPACE_TEXT, XML_DROP_DOWN,
false, false );
ProcessStringSequence
(GetStringSequenceProperty( sPropertyItems, rPropSet ),
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index fd40768..b456ae6 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -563,7 +563,7 @@ XMLTextFieldImportContext::CreateTextFieldImportContext(
pContext = new XMLTableFormulaImportContext( rImport, rHlp,
nPrefix, rName );
break;
- case XML_TOK_TEXT_DROPDOWN:
+ case XML_TOK_TEXT_DROP_DOWN:
pContext = new XMLDropDownFieldImportContext( rImport, rHlp,
nPrefix, rName );
break;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 8954cb2..5307ce0 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -259,7 +259,7 @@ static const SvXMLTokenMapEntry aTextPElemTokenMap[] =
{ XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, XML_TOK_TEXT_ANNOTATION_END },
{ XML_NAMESPACE_TEXT, XML_SCRIPT, XML_TOK_TEXT_SCRIPT },
{ XML_NAMESPACE_TEXT, XML_TABLE_FORMULA, XML_TOK_TEXT_TABLE_FORMULA },
- { XML_NAMESPACE_TEXT, XML_DROPDOWN, XML_TOK_TEXT_DROPDOWN },
+ { XML_NAMESPACE_TEXT, XML_DROP_DOWN, XML_TOK_TEXT_DROP_DOWN },
// Calc fields
{ XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_TEXT_SHEET_NAME },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
