diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-08 00:45:29 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-12-13 16:01:10 +0100 |
commit | 7037b6cc26ecec9528299d7b6925f4da37a6919a (patch) | |
tree | b79d162baa0a8e180dcb3ae2bbbf5d8beed32a4e /xmloff | |
parent | 079e38cd7e89957bc81f6db4a64999adba9846b0 (diff) |
import part for: "export to extension namespace instead of odf ..."
See master commit a4e4cdcdd7acfe779b2a3b244dd449f136308a93
(cherry picked from commit 40ac1ada98e3e2648daf9d17e520040be2c17911)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
xmloff/source/style/PageMasterStyleMap.cxx
Change-Id: I0b61e05e3b153ba7efe351b18cb705ea6348f546
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/style/PageMasterStyleMap.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 1fe2c173e426..199131d7abf3 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -24,10 +24,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) @@ -81,6 +84,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 ), |