|
|
63f0e84 |
From 34ed3bc64d64c8f4b1c8738cd530dc2401dbbd78 Mon Sep 17 00:00:00 2001
|
|
|
63f0e84 |
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
63f0e84 |
Date: Mon, 8 Dec 2014 00:45:29 +0100
|
|
|
63f0e84 |
Subject: [PATCH 4/5] import part for: "export to extension namespace instead
|
|
|
63f0e84 |
of odf ..."
|
|
|
63f0e84 |
|
|
|
63f0e84 |
See master commit a4e4cdcdd7acfe779b2a3b244dd449f136308a93
|
|
|
63f0e84 |
|
|
|
63f0e84 |
(cherry picked from commit 40ac1ada98e3e2648daf9d17e520040be2c17911)
|
|
|
63f0e84 |
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
|
63f0e84 |
|
|
|
63f0e84 |
Conflicts:
|
|
|
63f0e84 |
xmloff/source/style/PageMasterStyleMap.cxx
|
|
|
63f0e84 |
|
|
|
63f0e84 |
(cherry picked from commit 55568c0b95d2b2a072b896107963052bf78f1ff0)
|
|
|
63f0e84 |
|
|
|
63f0e84 |
Conflicts:
|
|
|
63f0e84 |
xmloff/source/style/PageMasterStyleMap.cxx
|
|
|
63f0e84 |
|
|
|
63f0e84 |
Change-Id: I0b61e05e3b153ba7efe351b18cb705ea6348f546
|
|
|
63f0e84 |
---
|
|
|
63f0e84 |
xmloff/source/style/PageMasterStyleMap.cxx | 5 +++++
|
|
|
63f0e84 |
1 file changed, 5 insertions(+)
|
|
|
63f0e84 |
|
|
|
63f0e84 |
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
|
|
|
63f0e84 |
index 458bfdf..c32c38e 100644
|
|
|
63f0e84 |
--- a/xmloff/source/style/PageMasterStyleMap.cxx
|
|
|
63f0e84 |
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
|
|
|
63f0e84 |
@@ -24,12 +24,15 @@
|
|
|
63f0e84 |
using namespace ::xmloff::token;
|
|
|
63f0e84 |
|
|
|
63f0e84 |
#define MAP(name,prefix,token,type,context,version) { name, sizeof(name)-1, prefix, token, type, context, version, false }
|
|
|
63f0e84 |
+#define MAP_IMPORT(name,prefix,token,type,context,version) { name, sizeof(name)-1, prefix, token, type, context, version, true }
|
|
|
63f0e84 |
#define PLMAP(name,prefix,token,type,context) \
|
|
|
63f0e84 |
MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context, SvtSaveOptions::ODFVER_010)
|
|
|
63f0e84 |
#define PLMAP_12(name,prefix,token,type,context) \
|
|
|
63f0e84 |
MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context, SvtSaveOptions::ODFVER_012)
|
|
|
63f0e84 |
#define PLMAP_EX(name,prefix,token,type,context) \
|
|
|
63f0e84 |
MAP(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context, SvtSaveOptions::ODFVER_012_EXT_COMPAT)
|
|
|
63f0e84 |
+#define PLMAP_EXT_IMPORT(name,prefix,token,type,context) \
|
|
|
63f0e84 |
+ MAP_IMPORT(name,prefix,token,type|XML_TYPE_PROP_PAGE_LAYOUT,context, SvtSaveOptions::ODFVER_012_EXT_COMPAT)
|
|
|
63f0e84 |
#define HFMAP(name,prefix,token,type,context) \
|
|
|
63f0e84 |
MAP(name,prefix,token,type|XML_TYPE_PROP_HEADER_FOOTER,context, SvtSaveOptions::ODFVER_010)
|
|
|
63f0e84 |
|
|
|
63f0e84 |
@@ -83,6 +86,8 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
|
|
|
63f0e84 |
PLMAP( "ScaleToPages", XML_NAMESPACE_STYLE, XML_SCALE_TO_PAGES, XML_TYPE_NUMBER16, CTF_PM_SCALETOPAGES ),
|
|
|
63f0e84 |
PLMAP( "ScaleToPagesX", XML_NAMESPACE_STYLE, XML_SCALE_TO_X, XML_TYPE_NUMBER16, CTF_PM_SCALETOX ),
|
|
|
63f0e84 |
PLMAP( "ScaleToPagesY", XML_NAMESPACE_STYLE, XML_SCALE_TO_Y, XML_TYPE_NUMBER16, CTF_PM_SCALETOY ),
|
|
|
63f0e84 |
+ PLMAP_EXT_IMPORT( "ScaleToPagesX", XML_NAMESPACE_LO_EXT, XML_SCALE_TO_X, XML_TYPE_NUMBER16, CTF_PM_SCALETOX ),
|
|
|
63f0e84 |
+ PLMAP_EXT_IMPORT( "ScaleToPagesY", XML_NAMESPACE_LO_EXT, XML_SCALE_TO_Y, XML_TYPE_NUMBER16, CTF_PM_SCALETOY ),
|
|
|
63f0e84 |
PLMAP( "CenterHorizontally", XML_NAMESPACE_STYLE, XML_TABLE_CENTERING, XML_PM_TYPE_CENTER_HORIZONTAL | MID_FLAG_MULTI_PROPERTY | MID_FLAG_MERGE_ATTRIBUTE, 0 ),
|
|
|
63f0e84 |
PLMAP( "CenterVertically", XML_NAMESPACE_STYLE, XML_TABLE_CENTERING, XML_PM_TYPE_CENTER_VERTICAL | MID_FLAG_MULTI_PROPERTY | MID_FLAG_MERGE_ATTRIBUTE, 0 ),
|
|
|
63f0e84 |
PLMAP( "TextColumns", XML_NAMESPACE_STYLE, XML_COLUMNS, MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_COLUMNS, CTF_PM_TEXTCOLUMNS ),
|
|
|
63f0e84 |
--
|
|
|
63f0e84 |
1.9.3
|
|
|
63f0e84 |
|