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

[Markus Mohrhard]

 xmloff/source/chart/PropertyMap.hxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8dfaba9dc059cd27c14c8b9f3a1d1c6951e0b6fe
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Tue Dec 9 23:20:13 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.
    
    (cherry picked from commit 88d3931d92bc89519acf95f0510f6f2a6ff7c72c)
    Signed-off-by: Michael Stahl <mst...@redhat.com>
    
    Backpoting the export part of this too since the attributes were added
    in LO 4.3 so the change has very limited impact.
    
    Conflicts:
        xmloff/source/chart/PropertyMap.hxx
    
    Change-Id: I1c41716b8b16e186ec84767b4b3a636d083162b8

diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index af19843..12393dd 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -137,12 +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_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 ),
+    MAP_ENTRY_ODF_EXT( "DataTableHBorder", LO_EXT, 
XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ),
+    MAP_ENTRY_ODF_EXT( "DataTableVBorder", LO_EXT, 
XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
+    MAP_ENTRY_ODF_EXT( "DataTableOutline", LO_EXT, 
XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ),
+    MAP_ENTRY_ODF_EXT_IMPORT( "DataTableHBorder", CHART, 
XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ),
+    MAP_ENTRY_ODF_EXT_IMPORT( "DataTableVBorder", CHART, 
XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ),
+    MAP_ENTRY_ODF_EXT_IMPORT( "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 ),
     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