[Libreoffice-commits] core.git: Branch 'feature/fastparser' - 17 commits - xmloff/source
Daniel Sikeler
d.sikeler94 at gmail.com
Wed Feb 25 23:11:55 PST 2015
xmloff/source/chart/SchXMLAxisContext.cxx | 53 ++-
xmloff/source/chart/SchXMLImport.cxx | 217 ++++++++----
xmloff/source/chart/SchXMLLegendContext.cxx | 34 +
xmloff/source/chart/XMLSymbolImageContext.cxx | 16
xmloff/source/draw/animationimport.cxx | 189 +++++++---
xmloff/source/style/XMLBackgroundImageContext.cxx | 35 +-
xmloff/source/style/xmltabi.cxx | 20 -
xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx | 103 +++++
xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx | 8
xmloff/source/text/XMLIndexBibliographySourceContext.cxx | 37 ++
xmloff/source/text/XMLIndexBibliographySourceContext.hxx | 8
xmloff/source/text/XMLIndexBodyContext.cxx | 30 +
xmloff/source/text/XMLIndexBodyContext.hxx | 8
xmloff/source/text/XMLIndexIllustrationSourceContext.cxx | 33 +
xmloff/source/text/XMLIndexIllustrationSourceContext.hxx | 6
xmloff/source/text/XMLIndexObjectSourceContext.cxx | 65 +++
xmloff/source/text/XMLIndexObjectSourceContext.hxx | 8
xmloff/source/text/XMLIndexSourceBaseContext.cxx | 238 ++++++++-----
xmloff/source/text/XMLIndexSourceBaseContext.hxx | 12
xmloff/source/text/XMLIndexTOCContext.cxx | 259 ++++++++++++++-
xmloff/source/text/XMLIndexTOCContext.hxx | 14
xmloff/source/text/XMLIndexTOCSourceContext.cxx | 60 +++
xmloff/source/text/XMLIndexTOCSourceContext.hxx | 8
xmloff/source/text/XMLIndexTOCStylesContext.cxx | 80 ++++
xmloff/source/text/XMLIndexTOCStylesContext.hxx | 12
xmloff/source/text/XMLIndexTableSourceContext.cxx | 63 +++
xmloff/source/text/XMLIndexTableSourceContext.hxx | 8
xmloff/source/text/XMLIndexTemplateContext.cxx | 159 ++++++++-
xmloff/source/text/XMLIndexTemplateContext.hxx | 17
xmloff/source/text/XMLIndexTitleTemplateContext.cxx | 55 +++
xmloff/source/text/XMLIndexTitleTemplateContext.hxx | 10
xmloff/source/text/XMLIndexUserSourceContext.cxx | 80 ++++
xmloff/source/text/XMLIndexUserSourceContext.hxx | 8
xmloff/source/token/tokens.txt | 2
34 files changed, 1665 insertions(+), 290 deletions(-)
New commits:
commit f199dc819a18aefd0dac37cb658c4f3caa980d08
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 25 14:23:28 2015 +0100
SvXMLTokenMapEntries in xmloff/source/chart/
fixed typo in tokens.txt
Change-Id: I47714431181793dda06e1005c8dbcf47d71cd083
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index f7192cf..369e90f 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -28,6 +28,7 @@
#include <xmloff/prstylei.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
+#include <xmloff/token/tokens.hxx>
#include <tools/color.hxx>
@@ -43,20 +44,23 @@
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
using namespace ::xmloff::token;
using namespace com::sun::star;
+using namespace xmloff;
using com::sun::star::uno::Reference;
+using css::xml::sax::FastToken::NAMESPACE;
static const SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
{
{ XML_X, SCH_XML_AXIS_X },
{ XML_Y, SCH_XML_AXIS_Y },
{ XML_Z, SCH_XML_AXIS_Z },
- { XML_TOKEN_INVALID, 0 }
+ { xmloff::token::XML_TOKEN_INVALID, 0 }
};
static const SvXMLEnumMapEntry aXMLAxisTypeMap[] =
@@ -64,7 +68,7 @@ static const SvXMLEnumMapEntry aXMLAxisTypeMap[] =
{ XML_AUTO, ::com::sun::star::chart::ChartAxisType::AUTOMATIC },
{ XML_TEXT, ::com::sun::star::chart::ChartAxisType::CATEGORY },
{ XML_DATE, ::com::sun::star::chart::ChartAxisType::DATE },
- { XML_TOKEN_INVALID, 0 }
+ { xmloff::token::XML_TOKEN_INVALID, 0 }
};
class SchXMLCategoriesContext : public SvXMLImportContext
@@ -247,11 +251,16 @@ enum AxisAttributeTokens
const SvXMLTokenMapEntry aAxisAttributeTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_DIMENSION, XML_TOK_AXIS_DIMENSION },
- { XML_NAMESPACE_CHART, XML_NAME, XML_TOK_AXIS_NAME },
- { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_AXIS_STYLE_NAME },
- { XML_NAMESPACE_CHART, XML_AXIS_TYPE, XML_TOK_AXIS_TYPE },
- { XML_NAMESPACE_CHART_EXT, XML_AXIS_TYPE, XML_TOK_AXIS_TYPE_EXT },
+ { XML_NAMESPACE_CHART, XML_DIMENSION, XML_TOK_AXIS_DIMENSION,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_dimension) },
+ { XML_NAMESPACE_CHART, XML_NAME, XML_TOK_AXIS_NAME,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_name) },
+ { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_AXIS_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_style_name) },
+ { XML_NAMESPACE_CHART, XML_AXIS_TYPE, XML_TOK_AXIS_TYPE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_axis_type) },
+ { XML_NAMESPACE_CHART_EXT, XML_AXIS_TYPE, XML_TOK_AXIS_TYPE_EXT,
+ (NAMESPACE | XML_NAMESPACE_CHART_EXT | XML_axis_type) },
XML_TOKEN_MAP_END
};
@@ -603,11 +612,16 @@ enum AxisChildTokens
const SvXMLTokenMapEntry aAxisChildTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_AXIS_TITLE },
- { XML_NAMESPACE_CHART, XML_CATEGORIES, XML_TOK_AXIS_CATEGORIES },
- { XML_NAMESPACE_CHART, XML_GRID, XML_TOK_AXIS_GRID },
- { XML_NAMESPACE_CHART, XML_DATE_SCALE, XML_TOK_AXIS_DATE_SCALE },
- { XML_NAMESPACE_CHART_EXT, XML_DATE_SCALE, XML_TOK_AXIS_DATE_SCALE_EXT },
+ { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_AXIS_TITLE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_title) },
+ { XML_NAMESPACE_CHART, XML_CATEGORIES, XML_TOK_AXIS_CATEGORIES,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_categories) },
+ { XML_NAMESPACE_CHART, XML_GRID, XML_TOK_AXIS_GRID,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_grid) },
+ { XML_NAMESPACE_CHART, XML_DATE_SCALE, XML_TOK_AXIS_DATE_SCALE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_date_scale) },
+ { XML_NAMESPACE_CHART_EXT, XML_DATE_SCALE, XML_TOK_AXIS_DATE_SCALE_EXT,
+ (NAMESPACE | XML_NAMESPACE_CHART_EXT | XML_date_scale) },
XML_TOKEN_MAP_END
};
@@ -907,11 +921,16 @@ enum DateScaleAttributeTokens
const SvXMLTokenMapEntry aDateScaleAttributeTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_BASE_TIME_UNIT, XML_TOK_DATESCALE_BASE_TIME_UNIT },
- { XML_NAMESPACE_CHART, XML_MAJOR_INTERVAL_VALUE, XML_TOK_DATESCALE_MAJOR_INTERVAL_VALUE },
- { XML_NAMESPACE_CHART, XML_MAJOR_INTERVAL_UNIT, XML_TOK_DATESCALE_MAJOR_INTERVAL_UNIT },
- { XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_VALUE, XML_TOK_DATESCALE_MINOR_INTERVAL_VALUE },
- { XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_UNIT, XML_TOK_DATESCALE_MINOR_INTERVAL_UNIT },
+ { XML_NAMESPACE_CHART, XML_BASE_TIME_UNIT, XML_TOK_DATESCALE_BASE_TIME_UNIT,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_base_time_unit) },
+ { XML_NAMESPACE_CHART, XML_MAJOR_INTERVAL_VALUE, XML_TOK_DATESCALE_MAJOR_INTERVAL_VALUE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_major_interval_value) },
+ { XML_NAMESPACE_CHART, XML_MAJOR_INTERVAL_UNIT, XML_TOK_DATESCALE_MAJOR_INTERVAL_UNIT,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_major_interval_unit) },
+ { XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_VALUE, XML_TOK_DATESCALE_MINOR_INTERVAL_VALUE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_minor_interval_value) },
+ { XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_UNIT, XML_TOK_DATESCALE_MINOR_INTERVAL_UNIT,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_minor_interval_unit) },
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index ce11bea..b541622 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -28,6 +28,7 @@
#include <comphelper/processfactory.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
#include <xmloff/xmluconv.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmlictxt.hxx>
@@ -44,6 +45,7 @@
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -52,9 +54,11 @@
using namespace com::sun::star;
using namespace ::xmloff::token;
+using namespace xmloff;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
+using css::xml::sax::FastToken::NAMESPACE;
namespace
{
@@ -160,10 +164,14 @@ const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap()
{
static const SvXMLTokenMapEntry aDocElemTokenMap[] =
{
- { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
- { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
- { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META },
- { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY },
+ { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_automatic_styles) },
+ { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_styles) },
+ { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_meta) },
+ { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_body) },
XML_TOKEN_MAP_END
};
@@ -179,12 +187,18 @@ const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap()
{
static const SvXMLTokenMapEntry aTableElemTokenMap[] =
{
- { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS },
- { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLUMN },
- { 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_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_header_columns) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_columns) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLUMN,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_column) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_header_rows) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_rows) },
+ { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table_row) },
XML_TOKEN_MAP_END
};
@@ -200,11 +214,16 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap()
{
static const SvXMLTokenMapEntry aChartElemTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_TOK_CHART_PLOT_AREA },
- { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_CHART_TITLE },
- { XML_NAMESPACE_CHART, XML_SUBTITLE, XML_TOK_CHART_SUBTITLE },
- { XML_NAMESPACE_CHART, XML_LEGEND, XML_TOK_CHART_LEGEND },
- { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_CHART_TABLE },
+ { XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_TOK_CHART_PLOT_AREA,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_plot_area) },
+ { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_CHART_TITLE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_title) },
+ { XML_NAMESPACE_CHART, XML_SUBTITLE, XML_TOK_CHART_SUBTITLE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_subtitle) },
+ { XML_NAMESPACE_CHART, XML_LEGEND, XML_TOK_CHART_LEGEND,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_legend) },
+ { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_CHART_TABLE,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_table) },
XML_TOKEN_MAP_END
};
@@ -220,16 +239,26 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap()
{
static const SvXMLTokenMapEntry aPlotAreaElemTokenMap[] =
{
- { XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION_EXT },
- { XML_NAMESPACE_CHART, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION },
- { XML_NAMESPACE_CHART, XML_AXIS, XML_TOK_PA_AXIS },
- { XML_NAMESPACE_CHART, XML_SERIES, XML_TOK_PA_SERIES },
- { XML_NAMESPACE_CHART, XML_WALL, XML_TOK_PA_WALL },
- { XML_NAMESPACE_CHART, XML_FLOOR, XML_TOK_PA_FLOOR },
- { XML_NAMESPACE_DR3D, XML_LIGHT, XML_TOK_PA_LIGHT_SOURCE },
- { XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, XML_TOK_PA_STOCK_GAIN },
- { XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, XML_TOK_PA_STOCK_LOSS },
- { XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, XML_TOK_PA_STOCK_RANGE },
+ { XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION_EXT,
+ (NAMESPACE | XML_NAMESPACE_CHART_EXT | XML_coordinate_region) },
+ { XML_NAMESPACE_CHART, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_coordinate_region) },
+ { XML_NAMESPACE_CHART, XML_AXIS, XML_TOK_PA_AXIS,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_axis) },
+ { XML_NAMESPACE_CHART, XML_SERIES, XML_TOK_PA_SERIES,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_series) },
+ { XML_NAMESPACE_CHART, XML_WALL, XML_TOK_PA_WALL,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_wall) },
+ { XML_NAMESPACE_CHART, XML_FLOOR, XML_TOK_PA_FLOOR,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_floor) },
+ { XML_NAMESPACE_DR3D, XML_LIGHT, XML_TOK_PA_LIGHT_SOURCE,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_light) },
+ { XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, XML_TOK_PA_STOCK_GAIN,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_stock_gain_marker) },
+ { XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, XML_TOK_PA_STOCK_LOSS,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_stock_loss_marker) },
+ { XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, XML_TOK_PA_STOCK_RANGE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_stock_range_line) },
XML_TOKEN_MAP_END
};
@@ -245,12 +274,18 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap()
{
static const SvXMLTokenMapEntry aSeriesElemTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT },
- { XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN },
- { XML_NAMESPACE_CHART, XML_MEAN_VALUE, XML_TOK_SERIES_MEAN_VALUE_LINE },
- { XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, XML_TOK_SERIES_REGRESSION_CURVE },
- { XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, XML_TOK_SERIES_ERROR_INDICATOR },
- { XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, XML_TOK_SERIES_PROPERTY_MAPPING },
+ { XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_data_point) },
+ { XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_domain) },
+ { XML_NAMESPACE_CHART, XML_MEAN_VALUE, XML_TOK_SERIES_MEAN_VALUE_LINE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_mean_value) },
+ { XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, XML_TOK_SERIES_REGRESSION_CURVE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_regression_curve) },
+ { XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, XML_TOK_SERIES_ERROR_INDICATOR,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_error_indicator) },
+ { XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, XML_TOK_SERIES_PROPERTY_MAPPING,
+ (NAMESPACE | XML_NAMESPACE_LO_EXT | XML_property_mapping) },
XML_TOKEN_MAP_END
};
@@ -266,13 +301,20 @@ const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap()
{
static const SvXMLTokenMapEntry aChartAttrTokenMap[] =
{
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CHART_HREF },
- { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_CHART_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_CHART_HEIGHT },
- { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_CHART_STYLE_NAME },
- { XML_NAMESPACE_CHART, XML_COLUMN_MAPPING, XML_TOK_CHART_COL_MAPPING },
- { XML_NAMESPACE_CHART, XML_ROW_MAPPING, XML_TOK_CHART_ROW_MAPPING },
+ { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CHART_HREF,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_href) },
+ { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_class) },
+ { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_CHART_WIDTH,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_width) },
+ { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_CHART_HEIGHT,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_height) },
+ { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_CHART_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_style_name) },
+ { XML_NAMESPACE_CHART, XML_COLUMN_MAPPING, XML_TOK_CHART_COL_MAPPING,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_column_mapping) },
+ { XML_NAMESPACE_CHART, XML_ROW_MAPPING, XML_TOK_CHART_ROW_MAPPING,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_row_mapping) },
XML_TOKEN_MAP_END
};
@@ -288,24 +330,42 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
{
static const SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] =
{
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PA_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PA_HEIGHT },
- { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_PA_STYLE_NAME },
- { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_PA_CHART_ADDRESS },
- { XML_NAMESPACE_CHART, XML_DATA_SOURCE_HAS_LABELS, XML_TOK_PA_DS_HAS_LABELS },
- { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_PA_TRANSFORM },
- { XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_PA_VRP },
- { XML_NAMESPACE_DR3D, XML_VPN, XML_TOK_PA_VPN },
- { XML_NAMESPACE_DR3D, XML_VUP, XML_TOK_PA_VUP },
- { XML_NAMESPACE_DR3D, XML_PROJECTION, XML_TOK_PA_PROJECTION },
- { XML_NAMESPACE_DR3D, XML_DISTANCE, XML_TOK_PA_DISTANCE },
- { XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, XML_TOK_PA_FOCAL_LENGTH },
- { XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, XML_TOK_PA_SHADOW_SLANT },
- { XML_NAMESPACE_DR3D, XML_SHADE_MODE, XML_TOK_PA_SHADE_MODE },
- { XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, XML_TOK_PA_AMBIENT_COLOR },
- { XML_NAMESPACE_DR3D, XML_LIGHTING_MODE, XML_TOK_PA_LIGHTING_MODE },
+ { XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_x) },
+ { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_y) },
+ { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PA_WIDTH,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_width) },
+ { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PA_HEIGHT,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_height) },
+ { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_PA_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_style_name) },
+ { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_PA_CHART_ADDRESS,
+ (NAMESPACE | XML_NAMESPACE_TABLE | XML_cell_range_address) },
+ { XML_NAMESPACE_CHART, XML_DATA_SOURCE_HAS_LABELS, XML_TOK_PA_DS_HAS_LABELS,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_data_source_has_labels) },
+ { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_PA_TRANSFORM,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_transform) },
+ { XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_PA_VRP,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_vrp) },
+ { XML_NAMESPACE_DR3D, XML_VPN, XML_TOK_PA_VPN,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_vpn) },
+ { XML_NAMESPACE_DR3D, XML_VUP, XML_TOK_PA_VUP,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_vup) },
+ { XML_NAMESPACE_DR3D, XML_PROJECTION, XML_TOK_PA_PROJECTION,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_projection) },
+ { XML_NAMESPACE_DR3D, XML_DISTANCE, XML_TOK_PA_DISTANCE,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_distance) },
+ { XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, XML_TOK_PA_FOCAL_LENGTH,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_focal_length) },
+ { XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, XML_TOK_PA_SHADOW_SLANT,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_shadow_slant) },
+ { XML_NAMESPACE_DR3D, XML_SHADE_MODE, XML_TOK_PA_SHADE_MODE,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_shade_mode) },
+ { XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, XML_TOK_PA_AMBIENT_COLOR,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_ambient_color) },
+ { XML_NAMESPACE_DR3D, XML_LIGHTING_MODE, XML_TOK_PA_LIGHTING_MODE,
+ (NAMESPACE | XML_NAMESPACE_DR3D | XML_lighting_mode) },
XML_TOKEN_MAP_END
};
@@ -321,8 +381,10 @@ const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap()
{
static const SvXMLTokenMapEntry aCellAttrTokenMap[] =
{
- { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE },
- { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_CELL_VALUE },
+ { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_value_type) },
+ { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_CELL_VALUE,
+ (NAMESPACE | XML_NAMESPACE_OFFICE | XML_value) },
XML_TOKEN_MAP_END
};
@@ -338,12 +400,18 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap()
{
static const SvXMLTokenMapEntry aSeriesAttrTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE },
- { XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS },
- { XML_NAMESPACE_LO_EXT, XML_LABEL_STRING, XML_TOK_SERIES_LABEL_STRING },
- { XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_TOK_SERIES_ATTACHED_AXIS },
- { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_SERIES_STYLE_NAME },
- { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_SERIES_CHART_CLASS },
+ { XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_values_cell_range_address) },
+ { XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_label_cell_address) },
+ { XML_NAMESPACE_LO_EXT, XML_LABEL_STRING, XML_TOK_SERIES_LABEL_STRING,
+ (NAMESPACE | XML_NAMESPACE_LO_EXT | XML_label_string) },
+ { XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_TOK_SERIES_ATTACHED_AXIS,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_attached_axis) },
+ { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_SERIES_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_style_name) },
+ { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_SERIES_CHART_CLASS,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_class) },
XML_TOKEN_MAP_END
};
@@ -359,8 +427,10 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPropMappingAttrTokenMap()
{
static const SvXMLTokenMapEntry aPropMappingAttrTokenMap[] =
{
- { XML_NAMESPACE_LO_EXT, XML_PROPERTY, XML_TOK_PROPERTY_MAPPING_PROPERTY },
- { XML_NAMESPACE_LO_EXT, XML_CELL_RANGE_ADDRESS, XML_TOK_PROPERTY_MAPPING_RANGE },
+ { XML_NAMESPACE_LO_EXT, XML_PROPERTY, XML_TOK_PROPERTY_MAPPING_PROPERTY,
+ (NAMESPACE | XML_NAMESPACE_LO_EXT | XML_property) },
+ { XML_NAMESPACE_LO_EXT, XML_CELL_RANGE_ADDRESS, XML_TOK_PROPERTY_MAPPING_RANGE,
+ (NAMESPACE | XML_NAMESPACE_LO_EXT | XML_cell_range_address) },
XML_TOKEN_MAP_END
};
@@ -376,11 +446,16 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap()
{
static const SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_REGEQ_STYLE_NAME },
- { XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_TOK_REGEQ_DISPLAY_EQUATION },
- { XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, XML_TOK_REGEQ_DISPLAY_R_SQUARE },
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_REGEQ_POS_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_REGEQ_POS_Y },
+ { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_REGEQ_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_style_name)},
+ { XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_TOK_REGEQ_DISPLAY_EQUATION,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_display_equation) },
+ { XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, XML_TOK_REGEQ_DISPLAY_R_SQUARE,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_display_r_square) },
+ { XML_NAMESPACE_SVG, XML_X, XML_TOK_REGEQ_POS_X,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_x) },
+ { XML_NAMESPACE_SVG, XML_Y, XML_TOK_REGEQ_POS_Y,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_y) },
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 7bb30bf..6be21d8 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -25,14 +25,18 @@
#include <xmloff/prstylei.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmluconv.hxx>
+#include <xmloff/token/tokens.hxx>
#include <com/sun/star/chart/ChartLegendPosition.hpp>
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using namespace ::xmloff::token;
using namespace com::sun::star;
+using namespace xmloff;
+using css::xml::sax::FastToken::NAMESPACE;
using com::sun::star::uno::Reference;
namespace
@@ -54,16 +58,26 @@ enum LegendAttributeTokens
const SvXMLTokenMapEntry aLegendAttributeTokenMap[] =
{
- { XML_NAMESPACE_CHART, XML_LEGEND_POSITION, XML_TOK_LEGEND_POSITION },
- { XML_NAMESPACE_SVG, XML_X, XML_TOK_LEGEND_X },
- { XML_NAMESPACE_SVG, XML_Y, XML_TOK_LEGEND_Y },
- { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_LEGEND_STYLE_NAME },
- { XML_NAMESPACE_STYLE, XML_LEGEND_EXPANSION, XML_TOK_LEGEND_EXPANSION },
- { XML_NAMESPACE_STYLE, XML_LEGEND_EXPANSION_ASPECT_RATIO, XML_TOK_LEGEND_EXPANSION_ASPECT_RATIO },
- { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_LEGEND_WIDTH },
- { XML_NAMESPACE_CHART_EXT, XML_WIDTH, XML_TOK_LEGEND_WIDTH_EXT },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_LEGEND_HEIGHT },
- { XML_NAMESPACE_CHART_EXT, XML_HEIGHT, XML_TOK_LEGEND_HEIGHT_EXT },
+ { XML_NAMESPACE_CHART, XML_LEGEND_POSITION, XML_TOK_LEGEND_POSITION,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_legend_position) },
+ { XML_NAMESPACE_SVG, XML_X, XML_TOK_LEGEND_X,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_x) },
+ { XML_NAMESPACE_SVG, XML_Y, XML_TOK_LEGEND_Y,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_y) },
+ { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_LEGEND_STYLE_NAME,
+ (NAMESPACE | XML_NAMESPACE_CHART | XML_style_name) },
+ { XML_NAMESPACE_STYLE, XML_LEGEND_EXPANSION, XML_TOK_LEGEND_EXPANSION,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_legend_expansion) },
+ { XML_NAMESPACE_STYLE, XML_LEGEND_EXPANSION_ASPECT_RATIO, XML_TOK_LEGEND_EXPANSION_ASPECT_RATIO,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_legend_expansion_aspect_ratio) },
+ { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_LEGEND_WIDTH,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_width) },
+ { XML_NAMESPACE_CHART_EXT, XML_WIDTH, XML_TOK_LEGEND_WIDTH_EXT,
+ (NAMESPACE | XML_NAMESPACE_CHART_EXT | XML_width) },
+ { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_LEGEND_HEIGHT,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_height) },
+ { XML_NAMESPACE_CHART_EXT, XML_HEIGHT, XML_TOK_LEGEND_HEIGHT_EXT,
+ (NAMESPACE | XML_NAMESPACE_CHART_EXT | XML_height) },
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx
index b448b92..8154e77 100644
--- a/xmloff/source/chart/XMLSymbolImageContext.cxx
+++ b/xmloff/source/chart/XMLSymbolImageContext.cxx
@@ -19,16 +19,20 @@
#include "XMLSymbolImageContext.hxx"
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/XMLBase64ImportContext.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
TYPEINIT1( XMLSymbolImageContext, XMLElementPropertyContext );
using namespace ::com::sun::star;
+using namespace xmloff;
+using css::xml::sax::FastToken::NAMESPACE;
enum SvXMLTokenMapAttrs
{
@@ -41,10 +45,14 @@ enum SvXMLTokenMapAttrs
static const SvXMLTokenMapEntry aSymbolImageAttrTokenMap[] =
{
- { XML_NAMESPACE_XLINK, ::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF },
- { XML_NAMESPACE_XLINK, ::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE },
- { XML_NAMESPACE_XLINK, ::xmloff::token::XML_ACTUATE, XML_TOK_SYMBOL_IMAGE_ACTUATE },
- { XML_NAMESPACE_XLINK, ::xmloff::token::XML_SHOW, XML_TOK_SYMBOL_IMAGE_SHOW },
+ { XML_NAMESPACE_XLINK, ::xmloff::token::XML_HREF, XML_TOK_SYMBOL_IMAGE_HREF,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_href) },
+ { XML_NAMESPACE_XLINK, ::xmloff::token::XML_TYPE, XML_TOK_SYMBOL_IMAGE_TYPE,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_type) },
+ { XML_NAMESPACE_XLINK, ::xmloff::token::XML_ACTUATE, XML_TOK_SYMBOL_IMAGE_ACTUATE,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_actuate) },
+ { XML_NAMESPACE_XLINK, ::xmloff::token::XML_SHOW, XML_TOK_SYMBOL_IMAGE_SHOW,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_show) },
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index f17cb13..7fc6e79 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1923,10 +1923,10 @@ proceedings
product
projection
properties
-propertry-mapping
property
property-is-list
property-is-void
+property-mapping
property-name
property-type
property-value
commit 5a0619ff4a44e5c6b2992e4ab74dec114989e71b
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 25 14:20:15 2015 +0100
SvXMLTokenMapEntries in xmloff/source/draw/
Change-Id: I293ec56ec933d22ce63c441fd7bc0c2f0f34bfd9
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index a72dced..3673f86 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/animations/Event.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/text/XTextRangeCompare.hpp>
#include <com/sun/star/presentation/ParagraphTarget.hpp>
@@ -56,6 +57,7 @@
#include <xmloff/xmltypes.hxx>
#include "sdpropls.hxx"
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmluconv.hxx>
@@ -77,6 +79,7 @@ using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
+using namespace xmloff;
using ::com::sun::star::xml::sax::XAttributeList;
using ::com::sun::star::beans::NamedValue;
@@ -87,6 +90,7 @@ using ::com::sun::star::container::XEnumerationAccess;
using ::com::sun::star::container::XEnumeration;
using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::lang::XInitialization;
+using css::xml::sax::FastToken::NAMESPACE;
Sequence< OUString > SAL_CALL AnimationsImport_getSupportedServiceNames() throw()
{
@@ -150,17 +154,28 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeTokenMap()
{
static const SvXMLTokenMapEntry aAnimationNodeTokenMap[] =
{
- { XML_NAMESPACE_ANIMATION, XML_PAR, (sal_uInt16)AnimationNodeType::PAR },
- { XML_NAMESPACE_ANIMATION, XML_SEQ, (sal_uInt16)AnimationNodeType::SEQ },
- { XML_NAMESPACE_ANIMATION, XML_ITERATE, (sal_uInt16)AnimationNodeType::ITERATE },
- { XML_NAMESPACE_ANIMATION, XML_ANIMATE, (sal_uInt16)AnimationNodeType::ANIMATE },
- { XML_NAMESPACE_ANIMATION, XML_SET, (sal_uInt16)AnimationNodeType::SET },
- { XML_NAMESPACE_ANIMATION, XML_ANIMATEMOTION, (sal_uInt16)AnimationNodeType::ANIMATEMOTION },
- { XML_NAMESPACE_ANIMATION, XML_ANIMATECOLOR, (sal_uInt16)AnimationNodeType::ANIMATECOLOR },
- { XML_NAMESPACE_ANIMATION, XML_ANIMATETRANSFORM, (sal_uInt16)AnimationNodeType::ANIMATETRANSFORM },
- { XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, (sal_uInt16)AnimationNodeType::TRANSITIONFILTER },
- { XML_NAMESPACE_ANIMATION, XML_AUDIO, (sal_uInt16)AnimationNodeType::AUDIO },
- { XML_NAMESPACE_ANIMATION, XML_COMMAND, (sal_uInt16)AnimationNodeType::COMMAND },
+ { XML_NAMESPACE_ANIMATION, XML_PAR, (sal_uInt16)AnimationNodeType::PAR,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_par) },
+ { XML_NAMESPACE_ANIMATION, XML_SEQ, (sal_uInt16)AnimationNodeType::SEQ,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_seq) },
+ { XML_NAMESPACE_ANIMATION, XML_ITERATE, (sal_uInt16)AnimationNodeType::ITERATE,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_iterate) },
+ { XML_NAMESPACE_ANIMATION, XML_ANIMATE, (sal_uInt16)AnimationNodeType::ANIMATE,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_animate) },
+ { XML_NAMESPACE_ANIMATION, XML_SET, (sal_uInt16)AnimationNodeType::SET,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_set) },
+ { XML_NAMESPACE_ANIMATION, XML_ANIMATEMOTION, (sal_uInt16)AnimationNodeType::ANIMATEMOTION,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_animateMotion) },
+ { XML_NAMESPACE_ANIMATION, XML_ANIMATECOLOR, (sal_uInt16)AnimationNodeType::ANIMATECOLOR,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_animateColor) },
+ { XML_NAMESPACE_ANIMATION, XML_ANIMATETRANSFORM, (sal_uInt16)AnimationNodeType::ANIMATETRANSFORM,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_animateTransform) },
+ { XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, (sal_uInt16)AnimationNodeType::TRANSITIONFILTER,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_transitionFilter) },
+ { XML_NAMESPACE_ANIMATION, XML_AUDIO, (sal_uInt16)AnimationNodeType::AUDIO,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_audio) },
+ { XML_NAMESPACE_ANIMATION, XML_COMMAND, (sal_uInt16)AnimationNodeType::COMMAND,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_command) },
XML_TOKEN_MAP_END
};
@@ -229,56 +244,106 @@ const SvXMLTokenMap& AnimationsImportHelperImpl::getAnimationNodeAttributeTokenM
{
static const SvXMLTokenMapEntry aAnimationNodeAttributeTokenMap[] =
{
- { XML_NAMESPACE_SMIL, XML_BEGIN, (sal_uInt16)ANA_Begin },
- { XML_NAMESPACE_SMIL, XML_DUR, (sal_uInt16)ANA_Dur },
- { XML_NAMESPACE_SMIL, XML_END, (sal_uInt16)ANA_End },
- { XML_NAMESPACE_SMIL, XML_FILL, (sal_uInt16)ANA_Fill },
- { XML_NAMESPACE_SMIL, XML_FILLDEFAULT, (sal_uInt16)ANA_FillDefault },
- { XML_NAMESPACE_SMIL, XML_RESTART, (sal_uInt16)ANA_Restart },
- { XML_NAMESPACE_SMIL, XML_RESTARTDEFAULT, (sal_uInt16)ANA_RestartDefault },
- { XML_NAMESPACE_SMIL, XML_ACCELERATE, (sal_uInt16)ANA_Accelerate },
- { XML_NAMESPACE_SMIL, XML_DECELERATE, (sal_uInt16)ANA_Decelerate },
- { XML_NAMESPACE_SMIL, XML_AUTOREVERSE, (sal_uInt16)ANA_AutoReverse },
- { XML_NAMESPACE_SMIL, XML_REPEATCOUNT, (sal_uInt16)ANA_RepeatCount },
- { XML_NAMESPACE_SMIL, XML_REPEATDUR, (sal_uInt16)ANA_RepeatDur },
- { XML_NAMESPACE_SMIL, XML_ENDSYNC, (sal_uInt16)ANA_EndSync },
- { XML_NAMESPACE_PRESENTATION, XML_NODE_TYPE, (sal_uInt16)ANA_Node_Type },
- { XML_NAMESPACE_PRESENTATION, XML_PRESET_ID, (sal_uInt16)ANA_Preset_ID },
- { XML_NAMESPACE_PRESENTATION, XML_PRESET_SUB_TYPE, (sal_uInt16)ANA_Preset_Sub_Type },
- { XML_NAMESPACE_PRESENTATION, XML_PRESET_CLASS, (sal_uInt16)ANA_Preset_Class },
- { XML_NAMESPACE_PRESENTATION, XML_AFTER_EFFECT, (sal_uInt16)ANA_After_Effect },
- { XML_NAMESPACE_SMIL, XML_TARGETELEMENT, (sal_uInt16)ANA_Target },
- { XML_NAMESPACE_XLINK, XML_HREF, (sal_uInt16)ANA_XLink },
- { XML_NAMESPACE_PRESENTATION, XML_MASTER_ELEMENT, (sal_uInt16)ANA_MasterElement },
- { XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, (sal_uInt16)ANA_SubItem },
- { XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, (sal_uInt16)ANA_AttributeName },
- { XML_NAMESPACE_SMIL, XML_VALUES, (sal_uInt16)ANA_Values },
- { XML_NAMESPACE_SMIL, XML_FROM, (sal_uInt16)ANA_From },
- { XML_NAMESPACE_SMIL, XML_BY, (sal_uInt16)ANA_By },
- { XML_NAMESPACE_SMIL, XML_TO, (sal_uInt16)ANA_To },
- { XML_NAMESPACE_SMIL, XML_KEYTIMES, (sal_uInt16)ANA_KeyTimes },
- { XML_NAMESPACE_SMIL, XML_CALCMODE, (sal_uInt16)ANA_CalcMode },
- { XML_NAMESPACE_SMIL, XML_ACCUMULATE, (sal_uInt16)ANA_Accumulate },
- { XML_NAMESPACE_PRESENTATION, XML_ADDITIVE, (sal_uInt16)ANA_AdditiveMode },
- { XML_NAMESPACE_SMIL, XML_ADDITIVE, (sal_uInt16)ANA_AdditiveMode },
- { XML_NAMESPACE_SMIL, XML_KEYSPLINES, (sal_uInt16)ANA_KeySplines },
- { XML_NAMESPACE_SVG, XML_PATH, (sal_uInt16)ANA_Path },
- { XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION, (sal_uInt16)ANA_ColorSpace },
- { XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION_DIRECTION, (sal_uInt16)ANA_ColorDirection },
- { XML_NAMESPACE_SVG, XML_TYPE, (sal_uInt16)ANA_TransformType },
- { XML_NAMESPACE_SMIL, XML_TYPE, (sal_uInt16)ANA_TransitionType },
- { XML_NAMESPACE_SMIL, XML_SUBTYPE, (sal_uInt16)ANA_TransitionSubType },
- { XML_NAMESPACE_SMIL, XML_MODE, (sal_uInt16)ANA_Mode },
- { XML_NAMESPACE_SMIL, XML_DIRECTION, (sal_uInt16)ANA_Direction },
- { XML_NAMESPACE_SMIL, XML_FADECOLOR, (sal_uInt16)ANA_FadeColor },
- { XML_NAMESPACE_ANIMATION, XML_ITERATE_TYPE, (sal_uInt16)ANA_IterateType },
- { XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, (sal_uInt16)ANA_IterateInterval },
- { XML_NAMESPACE_ANIMATION, XML_FORMULA, (sal_uInt16)ANA_Formula },
- { XML_NAMESPACE_ANIMATION, XML_ID, (sal_uInt16)ANA_ANIMID },
- { XML_NAMESPACE_XML, XML_ID, (sal_uInt16)ANA_XMLID },
- { XML_NAMESPACE_PRESENTATION, XML_GROUP_ID, (sal_uInt16)ANA_Group_Id },
- { XML_NAMESPACE_ANIMATION, XML_AUDIO_LEVEL, (sal_uInt16)ANA_Volume },
- { XML_NAMESPACE_ANIMATION, XML_COMMAND, (sal_uInt16)ANA_Command },
+ { XML_NAMESPACE_SMIL, XML_BEGIN, (sal_uInt16)ANA_Begin,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_begin) },
+ { XML_NAMESPACE_SMIL, XML_DUR, (sal_uInt16)ANA_Dur,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_dur) },
+ { XML_NAMESPACE_SMIL, XML_END, (sal_uInt16)ANA_End,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_end) },
+ { XML_NAMESPACE_SMIL, XML_FILL, (sal_uInt16)ANA_Fill,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_fill) },
+ { XML_NAMESPACE_SMIL, XML_FILLDEFAULT, (sal_uInt16)ANA_FillDefault,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_fillDefault) },
+ { XML_NAMESPACE_SMIL, XML_RESTART, (sal_uInt16)ANA_Restart,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_restart) },
+ { XML_NAMESPACE_SMIL, XML_RESTARTDEFAULT, (sal_uInt16)ANA_RestartDefault,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_restartDefault) },
+ { XML_NAMESPACE_SMIL, XML_ACCELERATE, (sal_uInt16)ANA_Accelerate,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_accelerate) },
+ { XML_NAMESPACE_SMIL, XML_DECELERATE, (sal_uInt16)ANA_Decelerate,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_decelerate) },
+ { XML_NAMESPACE_SMIL, XML_AUTOREVERSE, (sal_uInt16)ANA_AutoReverse,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_autoReverse) },
+ { XML_NAMESPACE_SMIL, XML_REPEATCOUNT, (sal_uInt16)ANA_RepeatCount,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_repeatCount) },
+ { XML_NAMESPACE_SMIL, XML_REPEATDUR, (sal_uInt16)ANA_RepeatDur,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_repeatDur) },
+ { XML_NAMESPACE_SMIL, XML_ENDSYNC, (sal_uInt16)ANA_EndSync,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_endsync) },
+ { XML_NAMESPACE_PRESENTATION, XML_NODE_TYPE, (sal_uInt16)ANA_Node_Type,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_node_type) },
+ { XML_NAMESPACE_PRESENTATION, XML_PRESET_ID, (sal_uInt16)ANA_Preset_ID,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_preset_id) },
+ { XML_NAMESPACE_PRESENTATION, XML_PRESET_SUB_TYPE, (sal_uInt16)ANA_Preset_Sub_Type,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_preset_sub_type) },
+ { XML_NAMESPACE_PRESENTATION, XML_PRESET_CLASS, (sal_uInt16)ANA_Preset_Class,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_preset_class) },
+ { XML_NAMESPACE_PRESENTATION, XML_AFTER_EFFECT, (sal_uInt16)ANA_After_Effect,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_after_effect) },
+ { XML_NAMESPACE_SMIL, XML_TARGETELEMENT, (sal_uInt16)ANA_Target,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_targetElement) },
+ { XML_NAMESPACE_XLINK, XML_HREF, (sal_uInt16)ANA_XLink,
+ (NAMESPACE | XML_NAMESPACE_XLINK | XML_href) },
+ { XML_NAMESPACE_PRESENTATION, XML_MASTER_ELEMENT, (sal_uInt16)ANA_MasterElement,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_master_element) },
+ { XML_NAMESPACE_ANIMATION, XML_SUB_ITEM, (sal_uInt16)ANA_SubItem,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_sub_item) },
+ { XML_NAMESPACE_SMIL, XML_ATTRIBUTENAME, (sal_uInt16)ANA_AttributeName,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_attributeName) },
+ { XML_NAMESPACE_SMIL, XML_VALUES, (sal_uInt16)ANA_Values,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_values) },
+ { XML_NAMESPACE_SMIL, XML_FROM, (sal_uInt16)ANA_From,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_from) },
+ { XML_NAMESPACE_SMIL, XML_BY, (sal_uInt16)ANA_By,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_by) },
+ { XML_NAMESPACE_SMIL, XML_TO, (sal_uInt16)ANA_To,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_to) },
+ { XML_NAMESPACE_SMIL, XML_KEYTIMES, (sal_uInt16)ANA_KeyTimes,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_keyTimes) },
+ { XML_NAMESPACE_SMIL, XML_CALCMODE, (sal_uInt16)ANA_CalcMode,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_calcMode) },
+ { XML_NAMESPACE_SMIL, XML_ACCUMULATE, (sal_uInt16)ANA_Accumulate,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_accumulate) },
+ { XML_NAMESPACE_PRESENTATION, XML_ADDITIVE, (sal_uInt16)ANA_AdditiveMode,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_additive) },
+ { XML_NAMESPACE_SMIL, XML_ADDITIVE, (sal_uInt16)ANA_AdditiveMode,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_additive) },
+ { XML_NAMESPACE_SMIL, XML_KEYSPLINES, (sal_uInt16)ANA_KeySplines,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_keySplines) },
+ { XML_NAMESPACE_SVG, XML_PATH, (sal_uInt16)ANA_Path,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_path) },
+ { XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION, (sal_uInt16)ANA_ColorSpace,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_color_interpolation) },
+ { XML_NAMESPACE_ANIMATION, XML_COLOR_INTERPOLATION_DIRECTION, (sal_uInt16)ANA_ColorDirection,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_color_interpolation_direction) },
+ { XML_NAMESPACE_SVG, XML_TYPE, (sal_uInt16)ANA_TransformType,
+ (NAMESPACE | XML_NAMESPACE_SVG | XML_type) },
+ { XML_NAMESPACE_SMIL, XML_TYPE, (sal_uInt16)ANA_TransitionType,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_type) },
+ { XML_NAMESPACE_SMIL, XML_SUBTYPE, (sal_uInt16)ANA_TransitionSubType,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_subtype) },
+ { XML_NAMESPACE_SMIL, XML_MODE, (sal_uInt16)ANA_Mode,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_mode) },
+ { XML_NAMESPACE_SMIL, XML_DIRECTION, (sal_uInt16)ANA_Direction,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_direction) },
+ { XML_NAMESPACE_SMIL, XML_FADECOLOR, (sal_uInt16)ANA_FadeColor,
+ (NAMESPACE | XML_NAMESPACE_SMIL | XML_fadeColor) },
+ { XML_NAMESPACE_ANIMATION, XML_ITERATE_TYPE, (sal_uInt16)ANA_IterateType,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_iterate_type) },
+ { XML_NAMESPACE_ANIMATION, XML_ITERATE_INTERVAL, (sal_uInt16)ANA_IterateInterval,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_iterate_interval) },
+ { XML_NAMESPACE_ANIMATION, XML_FORMULA, (sal_uInt16)ANA_Formula,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_formula) },
+ { XML_NAMESPACE_ANIMATION, XML_ID, (sal_uInt16)ANA_ANIMID,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_id) },
+ { XML_NAMESPACE_XML, XML_ID, (sal_uInt16)ANA_XMLID,
+ (NAMESPACE | XML_NAMESPACE_XML | XML_id) },
+ { XML_NAMESPACE_PRESENTATION, XML_GROUP_ID, (sal_uInt16)ANA_Group_Id,
+ (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_group_id) },
+ { XML_NAMESPACE_ANIMATION, XML_AUDIO_LEVEL, (sal_uInt16)ANA_Volume,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_audio_level) },
+ { XML_NAMESPACE_ANIMATION, XML_COMMAND, (sal_uInt16)ANA_Command,
+ (NAMESPACE | XML_NAMESPACE_ANIMATION | XML_command) },
XML_TOKEN_MAP_END
};
@@ -753,7 +818,7 @@ void AnimationNodeContext::init_node( const ::com::sun::star::uno::Reference< :
Reference< XIterateContainer > xIter( mxNode, UNO_QUERY );
std::list< NamedValue > aUserData;
- XMLTokenEnum meAttributeName = XML_TOKEN_INVALID;
+ XMLTokenEnum meAttributeName = xmloff::token::XML_TOKEN_INVALID;
OUString aFrom, aBy, aTo, aValues;
bool bHaveXmlId( false );
OUString sXmlId;
commit 7ca75b516d424836bed8d1673b57579aaec717c6
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 25 14:16:34 2015 +0100
SvXMLTokenMapEntires in xmloff/source/style/
Change-Id: Iac78e9f6b7b1a8ba2cc2defa0838875f73abfd47
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 18749d82..6459f15 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -32,6 +32,8 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/XMLBase64ImportContext.hxx>
#include "XMLBackgroundImageContext.hxx"
+#include <xmloff/token/tokens.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using namespace ::com::sun::star;
@@ -39,6 +41,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::style;
using namespace ::com::sun::star::io;
using namespace ::xmloff::token;
+using namespace xmloff;
+
+using css::xml::sax::FastToken::NAMESPACE;
enum SvXMLTokenMapAttrs
{
@@ -56,14 +61,22 @@ static const SvXMLTokenMapEntry* lcl_getBGImgAttributesAttrTokenMap()
{
static const 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_DRAW, XML_OPACITY, XML_TOK_BGIMG_OPACITY },
+ { 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_NAMESPACE_DRAW, XML_OPACITY, XML_TOK_BGIMG_OPACITY,
+ (NAMESPACE | XML_NAMESPACE_DRAW | XML_opacity) },
XML_TOKEN_MAP_END
};
return aBGImgAttributesAttrTokenMap;
@@ -75,14 +88,14 @@ static const SvXMLEnumMapEntry psXML_BrushHoriPos[] =
{
{ XML_LEFT, GraphicLocation_LEFT_MIDDLE },
{ XML_RIGHT, GraphicLocation_RIGHT_MIDDLE },
- { XML_TOKEN_INVALID, 0 }
+ { xmloff::token::XML_TOKEN_INVALID, 0 }
};
static const SvXMLEnumMapEntry psXML_BrushVertPos[] =
{
{ XML_TOP, GraphicLocation_MIDDLE_TOP },
{ XML_BOTTOM, GraphicLocation_MIDDLE_BOTTOM },
- { XML_TOKEN_INVALID, 0 }
+ { xmloff::token::XML_TOKEN_INVALID, 0 }
};
static void lcl_xmlbic_MergeHoriPos( GraphicLocation& ePos,
@@ -292,7 +305,7 @@ void XMLBackgroundImageContext::ProcessAttrs(
{ XML_BACKGROUND_REPEAT, GraphicLocation_TILED },
{ XML_BACKGROUND_NO_REPEAT, GraphicLocation_MIDDLE_MIDDLE },
{ XML_BACKGROUND_STRETCH, GraphicLocation_AREA },
- { XML_TOKEN_INVALID, 0 }
+ { xmloff::token::XML_TOKEN_INVALID, 0 }
};
if( SvXMLUnitConverter::convertEnum( nPos, rValue,
psXML_BrushRepeat ) )
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 39ceff7..b5a1148 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -28,10 +28,15 @@
#include <xmloff/i18nmap.hxx>
#include <xmloff/xmluconv.hxx>
#include "xmltabi.hxx"
+#include <xmloff/token/tokens.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using namespace ::com::sun::star;
using namespace ::xmloff::token;
+using namespace xmloff;
+
+using css::xml::sax::FastToken::NAMESPACE;
enum SvXMLTokenMapAttrs
{
@@ -45,11 +50,16 @@ enum SvXMLTokenMapAttrs
static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] =
{
- { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_TABSTOP_POSITION },
- { XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE },
- { XML_NAMESPACE_STYLE, XML_CHAR, XML_TOK_TABSTOP_CHAR },
- { XML_NAMESPACE_STYLE, XML_LEADER_TEXT, XML_TOK_TABSTOP_LEADER_TEXT },
- { XML_NAMESPACE_STYLE, XML_LEADER_STYLE, XML_TOK_TABSTOP_LEADER_STYLE },
+ { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_TABSTOP_POSITION,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_position) },
+ { XML_NAMESPACE_STYLE, XML_TYPE, XML_TOK_TABSTOP_TYPE,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_type) },
+ { XML_NAMESPACE_STYLE, XML_CHAR, XML_TOK_TABSTOP_CHAR,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_char) },
+ { XML_NAMESPACE_STYLE, XML_LEADER_TEXT, XML_TOK_TABSTOP_LEADER_TEXT,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_leader_text) },
+ { XML_NAMESPACE_STYLE, XML_LEADER_STYLE, XML_TOK_TABSTOP_LEADER_STYLE,
+ (NAMESPACE | XML_NAMESPACE_STYLE | XML_leader_style) },
XML_TOKEN_MAP_END
};
commit 037e73f9274427afaddaeb2382308d5b5bbaf8d6
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 25 08:42:56 2015 +0100
XMLIndexTOCContext implements fastparser ...
interface
Change-Id: Ia0b9559cd015ecec89c836918da062e8b2e1c715
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 341765d..cadcb2e 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/text/XTextSection.hpp>
#include <com/sun/star/text/XRelativeTextContentInsert.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
#include <sax/tools/converter.hxx>
#include "XMLIndexTOCSourceContext.hxx"
#include "XMLIndexObjectSourceContext.hxx"
@@ -40,6 +41,7 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
#include <xmloff/prstylei.hxx>
#include <xmloff/xmlerror.hxx>
#include <xmloff/xmluconv.hxx>
@@ -50,12 +52,14 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
+using namespace css::xml::sax;
+using namespace xmloff;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Reference;
-using ::com::sun::star::xml::sax::XAttributeList;
using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::lang::IllegalArgumentException;
+using css::xml::sax::FastToken::NAMESPACE;
TYPEINIT1(XMLIndexTOCContext, SvXMLImportContext);
@@ -91,7 +95,7 @@ SvXMLEnumMapEntry const aIndexTypeMap[] =
{ XML_BIBLIOGRAPHY, TEXT_INDEX_BIBLIOGRAPHY },
{ XML_USER_INDEX, TEXT_INDEX_USER },
{ XML_ILLUSTRATION_INDEX, TEXT_INDEX_ILLUSTRATION },
- { XML_TOKEN_INVALID, 0 }
+ { xmloff::token::XML_TOKEN_INVALID, 0 }
};
@@ -101,6 +105,7 @@ XMLIndexTOCContext::XMLIndexTOCContext(SvXMLImport& rImport,
, sIsProtected("IsProtected")
, sName("Name")
, eIndexType(TEXT_INDEX_UNKNOWN)
+ , iIndexType(0)
, bValid(false)
{
if (XML_NAMESPACE_TEXT == nPrfx)
@@ -120,6 +125,32 @@ XMLIndexTOCContext::XMLIndexTOCContext(SvXMLImport& rImport,
}
}
+XMLIndexTOCContext::XMLIndexTOCContext( SvXMLImport& rImport,
+ sal_Int32 Element )
+: SvXMLImportContext( rImport ),
+ sIsProtected("IsProtected"),
+ sName("Name"),
+ eIndexType(TEXT_INDEX_UNKNOWN),
+ iIndexType(0),
+ bValid(false)
+{
+ if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_of_content) )
+ iIndexType = XML_table_of_content_source;
+ else if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_alphabetical_index) )
+ iIndexType = XML_alphabetical_index_source;
+ else if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_index) )
+ iIndexType = XML_table_index_source;
+ else if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_object_index) )
+ iIndexType = XML_object_index_source;
+ else if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_bibliography) )
+ iIndexType = XML_bibliography_source;
+ else if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_index) )
+ iIndexType = XML_user_index_source;
+ else if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_illustration_index) )
+ iIndexType = XML_illustration_index_source;
+ bValid = iIndexType != 0;
+}
+
XMLIndexTOCContext::~XMLIndexTOCContext()
{
}
@@ -255,6 +286,128 @@ void XMLIndexTOCContext::StartElement(
}
}
+void SAL_CALL XMLIndexTOCContext::startFastElement( sal_Int32 /*Element*/,
+ const Reference< XFastAttributeList >& xAttrList )
+ throw(RuntimeException, SAXException, std::exception)
+{
+ if (bValid)
+ {
+ // find text:style-name attribute and set section style
+ // find text:protected and set value
+ // find text:name and set value (if not empty)
+ sal_Bool bProtected = sal_False;
+ OUString sIndexName;
+ OUString sXmlId;
+ XMLPropStyleContext* pStyle(NULL);
+ Sequence< css::xml::FastAttribute > attributes = xAttrList->getFastAttributes();
+ for( css::xml::FastAttribute attribute : attributes )
+ {
+ if( attribute.Token == (NAMESPACE | XML_NAMESPACE_TEXT | XML_style_name) )
+ {
+ pStyle = GetImport().GetTextImport()->FindSectionStyle(
+ attribute.Value );
+ }
+ else if( attribute.Token == (NAMESPACE | XML_NAMESPACE_TEXT | XML_protected) )
+ {
+ bool bTmp(false);
+ if( ::sax::Converter::convertBool( bTmp, attribute.Value ) )
+ {
+ bProtected = bTmp;
+ }
+ }
+ else if( attribute.Token == (NAMESPACE | XML_NAMESPACE_TEXT | XML_name) )
+ {
+ sIndexName = attribute.Value;
+ }
+ else if ( attribute.Token == (NAMESPACE | XML_NAMESPACE_XML | XML_id) )
+ {
+ sXmlId = attribute.Value;
+ }
+ }
+
+ // create table of content (via MultiServiceFactory)
+ Reference<XMultiServiceFactory> xFactory(GetImport().GetModel(),
+ UNO_QUERY);
+ if( xFactory.is() )
+ {
+ Reference<XInterface> xIfc =
+ xFactory->createInstance(
+ OUString::createFromAscii(aIndexServiceMap[eIndexType]));
+ if( xIfc.is() )
+ {
+ // get Property set
+ Reference<XPropertySet> xPropSet(xIfc, UNO_QUERY);
+ xTOCPropertySet = xPropSet;
+
+ // insert section
+ // a) insert section
+ // The inserted index consists of an empty paragraph
+ // only, as well as an empty paragraph *after* the index
+ // b) insert marker after index, and put Cursor inside of the
+ // index
+
+ // preliminaries
+#ifndef DBG_UTIL
+ OUString sMarker(" ");
+#else
+ OUString sMarker("Y");
+#endif
+ rtl::Reference<XMLTextImportHelper> rImport =
+ GetImport().GetTextImport();
+
+ // a) insert index
+ Reference<XTextContent> xTextContent(xIfc, UNO_QUERY);
+ try
+ {
+ GetImport().GetTextImport()->InsertTextContent(
+ xTextContent);
+ }
+ catch(const IllegalArgumentException& e)
+ {
+ // illegal argument? Then we can't accept indices here!
+ Sequence<OUString> aSeq(1);
+ aSeq[0] = GetLocalName();
+ GetImport().SetError(
+ XMLERROR_FLAG_ERROR | XMLERROR_NO_INDEX_ALLOWED_HERE,
+ aSeq, e.Message, NULL );
+
+ // set bValid to false, and return prematurely
+ bValid = false;
+ return;
+ }
+
+ // xml:id for RDF metadata
+ GetImport().SetXmlId(xIfc, sXmlId);
+
+ // b) insert marker and move cursor
+ rImport->InsertString(sMarker);
+ rImport->GetCursor()->goLeft(2, sal_False);
+ }
+ }
+
+ // finally, check for redlines that should start at
+ // the section start node
+ if( bValid )
+ GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(true);
+
+ if (pStyle != NULL)
+ {
+ pStyle->FillPropertySet( xTOCPropertySet );
+ }
+
+ Any aAny;
+ aAny.setValue( &bProtected, ::getBooleanCppuType() );
+ xTOCPropertySet->setPropertyValue( sIsProtected, aAny );
+
+ if (!sIndexName.isEmpty())
+ {
+ aAny <<= sIndexName;
+ xTOCPropertySet->setPropertyValue( sName, aAny );
+ }
+ }
+
+}
+
void XMLIndexTOCContext::EndElement()
{
// complete import of index by removing the markers (if the index
@@ -285,6 +438,38 @@ void XMLIndexTOCContext::EndElement()
}
}
+void SAL_CALL XMLIndexTOCContext::endFastElement( sal_Int32 /*Element*/ )
+ throw(RuntimeException, SAXException, std::exception)
+{
+ // complete import of index by removing the markers (if the index
+ // was actually inserted, that is)
+ if( bValid )
+ {
+ // preliminaries
+ OUString sEmpty;
+ rtl::Reference<XMLTextImportHelper> rHelper= GetImport().GetTextImport();
+
+ // get rid of last paragraph (unless it's the only paragraph)
+ rHelper->GetCursor()->goRight(1, sal_False);
+ if( xBodyContextRef.Is() &&
+ static_cast<XMLIndexBodyContext*>(&xBodyContextRef)->HasContent() )
+ {
+ rHelper->GetCursor()->goLeft(1, sal_True);
+ rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
+ sEmpty, sal_True);
+ }
+
+ // and delete second marker
+ rHelper->GetCursor()->goRight(1, sal_True);
+ rHelper->GetText()->insertString(rHelper->GetCursorAsRange(),
+ sEmpty, sal_True);
+
+ // check for Redlines on our end node
+ GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false);
+ }
+
+}
+
SvXMLImportContext* XMLIndexTOCContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -367,4 +552,74 @@ SvXMLImportContext* XMLIndexTOCContext::CreateChildContext(
return pContext;
}
+Reference< XFastContextHandler > SAL_CALL
+ XMLIndexTOCContext::createFastChildContext( sal_Int32 Element,
+ const Reference< XFastAttributeList >& xAttrList )
+ throw(RuntimeException, SAXException, std::exception)
+{
+ SvXMLImportContext *pContext = 0;
+
+ if( bValid )
+ {
+ if( XML_NAMESPACE_TEXT == (Element & XML_NAMESPACE_TEXT) )
+ {
+ if( XML_index_body == (Element & XML_index_body) )
+ {
+ pContext = new XMLIndexBodyContext(GetImport(), Element);
+ if( !xBodyContextRef.Is() ||
+ !static_cast<XMLIndexBodyContext*>(&xBodyContextRef)->HasContent() )
+ {
+ xBodyContextRef = pContext;
+ }
+ }
+ else if( iIndexType == (Element & iIndexType) )
+ {
+ // instantiate source context for the appropriate index type
+ switch( iIndexType )
+ {
+ case XML_table_of_content_source:
+ pContext = new XMLIndexTOCSourceContext(
+ GetImport(), Element, xTOCPropertySet );
+ break;
+ case XML_object_index_source:
+ pContext = new XMLIndexObjectSourceContext(
+ GetImport(), Element, xTOCPropertySet );
+ break;
+ case XML_alphabetical_index_source:
+ pContext = new XMLIndexAlphabeticalSourceContext(
+ GetImport(), Element, xTOCPropertySet );
+ break;
+ case XML_user_index_source:
+ pContext = new XMLIndexUserSourceContext(
+ GetImport(), Element, xTOCPropertySet );
+ break;
+ case XML_bibliography_source:
+ pContext = new XMLIndexBibliographySourceContext(
+ GetImport(), Element, xTOCPropertySet );
+ break;
+ case XML_table_index_source:
+ pContext = new XMLIndexTableSourceContext(
+ GetImport(), Element, xTOCPropertySet );
+ break;
+ case XML_illustration_index_source:
+ pContext = new XMLIndexIllustrationSourceContext(
+ GetImport(), Element, xTOCPropertySet );
+ break;
+
+ default:
+ OSL_FAIL("index type not implemented");
+ break;
+ }
+ } // else: ignore
+ } // else: no text: namespace -> ignore
+ } // else: not valid -> ignore
+
+ if( !pContext )
+ {
+ return SvXMLImportContext::createFastChildContext( Element, xAttrList );
+ }
+
+ return pContext;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx
index 509d875..56f0e1f 100644
--- a/xmloff/source/text/XMLIndexTOCContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCContext.hxx
@@ -25,7 +25,8 @@
namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XAttributeList; } }
+ namespace xml { namespace sax { class XAttributeList;
+ class XFastAttributeList;} }
namespace beans { class XPropertySet; }
} } }
@@ -62,6 +63,7 @@ class XMLIndexTOCContext : public SvXMLImportContext
::com::sun::star::beans::XPropertySet> xTOCPropertySet;
enum IndexTypeEnum eIndexType;
+ sal_Int32 iIndexType;
bool bValid;
@@ -75,6 +77,7 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLocalName );
+ XMLIndexTOCContext( SvXMLImport& rImport, sal_Int32 Element );
virtual ~XMLIndexTOCContext();
@@ -83,14 +86,23 @@ protected:
virtual void StartElement(
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
+ virtual void SAL_CALL startFastElement( sal_Int32 Element,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
+ virtual void SAL_CALL endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
#endif
commit bab0b5dc41bd286d103437307c379e567ca4f7d9
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 25 08:30:30 2015 +0100
XMLIndexAlphabeticalSourceContext implements ...
fastparser interface
Change-Id: Ic2a7210947bf74d4627baa5652b5ff16e148e086
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index 0fba2c1..d55f81f 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -34,10 +34,12 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
#include <xmloff/xmluconv.hxx>
#include <rtl/ustring.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
-
+using namespace css::xml::sax;
using ::com::sun::star::beans::XPropertySet;
@@ -47,6 +49,8 @@ using ::com::sun::star::xml::sax::XAttributeList;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_ALPHABETICAL_INDEX_ENTRY_TEMPLATE;
using ::xmloff::token::XML_OUTLINE_LEVEL;
+using xmloff::XML_alphabetical_index_entry_template;
+using css::xml::sax::FastToken::NAMESPACE;
const sal_Char sAPI_MainEntryCharacterStyleName[] = "MainEntryCharacterStyleName";
const sal_Char sAPI_UseAlphabeticalSeparators[] = "UseAlphabeticalSeparators";
@@ -91,6 +95,33 @@ XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext(
{
}
+XMLIndexAlphabeticalSourceContext::XMLIndexAlphabeticalSourceContext(
+ SvXMLImport& rImport, sal_Int32 Element,
+ Reference< XPropertySet >& rPropSet )
+: XMLIndexSourceBaseContext( rImport, Element, rPropSet, false ),
+ sMainEntryCharacterStyleName(sAPI_MainEntryCharacterStyleName),
+ sUseAlphabeticalSeparators(sAPI_UseAlphabeticalSeparators),
+ sUseCombinedEntries(sAPI_UseCombinedEntries),
+ sIsCaseSensitive(sAPI_IsCaseSensitive),
+ sUseKeyAsEntry(sAPI_UseKeyAsEntry),
+ sUseUpperCase(sAPI_UseUpperCase),
+ sUseDash(sAPI_UseDash),
+ sUsePP(sAPI_UsePP),
+ sIsCommaSeparated("IsCommaSeparated"),
+ sSortAlgorithm(sAPI_SortAlgorithm),
+ sLocale(sAPI_Locale),
+ bMainEntryStyleNameOK(false),
+ bSeparators(false),
+ bCombineEntries(true),
+ bCaseSensitive(true),
+ bEntry(false),
+ bUpperCase(false),
+ bCombineDash(false),
+ bCombinePP(true),
+ bCommaSeparated(false)
+{
+}
+
XMLIndexAlphabeticalSourceContext::~XMLIndexAlphabeticalSourceContext()
{
}
@@ -243,6 +274,58 @@ void XMLIndexAlphabeticalSourceContext::EndElement()
XMLIndexSourceBaseContext::EndElement();
}
+void SAL_CALL XMLIndexAlphabeticalSourceContext::endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ Any aAny;
+
+ if (bMainEntryStyleNameOK)
+ {
+ aAny <<= GetImport().GetStyleDisplayName(
+ XML_STYLE_FAMILY_TEXT_TEXT, sMainEntryStyleName );
+ rIndexPropertySet->setPropertyValue(sMainEntryCharacterStyleName,aAny);
+ }
+
+ aAny.setValue(&bSeparators, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sUseAlphabeticalSeparators, aAny);
+
+ aAny.setValue(&bCombineEntries, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sUseCombinedEntries, aAny);
+
+ aAny.setValue(&bCaseSensitive, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sIsCaseSensitive, aAny);
+
+ aAny.setValue(&bEntry, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sUseKeyAsEntry, aAny);
+
+ aAny.setValue(&bUpperCase, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sUseUpperCase, aAny);
+
+ aAny.setValue(&bCombineDash, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sUseDash, aAny);
+
+ aAny.setValue(&bCombinePP, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sUsePP, aAny);
+
+ aAny.setValue(&bCommaSeparated, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sIsCommaSeparated, aAny);
+
+
+ if (!sAlgorithm.isEmpty())
+ {
+ aAny <<= sAlgorithm;
+ rIndexPropertySet->setPropertyValue(sSortAlgorithm, aAny);
+ }
+
+ if ( !maLanguageTagODF.isEmpty() )
+ {
+ aAny <<= maLanguageTagODF.getLanguageTag().getLocale( false);
+ rIndexPropertySet->setPropertyValue(sLocale, aAny);
+ }
+
+ XMLIndexSourceBaseContext::endFastElement(Element);
+}
+
SvXMLImportContext* XMLIndexAlphabeticalSourceContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -266,4 +349,22 @@ SvXMLImportContext* XMLIndexAlphabeticalSourceContext::CreateChildContext(
}
}
+Reference< XFastContextHandler > SAL_CALL
+ XMLIndexAlphabeticalSourceContext::createFastChildContext( sal_Int32 Element,
+ const Reference< XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_alphabetical_index_entry_template) )
+ {
+ return new XMLIndexTemplateContext( GetImport(), rIndexPropertySet,
+ Element, aLevelNameAlphaMap, XML_OUTLINE_LEVEL,
+ aLevelStylePropNameAlphaMap, aAllowedTokenTypesAlpha );
+ }
+ else
+ {
+ return XMLIndexSourceBaseContext::createFastChildContext(
+ Element, xAttrList );
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index 44daad7..900f366 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
@@ -74,6 +74,8 @@ public:
const OUString& rLocalName,
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet);
+ XMLIndexAlphabeticalSourceContext( SvXMLImport& rImport, sal_Int32 Element,
+ css::uno::Reference< css::beans::XPropertySet >& rPropSet );
virtual ~XMLIndexAlphabeticalSourceContext();
@@ -84,12 +86,18 @@ protected:
const OUString& rValue) SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
+ virtual void SAL_CALL endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
#endif
commit 0e48a6a8fa4453f438e0115e385789c54112d773
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 25 08:22:39 2015 +0100
XMLIndexBibliographySourceContext implements ...
fastparser interface
Change-Id: I0febaf7f5bece8ccd4643edfcb80e14808cb61e0
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
index 9346173..bf88ac3 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx
@@ -29,16 +29,21 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
#include <xmloff/xmluconv.hxx>
#include <rtl/ustring.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using namespace ::xmloff::token;
+using namespace xmloff;
+using namespace css::xml::sax;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
using ::com::sun::star::xml::sax::XAttributeList;
+using css::xml::sax::FastToken::NAMESPACE;
TYPEINIT1(XMLIndexBibliographySourceContext, XMLIndexSourceBaseContext);
@@ -54,6 +59,13 @@ XMLIndexBibliographySourceContext::XMLIndexBibliographySourceContext(
{
}
+XMLIndexBibliographySourceContext::XMLIndexBibliographySourceContext(
+ SvXMLImport& rImport, sal_Int32 Element,
+ Reference< XPropertySet >& rPropSet )
+: XMLIndexSourceBaseContext( rImport, Element, rPropSet, false )
+{
+}
+
XMLIndexBibliographySourceContext::~XMLIndexBibliographySourceContext()
{
}
@@ -71,6 +83,11 @@ void XMLIndexBibliographySourceContext::EndElement()
// No attributes, no properties.
}
+void SAL_CALL XMLIndexBibliographySourceContext::endFastElement( sal_Int32 /*Element*/ )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ // No attributes, no properties.
+}
SvXMLImportContext* XMLIndexBibliographySourceContext::CreateChildContext(
sal_uInt16 nPrefix,
@@ -96,4 +113,24 @@ SvXMLImportContext* XMLIndexBibliographySourceContext::CreateChildContext(
}
+Reference< XFastContextHandler > SAL_CALL
+ XMLIndexBibliographySourceContext::createFastChildContext( sal_Int32 Element,
+ const Reference< XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_bibliography_entry_template) )
+ {
+ return new XMLIndexTemplateContext( GetImport(), rIndexPropertySet,
+ Element, aLevelNameBibliographyMap,
+ XML_BIBLIOGRAPHY_TYPE,
+ aLevelStylePropNameBibliographyMap,
+ aAllowedTokenTypesBibliography );
+ }
+ else
+ {
+ return XMLIndexSourceBaseContext::createFastChildContext(
+ Element, xAttrList );
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
index f3de882..b983acf 100644
--- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
+++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx
@@ -46,6 +46,8 @@ public:
const OUString& rLocalName,
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet);
+ XMLIndexBibliographySourceContext( SvXMLImport& rImport, sal_Int32 Element,
+ css::uno::Reference< css::beans::XPropertySet >& rPropSet );
virtual ~XMLIndexBibliographySourceContext();
@@ -56,12 +58,18 @@ protected:
const OUString& rValue) SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
+ virtual void SAL_CALL endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
#endif
commit bcc30b4a23ddc1e55a4785bd46d65d432e34a737
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Wed Feb 25 08:12:58 2015 +0100
XMLIndexObjectSourceContext imp fastparser ...
interface
Change-Id: I2b86ff9f682ef7a6c9d52c65e2ea104c7abc6dcc
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index 98451c6..7f5ea98 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -36,7 +36,10 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
+using namespace css::xml::sax;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Reference;
@@ -45,6 +48,8 @@ using ::com::sun::star::xml::sax::XAttributeList;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_OBJECT_INDEX_ENTRY_TEMPLATE;
using ::xmloff::token::XML_TOKEN_INVALID;
+using xmloff::XML_object_index_entry_template;
+using css::xml::sax::FastToken::NAMESPACE;
const sal_Char sAPI_CreateFromStarCalc[] = "CreateFromStarCalc";
const sal_Char sAPI_CreateFromStarChart[] = "CreateFromStarChart";
@@ -75,6 +80,23 @@ XMLIndexObjectSourceContext::XMLIndexObjectSourceContext(
{
}
+XMLIndexObjectSourceContext::XMLIndexObjectSourceContext(
+ SvXMLImport& rImport, sal_Int32 Element,
+ Reference< XPropertySet >& rPropSet )
+: XMLIndexSourceBaseContext( rImport, Element, rPropSet, false ),
+ sCreateFromStarCalc(sAPI_CreateFromStarCalc),
+ sCreateFromStarChart(sAPI_CreateFromStarChart),
+ sCreateFromStarDraw(sAPI_CreateFromStarDraw),
+ sCreateFromStarMath(sAPI_CreateFromStarMath),
+ sCreateFromOtherEmbeddedObjects(sAPI_CreateFromOtherEmbeddedObjects),
+ bUseCalc(false),
+ bUseChart(false),
+ bUseDraw(false),
+ bUseMath(false),
+ bUseOtherObjects(false)
+{
+}
+
XMLIndexObjectSourceContext::~XMLIndexObjectSourceContext()
{
}
@@ -150,6 +172,30 @@ void XMLIndexObjectSourceContext::EndElement()
XMLIndexSourceBaseContext::EndElement();
}
+void SAL_CALL XMLIndexObjectSourceContext::endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ Any aAny;
+
+ aAny.setValue(&bUseCalc, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromStarCalc, aAny);
+
+ aAny.setValue(&bUseChart, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromStarChart, aAny);
+
+ aAny.setValue(&bUseDraw, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromStarDraw, aAny);
+
+ aAny.setValue(&bUseMath, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromStarMath, aAny);
+
+ aAny.setValue(&bUseOtherObjects, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromOtherEmbeddedObjects, aAny);
+
+ XMLIndexSourceBaseContext::endFastElement(Element);
+}
+
+
SvXMLImportContext* XMLIndexObjectSourceContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -174,4 +220,23 @@ SvXMLImportContext* XMLIndexObjectSourceContext::CreateChildContext(
}
+Reference< XFastContextHandler > SAL_CALL
+ XMLIndexObjectSourceContext::createFastChildContext( sal_Int32 Element,
+ const Reference< XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_object_index_entry_template) )
+ {
+ return new XMLIndexTemplateContext( GetImport(), rIndexPropertySet,
+ Element, aLevelNameTableMap,
+ XML_TOKEN_INVALID, // no outline-level attr
+ aLevelStylePropNameTableMap, aAllowedTokenTypesTable );
+ }
+ else
+ {
+ return XMLIndexSourceBaseContext::createFastChildContext(
+ Element, xAttrList );
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
index eefe763..8581211 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx
@@ -57,6 +57,8 @@ public:
const OUString& rLocalName,
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet);
+ XMLIndexObjectSourceContext( SvXMLImport& rImport, sal_Int32 Element,
+ css::uno::Reference< css::beans::XPropertySet >& rPropSet );
virtual ~XMLIndexObjectSourceContext();
@@ -67,12 +69,18 @@ protected:
const OUString& rValue) SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
+ virtual void SAL_CALL endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
#endif
commit 9540f1c8b3923026d9b31058588774fb71334c82
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Tue Feb 24 15:55:56 2015 +0100
XMLIndexUserSourceContext imp fastparser interface
Change-Id: I918f58f183ac2aad4ad60c088209c3b343306849
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index f5772dc..6b43ec8 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -31,7 +31,10 @@
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
#include <rtl/ustring.hxx>
+#include <xmloff/token/tokens.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
+using namespace css::xml::sax;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Reference;
@@ -40,6 +43,8 @@ using ::com::sun::star::xml::sax::XAttributeList;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_USER_INDEX_ENTRY_TEMPLATE;
using ::xmloff::token::XML_OUTLINE_LEVEL;
+using xmloff::XML_user_index_entry_template;
+using css::xml::sax::FastToken::NAMESPACE;
const sal_Char sAPI_CreateFromEmbeddedObjects[] = "CreateFromEmbeddedObjects";
@@ -80,6 +85,28 @@ XMLIndexUserSourceContext::XMLIndexUserSourceContext(
{
}
+XMLIndexUserSourceContext::XMLIndexUserSourceContext(
+ SvXMLImport& rImport, sal_Int32 Element,
+ Reference< XPropertySet >& rPropSet )
+: XMLIndexSourceBaseContext( rImport, Element, rPropSet, true ),
+ sCreateFromEmbeddedObjects(sAPI_CreateFromEmbeddedObjects),
+ sCreateFromGraphicObjects(sAPI_CreateFromGraphicObjects),
+ sCreateFromMarks(sAPI_CreateFromMarks),
+ sCreateFromTables(sAPI_CreateFromTables),
+ sCreateFromTextFrames(sAPI_CreateFromTextFrames),
+ sUseLevelFromSource(sAPI_UseLevelFromSource),
+ sCreateFromLevelParagraphStyles(sAPI_CreateFromLevelParagraphStyles),
+ sUserIndexName(sAPI_UserIndexName),
+ bUseObjects(false),
+ bUseGraphic(false),
+ bUseMarks(false),
+ bUseTables(false),
+ bUseFrames(false),
+ bUseLevelFromSource(false),
+ bUseLevelParagraphStyles(false)
+{
+}
+
XMLIndexUserSourceContext::~XMLIndexUserSourceContext()
{
}
@@ -186,6 +213,41 @@ void XMLIndexUserSourceContext::EndElement()
XMLIndexSourceBaseContext::EndElement();
}
+void SAL_CALL XMLIndexUserSourceContext::endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ Any aAny;
+
+ aAny.setValue(&bUseObjects, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromEmbeddedObjects, aAny);
+
+ aAny.setValue(&bUseGraphic, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromGraphicObjects, aAny);
+
+ aAny.setValue(&bUseLevelFromSource, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sUseLevelFromSource, aAny);
+
+ aAny.setValue(&bUseMarks, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromMarks, aAny);
+
+ aAny.setValue(&bUseTables, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromTables, aAny);
+
+ aAny.setValue(&bUseFrames, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromTextFrames, aAny);
+
+ aAny.setValue(&bUseLevelParagraphStyles, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromLevelParagraphStyles, aAny);
+
+ if( !sIndexName.isEmpty() )
+ {
+ aAny <<= sIndexName;
+ rIndexPropertySet->setPropertyValue(sUserIndexName, aAny);
+ }
+
+ XMLIndexSourceBaseContext::endFastElement(Element);
+}
+
SvXMLImportContext* XMLIndexUserSourceContext::CreateChildContext(
sal_uInt16 nPrefix,
@@ -211,4 +273,22 @@ SvXMLImportContext* XMLIndexUserSourceContext::CreateChildContext(
}
+Reference< XFastContextHandler > SAL_CALL
+ XMLIndexUserSourceContext::createFastChildContext( sal_Int32 Element,
+ const Reference< XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_index_entry_template) )
+ {
+ return new XMLIndexTemplateContext( GetImport(), rIndexPropertySet,
+ Element, aSvLevelNameTOCMap, XML_OUTLINE_LEVEL,
+ aLevelStylePropNameTOCMap, aAllowedTokenTypesUser );
+ }
+ else
+ {
+ return XMLIndexSourceBaseContext::createFastChildContext(
+ Element, xAttrList );
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx
index 72bc536f..a7db387 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx
@@ -63,6 +63,8 @@ public:
const OUString& rLocalName,
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet);
+ XMLIndexUserSourceContext( SvXMLImport& rImport, sal_Int32 Element,
+ css::uno::Reference< css::beans::XPropertySet >& rPropSet );
virtual ~XMLIndexUserSourceContext();
@@ -73,12 +75,18 @@ protected:
const OUString& rValue) SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
+ virtual void SAL_CALL endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
#endif
commit 19812dc31f4c41d204b4f6a8937debb733f2f269
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Tue Feb 24 15:47:42 2015 +0100
XMLIndexTOCSourceContext impl fastparser interface
Change-Id: Ie47f2e01d77f04b0bfe18b022e11200a761f184a
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index d1ec00d..d4f8120 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -30,16 +30,21 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>
+#include <xmloff/token/tokens.hxx>
#include <rtl/ustring.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
using namespace ::xmloff::token;
+using namespace xmloff;
+using namespace css::xml::sax;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
using ::com::sun::star::xml::sax::XAttributeList;
+using css::xml::sax::FastToken::NAMESPACE;
const sal_Char sAPI_CreateFromOutline[] = "CreateFromOutline";
const sal_Char sAPI_CreateFromMarks[] = "CreateFromMarks";
@@ -67,6 +72,22 @@ XMLIndexTOCSourceContext::XMLIndexTOCSourceContext(
{
}
+XMLIndexTOCSourceContext::XMLIndexTOCSourceContext(
+ SvXMLImport& rImport, sal_Int32 Element,
+ Reference< XPropertySet >& rPropSet )
+: XMLIndexSourceBaseContext( rImport, Element, rPropSet, true ),
+ sCreateFromMarks(sAPI_CreateFromMarks),
+ sLevel(sAPI_Level),
+ sCreateFromOutline(sAPI_CreateFromOutline),
+ sCreateFromLevelParagraphStyles(sAPI_CreateFromLevelParagraphStyles),
+ // use all chapters by default
+ nOutlineLevel(rImport.GetTextImport()->GetChapterNumbering()->getCount()),
+ bUseOutline(true),
+ bUseMarks(true),
+ bUseParagraphStyles(false)
+{
+}
+
XMLIndexTOCSourceContext::~XMLIndexTOCSourceContext()
{
}
@@ -156,6 +177,27 @@ void XMLIndexTOCSourceContext::EndElement()
XMLIndexSourceBaseContext::EndElement();
}
+void SAL_CALL XMLIndexTOCSourceContext::endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ Any aAny;
+
+ aAny.setValue(&bUseMarks, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromMarks, aAny);
+
+ aAny.setValue(&bUseOutline, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromOutline, aAny);
+
+ aAny.setValue(&bUseParagraphStyles, ::getBooleanCppuType());
+ rIndexPropertySet->setPropertyValue(sCreateFromLevelParagraphStyles, aAny);
+
+ aAny <<= (sal_Int16)nOutlineLevel;
+ rIndexPropertySet->setPropertyValue(sLevel, aAny);
+
+ // process common attributes
+ XMLIndexSourceBaseContext::endFastElement(Element);
+}
+
SvXMLImportContext* XMLIndexTOCSourceContext::CreateChildContext(
sal_uInt16 nPrefix,
@@ -180,4 +222,22 @@ SvXMLImportContext* XMLIndexTOCSourceContext::CreateChildContext(
}
}
+Reference< XFastContextHandler > SAL_CALL
+ XMLIndexTOCSourceContext::createFastChildContext( sal_Int32 Element,
+ const Reference< XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, SAXException, std::exception)
+{
+ if( Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_of_content_entry_template) )
+ {
+ return new XMLIndexTemplateContext(GetImport(), rIndexPropertySet,
+ Element, aSvLevelNameTOCMap, XML_OUTLINE_LEVEL,
+ aLevelStylePropNameTOCMap, aAllowedTokenTypesTOC, true );
+ }
+ else
+ {
+ return XMLIndexSourceBaseContext::createFastChildContext(
+ Element, xAttrList );
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
index e6a79b6..7d46ff1 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx
@@ -55,6 +55,8 @@ public:
const OUString& rLocalName,
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet);
+ XMLIndexTOCSourceContext( SvXMLImport& rImport, sal_Int32 Element,
+ css::uno::Reference< css::beans::XPropertySet >& rPropSet );
virtual ~XMLIndexTOCSourceContext();
@@ -65,12 +67,18 @@ protected:
const OUString& rValue) SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
+ virtual void SAL_CALL endFastElement( sal_Int32 Element )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList ) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+ createFastChildContext( sal_Int32 Element,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+ throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
};
#endif
commit 15109d18aaa66700af049f385635714382cb6192
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date: Tue Feb 24 15:36:04 2015 +0100
fastparser interface impl. for ...
XMLIndexIllustrationSourceContext
Change-Id: I28ee4eeea00088a8355d3e080f880530f14a15ae
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx
index 0bc5ddc..cc2f186 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list