sc/source/filter/xml/xmlimprt.cxx | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit e05ca3f14119a1e70838603f1a3dedbc9c51f76e
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Apr 26 08:15:35 2013 +0200
Revert "remove a bit of unnecessary whitespace to make lines shorter"
This reverts commit f098f40e0f8ccce4fc8187c4d3eb9c69ea103b1c.
Conflicts:
sc/source/filter/xml/xmlimprt.cxx
Change-Id: I8a70f7503aea0e2968a04ba57a76d690a54d344c
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index c7ec58c..8a3bda1 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -202,22 +202,22 @@ const SvXMLTokenMap&
ScXMLImport::GetTableRowCellAttrTokenMap()
{
static SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME },
- { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME,
XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME },
- { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_ROWS },
- { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_COLS },
- { XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_COLUMNS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_COLS },
- { XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_ROWS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_ROWS },
- { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
XML_TOK_TABLE_ROW_CELL_ATTR_REPEATED },
- { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE,
XML_TOK_TABLE_ROW_CELL_ATTR_VALUE_TYPE },
- { XML_NAMESPACE_CALC_EXT, XML_VALUE_TYPE,
XML_TOK_TABLE_ROW_CELL_ATTR_NEW_VALUE_TYPE },
- { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_TABLE_ROW_CELL_ATTR_VALUE },
- { XML_NAMESPACE_OFFICE, XML_DATE_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_DATE_VALUE },
- { XML_NAMESPACE_OFFICE, XML_TIME_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_TIME_VALUE },
- { XML_NAMESPACE_OFFICE, XML_STRING_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_STRING_VALUE },
- { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_BOOLEAN_VALUE },
- { XML_NAMESPACE_TABLE, XML_FORMULA,
XML_TOK_TABLE_ROW_CELL_ATTR_FORMULA },
- { XML_NAMESPACE_OFFICE, XML_CURRENCY,
XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY },
+ { XML_NAMESPACE_TABLE, XML_STYLE_NAME,
XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME },
+ { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME,
XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_ROWS },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_COLS },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_COLUMNS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_COLS },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_MATRIX_ROWS_SPANNED,
XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_ROWS },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
XML_TOK_TABLE_ROW_CELL_ATTR_REPEATED },
+ { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE,
XML_TOK_TABLE_ROW_CELL_ATTR_VALUE_TYPE },
+ { XML_NAMESPACE_CALC_EXT, XML_VALUE_TYPE,
XML_TOK_TABLE_ROW_CELL_ATTR_NEW_VALUE_TYPE },
+ { XML_NAMESPACE_OFFICE, XML_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_VALUE },
+ { XML_NAMESPACE_OFFICE, XML_DATE_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_DATE_VALUE },
+ { XML_NAMESPACE_OFFICE, XML_TIME_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_TIME_VALUE },
+ { XML_NAMESPACE_OFFICE, XML_STRING_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_STRING_VALUE },
+ { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE,
XML_TOK_TABLE_ROW_CELL_ATTR_BOOLEAN_VALUE },
+ { XML_NAMESPACE_TABLE, XML_FORMULA,
XML_TOK_TABLE_ROW_CELL_ATTR_FORMULA },
+ { XML_NAMESPACE_OFFICE, XML_CURRENCY,
XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY },
XML_TOKEN_MAP_END
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
