dba33g: #i112620# add new namespace for chartooo

3 files changed, 8 insertions, 2 deletions

diff --git a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
index 45e5f64c4670..823bf6540f47 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
@@ -46,6 +46,7 @@ public class OfficeNamespaces
     public static final String DATASTYLE_NS = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0";
     public static final String SVG_NS = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0";
     public static final String CHART_NS = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0";
+    public static final String CHARTOOO_NS = "http://openoffice.org/2010/chart";
     public static final String DR3D_NS = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0";
     public static final String MATHML_NS = "http://www.w3.org/1998/Math/MathML";
     public static final String FORM_NS = "urn:oasis:names:tc:opendocument:xmlns:form:1.0";
@@ -58,6 +59,7 @@ public class OfficeNamespaces
     public static final String XSD_NS = "http://www.w3.org/2001/XMLSchema";
     public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
     public static final String OOREPORT_NS = "http://openoffice.org/2005/report";
+    public static final String GRDDL_NS = "http://www.w3.org/2003/g/data-view#";
     public static final String CONFIG = "urn:oasis:names:tc:opendocument:xmlns:config:1.0";
     /**
      * @deprecated
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
index a3a54f119847..d4046424e07d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -363,6 +363,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
             rootAttributes.addNamespaceDeclaration("number", OfficeNamespaces.DATASTYLE_NS);
             rootAttributes.addNamespaceDeclaration("svg", OfficeNamespaces.SVG_NS);
             rootAttributes.addNamespaceDeclaration("chart", OfficeNamespaces.CHART_NS);
+            rootAttributes.addNamespaceDeclaration("chartooo", OfficeNamespaces.CHARTOOO_NS);
             rootAttributes.addNamespaceDeclaration("dr3d", OfficeNamespaces.DR3D_NS);
             rootAttributes.addNamespaceDeclaration("math", OfficeNamespaces.MATHML_NS);
             rootAttributes.addNamespaceDeclaration("form", OfficeNamespaces.FORM_NS);
@@ -374,7 +375,8 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
             rootAttributes.addNamespaceDeclaration("xforms", OfficeNamespaces.XFORMS_NS);
             rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
             rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
-            rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.0");
+            rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
+            rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2");
 
             this.rootXmlWriter.writeXmlDeclaration("UTF-8");
             this.rootXmlWriter.writeTag(OfficeNamespaces.OFFICE_NS, "document-content", rootAttributes, XmlWriterSupport.OPEN);
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
index b931ec80820c..9b2e6b33b5f7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -358,6 +358,7 @@ public class StylesWriter
                 OfficeNamespaces.DATASTYLE_NS);
         rootAttributes.addNamespaceDeclaration("svg", OfficeNamespaces.SVG_NS);
         rootAttributes.addNamespaceDeclaration("chart", OfficeNamespaces.CHART_NS);
+        rootAttributes.addNamespaceDeclaration("chartooo", OfficeNamespaces.CHARTOOO_NS);
         rootAttributes.addNamespaceDeclaration("dr3d", OfficeNamespaces.DR3D_NS);
         rootAttributes.addNamespaceDeclaration("math", OfficeNamespaces.MATHML_NS);
         rootAttributes.addNamespaceDeclaration("form", OfficeNamespaces.FORM_NS);
@@ -372,7 +373,8 @@ public class StylesWriter
                 OfficeNamespaces.XFORMS_NS);
         rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS);
         rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
-        rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.0");
+        rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
+        rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2");
 
         this.xmlWriter.writeXmlDeclaration("UTF-8");
         this.xmlWriter.writeTag(OfficeNamespaces.OFFICE_NS,