[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - xmloff/source

2014-12-11 Thread Markus Mohrhard 
 xmloff/source/style/PageMasterStyleMap.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit d949d7a10bfc16deae315240e4072e2db7cef529
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 ...

See master commit a4e4cdcdd7acfe779b2a3b244dd449f136308a93

(cherry picked from commit 40ac1ada98e3e2648daf9d17e520040be2c17911)
Signed-off-by: Michael Stahl mst...@redhat.com

Conflicts:
xmloff/source/style/PageMasterStyleMap.cxx

Change-Id: I0b61e05e3b153ba7efe351b18cb705ea6348f546
(cherry picked from commit 55568c0b95d2b2a072b896107963052bf78f1ff0)
Reviewed-on: https://gerrit.libreoffice.org/13391
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/xmloff/source/style/PageMasterStyleMap.cxx 
b/xmloff/source/style/PageMasterStyleMap.cxx
index 1fe2c17..199131d 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 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - xmloff/source

2014-12-11 Thread Markus Mohrhard 
 xmloff/source/chart/PropertyMap.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3328458f260cac0521d831dbcc142504b03e0fa4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Dec 7 00:01:30 2014 +0100

import part for: related fdo#45266, don't write extension elements into

... ODF namespaces

See master commit 88d3931d92bc89519acf95f0510f6f2a6ff7c72c

Change-Id: I8ec31d026f5c6fdc4b7fc573060e7837a337d50b
Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 80fc80ae704e3ba3587cde3d146829dc012d29a1)
Reviewed-on: https://gerrit.libreoffice.org/13381
Reviewed-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

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 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - xmloff/source

2014-12-08 Thread Michael Stahl 
 xmloff/source/text/XMLTextMarkImportContext.cxx |   49 
 1 file changed, 34 insertions(+), 15 deletions(-)

New commits:
commit 1317e958f2195e2b05cdf72ca5eb1c04e64dc1bd
Author: Michael Stahl mst...@redhat.com
Date:   Fri Dec 5 18:04:39 2014 +0100

fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...

... if it has start/end, because Writer will become grumpy and crash.

(cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a)

Conflicts:
xmloff/source/text/XMLTextMarkImportContext.cxx

Change-Id: I6024051249eeac6ed9e43856fa77db969287f888
Reviewed-on: https://gerrit.libreoffice.org/13319
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit b903e2a7ac730865d9a6ee48fb0392ecff2c7d30)
Reviewed-on: https://gerrit.libreoffice.org/13376
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 8aaa952..d8f8bef 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -143,7 +143,7 @@ static const char *lcl_getFormFieldmarkName(OUString name)
 return NULL;
 }
 
-static OUString lcl_getFieldmarkName(OUString name)
+static OUString lcl_getFieldmarkName(OUString const name)
 {
 static const char sFormtext[]=ODF_FORMTEXT;
 if (name.equalsAscii(msoffice.field.FORMTEXT) ||
@@ -288,19 +288,40 @@ void XMLTextMarkImportContext::EndElement()
 
 bool 
bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd  
m_rHelper.hasCurrentFieldCtx());
 
-// insert reference
-const ReferenceXInterface xContent(
-CreateAndInsertMark(GetImport(),
-
(bImportAsField?sAPI_fieldmark:sAPI_bookmark),
-m_sBookmarkName,
-xInsertionCursor,
-m_sXmlId) );
-if (pRDFaAttributes)
+// fdo#86795 check if it's actually a checkbox 
first
+bool isInvalid(false);
+OUString fieldmarkTypeName;
+if (bImportAsField  
m_rHelper.hasCurrentFieldCtx())
 {
-const Referencerdf::XMetadatable
-xMeta(xContent, UNO_QUERY);
-GetImport().GetRDFaImportHelper().AddRDFa(
-xMeta, pRDFaAttributes);
+
+OUString const 
type(m_rHelper.getCurrentFieldType());
+fieldmarkTypeName = lcl_getFieldmarkName(type);
+if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
+fieldmarkTypeName == ODF_FORMDROPDOWN)
+{   // sw can't handle checkbox with start+end
+SAL_INFO(xmloff.text, invalid 
fieldmark-start/fieldmark-end ignored);
+isInvalid = true;
+}
+}
+
+ReferenceXInterface xContent;
+if (!isInvalid)
+{
+// insert reference
+xContent = CreateAndInsertMark(GetImport(),
+(bImportAsField
+? OUString(sAPI_fieldmark)
+: OUString(sAPI_bookmark)),
+m_sBookmarkName,
+xInsertionCursor,
+m_sXmlId);
+if (pRDFaAttributes)
+{
+const Referencerdf::XMetadatable
+xMeta(xContent, UNO_QUERY);
+GetImport().GetRDFaImportHelper().AddRDFa(
+xMeta, pRDFaAttributes);
+}
 }
 
 if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) {
@@ -308,8 +329,6 @@ void XMLTextMarkImportContext::EndElement()
 // setup fieldmark...
 Reference 
::com::sun::star::text::XFormField xFormField(xContent, UNO_QUERY);
 if (xFormField.is()  
m_rHelper.hasCurrentFieldCtx()) {
-