[Libreoffice-commits] core.git: Branch 'feature/fastparser' - 6 commits - reportdesign/source starmath/Library_sm.mk starmath/source sw/source xmloff/source
Daniel Sikeler
d.sikeler94 at gmail.com
Wed Feb 11 04:18:53 PST 2015
reportdesign/source/filter/xml/xmlfilter.cxx | 262 ++++++++++++++--------
starmath/Library_sm.mk | 5
starmath/source/mathmlimport.cxx | 181 ++++++++++-----
sw/source/filter/xml/xmlbrsh.cxx | 25 +-
sw/source/filter/xml/xmlimp.cxx | 51 +++-
sw/source/filter/xml/xmlimp.hxx | 1
sw/source/filter/xml/xmltbli.cxx | 78 ++++--
sw/source/filter/xml/xmltext.cxx | 49 ++++
xmloff/source/xforms/SchemaContext.cxx | 5
xmloff/source/xforms/SchemaRestrictionContext.cxx | 27 +-
xmloff/source/xforms/SchemaSimpleTypeContext.cxx | 7
xmloff/source/xforms/TokenContext.hxx | 2
xmloff/source/xforms/XFormsBindContext.cxx | 19 -
xmloff/source/xforms/XFormsInstanceContext.cxx | 7
xmloff/source/xforms/XFormsModelContext.cxx | 15 -
xmloff/source/xforms/XFormsSubmissionContext.cxx | 33 +-
xmloff/source/xforms/xformsapi.cxx | 29 +-
17 files changed, 546 insertions(+), 250 deletions(-)
New commits:
commit 62186ef6f581147c9206092afe5ca4f2b26e7a71
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 11 11:09:26 2015 +0100
SvXMLTokenMapEntries in reportdesign
Change-Id: I9922f796593bfca9321561afcb65ca98bb97d806
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 9c1ebf4..56fab21 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include "xmlfilter.hxx"
#include "xmlGroup.hxx"
#include "xmlReport.hxx"
@@ -38,6 +39,7 @@
#include <xmloff/txtimp.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/XMLFontStylesContext.hxx>
+#include <xmloff/token/tokens.hxx>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -80,6 +82,7 @@ using namespace xmloff;
sal_Char const sXML_np___rpt[] = "__report";
using namespace ::com::sun::star::util;
+using css::xml::sax::FastToken::NAMESPACE;
class RptMLMasterStylesContext_Impl:
public XMLTextMasterStylesContext, private boost::noncopyable
@@ -711,14 +714,22 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
- { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
- { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
- { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT },
- { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT },
- { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
- { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES },
- { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META },
+ { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_settings) },
+ { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_styles) },
+ { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_automatic_styles) },
+ { XML_NAMESPACE_OFFICE, XML_REPORT, XML_TOK_DOC_REPORT,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_report) },
+ { XML_NAMESPACE_OOO, XML_REPORT, XML_TOK_DOC_REPORT,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_report) },
+ { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_font_face_decls) },
+ { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_master_styles) },
+ { XML_NAMESPACE_OFFICE, XML_DOCUMENT_META, XML_TOK_DOC_META,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_document_meta) },
XML_TOKEN_MAP_END
};
m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -746,11 +757,16 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME },
- { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA},
- { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED },
- { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA },
- { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING },
+ { XML_NAMESPACE_REPORT, XML_NAME, XML_TOK_FUNCTION_NAME,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_name) },
+ { XML_NAMESPACE_REPORT, XML_FORMULA, XML_TOK_FUNCTION_FORMULA,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_formula) },
+ { XML_NAMESPACE_REPORT, XML_PRE_EVALUATED, XML_TOK_PRE_EVALUATED,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_pre_evaluated) },
+ { XML_NAMESPACE_REPORT, XML_INITIAL_FORMULA,XML_TOK_INITIAL_FORMULA,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_initial_formula) },
+ { XML_NAMESPACE_REPORT, XML_DEEP_TRAVERSING,XML_TOK_DEEP_TRAVERSING,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_deep_traversing) },
XML_TOKEN_MAP_END
};
m_pFunctionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -764,9 +780,12 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED },
- { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA },
- { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME },
+ { XML_NAMESPACE_REPORT, XML_ENABLED , XML_TOK_ENABLED,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_enabled) },
+ { XML_NAMESPACE_REPORT, XML_FORMULA , XML_TOK_FORMULA,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_formula) },
+ { XML_NAMESPACE_REPORT, XML_STYLE_NAME , XML_TOK_FORMAT_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_style_name) },
XML_TOKEN_MAP_END
};
m_pFormatElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -780,19 +799,30 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN },
- { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER },
- { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE },
- { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER },
- { XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION , XML_TOK_SORT_EXPRESSION },
- { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION },
- { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER },
- { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP },
- { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL },
- { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER },
- { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING },
- { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER },
- { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION },
+ { XML_NAMESPACE_REPORT, XML_START_NEW_COLUMN , XML_TOK_START_NEW_COLUMN,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_start_new_column) },
+ { XML_NAMESPACE_REPORT, XML_RESET_PAGE_NUMBER , XML_TOK_RESET_PAGE_NUMBER,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_reset_page_number) },
+ { XML_NAMESPACE_REPORT, XML_PRINT_HEADER_ON_EACH_PAGE , XML_TOK_PRINT_HEADER_ON_EACH_PAGE,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_print_header_on_each_page) },
+ { XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION , XML_TOK_SORT_EXPRESSION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_sort_expression) },
+ { XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION , XML_TOK_GROUP_EXPRESSION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_group_expression) },
+ { XML_NAMESPACE_REPORT, XML_GROUP_HEADER , XML_TOK_GROUP_HEADER,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_group_header) },
+ { XML_NAMESPACE_REPORT, XML_GROUP , XML_TOK_GROUP_GROUP,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_group) },
+ { XML_NAMESPACE_REPORT, XML_DETAIL , XML_TOK_GROUP_DETAIL,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_detail) },
+ { XML_NAMESPACE_REPORT, XML_GROUP_FOOTER , XML_TOK_GROUP_FOOTER,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_group_footer) },
+ { XML_NAMESPACE_REPORT, XML_SORT_ASCENDING , XML_TOK_SORT_ASCENDING,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_sort_ascending) },
+ { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_GROUP_KEEP_TOGETHER,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_keep_together) },
+ { XML_NAMESPACE_REPORT, XML_FUNCTION , XML_TOK_GROUP_FUNCTION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_function) },
XML_TOKEN_MAP_END
};
m_pGroupElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -806,11 +836,16 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES },
- { XML_NAMESPACE_REPORT, XML_PRINT_WHEN_GROUP_CHANGE ,XML_TOK_PRINT_WHEN_GROUP_CHANGE },
- { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION },
- { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT },
- { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION },
+ { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_print_repeated_values) },
+ { XML_NAMESPACE_REPORT, XML_PRINT_WHEN_GROUP_CHANGE ,XML_TOK_PRINT_WHEN_GROUP_CHANGE,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_print_when_group_change) },
+ { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_conditional_print_expression) },
+ { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_report_component) },
+ { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_format_condition) },
XML_TOKEN_MAP_END
};
m_pElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -824,15 +859,24 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL },
- { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES },
- { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE },
- { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA },
- { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE },
- { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT },
- { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA },
- { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI },
- { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE },
+ { XML_NAMESPACE_FORM, XML_LABEL ,XML_TOK_LABEL,
+ (NAMESPACE | XML_NAMESPACE_FORM | XML_label) },
+ { XML_NAMESPACE_FORM, XML_PROPERTIES ,XML_TOK_PROPERTIES,
+ (NAMESPACE | XML_NAMESPACE_FORM | XML_properties) },
+ { XML_NAMESPACE_FORM, XML_SIZE ,XML_TOK_SIZE,
+ (NAMESPACE | XML_NAMESPACE_FORM | XML_size) },
+ { XML_NAMESPACE_FORM, XML_IMAGE_DATA ,XML_TOK_IMAGE_DATA,
+ (NAMESPACE | XML_NAMESPACE_FORM | XML_image_data) },
+ { XML_NAMESPACE_REPORT, XML_SCALE ,XML_TOK_SCALE,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_scale) },
+ { XML_NAMESPACE_REPORT, XML_REPORT_ELEMENT ,XML_TOK_REPORT_ELEMENT,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_report_element) },
+ { XML_NAMESPACE_REPORT, XML_FORMULA ,XML_TOK_DATA_FORMULA,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_formula) },
+ { XML_NAMESPACE_REPORT, XML_PRESERVE_IRI ,XML_TOK_PRESERVE_IRI,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_preserve_IRI) },
+ { XML_NAMESPACE_REPORT, XML_SELECT_PAGE ,XML_TOK_SELECT_PAGE,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_select_page) },
XML_TOKEN_MAP_END
};
m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -846,15 +890,24 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME },
- { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE },
- { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY },
- { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE },
- { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY },
- { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE },
- { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE },
- { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE },
- { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE },
+ { XML_NAMESPACE_FORM, XML_PROPERTY_NAME ,XML_TOK_PROPERTY_NAME,
+ (NAMESPACE | XML_NAMESPACE_FORM | XML_property_name) },
+ { XML_NAMESPACE_OOO, XML_VALUE_TYPE ,XML_TOK_VALUE_TYPE,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_value_type) },
+ { XML_NAMESPACE_FORM, XML_LIST_PROPERTY ,XML_TOK_LIST_PROPERTY,
+ (NAMESPACE | XML_NAMESPACE_FORM | XML_list_property) },
+ { XML_NAMESPACE_OOO, XML_VALUE ,XML_TOK_VALUE,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_value) },
+ { XML_NAMESPACE_OOO, XML_CURRENCY ,XML_TOK_CURRENCY,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_currency) },
+ { XML_NAMESPACE_OOO, XML_DATE_VALUE ,XML_TOK_DATE_VALUE,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_date_value) },
+ { XML_NAMESPACE_OOO, XML_TIME_VALUE ,XML_TOK_TIME_VALUE,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_time_value) },
+ { XML_NAMESPACE_OOO, XML_STRING_VALUE ,XML_TOK_STRING_VALUE,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_string_value) },
+ { XML_NAMESPACE_OOO, XML_BOOLEAN_VALUE ,XML_TOK_BOOLEAN_VALUE,
+ (NAMESPACE | XML_NAMESPACE_OOO | XML_boolean_value) },
XML_TOKEN_MAP_END
};
m_pControlElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -868,9 +921,12 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME },
- { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME },
- { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM },
+ { XML_NAMESPACE_DRAW, XML_NAME , XML_TOK_NAME,
+ (NAMESPACE | XML_NAMESPACE_DRAW | XML_name) },
+ { XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME , XML_TOK_TEXT_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_DRAW | XML_text_style_name) },
+ { XML_NAMESPACE_REPORT, XML_TRANSFORM , XML_TOK_TRANSFORM,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_transform) },
XML_TOKEN_MAP_END
};
m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -884,17 +940,28 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME },
- { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW },
- { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS },
- { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL },
- { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED },
- { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED },
- { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION},
+ { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_NAME,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_name) },
+ { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_COLUMN_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_style_name) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN , XML_TOK_COLUMN,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_column) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW , XML_TOK_ROW,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_row) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_CELL , XML_TOK_CELL,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_cell) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS , XML_TOK_TABLE_COLUMNS,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_columns) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROWS , XML_TOK_TABLE_ROWS,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_rows) },
+ { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_covered_table_cell) },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_number_columns_spanned) },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_number_rows_spanned) },
+ { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_conditional_print_expression) },
XML_TOKEN_MAP_END
};
m_pColumnTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -908,15 +975,24 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE },
- { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME },
- { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE },
- { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE },
- { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN },
- { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER },
- { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION },
- { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME },
- { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION },
+ { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table) },
+ { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_name) },
+ { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_visible) },
+ { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_force_new_page) },
+ { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_force_new_column) },
+ { XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER , XML_TOK_KEEP_TOGETHER,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_keep_together) },
+ { XML_NAMESPACE_REPORT, XML_REPEAT_SECTION , XML_TOK_REPEAT_SECTION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_repeat_section) },
+ { XML_NAMESPACE_TABLE, XML_STYLE_NAME , XML_TOK_SECT_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_style_name) },
+ { XML_NAMESPACE_REPORT, XML_PAGE_PRINT_OPTION , XML_TOK_PAGE_PRINT_OPTION,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_page_print_option) },
XML_TOKEN_MAP_END
};
@@ -931,18 +1007,30 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P },
- { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT },
- { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT },
- { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE },
- { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT },
- { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE },
- { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME },
- { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER },
- { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT },
- { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP },
- { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK },
- { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S },
+ { XML_NAMESPACE_TEXT, XML_P , XML_TOK_P,
+ (NAMESPACE | XML_NAMESPACE_TEXT | XML_p) },
+ { XML_NAMESPACE_REPORT, XML_FIXED_CONTENT , XML_TOK_FIXED_CONTENT,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_fixed_content) },
+ { XML_NAMESPACE_REPORT, XML_FORMATTED_TEXT , XML_TOK_FORMATTED_TEXT,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_formatted_text) },
+ { XML_NAMESPACE_REPORT, XML_IMAGE , XML_TOK_IMAGE,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_image) },
+ { XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT , XML_TOK_SUB_DOCUMENT,
+ (NAMESPACE | XML_NAMESPACE_REPORT | XML_sub_document) },
+ { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE , XML_TOK_CUSTOM_SHAPE,
+ (NAMESPACE | XML_NAMESPACE_DRAW | XML_custom_shape) },
+ { XML_NAMESPACE_DRAW, XML_FRAME , XML_TOK_FRAME,
+ (NAMESPACE | XML_NAMESPACE_DRAW | XML_frame) },
+ { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER , XML_TOK_PAGE_NUMBER,
+ (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_number) },
+ { XML_NAMESPACE_TEXT, XML_PAGE_COUNT , XML_TOK_PAGE_COUNT,
+ (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_count) },
+ { XML_NAMESPACE_TEXT, XML_TAB , XML_TOK_TEXT_TAB_STOP,
+ (NAMESPACE | XML_NAMESPACE_TEXT | XML_tab) },
+ { XML_NAMESPACE_TEXT, XML_LINE_BREAK , XML_TOK_TEXT_LINE_BREAK,
+ (NAMESPACE | XML_NAMESPACE_TEXT | XML_line_break) },
+ { XML_NAMESPACE_TEXT, XML_S , XML_TOK_TEXT_S,
+ (NAMESPACE | XML_NAMESPACE_TEXT | XML_s) },
XML_TOKEN_MAP_END
};
m_pCellElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
commit 2baf71f28f5ef3d645815e4db03bfec859230032
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 11 10:44:56 2015 +0100
SvXMLTokenMapEntries in starmath
Change-Id: Ib7754ac04bff91ada467d07e19ac3a19da4df87b
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index fc1d1e1..80a1ec1 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -23,7 +23,10 @@ $(eval $(call gb_Library_set_include,sm,\
$(eval $(call gb_Library_use_external,sm,boost_headers))
-$(eval $(call gb_Library_use_custom_headers,sm,oox/generated))
+$(eval $(call gb_Library_use_custom_headers,sm,\
+ oox/generated \
+ xmloff/generated \
+))
$(eval $(call gb_Library_use_sdk_api,sm))
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 45510c8..e4d88c6 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -27,6 +27,7 @@ one go*/
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XDTDHandler.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XActiveDataControl.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
@@ -58,6 +59,7 @@ one go*/
#include <xmloff/attrlist.hxx>
#include <xmloff/xmluconv.hxx>
#include <xmloff/xmlmetai.hxx>
+#include <xmloff/token/tokens.hxx>
#include <osl/mutex.hxx>
#include <memory>
@@ -76,6 +78,8 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
+using namespace xmloff;
+using css::xml::sax::FastToken::NAMESPACE;
#define IMPORT_SVC_NAME "com.sun.star.xml.XMLImportFilter"
@@ -1854,106 +1858,165 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext(
static const SvXMLTokenMapEntry aPresLayoutElemTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS },
- { XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH },
- { XML_NAMESPACE_MATH, XML_MSTYLE, XML_TOK_MSTYLE },
- { XML_NAMESPACE_MATH, XML_MERROR, XML_TOK_MERROR },
- { XML_NAMESPACE_MATH, XML_MPHANTOM, XML_TOK_MPHANTOM },
- { XML_NAMESPACE_MATH, XML_MROW, XML_TOK_MROW },
- { XML_NAMESPACE_MATH, XML_MENCLOSE, XML_TOK_MENCLOSE },
- { XML_NAMESPACE_MATH, XML_MFRAC, XML_TOK_MFRAC },
- { XML_NAMESPACE_MATH, XML_MSQRT, XML_TOK_MSQRT },
- { XML_NAMESPACE_MATH, XML_MROOT, XML_TOK_MROOT },
- { XML_NAMESPACE_MATH, XML_MSUB, XML_TOK_MSUB },
- { XML_NAMESPACE_MATH, XML_MSUP, XML_TOK_MSUP },
- { XML_NAMESPACE_MATH, XML_MSUBSUP, XML_TOK_MSUBSUP },
- { XML_NAMESPACE_MATH, XML_MUNDER, XML_TOK_MUNDER },
- { XML_NAMESPACE_MATH, XML_MOVER, XML_TOK_MOVER },
- { XML_NAMESPACE_MATH, XML_MUNDEROVER, XML_TOK_MUNDEROVER },
- { XML_NAMESPACE_MATH, XML_MMULTISCRIPTS, XML_TOK_MMULTISCRIPTS },
- { XML_NAMESPACE_MATH, XML_MTABLE, XML_TOK_MTABLE },
- { XML_NAMESPACE_MATH, XML_MACTION, XML_TOK_MACTION },
- { XML_NAMESPACE_MATH, XML_MFENCED, XML_TOK_MFENCED },
- { XML_NAMESPACE_MATH, XML_MPADDED, XML_TOK_MPADDED },
+ { XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_semantics) },
+ { XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_math) },
+ { XML_NAMESPACE_MATH, XML_MSTYLE, XML_TOK_MSTYLE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mstyle) },
+ { XML_NAMESPACE_MATH, XML_MERROR, XML_TOK_MERROR,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_merror) },
+ { XML_NAMESPACE_MATH, XML_MPHANTOM, XML_TOK_MPHANTOM,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mphantom) },
+ { XML_NAMESPACE_MATH, XML_MROW, XML_TOK_MROW,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mrow) },
+ { XML_NAMESPACE_MATH, XML_MENCLOSE, XML_TOK_MENCLOSE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_menclose) },
+ { XML_NAMESPACE_MATH, XML_MFRAC, XML_TOK_MFRAC,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mfrac) },
+ { XML_NAMESPACE_MATH, XML_MSQRT, XML_TOK_MSQRT,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_msqrt) },
+ { XML_NAMESPACE_MATH, XML_MROOT, XML_TOK_MROOT,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mroot) },
+ { XML_NAMESPACE_MATH, XML_MSUB, XML_TOK_MSUB,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_msub) },
+ { XML_NAMESPACE_MATH, XML_MSUP, XML_TOK_MSUP,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_msup) },
+ { XML_NAMESPACE_MATH, XML_MSUBSUP, XML_TOK_MSUBSUP,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_msubsup) },
+ { XML_NAMESPACE_MATH, XML_MUNDER, XML_TOK_MUNDER,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_munder) },
+ { XML_NAMESPACE_MATH, XML_MOVER, XML_TOK_MOVER,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mover) },
+ { XML_NAMESPACE_MATH, XML_MUNDEROVER, XML_TOK_MUNDEROVER,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_munderover) },
+ { XML_NAMESPACE_MATH, XML_MMULTISCRIPTS, XML_TOK_MMULTISCRIPTS,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mmultiscripts) },
+ { XML_NAMESPACE_MATH, XML_MTABLE, XML_TOK_MTABLE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mtable) },
+ { XML_NAMESPACE_MATH, XML_MACTION, XML_TOK_MACTION,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_maction) },
+ { XML_NAMESPACE_MATH, XML_MFENCED, XML_TOK_MFENCED,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mfenced) },
+ { XML_NAMESPACE_MATH, XML_MPADDED, XML_TOK_MPADDED,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mpadded) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_FONTWEIGHT, XML_TOK_FONTWEIGHT },
- { XML_NAMESPACE_MATH, XML_FONTSTYLE, XML_TOK_FONTSTYLE },
- { XML_NAMESPACE_MATH, XML_FONTSIZE, XML_TOK_FONTSIZE },
- { XML_NAMESPACE_MATH, XML_FONTFAMILY, XML_TOK_FONTFAMILY },
- { XML_NAMESPACE_MATH, XML_COLOR, XML_TOK_COLOR },
- { XML_NAMESPACE_MATH, XML_MATHCOLOR, XML_TOK_MATHCOLOR },
+ { XML_NAMESPACE_MATH, XML_FONTWEIGHT, XML_TOK_FONTWEIGHT,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_fontweight) },
+ { XML_NAMESPACE_MATH, XML_FONTSTYLE, XML_TOK_FONTSTYLE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_fontstyle) },
+ { XML_NAMESPACE_MATH, XML_FONTSIZE, XML_TOK_FONTSIZE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_fontsize) },
+ { XML_NAMESPACE_MATH, XML_FONTFAMILY, XML_TOK_FONTFAMILY,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_fontfamily) },
+ { XML_NAMESPACE_MATH, XML_COLOR, XML_TOK_COLOR,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_color) },
+ { XML_NAMESPACE_MATH, XML_MATHCOLOR, XML_TOK_MATHCOLOR,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mathcolor) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aFencedAttrTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_OPEN, XML_TOK_OPEN },
- { XML_NAMESPACE_MATH, XML_CLOSE, XML_TOK_CLOSE },
+ { XML_NAMESPACE_MATH, XML_OPEN, XML_TOK_OPEN,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_open) },
+ { XML_NAMESPACE_MATH, XML_CLOSE, XML_TOK_CLOSE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_close) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aOperatorAttrTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_STRETCHY, XML_TOK_STRETCHY },
+ { XML_NAMESPACE_MATH, XML_STRETCHY, XML_TOK_STRETCHY,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_stretchy) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aAnnotationAttrTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_ENCODING, XML_TOK_ENCODING },
+ { XML_NAMESPACE_MATH, XML_ENCODING, XML_TOK_ENCODING,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_encoding) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aPresElemTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_ANNOTATION, XML_TOK_ANNOTATION },
- { XML_NAMESPACE_MATH, XML_MI, XML_TOK_MI },
- { XML_NAMESPACE_MATH, XML_MN, XML_TOK_MN },
- { XML_NAMESPACE_MATH, XML_MO, XML_TOK_MO },
- { XML_NAMESPACE_MATH, XML_MTEXT, XML_TOK_MTEXT },
- { XML_NAMESPACE_MATH, XML_MSPACE,XML_TOK_MSPACE },
- { XML_NAMESPACE_MATH, XML_MS, XML_TOK_MS },
- { XML_NAMESPACE_MATH, XML_MALIGNGROUP, XML_TOK_MALIGNGROUP },
+ { XML_NAMESPACE_MATH, XML_ANNOTATION, XML_TOK_ANNOTATION,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_annotation) },
+ { XML_NAMESPACE_MATH, XML_MI, XML_TOK_MI,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mi) },
+ { XML_NAMESPACE_MATH, XML_MN, XML_TOK_MN,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mn) },
+ { XML_NAMESPACE_MATH, XML_MO, XML_TOK_MO,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mo) },
+ { XML_NAMESPACE_MATH, XML_MTEXT, XML_TOK_MTEXT,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mtext) },
+ { XML_NAMESPACE_MATH, XML_MSPACE,XML_TOK_MSPACE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mspace) },
+ { XML_NAMESPACE_MATH, XML_MS, XML_TOK_MS,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_ms) },
+ { XML_NAMESPACE_MATH, XML_MALIGNGROUP, XML_TOK_MALIGNGROUP,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_maligngroup) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aPresScriptEmptyElemTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_MPRESCRIPTS, XML_TOK_MPRESCRIPTS },
- { XML_NAMESPACE_MATH, XML_NONE, XML_TOK_NONE },
+ { XML_NAMESPACE_MATH, XML_MPRESCRIPTS, XML_TOK_MPRESCRIPTS,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mprescripts) },
+ { XML_NAMESPACE_MATH, XML_NONE, XML_TOK_NONE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_none) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aPresTableElemTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_MTR, XML_TOK_MTR },
- { XML_NAMESPACE_MATH, XML_MTD, XML_TOK_MTD },
+ { XML_NAMESPACE_MATH, XML_MTR, XML_TOK_MTR,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mtr) },
+ { XML_NAMESPACE_MATH, XML_MTD, XML_TOK_MTD,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_mtd) },
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aColorTokenMap[] =
{
- { XML_NAMESPACE_MATH, XML_BLACK, TBLACK},
- { XML_NAMESPACE_MATH, XML_WHITE, TWHITE},
- { XML_NAMESPACE_MATH, XML_RED, TRED},
- { XML_NAMESPACE_MATH, XML_GREEN, TGREEN},
- { XML_NAMESPACE_MATH, XML_BLUE, TBLUE},
- { XML_NAMESPACE_MATH, XML_AQUA, TAQUA},
- { XML_NAMESPACE_MATH, XML_FUCHSIA, TFUCHSIA},
- { XML_NAMESPACE_MATH, XML_YELLOW, TYELLOW},
- { XML_NAMESPACE_MATH, XML_NAVY, TNAVY},
- { XML_NAMESPACE_MATH, XML_TEAL, TTEAL},
- { XML_NAMESPACE_MATH, XML_MAROON, TMAROON},
- { XML_NAMESPACE_MATH, XML_PURPLE, TPURPLE},
- { XML_NAMESPACE_MATH, XML_OLIVE, TOLIVE},
- { XML_NAMESPACE_MATH, XML_GRAY, TGRAY},
- { XML_NAMESPACE_MATH, XML_SILVER, TSILVER},
- { XML_NAMESPACE_MATH, XML_LIME, TLIME},
+ { XML_NAMESPACE_MATH, XML_BLACK, TBLACK,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_black) },
+ { XML_NAMESPACE_MATH, XML_WHITE, TWHITE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_white) },
+ { XML_NAMESPACE_MATH, XML_RED, TRED,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_red) },
+ { XML_NAMESPACE_MATH, XML_GREEN, TGREEN,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_green) },
+ { XML_NAMESPACE_MATH, XML_BLUE, TBLUE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_blue) },
+ { XML_NAMESPACE_MATH, XML_AQUA, TAQUA,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_aqua) },
+ { XML_NAMESPACE_MATH, XML_FUCHSIA, TFUCHSIA,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_fuchsia) },
+ { XML_NAMESPACE_MATH, XML_YELLOW, TYELLOW,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_yellow) },
+ { XML_NAMESPACE_MATH, XML_NAVY, TNAVY,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_navy) },
+ { XML_NAMESPACE_MATH, XML_TEAL, TTEAL,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_teal) },
+ { XML_NAMESPACE_MATH, XML_MAROON, TMAROON,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_maroon) },
+ { XML_NAMESPACE_MATH, XML_PURPLE, TPURPLE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_purple) },
+ { XML_NAMESPACE_MATH, XML_OLIVE, TOLIVE,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_olive) },
+ { XML_NAMESPACE_MATH, XML_GRAY, TGRAY,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_gray) },
+ { XML_NAMESPACE_MATH, XML_SILVER, TSILVER,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_silver) },
+ { XML_NAMESPACE_MATH, XML_LIME, TLIME,
+ (NAMESPACE | XML_NAMESPACE_MATH | XML_lime) },
XML_TOKEN_MAP_END
};
commit b3da578655f20e1d1f01edf3e8b460d22ec5cb4f
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 11 10:07:43 2015 +0100
SvXMLTokenMapEntries in xmloff/source/xforms/
Change-Id: Id68fee46f062cabda2cb838191ee6d036e05dee8
diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx
index 0d827e5..65a5848 100644
--- a/xmloff/source/xforms/SchemaContext.cxx
+++ b/xmloff/source/xforms/SchemaContext.cxx
@@ -27,16 +27,19 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmluconv.hxx>
+#include <xmloff/token/tokens.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
#include <com/sun/star/xforms/XDataTypeRepository.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using com::sun::star::uno::Reference;
using com::sun::star::uno::Any;
using com::sun::star::xml::sax::XAttributeList;
using com::sun::star::xforms::XDataTypeRepository;
using namespace xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
@@ -48,7 +51,7 @@ static const SvXMLTokenMapEntry aAttributes[] =
static const SvXMLTokenMapEntry aChildren[] =
{
- TOKEN_MAP_ENTRY( XSD, SIMPLETYPE ),
+ TOKEN_MAP_ENTRY( XSD, SIMPLETYPE, simpleType ),
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index f9622aa..7710ab1 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -26,6 +26,7 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlimp.hxx>
+#include <xmloff/token/tokens.hxx>
#include <sax/tools/converter.hxx>
@@ -38,6 +39,7 @@
#include <com/sun/star/xforms/XDataTypeRepository.hpp>
#include <com/sun/star/xsd/DataTypeClass.hpp>
#include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
@@ -55,30 +57,31 @@ using com::sun::star::beans::XPropertySet;
using com::sun::star::beans::XPropertySetInfo;
using com::sun::star::xforms::XDataTypeRepository;
using namespace xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
static const SvXMLTokenMapEntry aAttributes[] =
{
- TOKEN_MAP_ENTRY( NONE, BASE ),
+ TOKEN_MAP_ENTRY( NONE, BASE, base ),
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aChildren[] =
{
- TOKEN_MAP_ENTRY( XSD, LENGTH ),
- TOKEN_MAP_ENTRY( XSD, MINLENGTH ),
- TOKEN_MAP_ENTRY( XSD, MAXLENGTH ),
- TOKEN_MAP_ENTRY( XSD, MININCLUSIVE ),
- TOKEN_MAP_ENTRY( XSD, MINEXCLUSIVE ),
- TOKEN_MAP_ENTRY( XSD, MAXINCLUSIVE ),
- TOKEN_MAP_ENTRY( XSD, MAXEXCLUSIVE ),
- TOKEN_MAP_ENTRY( XSD, PATTERN ),
+ TOKEN_MAP_ENTRY( XSD, LENGTH, length ),
+ TOKEN_MAP_ENTRY( XSD, MINLENGTH, minLength ),
+ TOKEN_MAP_ENTRY( XSD, MAXLENGTH, maxLength ),
+ TOKEN_MAP_ENTRY( XSD, MININCLUSIVE, minInclusive ),
+ TOKEN_MAP_ENTRY( XSD, MINEXCLUSIVE, minExclusive ),
+ TOKEN_MAP_ENTRY( XSD, MAXINCLUSIVE, maxInclusive ),
+ TOKEN_MAP_ENTRY( XSD, MAXEXCLUSIVE, maxExclusive ),
+ TOKEN_MAP_ENTRY( XSD, PATTERN, pattern),
// ??? XML_ENUMERATION
- TOKEN_MAP_ENTRY( XSD, WHITESPACE ),
- TOKEN_MAP_ENTRY( XSD, TOTALDIGITS ),
- TOKEN_MAP_ENTRY( XSD, FRACTIONDIGITS ),
+ TOKEN_MAP_ENTRY( XSD, WHITESPACE, whiteSpace ),
+ TOKEN_MAP_ENTRY( XSD, TOTALDIGITS, totalDigits ),
+ TOKEN_MAP_ENTRY( XSD, FRACTIONDIGITS, fractionDigits ),
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
index d0e1a8d..9554184 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx
@@ -26,11 +26,13 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmluconv.hxx>
+#include <xmloff/token/tokens.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/xsd/WhiteSpaceTreatment.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using com::sun::star::uno::Reference;
using com::sun::star::uno::Any;
@@ -38,19 +40,20 @@ using com::sun::star::xml::sax::XAttributeList;
using com::sun::star::beans::XPropertySet;
using com::sun::star::xforms::XDataTypeRepository;
using namespace xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
static const SvXMLTokenMapEntry aAttributes[] =
{
- TOKEN_MAP_ENTRY( NONE, NAME ),
+ TOKEN_MAP_ENTRY( NONE, NAME, name ),
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aChildren[] =
{
- TOKEN_MAP_ENTRY( XSD, RESTRICTION ),
+ TOKEN_MAP_ENTRY( XSD, RESTRICTION, restriction ),
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 072174a..0a78e39 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star {
} } }
class SvXMLImport;
-#define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN }
+#define TOKEN_MAP_ENTRY(NSPACE,TOKEN,FASTTOKEN) { XML_NAMESPACE_##NSPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN, (NAMESPACE | XML_NAMESPACE_##NSPACE | xmloff::XML_##FASTTOKEN) }
extern struct SvXMLTokenMapEntry aEmptyMap[1];
diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx
index c7eb928..4678ce9 100644
--- a/xmloff/source/xforms/XFormsBindContext.cxx
+++ b/xmloff/source/xforms/XFormsBindContext.cxx
@@ -28,9 +28,11 @@
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/token/tokens.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/xforms/XModel2.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
@@ -44,20 +46,21 @@ using com::sun::star::container::XNameContainer;
using com::sun::star::xml::sax::XAttributeList;
using com::sun::star::xforms::XModel2;
using namespace xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
static const struct SvXMLTokenMapEntry aAttributeMap[] =
{
- TOKEN_MAP_ENTRY( NONE, NODESET ),
- TOKEN_MAP_ENTRY( NONE, ID ),
- TOKEN_MAP_ENTRY( NONE, READONLY ),
- TOKEN_MAP_ENTRY( NONE, RELEVANT ),
- TOKEN_MAP_ENTRY( NONE, REQUIRED ),
- TOKEN_MAP_ENTRY( NONE, CONSTRAINT ),
- TOKEN_MAP_ENTRY( NONE, CALCULATE ),
- TOKEN_MAP_ENTRY( NONE, TYPE ),
+ TOKEN_MAP_ENTRY( NONE, NODESET, nodeset ),
+ TOKEN_MAP_ENTRY( NONE, ID, id ),
+ TOKEN_MAP_ENTRY( NONE, READONLY, readonly ),
+ TOKEN_MAP_ENTRY( NONE, RELEVANT, relevant ),
+ TOKEN_MAP_ENTRY( NONE, REQUIRED, required ),
+ TOKEN_MAP_ENTRY( NONE, CONSTRAINT, constraint ),
+ TOKEN_MAP_ENTRY( NONE, CALCULATE, calculate ),
+ TOKEN_MAP_ENTRY( NONE, TYPE, type ),
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index e0503b7..c414304 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/xforms/XModel2.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
@@ -37,6 +38,7 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmlerror.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/token/tokens.hxx>
using com::sun::star::uno::Reference;
@@ -52,11 +54,12 @@ using xmloff::token::IsXMLToken;
using xmloff::token::XML_INSTANCE;
using xmloff::token::XML_SRC;
using xmloff::token::XML_ID;
+using css::xml::sax::FastToken::NAMESPACE;
static const SvXMLTokenMapEntry aAttributes[] =
{
- TOKEN_MAP_ENTRY( NONE, SRC ),
- TOKEN_MAP_ENTRY( NONE, ID ),
+ TOKEN_MAP_ENTRY( NONE, SRC, src ),
+ TOKEN_MAP_ENTRY( NONE, ID, id ),
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index 10bd88b..ce160e9 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -31,6 +31,7 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlerror.hxx>
+#include <xmloff/token/tokens.hxx>
#include <osl/diagnose.h>
@@ -38,6 +39,7 @@
#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/xforms/XModel2.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using com::sun::star::xml::sax::XAttributeList;
@@ -45,23 +47,24 @@ using com::sun::star::beans::XPropertySet;
using com::sun::star::util::XUpdatable;
using namespace com::sun::star::uno;
using namespace xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
static const SvXMLTokenMapEntry aAttributes[] =
{
- TOKEN_MAP_ENTRY( NONE, ID ),
- TOKEN_MAP_ENTRY( NONE, SCHEMA ),
+ TOKEN_MAP_ENTRY( NONE, ID, id ),
+ TOKEN_MAP_ENTRY( NONE, SCHEMA, schema ),
XML_TOKEN_MAP_END
};
static const SvXMLTokenMapEntry aChildren[] =
{
- TOKEN_MAP_ENTRY( XFORMS, INSTANCE ),
- TOKEN_MAP_ENTRY( XFORMS, BIND ),
- TOKEN_MAP_ENTRY( XFORMS, SUBMISSION ),
- TOKEN_MAP_ENTRY( XSD, SCHEMA ),
+ TOKEN_MAP_ENTRY( XFORMS, INSTANCE, instance ),
+ TOKEN_MAP_ENTRY( XFORMS, BIND, bind ),
+ TOKEN_MAP_ENTRY( XFORMS, SUBMISSION, submission ),
+ TOKEN_MAP_ENTRY( XSD, SCHEMA, schema ),
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx
index fb23981..04b292d 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.cxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx
@@ -28,11 +28,13 @@
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/token/tokens.hxx>
#include <sax/tools/converter.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/xforms/XModel2.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
@@ -44,27 +46,28 @@ using com::sun::star::xforms::XModel2;
using namespace com::sun::star::uno;
using namespace xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
static const struct SvXMLTokenMapEntry aAttributeMap[] =
{
- TOKEN_MAP_ENTRY( NONE, ID ),
- TOKEN_MAP_ENTRY( NONE, BIND ),
- TOKEN_MAP_ENTRY( NONE, REF ),
- TOKEN_MAP_ENTRY( NONE, ACTION ),
- TOKEN_MAP_ENTRY( NONE, METHOD ),
- TOKEN_MAP_ENTRY( NONE, VERSION ),
- TOKEN_MAP_ENTRY( NONE, INDENT ),
- TOKEN_MAP_ENTRY( NONE, MEDIATYPE ),
- TOKEN_MAP_ENTRY( NONE, ENCODING ),
- TOKEN_MAP_ENTRY( NONE, OMIT_XML_DECLARATION ),
- TOKEN_MAP_ENTRY( NONE, STANDALONE ),
- TOKEN_MAP_ENTRY( NONE, CDATA_SECTION_ELEMENTS ),
- TOKEN_MAP_ENTRY( NONE, REPLACE ),
- TOKEN_MAP_ENTRY( NONE, SEPARATOR ),
- TOKEN_MAP_ENTRY( NONE, INCLUDENAMESPACEPREFIXES ),
+ TOKEN_MAP_ENTRY( NONE, ID, id ),
+ TOKEN_MAP_ENTRY( NONE, BIND, bind ),
+ TOKEN_MAP_ENTRY( NONE, REF, ref ),
+ TOKEN_MAP_ENTRY( NONE, ACTION, action ),
+ TOKEN_MAP_ENTRY( NONE, METHOD, method ),
+ TOKEN_MAP_ENTRY( NONE, VERSION, version ),
+ TOKEN_MAP_ENTRY( NONE, INDENT, indent ),
+ TOKEN_MAP_ENTRY( NONE, MEDIATYPE, mediatype ),
+ TOKEN_MAP_ENTRY( NONE, ENCODING, encoding ),
+ TOKEN_MAP_ENTRY( NONE, OMIT_XML_DECLARATION, omit_xml_declaration ),
+ TOKEN_MAP_ENTRY( NONE, STANDALONE, standalone ),
+ TOKEN_MAP_ENTRY( NONE, CDATA_SECTION_ELEMENTS, cdata_section_elements ),
+ TOKEN_MAP_ENTRY( NONE, REPLACE, replace ),
+ TOKEN_MAP_ENTRY( NONE, SEPARATOR, separator ),
+ TOKEN_MAP_ENTRY( NONE, INCLUDENAMESPACEPREFIXES, includenamespaceprefixes ),
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx
index 4f127a2..3d70c0e 100644
--- a/xmloff/source/xforms/xformsapi.cxx
+++ b/xmloff/source/xforms/xformsapi.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/xforms/XModel2.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/xsd/DataTypeClass.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <comphelper/processfactory.hxx>
#include <tools/debug.hxx>
@@ -39,6 +40,7 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltkmap.hxx>
+#include <xmloff/token/tokens.hxx>
using com::sun::star::uno::Reference;
using com::sun::star::uno::Sequence;
@@ -58,6 +60,7 @@ using com::sun::star::uno::Exception;
using namespace com::sun::star;
using namespace xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
Reference<XModel2> xforms_createXFormsModel()
{
@@ -172,21 +175,21 @@ void xforms_setValue( Reference<XPropertySet>& xPropertySet,
xPropertySet->setPropertyValue( rName, rAny );
}
-#define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN }
+#define TOKEN_MAP_ENTRY(NSPACE,TOKEN,FASTTOKEN) { XML_NAMESPACE_##NSPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN, (NAMESPACE | XML_NAMESPACE_##NSPACE | xmloff::XML_##FASTTOKEN) }
static const SvXMLTokenMapEntry aTypes[] =
{
- TOKEN_MAP_ENTRY( XSD, STRING ),
- TOKEN_MAP_ENTRY( XSD, DECIMAL ),
- TOKEN_MAP_ENTRY( XSD, DOUBLE ),
- TOKEN_MAP_ENTRY( XSD, FLOAT ),
- TOKEN_MAP_ENTRY( XSD, BOOLEAN ),
- TOKEN_MAP_ENTRY( XSD, ANYURI ),
- TOKEN_MAP_ENTRY( XSD, DATETIME_XSD ),
- TOKEN_MAP_ENTRY( XSD, DATE ),
- TOKEN_MAP_ENTRY( XSD, TIME ),
- TOKEN_MAP_ENTRY( XSD, YEAR ),
- TOKEN_MAP_ENTRY( XSD, MONTH ),
- TOKEN_MAP_ENTRY( XSD, DAY ),
+ TOKEN_MAP_ENTRY( XSD, STRING, string ),
+ TOKEN_MAP_ENTRY( XSD, DECIMAL, decimal ),
+ TOKEN_MAP_ENTRY( XSD, DOUBLE, double ),
+ TOKEN_MAP_ENTRY( XSD, FLOAT, float ),
+ TOKEN_MAP_ENTRY( XSD, BOOLEAN, boolean ),
+ TOKEN_MAP_ENTRY( XSD, ANYURI, anyURI ),
+ TOKEN_MAP_ENTRY( XSD, DATETIME_XSD, dateTime ),
+ TOKEN_MAP_ENTRY( XSD, DATE, date ),
+ TOKEN_MAP_ENTRY( XSD, TIME, time ),
+ TOKEN_MAP_ENTRY( XSD, YEAR, year ),
+ TOKEN_MAP_ENTRY( XSD, MONTH, month ),
+ TOKEN_MAP_ENTRY( XSD, DAY, day ),
XML_TOKEN_MAP_END
};
commit 93802fe7354bd6b12360ce7c1f5274f9948877bd
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Tue Feb 10 14:26:51 2015 +0100
SwXMLBodyContext_Impl impl. fast parser interface
Change-Id: I295ffd28a413635b244d454ea66a3046b7faf2b6
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index f9a0b0d..db355e2 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -137,6 +137,8 @@ public:
SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList );
+ SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_Int32 Element,
+ const Reference< xml::sax::XFastAttributeList >& xAttrList );
virtual ~SwXMLBodyContext_Impl();
TYPEINFO_OVERRIDE();
@@ -144,6 +146,10 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ virtual Reference< xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const Reference< xml::sax::XFastAttributeList >& xAttrList )
+ throw(RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
@@ -153,6 +159,13 @@ SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
{
}
+SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
+ sal_Int32 /*Element*/,
+ const Reference< xml::sax::XFastAttributeList >& /*xAttrList*/)
+: SvXMLImportContext( rImport )
+{
+}
+
SwXMLBodyContext_Impl::~SwXMLBodyContext_Impl()
{
}
@@ -167,6 +180,13 @@ SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext(
return GetSwImport().CreateBodyContentContext( rLocalName );
}
+Reference< xml::sax::XFastContextHandler > SwXMLBodyContext_Impl::createFastChildContext(
+ sal_Int32 Element, const Reference< xml::sax::XFastAttributeList >& /*xAttrList*/)
+ throw(RuntimeException, xml::sax::SAXException, std::exception)
+{
+ return GetSwImport().CreateBodyContentContext( Element );
+}
+
// #i69629#
// enhance class <SwXMLDocContext_Impl> in order to be able to create subclasses
// NB: virtually inherit so we can multiply inherit properly
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 2e04a0a..ab21987 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -151,6 +151,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext *CreateBodyContentContext( const OUString& rLocalName );
+ SvXMLImportContext *CreateBodyContentContext( sal_Int32 Element );
sal_uInt16 GetStyleFamilyMask() const { return nStyleFamilyMask; }
bool IsInsertMode() const { return bInsert; }
bool IsStylesOnlyMode() const { return !bLoadDoc; }
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index 393d5f3..4691388 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -126,4 +126,17 @@ SvXMLImportContext *SwXMLImport::CreateBodyContentContext(
return pContext;
}
+SvXMLImportContext *SwXMLImport::CreateBodyContentContext(
+ sal_Int32 Element )
+{
+ SvXMLImportContext *pContext = 0;
+
+ if( !IsStylesOnlyMode() )
+ pContext = new SwXMLBodyContentContext_Impl( *this, Element );
+ else
+ pContext = new SvXMLImportContext( *this );
+
+ return pContext;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a9b19f3d003d6050cce6547ff9f15d705a4dd4c6
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Tue Feb 10 14:24:31 2015 +0100
SwXMLBodyContentContext_Impl impl. fast interface
one method isn't implemented yet
Change-Id: Ic65aa23b5bf9081a9355362b9637836083c1b533
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index f5e1e35..393d5f3 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -32,15 +32,22 @@ public:
SwXMLBodyContentContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName );
+ SwXMLBodyContentContext_Impl( SwXMLImport& rImport, sal_Int32 Element );
virtual ~SwXMLBodyContentContext_Impl();
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+ virtual Reference< xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const Reference< xml::sax::XFastAttributeList >& xAttrList )
+ throw(RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
// The body element's text:global attribute can be ignored, because
// we must have the correct object shell already.
virtual void EndElement() SAL_OVERRIDE;
+ virtual void SAL_CALL endFastElement( sal_Int32 Element )
+ throw(RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport,
@@ -50,6 +57,12 @@ SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport
{
}
+SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl(
+ SwXMLImport& rImport, sal_Int32 /*Element*/ )
+: SvXMLImportContext( rImport )
+{
+}
+
SwXMLBodyContentContext_Impl::~SwXMLBodyContentContext_Impl()
{
}
@@ -69,12 +82,35 @@ SvXMLImportContext *SwXMLBodyContentContext_Impl::CreateChildContext(
return pContext;
}
+Reference< xml::sax::XFastContextHandler > SAL_CALL
+ SwXMLBodyContentContext_Impl::createFastChildContext(
+ sal_Int32 /*Element*/,
+ const Reference< xml::sax::XFastAttributeList >& /*xAttrList*/ )
+ throw(RuntimeException, xml::sax::SAXException, std::exception)
+{
+ SvXMLImportContext *pContext = 0;
+
+ //TODO
+
+ if( !pContext )
+ pContext = new SvXMLImportContext( GetImport() );
+
+ return pContext;
+}
+
void SwXMLBodyContentContext_Impl::EndElement()
{
/* Code moved to SwXMLOmport::endDocument */
GetImport().GetTextImport()->SetOutlineStyles( false );
}
+void SAL_CALL SwXMLBodyContentContext_Impl::endFastElement( sal_Int32 /*Element*/ )
+ throw(RuntimeException, xml::sax::SAXException, std::exception)
+{
+ /* Code moved to SwXMLImport::endDocument */
+ GetImport().GetTextImport()->SetOutlineStyles( false );
+}
+
SvXMLImportContext *SwXMLImport::CreateBodyContentContext(
const OUString& rLocalName )
{
commit 7861812341dcec358d0885a1770955c90323795d
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Tue Feb 10 14:00:46 2015 +0100
SvXMLTokenMapEntries in sw/source/filter
Change-Id: I9b591851317b01010376a1a49b111ac4472d3f0e
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index d49da54..8dd37ee 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -19,6 +19,7 @@
#include "hintids.hxx"
#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <editeng/memberids.hrc>
#include <xmloff/nmspmap.hxx>
@@ -26,6 +27,7 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/XMLBase64ImportContext.hxx>
+#include <xmloff/token/tokens.hxx>
#include <svtools/grfmgr.hxx>
#include <svx/unomid.hxx>
#include <editeng/brushitem.hxx>
@@ -40,6 +42,8 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
+using css::xml::sax::FastToken::NAMESPACE;
+using namespace xmloff;
enum SvXMLTokenMapAttrs
{
@@ -55,13 +59,20 @@ enum SvXMLTokenMapAttrs
static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
{
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF },
- { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE },
- { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE },
- { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW },
- { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION },
- { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT },
- { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER },
+ { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_href) },
+ { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_type) },
+ { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_actuate) },
+ { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_show) },
+ { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_position) },
+ { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_repeat) },
+ { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_filter_name) },
XML_TOKEN_MAP_END
};
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index dfd3266..f9a0b0d 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -28,12 +28,14 @@
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/txtimp.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/token/tokens.hxx>
#include <xmloff/XMLTextShapeImportHelper.hxx>
#include <xmloff/XMLFontStylesContext.hxx>
#include <xmloff/ProgressBarHelper.hxx>
@@ -86,6 +88,8 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::xforms;
using namespace ::xmloff::token;
using namespace ::std;
+using namespace xmloff;
+using namespace css::xml::sax;
enum SwXMLDocTokens
{
@@ -103,15 +107,24 @@ enum SwXMLDocTokens
static SvXMLTokenMapEntry aDocTokenMap[] =
{
- { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS },
- { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
- { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
- { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES },
- { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META },
- { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY },
- { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT },
- { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
- { XML_NAMESPACE_XFORMS, XML_MODEL, XML_TOK_DOC_XFORMS },
+ { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_font_face_decls) },
+ { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_styles) },
+ { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_automatic_styles) },
+ { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_master_styles) },
+ { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_meta) },
+ { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_body) },
+ { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_scripts) },
+ { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_settings) },
+ { XML_NAMESPACE_XFORMS, XML_MODEL, XML_TOK_DOC_XFORMS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_XFORMS | XML_model) },
XML_TOKEN_MAP_END
};
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 0d27fb4..72134aa 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -30,6 +30,8 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/nmspmap.hxx>
+#include <xmloff/token/tokens.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <xmloff/families.hxx>
#include <xmloff/xmluconv.hxx>
@@ -67,6 +69,7 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
+using namespace xmloff;
enum SwXMLTableElemTokens
{
@@ -100,45 +103,66 @@ enum SwXMLTableCellAttrTokens
static SvXMLTokenMapEntry aTableElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS,
- XML_TOK_TABLE_HEADER_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
- { XML_NAMESPACE_LO_EXT, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
- { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS,
- XML_TOK_TABLE_HEADER_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS },
- { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW },
- { XML_NAMESPACE_LO_EXT, XML_TABLE_ROW, XML_TOK_TABLE_ROW },
- { XML_NAMESPACE_OFFICE, XML_DDE_SOURCE,
- XML_TOK_OFFICE_DDE_SOURCE },
+ { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_table_header_columns) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_table_columns) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_table_column) },
+ { XML_NAMESPACE_LO_EXT, XML_TABLE_COLUMN, XML_TOK_TABLE_COL,
+ (FastToken::NAMESPACE | XML_NAMESPACE_LO_EXT | XML_table_column) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_table_header_rows) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_table_rows) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_table_row) },
+ { XML_NAMESPACE_LO_EXT, XML_TABLE_ROW, XML_TOK_TABLE_ROW,
+ (FastToken::NAMESPACE | XML_NAMESPACE_LO_EXT | XML_table_row) },
+ { XML_NAMESPACE_OFFICE, XML_DDE_SOURCE, XML_TOK_OFFICE_DDE_SOURCE,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_dde_source) },
// There are slight differences between <table:table-columns> and
// <table:table-columns-groups>. However, none of these are
// supported in Writer (they are Calc-only features), so we
// support column groups by simply using the <table:table-columns>
// token for column groups, too.
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_table_column_group) },
XML_TOKEN_MAP_END
};
static SvXMLTokenMapEntry aTableCellAttrTokenMap[] =
{
- { XML_NAMESPACE_XML, XML_ID, XML_TOK_TABLE_XMLID },
- { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME },
- { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, XML_TOK_TABLE_NUM_COLS_SPANNED },
- { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, XML_TOK_TABLE_NUM_ROWS_SPANNED },
- { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_NUM_COLS_REPEATED },
- { XML_NAMESPACE_TABLE, XML_FORMULA, XML_TOK_TABLE_FORMULA },
- { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_TABLE_VALUE },
- { XML_NAMESPACE_OFFICE, XML_TIME_VALUE, XML_TOK_TABLE_TIME_VALUE },
- { XML_NAMESPACE_OFFICE, XML_DATE_VALUE, XML_TOK_TABLE_DATE_VALUE },
- { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE, XML_TOK_TABLE_BOOLEAN_VALUE },
- { XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TOK_TABLE_PROTECTED },
- { XML_NAMESPACE_TABLE, XML_PROTECT, XML_TOK_TABLE_PROTECTED }, // for backwards compatibility with SRC629 (and before)
- { XML_NAMESPACE_OFFICE, XML_STRING_VALUE, XML_TOK_TABLE_STRING_VALUE },
- { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_TABLE_VALUE_TYPE },
+ { XML_NAMESPACE_XML, XML_ID, XML_TOK_TABLE_XMLID,
+ (FastToken::NAMESPACE | XML_NAMESPACE_XML | XML_id) },
+ { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_STYLE_NAME,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_style_name) },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED, XML_TOK_TABLE_NUM_COLS_SPANNED,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_number_columns_spanned) },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, XML_TOK_TABLE_NUM_ROWS_SPANNED,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_number_rows_spanned) },
+ { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_NUM_COLS_REPEATED,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_number_columns_repeated) },
+ { XML_NAMESPACE_TABLE, XML_FORMULA, XML_TOK_TABLE_FORMULA,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_formula) },
+ { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_TABLE_VALUE,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_value) },
+ { XML_NAMESPACE_OFFICE, XML_TIME_VALUE, XML_TOK_TABLE_TIME_VALUE,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_time_value) },
+ { XML_NAMESPACE_OFFICE, XML_DATE_VALUE, XML_TOK_TABLE_DATE_VALUE,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_date_value) },
+ { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE, XML_TOK_TABLE_BOOLEAN_VALUE,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_boolean_value) },
+ { XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TOK_TABLE_PROTECTED,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_protected) },
+ { XML_NAMESPACE_TABLE, XML_PROTECT, XML_TOK_TABLE_PROTECTED,
+ (FastToken::NAMESPACE | XML_NAMESPACE_TABLE | XML_protect) }, // for backwards compatibility with SRC629 (and before)
+ { XML_NAMESPACE_OFFICE, XML_STRING_VALUE, XML_TOK_TABLE_STRING_VALUE,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_string_value) },
+ { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_TABLE_VALUE_TYPE,
+ (FastToken::NAMESPACE | XML_NAMESPACE_OFFICE | XML_value_type) },
XML_TOKEN_MAP_END
};
More information about the Libreoffice-commits
mailing list