From 9ffaf2cbfb855390954380eb40ebd7415b26e067 Mon Sep 17 00:00:00 2001 From: Vojtěch Doležal Date: Wed, 17 May 2023 09:01:23 +0200 Subject: Removed remaining macro concatenations from xmloff/ For PropertyMaps.cxx used: (MAP_FULL\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_ENTRY\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_ENTRY_ODF12\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_ENTRY_ODF_EXT\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_ENTRY_ODF_EXT_IMPORT\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_CONTEXT\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_SPECIAL\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_SPECIAL_ODF12\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ (MAP_SPECIAL_ODF13\( *[A-Za-z0-9_]+ *, *) => \1XML_NAMESPACE_ For xmlexppr.cxx used: ENTRY\( *([A-Za-z0-9_]+) *\) => { GET_PROP_TYPE(XML_TYPE_PROP_\1), XML_\1_PROPERTIES } For OOo2Oasis.cxx used: (OOO_IMPORTER\( *)([A-Za-z]+) => \1xmloff_\2_get_implementation For xformsapi.cxx used: TOKEN_MAP_ENTRY\( *([A-Za-z0-9"]+) *, *([A-Za-z0-9_]+) *\) => { XML_NAMESPACE_\1, xmloff::token::XML_\2, xmloff::token::XML_\2 } For xformsexport.cxx used: TABLE_ENTRY\( *([A-Za-z0-9"_]+) *, *([A-Za-z0-9"_]+) *, *([A-Za-z0-9"_]+) *, *([A-Za-z0-9"_]+) *\) => { \1, XML_NAMESPACE_\2, xmloff::token::XML_\3, \4 } elementexport.cxx and property_meta_data.cxx done by hand. Change-Id: Ifb0c76a60f95e74ff1f9d596afdaff138c2228c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151867 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- xmloff/source/chart/PropertyMaps.cxx | 240 ++++++++++++++--------------- xmloff/source/forms/elementexport.cxx | 44 +++--- xmloff/source/forms/property_meta_data.cxx | 19 +-- xmloff/source/style/xmlexppr.cxx | 29 ++-- xmloff/source/transform/OOo2Oasis.cxx | 58 +++---- xmloff/source/xforms/xformsapi.cxx | 25 ++- xmloff/source/xforms/xformsexport.cxx | 105 +++++++------ 7 files changed, 257 insertions(+), 263 deletions(-) diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index ea40bd4c7e6b..964e317e780c 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -60,16 +60,16 @@ using namespace ::xmloff::token; using namespace css::chart2; -#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId, EarliestODFVersionForExport ) { ApiName, XML_NAMESPACE_##NameSpace, xmloff::token::XMLTokenName, XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport, false } -#define MAP_ENTRY( a, ns, nm, t ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_010, false } -#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_012, false } +#define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId, EarliestODFVersionForExport ) { ApiName, NameSpace, xmloff::token::XMLTokenName, XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport, false } +#define MAP_ENTRY( a, ns, nm, t ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_010, false } +#define MAP_ENTRY_ODF12( a, ns, nm, t ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_012, false } #define MAP_ENTRY_ODF13( a, ns, nm, t ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_013, false } -#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false } -#define MAP_ENTRY_ODF_EXT_IMPORT( a, ns, nm, t ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true } -#define MAP_CONTEXT( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, SvtSaveOptions::ODFSVER_010, false } -#define MAP_SPECIAL( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFSVER_010, false } -#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFSVER_012, false } -#define MAP_SPECIAL_ODF13( a, ns, nm, t, c ) { a, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFSVER_013, false } +#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false } +#define MAP_ENTRY_ODF_EXT_IMPORT( a, ns, nm, t ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, true } +#define MAP_CONTEXT( a, ns, nm, t, c ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, SvtSaveOptions::ODFSVER_010, false } +#define MAP_SPECIAL( a, ns, nm, t, c ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFSVER_010, false } +#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFSVER_012, false } +#define MAP_SPECIAL_ODF13( a, ns, nm, t, c ) { a, ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFSVER_013, false } #define MAP_ENTRY_END { nullptr } // PropertyMap for Chart properties drawing- and @@ -79,119 +79,119 @@ using namespace css::chart2; const XMLPropertyMapEntry aXMLChartPropMap[] = { // chart subtypes - MAP_ENTRY( PROP_UpDown, CHART, XML_JAPANESE_CANDLE_STICK, XML_TYPE_BOOL ), // formerly XML_STOCK_UPDOWN_BARS - MAP_CONTEXT( PROP_Volume, CHART, XML_STOCK_WITH_VOLUME, XML_TYPE_BOOL, XML_SCH_CONTEXT_STOCK_WITH_VOLUME ), - MAP_ENTRY( PROP_Dim3D, CHART, XML_THREE_DIMENSIONAL, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_Deep, CHART, XML_DEEP, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_Lines, CHART, XML_LINES, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_Percent, CHART, XML_PERCENTAGE, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_SolidType, CHART, XML_SOLID_TYPE, XML_SCH_TYPE_SOLID_TYPE ), + MAP_ENTRY( PROP_UpDown, XML_NAMESPACE_CHART, XML_JAPANESE_CANDLE_STICK, XML_TYPE_BOOL ), // formerly XML_STOCK_UPDOWN_BARS + MAP_CONTEXT( PROP_Volume, XML_NAMESPACE_CHART, XML_STOCK_WITH_VOLUME, XML_TYPE_BOOL, XML_SCH_CONTEXT_STOCK_WITH_VOLUME ), + MAP_ENTRY( PROP_Dim3D, XML_NAMESPACE_CHART, XML_THREE_DIMENSIONAL, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_Deep, XML_NAMESPACE_CHART, XML_DEEP, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_Lines, XML_NAMESPACE_CHART, XML_LINES, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_Percent, XML_NAMESPACE_CHART, XML_PERCENTAGE, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_SolidType, XML_NAMESPACE_CHART, XML_SOLID_TYPE, XML_SCH_TYPE_SOLID_TYPE ), // ODF 1.3 OFFICE-3662 added values - MAP_ENTRY( PROP_SplineType, CHART, XML_INTERPOLATION, XML_SCH_TYPE_INTERPOLATION ), - MAP_ENTRY( PROP_Stacked, CHART, XML_STACKED, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_SplineType, XML_NAMESPACE_CHART, XML_INTERPOLATION, XML_SCH_TYPE_INTERPOLATION ), + MAP_ENTRY( PROP_Stacked, XML_NAMESPACE_CHART, XML_STACKED, XML_TYPE_BOOL ), // type: "none", "automatic", "named-symbol" or "image" - MAP_ENTRY( PROP_SymbolType, CHART, XML_SYMBOL_TYPE, XML_SCH_TYPE_SYMBOL_TYPE | MID_FLAG_MULTI_PROPERTY ), + MAP_ENTRY( PROP_SymbolType, XML_NAMESPACE_CHART, XML_SYMBOL_TYPE, XML_SCH_TYPE_SYMBOL_TYPE | MID_FLAG_MULTI_PROPERTY ), // if type=="named-symbol" => name of symbol (square, diamond, ...) - MAP_ENTRY( PROP_SymbolType, CHART, XML_SYMBOL_NAME, XML_SCH_TYPE_NAMED_SYMBOL | MID_FLAG_MULTI_PROPERTY ), + MAP_ENTRY( PROP_SymbolType, XML_NAMESPACE_CHART, XML_SYMBOL_NAME, XML_SCH_TYPE_NAMED_SYMBOL | MID_FLAG_MULTI_PROPERTY ), // if type=="image" => an xlink:href element with a linked (package) URI - MAP_SPECIAL( PROP_SymbolBitmap, CHART, XML_SYMBOL_IMAGE, XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE ), - MAP_SPECIAL( PROP_SymbolSize, CHART, XML_SYMBOL_WIDTH, XML_TYPE_MEASURE | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_SYMBOL_WIDTH ), - MAP_SPECIAL( PROP_SymbolSize, CHART, XML_SYMBOL_HEIGHT, XML_TYPE_MEASURE | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_SYMBOL_HEIGHT ), - MAP_ENTRY( PROP_Vertical, CHART, XML_VERTICAL, XML_TYPE_BOOL ), + MAP_SPECIAL( PROP_SymbolBitmap, XML_NAMESPACE_CHART, XML_SYMBOL_IMAGE, XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE ), + MAP_SPECIAL( PROP_SymbolSize, XML_NAMESPACE_CHART, XML_SYMBOL_WIDTH, XML_TYPE_MEASURE | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_SYMBOL_WIDTH ), + MAP_SPECIAL( PROP_SymbolSize, XML_NAMESPACE_CHART, XML_SYMBOL_HEIGHT, XML_TYPE_MEASURE | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_SYMBOL_HEIGHT ), + MAP_ENTRY( PROP_Vertical, XML_NAMESPACE_CHART, XML_VERTICAL, XML_TYPE_BOOL ), // #i32368# property should no longer be used as XML-property (in OASIS // format), but is still ex-/imported for compatibility with the OOo file format - MAP_CONTEXT( PROP_NumberOfLines, CHART, XML_LINES_USED, XML_TYPE_NUMBER, XML_SCH_CONTEXT_LINES_USED ), - MAP_ENTRY( PROP_StackedBarsConnected, CHART, XML_CONNECT_BARS, XML_TYPE_BOOL ), - - MAP_ENTRY_ODF12( PROP_GroupBarsPerAxis, CHART, XML_GROUP_BARS_PER_AXIS, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( PROP_IncludeHiddenCells, CHART, XML_INCLUDE_HIDDEN_CELLS, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( PROP_AutomaticPosition, CHART, XML_AUTOMATIC_POSITION, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( PROP_AutomaticSize, CHART, XML_AUTOMATIC_SIZE, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( PROP_StartingAngle, CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER ), - MAP_ENTRY_ODF12( PROP_MissingValueTreatment, CHART, XML_TREAT_EMPTY_CELLS, XML_SCH_TYPE_MISSING_VALUE_TREATMENT ), + MAP_CONTEXT( PROP_NumberOfLines, XML_NAMESPACE_CHART, XML_LINES_USED, XML_TYPE_NUMBER, XML_SCH_CONTEXT_LINES_USED ), + MAP_ENTRY( PROP_StackedBarsConnected, XML_NAMESPACE_CHART, XML_CONNECT_BARS, XML_TYPE_BOOL ), + + MAP_ENTRY_ODF12( PROP_GroupBarsPerAxis, XML_NAMESPACE_CHART, XML_GROUP_BARS_PER_AXIS, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( PROP_IncludeHiddenCells, XML_NAMESPACE_CHART, XML_INCLUDE_HIDDEN_CELLS, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( PROP_AutomaticPosition, XML_NAMESPACE_CHART, XML_AUTOMATIC_POSITION, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( PROP_AutomaticSize, XML_NAMESPACE_CHART, XML_AUTOMATIC_SIZE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( PROP_StartingAngle, XML_NAMESPACE_CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER ), + MAP_ENTRY_ODF12( PROP_MissingValueTreatment, XML_NAMESPACE_CHART, XML_TREAT_EMPTY_CELLS, XML_SCH_TYPE_MISSING_VALUE_TREATMENT ), // #72304 Chart data table flags - MAP_ENTRY_ODF_EXT( PROP_DataTableHBorder, LO_EXT, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_DataTableVBorder, LO_EXT, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_DataTableOutline, LO_EXT, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT_IMPORT( PROP_DataTableHBorder, CHART, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT_IMPORT( PROP_DataTableVBorder, CHART, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT_IMPORT( PROP_DataTableOutline, CHART, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_DataTableHBorder, XML_NAMESPACE_LO_EXT, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_DataTableVBorder, XML_NAMESPACE_LO_EXT, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_DataTableOutline, XML_NAMESPACE_LO_EXT, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT_IMPORT( PROP_DataTableHBorder, XML_NAMESPACE_CHART, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT_IMPORT( PROP_DataTableVBorder, XML_NAMESPACE_CHART, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT_IMPORT( PROP_DataTableOutline, XML_NAMESPACE_CHART, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), // Chart display units flags - MAP_ENTRY_ODF_EXT( PROP_DisplayUnits, LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_BuiltInUnit, LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, XML_TYPE_STRING ), - MAP_ENTRY_ODF_EXT( PROP_ExternalData, LO_EXT, XML_EXTERNALDATA, XML_TYPE_STRING), + MAP_ENTRY_ODF_EXT( PROP_DisplayUnits, XML_NAMESPACE_LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_BuiltInUnit, XML_NAMESPACE_LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, XML_TYPE_STRING ), + MAP_ENTRY_ODF_EXT( PROP_ExternalData, XML_NAMESPACE_LO_EXT, XML_EXTERNALDATA, XML_TYPE_STRING), - MAP_ENTRY_ODF_EXT( PROP_LabelBorderColor, LO_EXT, XML_LABEL_STROKE_COLOR, XML_TYPE_COLOR ), - MAP_ENTRY_ODF_EXT( PROP_LabelBorderStyle, LO_EXT, XML_LABEL_STROKE, XML_SCH_TYPE_LABEL_BORDER_STYLE ), - MAP_ENTRY_ODF_EXT( PROP_LabelBorderTransparency, LO_EXT, XML_LABEL_STROKE_OPACITY, XML_SCH_TYPE_LABEL_BORDER_OPACITY ), - MAP_ENTRY_ODF_EXT( PROP_LabelBorderWidth, LO_EXT, XML_LABEL_STROKE_WIDTH, XML_TYPE_MEASURE ), + MAP_ENTRY_ODF_EXT( PROP_LabelBorderColor, XML_NAMESPACE_LO_EXT, XML_LABEL_STROKE_COLOR, XML_TYPE_COLOR ), + MAP_ENTRY_ODF_EXT( PROP_LabelBorderStyle, XML_NAMESPACE_LO_EXT, XML_LABEL_STROKE, XML_SCH_TYPE_LABEL_BORDER_STYLE ), + MAP_ENTRY_ODF_EXT( PROP_LabelBorderTransparency, XML_NAMESPACE_LO_EXT, XML_LABEL_STROKE_OPACITY, XML_SCH_TYPE_LABEL_BORDER_OPACITY ), + MAP_ENTRY_ODF_EXT( PROP_LabelBorderWidth, XML_NAMESPACE_LO_EXT, XML_LABEL_STROKE_WIDTH, XML_TYPE_MEASURE ), - MAP_ENTRY_ODF_EXT( PROP_LabelFillColor, LO_EXT, XML_LABEL_FILL_COLOR, XML_TYPE_COLOR ), - MAP_ENTRY_ODF_EXT( PROP_LabelFillStyle, LO_EXT, XML_LABEL_FILL, XML_SCH_TYPE_LABEL_FILL_STYLE ), - MAP_ENTRY_ODF_EXT( PROP_LabelFillBackground, LO_EXT, XML_FILL_HATCH_SOLID, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_LabelFillHatchName, LO_EXT, XML_FILL_HATCH_NAME, XML_TYPE_STYLENAME), + MAP_ENTRY_ODF_EXT( PROP_LabelFillColor, XML_NAMESPACE_LO_EXT, XML_LABEL_FILL_COLOR, XML_TYPE_COLOR ), + MAP_ENTRY_ODF_EXT( PROP_LabelFillStyle, XML_NAMESPACE_LO_EXT, XML_LABEL_FILL, XML_SCH_TYPE_LABEL_FILL_STYLE ), + MAP_ENTRY_ODF_EXT( PROP_LabelFillBackground, XML_NAMESPACE_LO_EXT, XML_FILL_HATCH_SOLID, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_LabelFillHatchName, XML_NAMESPACE_LO_EXT, XML_FILL_HATCH_NAME, XML_TYPE_STYLENAME), // Data table - MAP_ENTRY_ODF_EXT( PROP_HBorder, LO_EXT, XML_SHOW_HORIZONTAL_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_VBorder, LO_EXT, XML_SHOW_VERTICAL_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_Outline, LO_EXT, XML_SHOW_OUTLINE, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_Keys, LO_EXT, XML_SHOW_KEYS, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_HBorder, XML_NAMESPACE_LO_EXT, XML_SHOW_HORIZONTAL_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_VBorder, XML_NAMESPACE_LO_EXT, XML_SHOW_VERTICAL_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_Outline, XML_NAMESPACE_LO_EXT, XML_SHOW_OUTLINE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_Keys, XML_NAMESPACE_LO_EXT, XML_SHOW_KEYS, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_ScaleText, CHART, XML_SCALE_TEXT, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_ScaleText, XML_NAMESPACE_CHART, XML_SCALE_TEXT, XML_TYPE_BOOL ), // spline settings - MAP_ENTRY( PROP_SplineOrder, CHART, XML_SPLINE_ORDER, XML_TYPE_NUMBER ), - MAP_ENTRY( PROP_SplineResolution, CHART, XML_SPLINE_RESOLUTION, XML_TYPE_NUMBER ), + MAP_ENTRY( PROP_SplineOrder, XML_NAMESPACE_CHART, XML_SPLINE_ORDER, XML_TYPE_NUMBER ), + MAP_ENTRY( PROP_SplineResolution, XML_NAMESPACE_CHART, XML_SPLINE_RESOLUTION, XML_TYPE_NUMBER ), // plot-area properties - MAP_ENTRY( PROP_DataRowSource, CHART, XML_SERIES_SOURCE, XML_SCH_TYPE_DATAROWSOURCE ), - MAP_ENTRY_ODF12( PROP_SortByXValues, CHART, XML_SORT_BY_X_VALUES, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( PROP_RightAngledAxes, CHART, XML_RIGHT_ANGLED_AXES, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_DataRowSource, XML_NAMESPACE_CHART, XML_SERIES_SOURCE, XML_SCH_TYPE_DATAROWSOURCE ), + MAP_ENTRY_ODF12( PROP_SortByXValues, XML_NAMESPACE_CHART, XML_SORT_BY_X_VALUES, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( PROP_RightAngledAxes, XML_NAMESPACE_CHART, XML_RIGHT_ANGLED_AXES, XML_TYPE_BOOL ), // axis properties - MAP_ENTRY( PROP_DisplayLabels, CHART, XML_DISPLAY_LABEL, XML_TYPE_BOOL ), - MAP_SPECIAL( PROP_Marks, CHART, XML_TICK_MARKS_MAJOR_INNER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MAJ_INNER ), // convert one constant - MAP_SPECIAL( PROP_Marks, CHART, XML_TICK_MARKS_MAJOR_OUTER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MAJ_OUTER ), // to two bools - MAP_SPECIAL( PROP_HelpMarks, CHART, XML_TICK_MARKS_MINOR_INNER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MIN_INNER ), // see above - MAP_SPECIAL( PROP_HelpMarks, CHART, XML_TICK_MARKS_MINOR_OUTER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MIN_OUTER ), - MAP_CONTEXT( PROP_Logarithmic, CHART, XML_LOGARITHMIC, XML_TYPE_BOOL, XML_SCH_CONTEXT_LOGARITHMIC ), - MAP_CONTEXT( PROP_Min, CHART, XML_MINIMUM, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_MIN ), - MAP_CONTEXT( PROP_Max, CHART, XML_MAXIMUM, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_MAX ), - MAP_CONTEXT( PROP_Origin, CHART, XML_ORIGIN, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_ORIGIN ), - MAP_CONTEXT( PROP_StepMain, CHART, XML_INTERVAL_MAJOR, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_STEP_MAIN ), - MAP_CONTEXT( PROP_StepHelpCount, CHART, XML_INTERVAL_MINOR_DIVISOR, XML_TYPE_NUMBER, XML_SCH_CONTEXT_STEP_HELP_COUNT ), - MAP_ENTRY( PROP_GapWidth, CHART, XML_GAP_WIDTH, XML_TYPE_NUMBER ), - MAP_ENTRY( PROP_Overlap, CHART, XML_OVERLAP, XML_TYPE_NUMBER ), - MAP_ENTRY( PROP_TextCanOverlap, CHART, XML_TEXT_OVERLAP, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( PROP_ReverseDirection, CHART, XML_REVERSE_DIRECTION, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_TextBreak, TEXT, XML_LINE_BREAK, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_TryStaggeringFirst, LO_EXT, XML_TRY_STAGGERING_FIRST, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_ArrangeOrder, CHART, XML_LABEL_ARRANGEMENT, XML_SCH_TYPE_AXIS_ARRANGEMENT ), - MAP_SPECIAL( PROP_NumberFormat, STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER, XML_SCH_CONTEXT_SPECIAL_NUMBER_FORMAT ), - MAP_ENTRY( PROP_LinkNumberFormatToSource, CHART, XML_LINK_DATA_STYLE_TO_SOURCE, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_Visible, CHART, XML_VISIBLE, XML_TYPE_BOOL ), - MAP_ENTRY_ODF_EXT( PROP_MajorOrigin, LO_EXT, XML_MAJOR_ORIGIN, XML_TYPE_DOUBLE ), - - MAP_FULL( PROP_CrossoverPosition, CHART, XML_AXIS_POSITION, XML_SCH_TYPE_AXIS_POSITION|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0, SvtSaveOptions::ODFSVER_012 ), - MAP_FULL( PROP_CrossoverValue, CHART, XML_AXIS_POSITION, XML_SCH_TYPE_AXIS_POSITION_VALUE|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0, SvtSaveOptions::ODFSVER_012 ), - MAP_FULL( PROP_LabelPosition, CHART, XML_AXIS_LABEL_POSITION, XML_SCH_TYPE_AXIS_LABEL_POSITION, 0, SvtSaveOptions::ODFSVER_012 ), - MAP_FULL( PROP_MarkPosition, CHART, XML_TICK_MARK_POSITION, XML_SCH_TYPE_TICK_MARK_POSITION, 0, SvtSaveOptions::ODFSVER_012 ), + MAP_ENTRY( PROP_DisplayLabels, XML_NAMESPACE_CHART, XML_DISPLAY_LABEL, XML_TYPE_BOOL ), + MAP_SPECIAL( PROP_Marks, XML_NAMESPACE_CHART, XML_TICK_MARKS_MAJOR_INNER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MAJ_INNER ), // convert one constant + MAP_SPECIAL( PROP_Marks, XML_NAMESPACE_CHART, XML_TICK_MARKS_MAJOR_OUTER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MAJ_OUTER ), // to two bools + MAP_SPECIAL( PROP_HelpMarks, XML_NAMESPACE_CHART, XML_TICK_MARKS_MINOR_INNER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MIN_INNER ), // see above + MAP_SPECIAL( PROP_HelpMarks, XML_NAMESPACE_CHART, XML_TICK_MARKS_MINOR_OUTER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_TICKS_MIN_OUTER ), + MAP_CONTEXT( PROP_Logarithmic, XML_NAMESPACE_CHART, XML_LOGARITHMIC, XML_TYPE_BOOL, XML_SCH_CONTEXT_LOGARITHMIC ), + MAP_CONTEXT( PROP_Min, XML_NAMESPACE_CHART, XML_MINIMUM, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_MIN ), + MAP_CONTEXT( PROP_Max, XML_NAMESPACE_CHART, XML_MAXIMUM, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_MAX ), + MAP_CONTEXT( PROP_Origin, XML_NAMESPACE_CHART, XML_ORIGIN, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_ORIGIN ), + MAP_CONTEXT( PROP_StepMain, XML_NAMESPACE_CHART, XML_INTERVAL_MAJOR, XML_TYPE_DOUBLE, XML_SCH_CONTEXT_STEP_MAIN ), + MAP_CONTEXT( PROP_StepHelpCount, XML_NAMESPACE_CHART, XML_INTERVAL_MINOR_DIVISOR, XML_TYPE_NUMBER, XML_SCH_CONTEXT_STEP_HELP_COUNT ), + MAP_ENTRY( PROP_GapWidth, XML_NAMESPACE_CHART, XML_GAP_WIDTH, XML_TYPE_NUMBER ), + MAP_ENTRY( PROP_Overlap, XML_NAMESPACE_CHART, XML_OVERLAP, XML_TYPE_NUMBER ), + MAP_ENTRY( PROP_TextCanOverlap, XML_NAMESPACE_CHART, XML_TEXT_OVERLAP, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( PROP_ReverseDirection, XML_NAMESPACE_CHART, XML_REVERSE_DIRECTION, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_TextBreak, XML_NAMESPACE_TEXT, XML_LINE_BREAK, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_TryStaggeringFirst, XML_NAMESPACE_LO_EXT, XML_TRY_STAGGERING_FIRST, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_ArrangeOrder, XML_NAMESPACE_CHART, XML_LABEL_ARRANGEMENT, XML_SCH_TYPE_AXIS_ARRANGEMENT ), + MAP_SPECIAL( PROP_NumberFormat, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER, XML_SCH_CONTEXT_SPECIAL_NUMBER_FORMAT ), + MAP_ENTRY( PROP_LinkNumberFormatToSource, XML_NAMESPACE_CHART, XML_LINK_DATA_STYLE_TO_SOURCE, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_Visible, XML_NAMESPACE_CHART, XML_VISIBLE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( PROP_MajorOrigin, XML_NAMESPACE_LO_EXT, XML_MAJOR_ORIGIN, XML_TYPE_DOUBLE ), + + MAP_FULL( PROP_CrossoverPosition, XML_NAMESPACE_CHART, XML_AXIS_POSITION, XML_SCH_TYPE_AXIS_POSITION|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0, SvtSaveOptions::ODFSVER_012 ), + MAP_FULL( PROP_CrossoverValue, XML_NAMESPACE_CHART, XML_AXIS_POSITION, XML_SCH_TYPE_AXIS_POSITION_VALUE|MID_FLAG_MERGE_ATTRIBUTE|MID_FLAG_MULTI_PROPERTY, 0, SvtSaveOptions::ODFSVER_012 ), + MAP_FULL( PROP_LabelPosition, XML_NAMESPACE_CHART, XML_AXIS_LABEL_POSITION, XML_SCH_TYPE_AXIS_LABEL_POSITION, 0, SvtSaveOptions::ODFSVER_012 ), + MAP_FULL( PROP_MarkPosition, XML_NAMESPACE_CHART, XML_TICK_MARK_POSITION, XML_SCH_TYPE_TICK_MARK_POSITION, 0, SvtSaveOptions::ODFSVER_012 ), // statistical properties - MAP_ENTRY( PROP_MeanValue, CHART, XML_MEAN_VALUE, XML_TYPE_BOOL ), - MAP_ENTRY( PROP_ErrorMargin, CHART, XML_ERROR_MARGIN, XML_TYPE_DOUBLE ), - MAP_ENTRY( PROP_PositiveError, CHART, XML_ERROR_LOWER_LIMIT, XML_TYPE_DOUBLE), - MAP_ENTRY( PROP_NegativeError, CHART, XML_ERROR_UPPER_LIMIT, XML_TYPE_DOUBLE), - MAP_ENTRY( PROP_ShowPositiveError, CHART, XML_ERROR_UPPER_INDICATOR, XML_TYPE_BOOL), - MAP_ENTRY( PROP_ShowNegativeError, CHART, XML_ERROR_LOWER_INDICATOR, XML_TYPE_BOOL), - MAP_ENTRY( PROP_ErrorBarStyle, CHART, XML_ERROR_CATEGORY, XML_SCH_TYPE_ERROR_BAR_STYLE ), - MAP_ENTRY( PROP_PercentageError, CHART, XML_ERROR_PERCENTAGE, XML_TYPE_DOUBLE ), + MAP_ENTRY( PROP_MeanValue, XML_NAMESPACE_CHART, XML_MEAN_VALUE, XML_TYPE_BOOL ), + MAP_ENTRY( PROP_ErrorMargin, XML_NAMESPACE_CHART, XML_ERROR_MARGIN, XML_TYPE_DOUBLE ), + MAP_ENTRY( PROP_PositiveError, XML_NAMESPACE_CHART, XML_ERROR_LOWER_LIMIT, XML_TYPE_DOUBLE), + MAP_ENTRY( PROP_NegativeError, XML_NAMESPACE_CHART, XML_ERROR_UPPER_LIMIT, XML_TYPE_DOUBLE), + MAP_ENTRY( PROP_ShowPositiveError, XML_NAMESPACE_CHART, XML_ERROR_UPPER_INDICATOR, XML_TYPE_BOOL), + MAP_ENTRY( PROP_ShowNegativeError, XML_NAMESPACE_CHART, XML_ERROR_LOWER_INDICATOR, XML_TYPE_BOOL), + MAP_ENTRY( PROP_ErrorBarStyle, XML_NAMESPACE_CHART, XML_ERROR_CATEGORY, XML_SCH_TYPE_ERROR_BAR_STYLE ), + MAP_ENTRY( PROP_PercentageError, XML_NAMESPACE_CHART, XML_ERROR_PERCENTAGE, XML_TYPE_DOUBLE ), // regression curve properties - MAP_SPECIAL( PROP_RegressionType, CHART, XML_REGRESSION_TYPE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE ), - MAP_SPECIAL_ODF13( PROP_MovingAverageType, LO_EXT, XML_REGRESSION_MOVING_TYPE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_MOVING_AVERAGE_TYPE ), - MAP_SPECIAL_ODF13( PROP_MovingAverageType, CHART, XML_REGRESSION_MOVING_TYPE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_MOVING_AVERAGE_TYPE ), + MAP_SPECIAL( PROP_RegressionType, XML_NAMESPACE_CHART, XML_REGRESSION_TYPE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE ), + MAP_SPECIAL_ODF13( PROP_MovingAverageType, XML_NAMESPACE_LO_EXT, XML_REGRESSION_MOVING_TYPE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_MOVING_AVERAGE_TYPE ), + MAP_SPECIAL_ODF13( PROP_MovingAverageType, XML_NAMESPACE_CHART, XML_REGRESSION_MOVING_TYPE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_MOVING_AVERAGE_TYPE ), // ODF 1.3 OFFICE-3958 MAP_ENTRY_ODF13( PROP_CurveName, XML_NAMESPACE_LO_EXT, XML_REGRESSION_CURVE_NAME, XML_TYPE_STRING ), @@ -207,40 +207,40 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF13( PROP_MovingAveragePeriod, XML_NAMESPACE_LO_EXT, XML_REGRESSION_PERIOD, XML_TYPE_NUMBER ), MAP_ENTRY_ODF13( PROP_MovingAveragePeriod, XML_NAMESPACE_CHART, XML_REGRESSION_PERIOD, XML_TYPE_NUMBER ), - MAP_ENTRY_ODF_EXT( PROP_ExtrapolateForward, LO_EXT, XML_REGRESSION_EXTRAPOLATE_FORWARD, XML_TYPE_DOUBLE ), - MAP_ENTRY_ODF_EXT( PROP_ExtrapolateBackward, LO_EXT, XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ), - MAP_ENTRY_ODF_EXT_IMPORT( PROP_ExtrapolateForward, CHART, XML_REGRESSION_EXTRAPOLATE_FORWARD, XML_TYPE_DOUBLE ), - MAP_ENTRY_ODF_EXT_IMPORT( PROP_ExtrapolateBackward, CHART, XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ), + MAP_ENTRY_ODF_EXT( PROP_ExtrapolateForward, XML_NAMESPACE_LO_EXT, XML_REGRESSION_EXTRAPOLATE_FORWARD, XML_TYPE_DOUBLE ), + MAP_ENTRY_ODF_EXT( PROP_ExtrapolateBackward, XML_NAMESPACE_LO_EXT, XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ), + MAP_ENTRY_ODF_EXT_IMPORT( PROP_ExtrapolateForward, XML_NAMESPACE_CHART, XML_REGRESSION_EXTRAPOLATE_FORWARD, XML_TYPE_DOUBLE ), + MAP_ENTRY_ODF_EXT_IMPORT( PROP_ExtrapolateBackward, XML_NAMESPACE_CHART, XML_REGRESSION_EXTRAPOLATE_BACKWARD, XML_TYPE_DOUBLE ), - MAP_ENTRY_ODF_EXT( PROP_XName, LO_EXT, XML_REGRESSION_X_NAME, XML_TYPE_STRING ), - MAP_ENTRY_ODF_EXT( PROP_YName, LO_EXT, XML_REGRESSION_Y_NAME, XML_TYPE_STRING ), + MAP_ENTRY_ODF_EXT( PROP_XName, XML_NAMESPACE_LO_EXT, XML_REGRESSION_X_NAME, XML_TYPE_STRING ), + MAP_ENTRY_ODF_EXT( PROP_YName, XML_NAMESPACE_LO_EXT, XML_REGRESSION_Y_NAME, XML_TYPE_STRING ), - MAP_SPECIAL_ODF12( PROP_ErrorBarRangePositive, CHART, XML_ERROR_UPPER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only - MAP_SPECIAL_ODF12( PROP_ErrorBarRangeNegative, CHART, XML_ERROR_LOWER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only + MAP_SPECIAL_ODF12( PROP_ErrorBarRangePositive, XML_NAMESPACE_CHART, XML_ERROR_UPPER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only + MAP_SPECIAL_ODF12( PROP_ErrorBarRangeNegative, XML_NAMESPACE_CHART, XML_ERROR_LOWER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only // errorbars properties (chart2) - MAP_ENTRY_ODF_EXT( PROP_Weight, LO_EXT, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), - MAP_ENTRY_ODF_EXT_IMPORT( PROP_Weight, CHART, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), + MAP_ENTRY_ODF_EXT( PROP_Weight, XML_NAMESPACE_LO_EXT, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), + MAP_ENTRY_ODF_EXT_IMPORT( PROP_Weight, XML_NAMESPACE_CHART, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), // series/data-point properties - MAP_SPECIAL( PROP_DataCaption, CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ), // convert one constant - MAP_SPECIAL( PROP_DataCaption, CHART, XML_DATA_LABEL_TEXT, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_TEXT ), // to 'tristate' and two bools - MAP_SPECIAL( PROP_DataCaption, CHART, XML_DATA_LABEL_SYMBOL, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_SYMBOL ), - MAP_SPECIAL_ODF13( PROP_DataCaption, CHART, XML_DATA_LABEL_SERIES, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_SERIES ), - MAP_SPECIAL_ODF12( PROP_LabelSeparator, CHART, XML_LABEL_SEPARATOR, XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR ), - MAP_ENTRY_ODF12( PROP_LabelPlacement, CHART, XML_LABEL_POSITION, XML_SCH_TYPE_LABEL_PLACEMENT_TYPE ), - MAP_ENTRY( PROP_SegmentOffset, CHART, XML_PIE_OFFSET, XML_TYPE_NUMBER ), - MAP_SPECIAL_ODF12( PROP_PercentageNumberFormat, STYLE, XML_PERCENTAGE_DATA_STYLE_NAME, XML_TYPE_NUMBER, XML_SCH_CONTEXT_SPECIAL_NUMBER_FORMAT ), - MAP_ENTRY_ODF_EXT( PROP_ShowCustomLeaderLines, LO_EXT, XML_CUSTOM_LEADERLINES, XML_TYPE_BOOL ), + MAP_SPECIAL( PROP_DataCaption, XML_NAMESPACE_CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ), // convert one constant + MAP_SPECIAL( PROP_DataCaption, XML_NAMESPACE_CHART, XML_DATA_LABEL_TEXT, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_TEXT ), // to 'tristate' and two bools + MAP_SPECIAL( PROP_DataCaption, XML_NAMESPACE_CHART, XML_DATA_LABEL_SYMBOL, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_SYMBOL ), + MAP_SPECIAL_ODF13( PROP_DataCaption, XML_NAMESPACE_CHART, XML_DATA_LABEL_SERIES, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_SERIES ), + MAP_SPECIAL_ODF12( PROP_LabelSeparator, XML_NAMESPACE_CHART, XML_LABEL_SEPARATOR, XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR ), + MAP_ENTRY_ODF12( PROP_LabelPlacement, XML_NAMESPACE_CHART, XML_LABEL_POSITION, XML_SCH_TYPE_LABEL_PLACEMENT_TYPE ), + MAP_ENTRY( PROP_SegmentOffset, XML_NAMESPACE_CHART, XML_PIE_OFFSET, XML_TYPE_NUMBER ), + MAP_SPECIAL_ODF12( PROP_PercentageNumberFormat, XML_NAMESPACE_STYLE, XML_PERCENTAGE_DATA_STYLE_NAME, XML_TYPE_NUMBER, XML_SCH_CONTEXT_SPECIAL_NUMBER_FORMAT ), + MAP_ENTRY_ODF_EXT( PROP_ShowCustomLeaderLines, XML_NAMESPACE_LO_EXT, XML_CUSTOM_LEADERLINES, XML_TYPE_BOOL ), // text properties for titles - MAP_SPECIAL( PROP_TextRotation, STYLE, XML_ROTATION_ANGLE, XML_TYPE_NUMBER, XML_SCH_CONTEXT_SPECIAL_TEXT_ROTATION ), // convert 1/100th degrees to degrees - MAP_ENTRY( PROP_StackedText, STYLE, XML_DIRECTION, XML_SCH_TYPE_TEXT_ORIENTATION ), + MAP_SPECIAL( PROP_TextRotation, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_NUMBER, XML_SCH_CONTEXT_SPECIAL_TEXT_ROTATION ), // convert 1/100th degrees to degrees + MAP_ENTRY( PROP_StackedText, XML_NAMESPACE_STYLE, XML_DIRECTION, XML_SCH_TYPE_TEXT_ORIENTATION ), // for compatibility to pre 6.0beta documents // MAP_SPECIAL( PROP_SymbolBitmap", CHART, XML_SYMBOL_IMAGE_NAME, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE_NAME ), - MAP_ENTRY( PROP_ChartUserDefinedAttributes, TEXT, XML_XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM ), + MAP_ENTRY( PROP_ChartUserDefinedAttributes, XML_NAMESPACE_TEXT, XML_XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM ), MAP_ENTRY_END }; diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index af4e7585feff..d474adcdad5c 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -167,9 +167,9 @@ namespace xmloff // So we translate the old persistence service name into new ones, if possible OUString sToWriteServiceName = sServiceName; -#define CHECK_N_TRANSLATE( name ) \ - else if (sServiceName == SERVICE_PERSISTENT_COMPONENT_##name) \ - sToWriteServiceName = SERVICE_##name +#define CHECK_N_TRANSLATE( persistentComponent, serviceName ) \ + else if (sServiceName == persistentComponent) \ + sToWriteServiceName = serviceName if (sServiceName == SERVICE_PERSISTENT_COMPONENT_EDIT) { @@ -179,25 +179,25 @@ namespace xmloff if (xSI.is() && xSI->supportsService(SERVICE_FORMATTEDFIELD)) sToWriteServiceName = SERVICE_FORMATTEDFIELD; } - CHECK_N_TRANSLATE( FORM ); - CHECK_N_TRANSLATE( LISTBOX ); - CHECK_N_TRANSLATE( COMBOBOX ); - CHECK_N_TRANSLATE( RADIOBUTTON ); - CHECK_N_TRANSLATE( GROUPBOX ); - CHECK_N_TRANSLATE( FIXEDTEXT ); - CHECK_N_TRANSLATE( COMMANDBUTTON ); - CHECK_N_TRANSLATE( CHECKBOX ); - CHECK_N_TRANSLATE( GRID ); - CHECK_N_TRANSLATE( IMAGEBUTTON ); - CHECK_N_TRANSLATE( FILECONTROL ); - CHECK_N_TRANSLATE( TIMEFIELD ); - CHECK_N_TRANSLATE( DATEFIELD ); - CHECK_N_TRANSLATE( NUMERICFIELD ); - CHECK_N_TRANSLATE( CURRENCYFIELD ); - CHECK_N_TRANSLATE( PATTERNFIELD ); - CHECK_N_TRANSLATE( HIDDENCONTROL ); - CHECK_N_TRANSLATE( IMAGECONTROL ); - CHECK_N_TRANSLATE( FORMATTEDFIELD ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_FORM, SERVICE_FORM ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_LISTBOX, SERVICE_LISTBOX ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_COMBOBOX, SERVICE_COMBOBOX ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_RADIOBUTTON, SERVICE_RADIOBUTTON ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_GROUPBOX, SERVICE_GROUPBOX ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_FIXEDTEXT, SERVICE_FIXEDTEXT ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_COMMANDBUTTON, SERVICE_COMMANDBUTTON ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_CHECKBOX, SERVICE_CHECKBOX ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_GRID, SERVICE_GRID ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_IMAGEBUTTON, SERVICE_IMAGEBUTTON ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_FILECONTROL, SERVICE_FILECONTROL ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_TIMEFIELD, SERVICE_TIMEFIELD ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_DATEFIELD, SERVICE_DATEFIELD ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_NUMERICFIELD, SERVICE_NUMERICFIELD ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_CURRENCYFIELD, SERVICE_CURRENCYFIELD ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_PATTERNFIELD, SERVICE_PATTERNFIELD ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_HIDDENCONTROL, SERVICE_HIDDENCONTROL ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_IMAGECONTROL, SERVICE_IMAGECONTROL ); + CHECK_N_TRANSLATE( SERVICE_PERSISTENT_COMPONENT_FORMATTEDFIELD, SERVICE_FORMATTEDFIELD ); #if OSL_DEBUG_LEVEL > 0 Reference< XServiceInfo > xSI(m_xProps, UNO_QUERY); OSL_ENSURE(xSI.is() && xSI->supportsService(sToWriteServiceName), diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index ce5760856711..f8cb46c316c5 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -37,9 +37,6 @@ namespace xmloff::metadata using namespace ::xmloff::token; -#define FORM_SINGLE_PROPERTY( id, att ) \ - PropertyDescription( PROPERTY_##id, XML_NAMESPACE_FORM, att, &FormHandlerFactory::getFormPropertyHandler, PID_##id ) - //= property meta data namespace { @@ -47,14 +44,14 @@ namespace xmloff::metadata { static const PropertyDescription s_propertyMetaData[] = { - FORM_SINGLE_PROPERTY( DATE_MIN, XML_MIN_VALUE ), - FORM_SINGLE_PROPERTY( DATE_MAX, XML_MAX_VALUE ), - FORM_SINGLE_PROPERTY( DEFAULT_DATE, XML_VALUE ), - FORM_SINGLE_PROPERTY( DATE, XML_CURRENT_VALUE ), - FORM_SINGLE_PROPERTY( TIME_MIN, XML_MIN_VALUE ), - FORM_SINGLE_PROPERTY( TIME_MAX, XML_MAX_VALUE ), - FORM_SINGLE_PROPERTY( DEFAULT_TIME, XML_VALUE ), - FORM_SINGLE_PROPERTY( TIME, XML_CURRENT_VALUE ), + PropertyDescription( PROPERTY_DATE_MIN, XML_NAMESPACE_FORM, XML_MIN_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_DATE_MIN ), + PropertyDescription( PROPERTY_DATE_MAX, XML_NAMESPACE_FORM, XML_MAX_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_DATE_MAX ), + PropertyDescription( PROPERTY_DEFAULT_DATE, XML_NAMESPACE_FORM, XML_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_DEFAULT_DATE ), + PropertyDescription( PROPERTY_DATE, XML_NAMESPACE_FORM, XML_CURRENT_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_DATE ), + PropertyDescription( PROPERTY_TIME_MIN, XML_NAMESPACE_FORM, XML_MIN_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_TIME_MIN ), + PropertyDescription( PROPERTY_TIME_MAX, XML_NAMESPACE_FORM, XML_MAX_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_TIME_MAX ), + PropertyDescription( PROPERTY_DEFAULT_TIME, XML_NAMESPACE_FORM, XML_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_DEFAULT_TIME ), + PropertyDescription( PROPERTY_TIME, XML_NAMESPACE_FORM, XML_CURRENT_VALUE, &FormHandlerFactory::getFormPropertyHandler, PID_TIME ), PropertyDescription() }; diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index ee1600da27d6..4cb8e7b05150 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -54,7 +54,6 @@ using namespace ::com::sun::star::lang; using namespace ::xmloff::token; #define GET_PROP_TYPE( f ) static_cast((f & XML_TYPE_PROP_MASK) >> XML_TYPE_PROP_SHIFT) -#define ENTRY(t) { GET_PROP_TYPE(XML_TYPE_PROP_##t), XML_##t##_PROPERTIES } namespace { @@ -70,20 +69,20 @@ const sal_uInt16 MAX_PROP_TYPES = XMLPropTokens_Impl const aPropTokens[MAX_PROP_TYPES] = { - ENTRY(CHART), - ENTRY(GRAPHIC), - ENTRY(TABLE), - ENTRY(TABLE_COLUMN), - ENTRY(TABLE_ROW), - ENTRY(TABLE_CELL), - ENTRY(LIST_LEVEL), - ENTRY(PARAGRAPH), - ENTRY(TEXT), - ENTRY(DRAWING_PAGE), - ENTRY(PAGE_LAYOUT), - ENTRY(HEADER_FOOTER), - ENTRY(RUBY), - ENTRY(SECTION) + { GET_PROP_TYPE(XML_TYPE_PROP_CHART), XML_CHART_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_GRAPHIC), XML_GRAPHIC_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_TABLE), XML_TABLE_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_TABLE_COLUMN), XML_TABLE_COLUMN_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_TABLE_ROW), XML_TABLE_ROW_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_TABLE_CELL), XML_TABLE_CELL_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_LIST_LEVEL), XML_LIST_LEVEL_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_PARAGRAPH), XML_PARAGRAPH_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_TEXT), XML_TEXT_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_DRAWING_PAGE), XML_DRAWING_PAGE_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_PAGE_LAYOUT), XML_PAGE_LAYOUT_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_HEADER_FOOTER), XML_HEADER_FOOTER_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_RUBY), XML_RUBY_PROPERTIES }, + { GET_PROP_TYPE(XML_TYPE_PROP_SECTION), XML_SECTION_PROPERTIES } }; // public methods diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 150de69aebc6..d7d63b853c8b 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1767,9 +1767,9 @@ xmloff_OOo2OasisTransformer_get_implementation( return cppu::acquire(new OOo2OasisTransformer("com.sun.star.comp.OOo2OasisTransformer", OUString())); } -#define OOO_IMPORTER( className, implName, subServiceName ) \ +#define OOO_IMPORTER( xml_className_get_impl, implName, subServiceName ) \ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* \ -xmloff_##className##_get_implementation( \ +xml_className_get_impl( \ css::uno::XComponentContext* , css::uno::Sequence const&) \ { \ return cppu::acquire(new OOo2OasisTransformer( \ @@ -1777,92 +1777,92 @@ xmloff_##className##_get_implementation( \ subServiceName )); \ } -OOO_IMPORTER( XMLWriterImportOOO, +OOO_IMPORTER( xmloff_XMLWriterImportOOO_get_implementation, "com.sun.star.comp.Writer.XMLImporter", "com.sun.star.comp.Writer.XMLOasisImporter" ) -OOO_IMPORTER( XMLWriterStylesImportOOO, +OOO_IMPORTER( xmloff_XMLWriterStylesImportOOO_get_implementation, "com.sun.star.comp.Writer.XMLStylesImporter", "com.sun.star.comp.Writer.XMLOasisStylesImporter" ) -OOO_IMPORTER( XMLWriterContentImportOOO, +OOO_IMPORTER( xmloff_XMLWriterContentImportOOO_get_implementation, "com.sun.star.comp.Writer.XMLContentImporter", "com.sun.star.comp.Writer.XMLOasisContentImporter" ) -OOO_IMPORTER( XMLWriterMetaImportOOO, +OOO_IMPORTER( xmloff_XMLWriterMetaImportOOO_get_implementation, "com.sun.star.comp.Writer.XMLMetaImporter", "com.sun.star.comp.Writer.XMLOasisMetaImporter" ) -OOO_IMPORTER( XMLWriterSettingsImportOOO, +OOO_IMPORTER( xmloff_XMLWriterSettingsImportOOO_get_implementation, "com.sun.star.comp.Writer.XMLSettingsImporter", "com.sun.star.comp.Writer.XMLOasisSettingsImporter" ) -OOO_IMPORTER( XMLImpressImportOOO, +OOO_IMPORTER( xmloff_XMLImpressImportOOO_get_implementation, "com.sun.star.comp.Impress.XMLImporter", "com.sun.star.comp.Impress.XMLOasisImporter" ) -OOO_IMPORTER( XMLImpressStylesImportOOO, +OOO_IMPORTER( xmloff_XMLImpressStylesImportOOO_get_implementation, "com.sun.star.comp.Impress.XMLStylesImporter", "com.sun.star.comp.Impress.XMLOasisStylesImporter" ) -OOO_IMPORTER( XMLImpressContentImportOOO, +OOO_IMPORTER( xmloff_XMLImpressContentImportOOO_get_implementation, "com.sun.star.comp.Impress.XMLContentImporter", "com.sun.star.comp.Impress.XMLOasisContentImporter" ) -OOO_IMPORTER( XMLImpressMetaImportOOO, +OOO_IMPORTER( xmloff_XMLImpressMetaImportOOO_get_implementation, "com.sun.star.comp.Impress.XMLMetaImporter", "com.sun.star.comp.Impress.XMLOasisMetaImporter" ) -OOO_IMPORTER( XMLImpressSettingsImportOOO, +OOO_IMPORTER( xmloff_XMLImpressSettingsImportOOO_get_implementation, "com.sun.star.comp.Impress.XMLSettingsImporter", "com.sun.star.comp.Impress.XMLOasisSettingsImporter" ) -OOO_IMPORTER( XMLDrawImportOOO, +OOO_IMPORTER( xmloff_XMLDrawImportOOO_get_implementation, "com.sun.star.comp.Draw.XMLImporter", "com.sun.star.comp.Draw.XMLOasisImporter" ) -OOO_IMPORTER( XMLDrawStylesImportOOO, +OOO_IMPORTER( xmloff_XMLDrawStylesImportOOO_get_implementation, "com.sun.star.comp.Draw.XMLStylesImporter", "com.sun.star.comp.Draw.XMLOasisStylesImporter" ) -OOO_IMPORTER( XMLDrawContentImportOOO, +OOO_IMPORTER( xmloff_XMLDrawContentImportOOO_get_implementation, "com.sun.star.comp.Draw.XMLContentImporter", "com.sun.star.comp.Draw.XMLOasisContentImporter" ) -OOO_IMPORTER( XMLDrawMetaImportOOO, +OOO_IMPORTER( xmloff_XMLDrawMetaImportOOO_get_implementation, "com.sun.star.comp.Draw.XMLMetaImporter", "com.sun.star.comp.Draw.XMLOasisMetaImporter" ) -OOO_IMPORTER( XMLDrawSettingsImportOOO, +OOO_IMPORTER( xmloff_XMLDrawSettingsImportOOO_get_implementation, "com.sun.star.comp.Draw.XMLSettingsImporter", "com.sun.star.comp.Draw.XMLOasisSettingsImporter" ) -OOO_IMPORTER( XMLCalcImportOOO, +OOO_IMPORTER( xmloff_XMLCalcImportOOO_get_implementation, "com.sun.star.comp.Calc.XMLImporter", "com.sun.star.comp.Calc.XMLOasisImporter" ) -OOO_IMPORTER( XMLCalcStylesImportOOO, +OOO_IMPORTER( xmloff_XMLCalcStylesImportOOO_get_implementation, "com.sun.star.comp.Calc.XMLStylesImporter", "com.sun.star.comp.Calc.XMLOasisStylesImporter" ) -OOO_IMPORTER( XMLCalcContentImportOOO, +OOO_IMPORTER( xmloff_XMLCalcContentImportOOO_get_implementation, "com.sun.star.comp.Calc.XMLContentImporter", "com.sun.star.comp.Calc.XMLOasisContentImporter" ) -OOO_IMPORTER( XMLCalcMetaImportOOO, +OOO_IMPORTER( xmloff_XMLCalcMetaImportOOO_get_implementation, "com.sun.star.comp.Calc.XMLMetaImporter", "com.sun.star.comp.Calc.XMLOasisMetaImporter" ) -OOO_IMPORTER( XMLCalcSettingsImportOOO, +OOO_IMPORTER( xmloff_XMLCalcSettingsImportOOO_get_implementation, "com.sun.star.comp.Calc.XMLSettingsImporter", "com.sun.star.comp.Calc.XMLOasisSettingsImporter" ) -OOO_IMPORTER( XMLChartImportOOO, +OOO_IMPORTER( xmloff_XMLChartImportOOO_get_implementation, "com.sun.star.comp.Chart.XMLImporter", "com.sun.star.comp.Chart.XMLOasisImporter" ) -OOO_IMPORTER( XMLChartStylesImportOOO, +OOO_IMPORTER( xmloff_XMLChartStylesImportOOO_get_implementation, "com.sun.star.comp.Chart.XMLStylesImporter", "com.sun.star.comp.Chart.XMLOasisStylesImporter" ) -OOO_IMPORTER( XMLChartContentImportOOO, +OOO_IMPORTER( xmloff_XMLChartContentImportOOO_get_implementation, "com.sun.star.comp.Chart.XMLContentImporter", "com.sun.star.comp.Chart.XMLOasisContentImporter" ) -OOO_IMPORTER( XMLMathMetaImportOOO, +OOO_IMPORTER( xmloff_XMLMathMetaImportOOO_get_implementation, "com.sun.star.comp.Math.XMLMetaImporter", "com.sun.star.comp.Math.XMLOasisMetaImporter" ) -OOO_IMPORTER( XMLMathSettingsImportOOO, +OOO_IMPORTER( xmloff_XMLMathSettingsImportOOO_get_implementation, "com.sun.star.comp.Math.XMLSettingsImporter", "com.sun.star.comp.Math.XMLOasisSettingsImporter" ) -OOO_IMPORTER( XMLMetaImportOOO, +OOO_IMPORTER( xmloff_XMLMetaImportOOO_get_implementation, "com.sun.star.document.XMLMetaImporter", "com.sun.star.document.XMLOasisMetaImporter" ) -OOO_IMPORTER( XMLAutoTextEventImportOOO, +OOO_IMPORTER( xmloff_XMLAutoTextEventImportOOO_get_implementation, "com.sun.star.comp.Writer.XMLAutotextEventsImporter", "com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter" ) diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 4c4a80ca3827..feb5d732b08c 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -170,21 +170,20 @@ void xforms_setValueAny( Reference const & xPropertySet, xPropertySet->setPropertyValue( rName, rAny ); } -#define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN } 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 ), + { XML_NAMESPACE_XSD, xmloff::token::XML_STRING, xmloff::token::XML_STRING }, + { XML_NAMESPACE_XSD, xmloff::token::XML_DECIMAL, xmloff::token::XML_DECIMAL }, + { XML_NAMESPACE_XSD, xmloff::token::XML_DOUBLE, xmloff::token::XML_DOUBLE }, + { XML_NAMESPACE_XSD, xmloff::token::XML_FLOAT, xmloff::token::XML_FLOAT }, + { XML_NAMESPACE_XSD, xmloff::token::XML_BOOLEAN, xmloff::token::XML_BOOLEAN }, + { XML_NAMESPACE_XSD, xmloff::token::XML_ANYURI, xmloff::token::XML_ANYURI }, + { XML_NAMESPACE_XSD, xmloff::token::XML_DATETIME_XSD, xmloff::token::XML_DATETIME_XSD }, + { XML_NAMESPACE_XSD, xmloff::token::XML_DATE, xmloff::token::XML_DATE }, + { XML_NAMESPACE_XSD, xmloff::token::XML_TIME, xmloff::token::XML_TIME }, + { XML_NAMESPACE_XSD, xmloff::token::XML_YEAR, xmloff::token::XML_YEAR }, + { XML_NAMESPACE_XSD, xmloff::token::XML_MONTH, xmloff::token::XML_MONTH }, + { XML_NAMESPACE_XSD, xmloff::token::XML_DAY, xmloff::token::XML_DAY }, XML_TOKEN_MAP_END }; diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index e88ac4b6e21a..9b1bc0da624f 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -122,7 +122,6 @@ static void lcl_export( const Reference& rPropertySet, SvXMLExport& rExport, const ExportTable* pTable ); -#define TABLE_ENTRY(NAME,NAMESPACE,TOKEN,CONVERTER) { NAME,XML_NAMESPACE_##NAMESPACE,xmloff::token::XML_##TOKEN, CONVERTER } #define TABLE_END { nullptr, 0, 0, nullptr } // any conversion functions @@ -156,8 +155,8 @@ static OUString lcl_getXSDType( SvXMLExport const & rExport, const ExportTable aXFormsModelTable[] = { - TABLE_ENTRY( "ID", NONE, ID, xforms_string ), - TABLE_ENTRY( "SchemaRef", NONE, SCHEMA, xforms_string ), + { "ID", XML_NAMESPACE_NONE, xmloff::token::XML_ID, xforms_string }, + { "SchemaRef", XML_NAMESPACE_NONE, xmloff::token::XML_SCHEMA, xforms_string }, TABLE_END }; @@ -255,15 +254,15 @@ void exportXFormsInstance( SvXMLExport& rExport, const ExportTable aXFormsBindingTable[] = { - TABLE_ENTRY( "BindingID", NONE, ID, xforms_string ), - TABLE_ENTRY( "BindingExpression", NONE, NODESET, xforms_string ), - TABLE_ENTRY( "ReadonlyExpression", NONE, READONLY, xforms_string ), - TABLE_ENTRY( "RelevantExpression", NONE, RELEVANT, xforms_string ), - TABLE_ENTRY( "RequiredExpression", NONE, REQUIRED, xforms_string ), - TABLE_ENTRY( "ConstraintExpression", NONE, CONSTRAINT, xforms_string ), - TABLE_ENTRY( "CalculateExpression", NONE, CALCULATE, xforms_string ), + { "BindingID", XML_NAMESPACE_NONE, xmloff::token::XML_ID, xforms_string }, + { "BindingExpression", XML_NAMESPACE_NONE, xmloff::token::XML_NODESET, xforms_string }, + { "ReadonlyExpression", XML_NAMESPACE_NONE, xmloff::token::XML_READONLY, xforms_string }, + { "RelevantExpression", XML_NAMESPACE_NONE, xmloff::token::XML_RELEVANT, xforms_string }, + { "RequiredExpression", XML_NAMESPACE_NONE, xmloff::token::XML_REQUIRED, xforms_string }, + { "ConstraintExpression", XML_NAMESPACE_NONE, xmloff::token::XML_CONSTRAINT, xforms_string }, + { "CalculateExpression", XML_NAMESPACE_NONE, xmloff::token::XML_CALCULATE, xforms_string }, // type handled separately, for type name <-> XSD type conversion - // TABLE_ENTRY( "Type", NONE, TYPE, xforms_string ), + // { "Type", XML_NAMESPACE_NONE, xmloff::token::XML_TYPE, xforms_string }, TABLE_END }; @@ -369,21 +368,21 @@ void exportXFormsBinding( SvXMLExport& rExport, const ExportTable aXFormsSubmissionTable[] = { - TABLE_ENTRY( "ID", NONE, ID, xforms_string ), - TABLE_ENTRY( "Bind", NONE, BIND, xforms_string ), - TABLE_ENTRY( "Ref", NONE, REF, xforms_string ), - TABLE_ENTRY( "Action", NONE, ACTION, xforms_string ), - TABLE_ENTRY( "Method", NONE, METHOD, xforms_string ), - TABLE_ENTRY( "Version", NONE, VERSION, xforms_string ), - TABLE_ENTRY( "Indent", NONE, INDENT, xforms_bool ), - TABLE_ENTRY( "MediaType", NONE, MEDIATYPE, xforms_string ), - TABLE_ENTRY( "Encoding", NONE, ENCODING, xforms_string ), - TABLE_ENTRY( "OmitXmlDeclaration", NONE, OMIT_XML_DECLARATION, xforms_bool ), - TABLE_ENTRY( "Standalone", NONE, STANDALONE, xforms_bool ), - TABLE_ENTRY( "CDataSectionElement", NONE, CDATA_SECTION_ELEMENTS, xforms_string ), - TABLE_ENTRY( "Replace", NONE, REPLACE, xforms_string ), - TABLE_ENTRY( "Separator", NONE, SEPARATOR, xforms_string ), - TABLE_ENTRY( "IncludeNamespacePrefixes", NONE, INCLUDENAMESPACEPREFIXES, xforms_string ), + { "ID", XML_NAMESPACE_NONE, xmloff::token::XML_ID, xforms_string }, + { "Bind", XML_NAMESPACE_NONE, xmloff::token::XML_BIND, xforms_string }, + { "Ref", XML_NAMESPACE_NONE, xmloff::token::XML_REF, xforms_string }, + { "Action", XML_NAMESPACE_NONE, xmloff::token::XML_ACTION, xforms_string }, + { "Method", XML_NAMESPACE_NONE, xmloff::token::XML_METHOD, xforms_string }, + { "Version", XML_NAMESPACE_NONE, xmloff::token::XML_VERSION, xforms_string }, + { "Indent", XML_NAMESPACE_NONE, xmloff::token::XML_INDENT, xforms_bool }, + { "MediaType", XML_NAMESPACE_NONE, xmloff::token::XML_MEDIATYPE, xforms_string }, + { "Encoding", XML_NAMESPACE_NONE, xmloff::token::XML_ENCODING, xforms_string }, + { "OmitXmlDeclaration", XML_NAMESPACE_NONE, xmloff::token::XML_OMIT_XML_DECLARATION, xforms_bool }, + { "Standalone", XML_NAMESPACE_NONE, xmloff::token::XML_STANDALONE, xforms_bool }, + { "CDataSectionElement", XML_NAMESPACE_NONE, xmloff::token::XML_CDATA_SECTION_ELEMENTS, xforms_string }, + { "Replace", XML_NAMESPACE_NONE, xmloff::token::XML_REPLACE, xforms_string }, + { "Separator", XML_NAMESPACE_NONE, xmloff::token::XML_SEPARATOR, xforms_string }, + { "IncludeNamespacePrefixes", XML_NAMESPACE_NONE, xmloff::token::XML_INCLUDENAMESPACEPREFIXES, xforms_string }, TABLE_END }; @@ -401,34 +400,34 @@ void exportXFormsSubmission( SvXMLExport& rExport, const ExportTable aDataTypeFacetTable[] = { - TABLE_ENTRY( "Length", XSD, LENGTH, xforms_int32 ), - TABLE_ENTRY( "MinLength", XSD, MINLENGTH, xforms_int32 ), - TABLE_ENTRY( "MaxLength", XSD, MAXLENGTH, xforms_int32 ), - TABLE_ENTRY( "MinInclusiveInt", XSD, MININCLUSIVE, xforms_int32 ), - TABLE_ENTRY( "MinExclusiveInt", XSD, MINEXCLUSIVE, xforms_int32 ), - TABLE_ENTRY( "MaxInclusiveInt", XSD, MAXINCLUSIVE, xforms_int32 ), - TABLE_ENTRY( "MaxExclusiveInt", XSD, MAXEXCLUSIVE, xforms_int32 ), - TABLE_ENTRY( "MinInclusiveDouble", XSD, MININCLUSIVE, xforms_double ), - TABLE_ENTRY( "MinExclusiveDouble", XSD, MINEXCLUSIVE, xforms_double ), - TABLE_ENTRY( "MaxInclusiveDouble", XSD, MAXINCLUSIVE, xforms_double ), - TABLE_ENTRY( "MaxExclusiveDouble", XSD, MAXEXCLUSIVE, xforms_double ), - TABLE_ENTRY( "MinInclusiveDate", XSD, MININCLUSIVE, xforms_date ), - TABLE_ENTRY( "MinExclusiveDate", XSD, MINEXCLUSIVE, xforms_date ), - TABLE_ENTRY( "MaxInclusiveDate", XSD, MAXINCLUSIVE, xforms_date ), - TABLE_ENTRY( "MaxExclusiveDate", XSD, MAXEXCLUSIVE, xforms_date ), - TABLE_ENTRY( "MinInclusiveTime", XSD, MININCLUSIVE, xforms_time ), - TABLE_ENTRY( "MinExclusiveTime", XSD, MINEXCLUSIVE, xforms_time ), - TABLE_ENTRY( "MaxInclusiveTime", XSD, MAXINCLUSIVE, xforms_time ), - TABLE_ENTRY( "MaxExclusiveTime", XSD, MAXEXCLUSIVE, xforms_time ), - TABLE_ENTRY( "MinInclusiveDateTime", XSD, MININCLUSIVE, xforms_dateTime ), - TABLE_ENTRY( "MinExclusiveDateTime", XSD, MINEXCLUSIVE, xforms_dateTime ), - TABLE_ENTRY( "MaxInclusiveDateTime", XSD, MAXINCLUSIVE, xforms_dateTime ), - TABLE_ENTRY( "MaxExclusiveDateTime", XSD, MAXEXCLUSIVE, xforms_dateTime ), - TABLE_ENTRY( "Pattern", XSD, PATTERN, xforms_string ), + { "Length", XML_NAMESPACE_XSD, xmloff::token::XML_LENGTH, xforms_int32 }, + { "MinLength", XML_NAMESPACE_XSD, xmloff::token::XML_MINLENGTH, xforms_int32 }, + { "MaxLength", XML_NAMESPACE_XSD, xmloff::token::XML_MAXLENGTH, xforms_int32 }, + { "MinInclusiveInt", XML_NAMESPACE_XSD, xmloff::token::XML_MININCLUSIVE, xforms_int32 }, + { "MinExclusiveInt", XML_NAMESPACE_XSD, xmloff::token::XML_MINEXCLUSIVE, xforms_int32 }, + { "MaxInclusiveInt", XML_NAMESPACE_XSD, xmloff::token::XML_MAXINCLUSIVE, xforms_int32 }, + { "MaxExclusiveInt", XML_NAMESPACE_XSD, xmloff::token::XML_MAXEXCLUSIVE, xforms_int32 }, + { "MinInclusiveDouble", XML_NAMESPACE_XSD, xmloff::token::XML_MININCLUSIVE, xforms_double }, + { "MinExclusiveDouble", XML_NAMESPACE_XSD, xmloff::token::XML_MINEXCLUSIVE, xforms_double }, + { "MaxInclusiveDouble", XML_NAMESPACE_XSD, xmloff::token::XML_MAXINCLUSIVE, xforms_double }, + { "MaxExclusiveDouble", XML_NAMESPACE_XSD, xmloff::token::XML_MAXEXCLUSIVE, xforms_double }, + { "MinInclusiveDate", XML_NAMESPACE_XSD, xmloff::token::XML_MININCLUSIVE, xforms_date }, + { "MinExclusiveDate", XML_NAMESPACE_XSD, xmloff::token::XML_MINEXCLUSIVE, xforms_date }, + { "MaxInclusiveDate", XML_NAMESPACE_XSD, xmloff::token::XML_MAXINCLUSIVE, xforms_date }, + { "MaxExclusiveDate", XML_NAMESPACE_XSD, xmloff::token::XML_MAXEXCLUSIVE, xforms_date }, + { "MinInclusiveTime", XML_NAMESPACE_XSD, xmloff::token::XML_MININCLUSIVE, xforms_time }, + { "MinExclusiveTime", XML_NAMESPACE_XSD, xmloff::token::XML_MINEXCLUSIVE, xforms_time }, + { "MaxInclusiveTime", XML_NAMESPACE_XSD, xmloff::token::XML_MAXINCLUSIVE, xforms_time }, + { "MaxExclusiveTime", XML_NAMESPACE_XSD, xmloff::token::XML_MAXEXCLUSIVE, xforms_time }, + { "MinInclusiveDateTime", XML_NAMESPACE_XSD, xmloff::token::XML_MININCLUSIVE, xforms_dateTime }, + { "MinExclusiveDateTime", XML_NAMESPACE_XSD, xmloff::token::XML_MINEXCLUSIVE, xforms_dateTime }, + { "MaxInclusiveDateTime", XML_NAMESPACE_XSD, xmloff::token::XML_MAXINCLUSIVE, xforms_dateTime }, + { "MaxExclusiveDateTime", XML_NAMESPACE_XSD, xmloff::token::XML_MAXEXCLUSIVE, xforms_dateTime }, + { "Pattern", XML_NAMESPACE_XSD, xmloff::token::XML_PATTERN, xforms_string }, // ??? XML_ENUMERATION, - TABLE_ENTRY( "WhiteSpace", XSD, WHITESPACE, xforms_whitespace ), - TABLE_ENTRY( "TotalDigits", XSD, TOTALDIGITS, xforms_int32 ), - TABLE_ENTRY( "FractionDigits", XSD, FRACTIONDIGITS, xforms_int32 ), + { "WhiteSpace", XML_NAMESPACE_XSD, xmloff::token::XML_WHITESPACE, xforms_whitespace }, + { "TotalDigits", XML_NAMESPACE_XSD, xmloff::token::XML_TOTALDIGITS, xforms_int32 }, + { "FractionDigits", XML_NAMESPACE_XSD, xmloff::token::XML_FRACTIONDIGITS, xforms_int32 }, TABLE_END }; -- cgit