include/xmloff/xmltoken.hxx | 1 +
sc/source/filter/xml/xmlbodyi.cxx | 5 +++++
sc/source/filter/xml/xmldpimp.cxx | 2 +-
sc/source/filter/xml/xmlimprt.cxx | 2 ++
xmloff/source/chart/PropertyMap.hxx | 3 +++
xmloff/source/core/xmltoken.cxx | 1 +
xmloff/source/style/PageMasterStyleMap.cxx | 5 +++++
7 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 588500d52141b7379999d42072fa7879af426555
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Dec 7 00:01:30 2014 +0100
iimport part for: "use correct xml element name, related fdo#45266"
Change-Id: I8ec31d026f5c6fdc4b7fc573060e7837a337d50b
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index a876c2b..af19843 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -140,6 +140,9 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_ENTRY_ODF12( "DataTableHBorder", CHART,
XML_CHART_DTABLE_SHOWHORZBORDER, 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 ),
+ MAP_ENTRY_ODF_EXT_IMPORT( "DataTableHBorder", LO_EXT,
XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ),
+ MAP_ENTRY_ODF_EXT_IMPORT( "DataTableVBorder", LO_EXT,
XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
+ MAP_ENTRY_ODF_EXT_IMPORT( "DataTableOutline", LO_EXT,
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 ),
MAP_ENTRY_ODF_EXT( "BuiltInUnit", LO_EXT, XML_CHART_DUNITS_BUILTINUNIT,
XML_TYPE_STRING ),
commit c795936a66041bb1dff8bd392f462ff80f583385
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Dec 8 00:47:44 2014 +0100
import part for: " use correct xml element name, related fdo#45266"
Change-Id: Ied71383fc837c7e667455f84937801e8d45f2989
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index e1a9d00..9639326 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2619,6 +2619,7 @@ namespace xmloff { namespace token {
XML_STEP,
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/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 1620f44..84c1ad8 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1785,6 +1785,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 11e08a1..323e073 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2624,6 +2624,7 @@ namespace xmloff { namespace token {
TOKEN( "step", XML_STEP ),
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 40ac1ada98e3e2648daf9d17e520040be2c17911
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Dec 8 00:45:29 2014 +0100
import part for: "export to extension namespace instead of odf ..."
Change-Id: I0b61e05e3b153ba7efe351b18cb705ea6348f546
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx
b/xmloff/source/style/PageMasterStyleMap.cxx
index e65da44..16dac27 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -27,10 +27,13 @@
using namespace ::xmloff::token;
#define MAP(name,prefix,token,type,context,version) { name, sizeof(name)-1,
prefix, token, type, context, version, false }
+#define MAP_IMPORT(name,prefix,token,type,context,version) { name,
sizeof(name)-1, prefix, token, type, context, version, true }
#define PLMAP(name,prefix,token,type,context) \
MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context,
SvtSaveOptions::ODFVER_010)
#define PLMAP_12(name,prefix,token,type,context) \
MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context,
SvtSaveOptions::ODFVER_012)
+#define PLMAP_EXT_IMPORT(name,prefix,token,type,context) \
+ MAP_IMPORT(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context,
SvtSaveOptions::ODFVER_012_EXT_COMPAT)
#define HFMAP(name,prefix,token,type,context) \
MAP(name,prefix,token,type|XML_TYPE_PROP_HEADER_FOOTER,context,
SvtSaveOptions::ODFVER_010)
@@ -87,6 +90,8 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
PLMAP( "ScaleToPages", XML_NAMESPACE_STYLE,
XML_SCALE_TO_PAGES, XML_TYPE_NUMBER16,
CTF_PM_SCALETOPAGES ),
PLMAP( "ScaleToPagesX", XML_NAMESPACE_STYLE, XML_SCALE_TO_X,
XML_TYPE_NUMBER16,
CTF_PM_SCALETOX ),
PLMAP( "ScaleToPagesY", XML_NAMESPACE_STYLE, XML_SCALE_TO_Y,
XML_TYPE_NUMBER16,
CTF_PM_SCALETOY ),
+ PLMAP_EXT_IMPORT( "ScaleToPagesX", XML_NAMESPACE_LO_EXT,
XML_SCALE_TO_X, XML_TYPE_NUMBER16,
CTF_PM_SCALETOX ),
+ PLMAP_EXT_IMPORT( "ScaleToPagesY", XML_NAMESPACE_LO_EXT,
XML_SCALE_TO_Y, XML_TYPE_NUMBER16,
CTF_PM_SCALETOY ),
PLMAP( "CenterHorizontally", XML_NAMESPACE_STYLE,
XML_TABLE_CENTERING, XML_PM_TYPE_CENTER_HORIZONTAL |
MID_FLAG_MULTI_PROPERTY | MID_FLAG_MERGE_ATTRIBUTE, 0 ),
PLMAP( "CenterVertically", XML_NAMESPACE_STYLE,
XML_TABLE_CENTERING, XML_PM_TYPE_CENTER_VERTICAL |
MID_FLAG_MULTI_PROPERTY | MID_FLAG_MERGE_ATTRIBUTE, 0 ),
PLMAP( "TextColumns", XML_NAMESPACE_STYLE, XML_COLUMNS,
MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_COLUMNS, CTF_PM_TEXTCOLUMNS ),
commit d74930783bbab284301e6f84eb3ddc7401852893
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Mon Dec 8 00:42:08 2014 +0100
import part for put that attribute into an extension namespace
Change-Id: Ie3618e44416a0765877e4b09e41e058d2808cdee
diff --git a/sc/source/filter/xml/xmlbodyi.cxx
b/sc/source/filter/xml/xmlbodyi.cxx
index efb655f..24e0860 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -114,6 +114,11 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
else if (IsXMLToken(aLocalName,
XML_PROTECTION_KEY_DIGEST_ALGORITHM_2))
meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
}
+ else if(nPrefix == XML_NAMESPACE_LO_EXT)
+ {
+ if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2))
+ meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
+ }
}
}
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 9f154db..1620f44 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -903,6 +903,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap()
{ XML_NAMESPACE_TABLE, XML_PROTECTION_KEY,
XML_TOK_TABLE_PASSWORD },
{ XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
XML_TOK_TABLE_PASSHASH },
{ XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
XML_TOK_TABLE_PASSHASH_2 },
+ { XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
XML_TOK_TABLE_PASSHASH_2 },
{ XML_NAMESPACE_TABLE, XML_PRINT, XML_TOK_TABLE_PRINT
},
XML_TOKEN_MAP_END
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
