include/xmloff/xmltoken.hxx | 8 ++++---- sc/source/filter/xml/XMLExportDataPilot.cxx | 6 ++---- sc/source/filter/xml/xmldpimp.cxx | 2 +- sc/source/filter/xml/xmlimprt.cxx | 1 + xmloff/source/chart/PropertyMap.hxx | 9 ++++++--- xmloff/source/core/xmltoken.cxx | 8 ++++---- 6 files changed, 18 insertions(+), 16 deletions(-)
New commits: commit a26222f5af55e8ffe9784dd411485d3c5c72e983 Author: Markus Mohrhard <[email protected]> Date: Sun Dec 7 00:55:48 2014 +0100 correct order of xml elements, related fdo#45266 Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 868202f..8946070 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -699,8 +699,8 @@ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sValueStr); SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, true, true); - WriteFieldReference(pDim); WriteLevels(pDim); + WriteFieldReference(pDim); if( pDim->GetOrientation() != sheet::DataPilotFieldOrientation_DATA ) WriteGroupDimElements(pDim, pDimData); } commit 06344c91dbc8826fc64698e06a6c66fb3e8a19e9 Author: Markus Mohrhard <[email protected]> Date: Sun Dec 7 00:41:44 2014 +0100 remove invalid attribute that is not read anyway Change-Id: Id7770ffda49ba7bc0ebc780c67c56b81152213f7 diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index fb5b812..1fb984f 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -2617,7 +2617,6 @@ namespace xmloff { namespace token { XML_DATE_START, XML_DATE_END, XML_STEP, - XML_IS_GROUP_FIELD, XML_DATA_PILOT_GROUPS, XML_DATA_PILOT_GROUP, XML_DATA_PILOT_GROUP_MEMBER, diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 2d5c42c..868202f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -599,7 +599,6 @@ void ScXMLExportDataPilot::WriteGroupDimAttributes(const ScDPSaveGroupDimension* if (pGroupDim) { OUString aSrcFieldName = ScDPUtil::getSourceDimensionName(pGroupDim->GetSourceDimName()); - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD, XML_TRUE); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, aSrcFieldName); if (pGroupDim->GetDatePart()) { @@ -613,7 +612,6 @@ void ScXMLExportDataPilot::WriteNumGroupDim(const ScDPSaveNumGroupDimension* pNu { if (pNumGroupDim) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD, XML_TRUE); if (pNumGroupDim->GetDatePart()) { WriteDatePart(pNumGroupDim->GetDatePart()); diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 82232b8..91d20c5 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2622,7 +2622,6 @@ namespace xmloff { namespace token { TOKEN( "date-start", XML_DATE_START ), TOKEN( "date-end", XML_DATE_END ), TOKEN( "step", XML_STEP ), - TOKEN( "is-group-field", XML_IS_GROUP_FIELD ), TOKEN( "data-pilot-groups", XML_DATA_PILOT_GROUPS ), TOKEN( "data-pilot-group", XML_DATA_PILOT_GROUP ), TOKEN( "data-pilot-group-member", XML_DATA_PILOT_GROUP_MEMBER ), commit 8e417a8fed528034e946bd25e66ce346c1b5384d Author: Markus Mohrhard <[email protected]> Date: Sun Dec 7 00:23:35 2014 +0100 use correct xml element name, related fdo#45266 Below data-pilot-groups the correct element name is data-pilot-group-member and not data-pilot-member. Change-Id: I41aecb7f85a881d13b3eaaa7be8de737b47ea312 diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index d02a4f4..fb5b812 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -2620,6 +2620,7 @@ namespace xmloff { namespace token { XML_IS_GROUP_FIELD, XML_DATA_PILOT_GROUPS, XML_DATA_PILOT_GROUP, + XML_DATA_PILOT_GROUP_MEMBER, XML_JAPANESE_CANDLE_STICK, XML_NAMED_SYMBOL, diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index afc66f9..2d5c42c 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -661,7 +661,7 @@ void ScXMLExportDataPilot::WriteGroupDimElements(ScDPSaveDimension* pDim, const if (pElem) { rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, *pElem); - SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, true, true); + SvXMLElementExport aElemDPM(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP_MEMBER, true, true); } } } diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index d1e181c..ac19a327 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -1867,7 +1867,7 @@ SvXMLImportContext *ScXMLDataPilotGroupContext::CreateChildContext( sal_uInt16 n if (nPrefix == XML_NAMESPACE_TABLE) { - if (IsXMLToken(rLName, XML_DATA_PILOT_MEMBER)) + if (IsXMLToken(rLName, XML_DATA_PILOT_MEMBER) || IsXMLToken(rLName, XML_DATA_PILOT_GROUP_MEMBER)) pContext = new ScXMLDataPilotGroupMemberContext(GetScImport(), nPrefix, rLName, xAttrList, this); } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 9f154db..547dcbd 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1784,6 +1784,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap() static const SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUP_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, XML_TOKEN_MAP_END }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 1aabcba..82232b8 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2625,6 +2625,7 @@ namespace xmloff { namespace token { TOKEN( "is-group-field", XML_IS_GROUP_FIELD ), TOKEN( "data-pilot-groups", XML_DATA_PILOT_GROUPS ), TOKEN( "data-pilot-group", XML_DATA_PILOT_GROUP ), + TOKEN( "data-pilot-group-member", XML_DATA_PILOT_GROUP_MEMBER ), TOKEN( "japanese-candle-stick", XML_JAPANESE_CANDLE_STICK ), TOKEN( "named-symbol", XML_NAMED_SYMBOL ), TOKEN( "diamond", XML_DIAMOND ), commit 88d3931d92bc89519acf95f0510f6f2a6ff7c72c Author: Markus Mohrhard <[email protected]> Date: Sun Dec 7 00:01:30 2014 +0100 don't write extension elements into ODF namespaces, related fdo#45266 We will still import the old elements but only write them into the lo-ext namespace. Also it will only be exported for ODF 1.2 extended. Change-Id: I1c41716b8b16e186ec84767b4b3a636d083162b8 diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 787f0a7..0145bde 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -137,9 +137,12 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF12( "StartingAngle", CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER ), MAP_ENTRY_ODF12( "MissingValueTreatment", CHART, XML_TREAT_EMPTY_CELLS, XML_SCH_TYPE_MISSING_VALUE_TREATMENT ), // #72304 Chart data table flags - MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( "DataTableVBorder", CHART, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( "DataTableHBorder", LO_EXT, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( "DataTableVBorder", LO_EXT, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT( "DataTableOutline", LO_EXT, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT_IMPORT( "DataTableHBorder", CHART, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT_IMPORT( "DataTableVBorder", CHART, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF_EXT_IMPORT( "DataTableOutline", CHART, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), // Chart display units flags MAP_ENTRY_ODF_EXT( "DisplayUnits", LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, XML_TYPE_BOOL ), MAP_ENTRY_ODF_EXT( "BuiltInUnit", LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, XML_TYPE_STRING ), commit a2df86642d58809aff28d60e4ffadfd593f0790e Author: Markus Mohrhard <[email protected]> Date: Sat Dec 6 23:58:40 2014 +0100 last inconsitently named data table value Change-Id: I1a558616156f5217e309c5957967a69d81c20b8e diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index fc34728..d02a4f4 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3237,7 +3237,7 @@ namespace xmloff { namespace token { // Chart data table properties XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_DATA_TABLE_SHOW_VERT_BORDER, - XML_CHART_DTABLE_SHOWOUTLINE, + XML_DATA_TABLE_SHOW_OUTLINE, // Chart Display units properties XML_CHART_DUNITS_DISPLAYUNITS, XML_CHART_DUNITS_BUILTINUNIT, diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 42a16d4..787f0a7 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -139,7 +139,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = // #72304 Chart data table flags MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableVBorder", CHART, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_DATA_TABLE_SHOW_OUTLINE, XML_TYPE_BOOL ), // Chart display units flags MAP_ENTRY_ODF_EXT( "DisplayUnits", LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, XML_TYPE_BOOL ), MAP_ENTRY_ODF_EXT( "BuiltInUnit", LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, XML_TYPE_STRING ), diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index ed8b3a4..1aabcba 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3236,7 +3236,7 @@ namespace xmloff { namespace token { TOKEN( "rfc-language-tag-complex", XML_RFC_LANGUAGE_TAG_COMPLEX ), TOKEN( "data-table-show-horz-border", XML_DATA_TABLE_SHOW_HORZ_BORDER ), TOKEN( "data-table-show-vert-border", XML_DATA_TABLE_SHOW_VERT_BORDER ), - TOKEN( "data-table-show-outline", XML_CHART_DTABLE_SHOWOUTLINE ), + TOKEN( "data-table-show-outline", XML_DATA_TABLE_SHOW_OUTLINE ), TOKEN( "display-units", XML_CHART_DUNITS_DISPLAYUNITS ), TOKEN( "display-units-built-in-unit", XML_CHART_DUNITS_BUILTINUNIT ), TOKEN( "external-data", XML_EXTERNALDATA), commit 6c238230d4ff8ae6b0c90bfd8e778ea225127aee Author: Markus Mohrhard <[email protected]> Date: Sat Dec 6 23:57:23 2014 +0100 more fixes for inconsistent naming Change-Id: Iedb1b30d4e3905f884bc3bb39d4703a883e95c46 diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 4680878..fc34728 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3236,7 +3236,7 @@ namespace xmloff { namespace token { XML_RFC_LANGUAGE_TAG_COMPLEX, // Chart data table properties XML_DATA_TABLE_SHOW_HORZ_BORDER, - XML_CHART_DTABLE_SHOWVERTBORDER, + XML_DATA_TABLE_SHOW_VERT_BORDER, XML_CHART_DTABLE_SHOWOUTLINE, // Chart Display units properties XML_CHART_DUNITS_DISPLAYUNITS, diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index b19fdc7..42a16d4 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -138,7 +138,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF12( "MissingValueTreatment", CHART, XML_TREAT_EMPTY_CELLS, XML_SCH_TYPE_MISSING_VALUE_TREATMENT ), // #72304 Chart data table flags MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), - MAP_ENTRY_ODF12( "DataTableVBorder", CHART, XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( "DataTableVBorder", CHART, XML_DATA_TABLE_SHOW_VERT_BORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ), // Chart display units flags MAP_ENTRY_ODF_EXT( "DisplayUnits", LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, XML_TYPE_BOOL ), diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index baa162e..ed8b3a4 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3235,7 +3235,7 @@ namespace xmloff { namespace token { TOKEN( "rfc-language-tag-asian", XML_RFC_LANGUAGE_TAG_ASIAN ), TOKEN( "rfc-language-tag-complex", XML_RFC_LANGUAGE_TAG_COMPLEX ), TOKEN( "data-table-show-horz-border", XML_DATA_TABLE_SHOW_HORZ_BORDER ), - TOKEN( "data-table-show-vert-border", XML_CHART_DTABLE_SHOWVERTBORDER ), + TOKEN( "data-table-show-vert-border", XML_DATA_TABLE_SHOW_VERT_BORDER ), TOKEN( "data-table-show-outline", XML_CHART_DTABLE_SHOWOUTLINE ), TOKEN( "display-units", XML_CHART_DUNITS_DISPLAYUNITS ), TOKEN( "display-units-built-in-unit", XML_CHART_DUNITS_BUILTINUNIT ), commit f04802e04c69728cf6901bb2c8e0c9ed95de362a Author: Markus Mohrhard <[email protected]> Date: Sat Dec 6 23:55:03 2014 +0100 use a consistent naming scheme Change-Id: Ia420779fd875cb2a81b90871b26940f8a0258b4d diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 45f30f3..4680878 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3235,7 +3235,7 @@ namespace xmloff { namespace token { XML_RFC_LANGUAGE_TAG_ASIAN, XML_RFC_LANGUAGE_TAG_COMPLEX, // Chart data table properties - XML_CHART_DTABLE_SHOWHORZBORDER, + XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_CHART_DTABLE_SHOWVERTBORDER, XML_CHART_DTABLE_SHOWOUTLINE, // Chart Display units properties diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index a876c2b..b19fdc7 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -137,7 +137,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF12( "StartingAngle", CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER ), MAP_ENTRY_ODF12( "MissingValueTreatment", CHART, XML_TREAT_EMPTY_CELLS, XML_SCH_TYPE_MISSING_VALUE_TREATMENT ), // #72304 Chart data table flags - MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ), + MAP_ENTRY_ODF12( "DataTableHBorder", CHART, XML_DATA_TABLE_SHOW_HORZ_BORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableVBorder", CHART, XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( "DataTableOutline", CHART, XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ), // Chart display units flags diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 7a483ef..baa162e 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3234,7 +3234,7 @@ namespace xmloff { namespace token { TOKEN( "rfc-language-tag", XML_RFC_LANGUAGE_TAG ), TOKEN( "rfc-language-tag-asian", XML_RFC_LANGUAGE_TAG_ASIAN ), TOKEN( "rfc-language-tag-complex", XML_RFC_LANGUAGE_TAG_COMPLEX ), - TOKEN( "data-table-show-horz-border", XML_CHART_DTABLE_SHOWHORZBORDER ), + TOKEN( "data-table-show-horz-border", XML_DATA_TABLE_SHOW_HORZ_BORDER ), TOKEN( "data-table-show-vert-border", XML_CHART_DTABLE_SHOWVERTBORDER ), TOKEN( "data-table-show-outline", XML_CHART_DTABLE_SHOWOUTLINE ), TOKEN( "display-units", XML_CHART_DUNITS_DISPLAYUNITS ), _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
