Merge commit 'ooo/DEV300_m103'

Conflicts:
	jfreereport/java/flute/makefile.mk
	jfreereport/java/libbase/makefile.mk
	jfreereport/java/libfonts/makefile.mk
	jfreereport/java/libformula/makefile.mk
	jfreereport/java/libloader/makefile.mk
	jfreereport/java/librepository/makefile.mk
	jfreereport/java/libserializer/makefile.mk
	jfreereport/java/libxml/makefile.mk
	jfreereport/java/sac/makefile.mk
	mysqlc/source/mysqlc_connection.cxx
	mysqlc/source/mysqlc_connection.hxx
	mysqlc/source/mysqlc_databasemetadata.cxx
	mysqlc/source/mysqlc_databasemetadata.hxx
	mysqlc/source/mysqlc_driver.cxx
	mysqlc/source/mysqlc_driver.hxx
	mysqlc/source/mysqlc_general.hxx
	mysqlc/source/mysqlc_preparedstatement.hxx
	mysqlc/source/mysqlc_resultsetmetadata.hxx
	mysqlc/source/mysqlc_statement.hxx
	sdext/source/minimizer/impoptimizer.cxx
	sdext/source/pdfimport/config/description.xml
	sdext/source/pdfimport/tree/drawtreevisiting.cxx
	sdext/source/presenter/PresenterWindowManager.cxx
	swext/prj/build.lst

15 files changed, 823 insertions, 307 deletions

diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
index 769657aa6bf5..a759b1712fe9 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
@@ -47,7 +47,6 @@ import com.sun.star.util.Time;
 
 import java.sql.Timestamp;
 
-
 public class SDBCReportData implements DataSource
 {
 
@@ -349,7 +348,7 @@ public class SDBCReportData implements DataSource
 
     private Object convertObject(final int type, final Object obj)
     {
-        final Object ret;
+        Object ret;
         switch (type)
         {
             case DataType.DATE:
@@ -365,7 +364,14 @@ public class SDBCReportData implements DataSource
             case DataType.NUMERIC:
                 if (!(obj instanceof Any))
                 {
-                    ret = new java.math.BigDecimal((String) obj);
+                    try
+                    {
+                        ret = new java.math.BigDecimal(String.valueOf(obj));
+                    }
+                    catch (NumberFormatException ex)
+                    {
+                        ret = obj;
+                    }
                 }
                 else
                 {
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index d68a2f8cedc8..9ba0c026c224 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -32,12 +32,15 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 #----- compile .java files -----------------------------------------
 
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR)
 .ELSE
-JARFILES = libbase-1.0.0.jar libformula-0.2.0.jar
+JARFILES += \
+    libbase-$(LIBBASE_VERSION).jar                      \
+    libformula-$(LIBFORMULA_VERSION).jar
 .ENDIF
 
 JAVAFILES       :=	AuthorFunction.java \
@@ -47,18 +50,20 @@ JAVAFILES       :=	AuthorFunction.java \
                     MetaDataFunctionCategory.java
 
 # PROPERTYFILES := $(shell @$(FIND) . -name "*.properties")
-PROPERTYFILES := $(CLASSDIR)$/$(PACKAGE)$/category.properties \
-         $(CLASSDIR)$/$(PACKAGE)$/category_en_US.properties \
-                 $(CLASSDIR)$/$(PACKAGE)$/Author-Function.properties \
-         $(CLASSDIR)$/$(PACKAGE)$/Author-Function_en_US.properties \
-                 $(CLASSDIR)$/$(PACKAGE)$/Title-Function.properties	\
-         $(CLASSDIR)$/$(PACKAGE)$/Title-Function_en_US.properties
+PROPERTYFILES:=$(CLASSDIR)$/$(PACKAGE)$/category.properties \
+                 $(CLASSDIR)$/$(PACKAGE)$/Title-Function.properties\
+                $(CLASSDIR)$/$(PACKAGE)$/category_en_US.properties \
+                $(CLASSDIR)$/$(PACKAGE)$/Author-Function.properties \
+                $(CLASSDIR)$/$(PACKAGE)$/Author-Function_en_US.properties \
+                $(CLASSDIR)$/$(PACKAGE)$/Title-Function_en_US.properties
                  
+L10NPROPERTYFILES = $(PROPERTYFILES)
+ALLTAR : $(PROPERTYFILES)
 # --- Targets ------------------------------------------------------
 .INCLUDE :  target.mk
 
-ALLTAR : $(PROPERTYFILES)
-
-$(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
+.IF "$(WITH_LANG)"==""
+$(CLASSDIR)/$(PACKAGE)/%.properties : %.properties
     @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+    $(COMMAND_ECHO)$(COPY) $< $@
+.ENDIF
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
index 70f3ff695cbb..5d27005f2d65 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
+++ b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
@@ -1,7 +1,7 @@
 RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
 Class-Path: reportbuilderwizard.jar
-  flute-1.3.0.jar libserializer-1.0.0.jar libbase-1.0.0.jar
-  libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar
-  libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar
-  flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
+  flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar
+  libfonts-1.1.6.jar libformula-1.1.7.jar liblayout-0.2.10.jar
+  libloader-1.1.6.jar librepository-1.1.6.jar libxml-1.1.7.jar
+  flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
 UNO-Type-Path: 
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
index f8e2b4294feb..87750f09afec 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@ -34,6 +34,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
+import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index 9280fcd71b70..d309e1da8385 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -33,13 +33,25 @@ PACKAGE = com$/sun$/star$/report$/pentaho
 nodep=true
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 
 #----- compile .java files -----------------------------------------
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR) $(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(LIBREPOSITORY_JAR)
 .ELSE
-JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar
+JARFILES += \
+    flute-$(FLUTE_VERSION).jar				            \
+    libserializer-$(LIBSERIALIZER_VERSION).jar			\
+    libbase-$(LIBBASE_VERSION).jar                      \
+    libfonts-$(LIBFONTS_VERSION).jar					\
+    libformula-$(LIBFORMULA_VERSION).jar				\
+    liblayout-$(LIBLAYOUT_VERSION).jar					\
+    libloader-$(LIBLOADER_VERSION).jar					\
+    librepository-$(LIBREPOSITORY_VERSION).jar			\
+    libxml-$(LIBXML_VERSION).jar						\
+    flow-engine-$(FLOW_ENGINE_VERSION).jar 	            \
+    sac.jar
 .ENDIF
 
 .IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
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 b41252a17089..cdc8eae1b73b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -41,6 +41,18 @@ import com.sun.star.report.pentaho.model.OfficeStyles;
 import com.sun.star.report.pentaho.model.OfficeStylesCollection;
 import com.sun.star.report.pentaho.styles.LengthCalculator;
 import com.sun.star.report.pentaho.styles.StyleMapper;
+import com.sun.org.apache.xerces.internal.parsers.DOMParser;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 
 import java.awt.Image;
 
@@ -54,6 +66,7 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.io.InputStream;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -137,7 +150,6 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
     public static final String FAILED = "Failed";
     public static final String VERTICAL_POS = "vertical-pos";
     private static final String ZERO_CM = "0cm";
-
     /** the verison of the ODF specification to which generated documents
      *  shall conform. */
     public static final String ODF_VERSION = "1.2";
@@ -381,7 +393,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
             rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS);
             rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS);
             rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
-                   ODF_VERSION);
+                    ODF_VERSION);
 
             this.rootXmlWriter.writeXmlDeclaration("UTF-8");
             this.rootXmlWriter.writeTag(OfficeNamespaces.OFFICE_NS, "document-content", rootAttributes, XmlWriterSupport.OPEN);
@@ -1037,6 +1049,53 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
         getXmlWriter().writeCloseTag();
     }
 
+    public void copyMeta()
+    {
+        // now copy the meta.xml
+        if (getInputRepository().isReadable("meta.xml"))
+        {
+            InputStream inputStream = null;
+            try
+            {
+                inputStream = getInputRepository().createInputStream("meta.xml");
+                DOMParser dOMParser = new DOMParser();
+                dOMParser.parse(new InputSource(inputStream));
+                Document document = dOMParser.getDocument();
+                NodeList nl = document.getElementsByTagName("document-meta/meta/generator");
+                Node node = document.getFirstChild().getFirstChild().getFirstChild().getFirstChild();
+                String creator = node.getNodeValue();
+                node.setNodeValue(creator + "/report_builder");
+                Transformer transformer = TransformerFactory.newInstance().newTransformer();
+                transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+
+                final OutputStream outputMetaStream = getOutputRepository().createOutputStream("meta.xml", "text/xml");
+                StreamResult result = new StreamResult(outputMetaStream);
+                DOMSource source = new DOMSource(document);
+                transformer.transform(source, result);
+
+                //IOUtils.getInstance().copyStreams(inputStream, outputMetaStream);
+                outputMetaStream.flush();
+                outputMetaStream.close();
+            }
+            catch (java.lang.Exception ex)
+            {
+            } finally
+            {
+                if (inputStream != null)
+                {
+                    try
+                    {
+                        inputStream.close();
+                    }
+                    catch (IOException ex)
+                    {
+                        Logger.getLogger(OfficeDocumentReportTarget.class.getName()).log(Level.SEVERE, null, ex);
+                    }
+                }
+            }
+        }
+    }
+
     public void endReport(final ReportStructureRoot report)
             throws DataSourceException, ReportProcessingException
     {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
index f76d43bb807a..2013b1c492ff 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -261,26 +261,6 @@ public class ChartRawReportTarget extends OfficeDocumentReportTarget
             throws DataSourceException, ReportProcessingException
     {
         super.endReport(report);
-        try
-        {
-            // now copy the meta.xml
-            if (getInputRepository().isReadable("meta.xml"))
-            {
-                final InputStream inputStream = getInputRepository().createInputStream("meta.xml");
-                try
-                {
-                    final OutputStream outputMetaStream = getOutputRepository().createOutputStream("meta.xml", "text/xml");
-                    IOUtils.getInstance().copyStreams(inputStream, outputMetaStream);
-                    outputMetaStream.close();
-                } finally
-                {
-                    inputStream.close();
-                }
-            }
-        }
-        catch (IOException ioe)
-        {
-            throw new ReportProcessingException("Failed to write settings document", ioe);
-        }
+        copyMeta();
     }
 }
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index d2c4ebd96e3c..baa43e687ccb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -845,6 +845,7 @@ public class SpreadsheetRawReportTarget extends OfficeDocumentReportTarget
         setElementBoundaryCollectionPass(false);
         resetTableCounter();
         columnCounter = 0;
+        copyMeta();
     }
 
     private boolean isElementBoundaryCollectionPass()
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
index 9f3746086b87..a66f3e8b6c4d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
@@ -26,6 +26,7 @@
  ************************************************************************/
 package com.sun.star.report.pentaho.output.text;
 
+
 import com.sun.star.report.DataSourceFactory;
 import com.sun.star.report.ImageService;
 import com.sun.star.report.InputRepository;
@@ -45,7 +46,7 @@ import com.sun.star.report.pentaho.output.StyleUtilities;
 import com.sun.star.report.pentaho.styles.LengthCalculator;
 
 import java.io.IOException;
-import java.io.InputStream;
+
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 
@@ -53,6 +54,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Map;
 
+
 import org.jfree.layouting.input.style.values.CSSNumericValue;
 import org.jfree.layouting.util.AttributeMap;
 import org.jfree.report.DataSourceException;
@@ -67,7 +69,6 @@ import org.jfree.report.util.AttributeNameGenerator;
 import org.jfree.report.util.IntegerCache;
 
 import org.pentaho.reporting.libraries.base.util.FastStack;
-import org.pentaho.reporting.libraries.base.util.IOUtils;
 import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
@@ -1270,7 +1271,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
             rootAttributes.addNamespaceDeclaration("config", OfficeNamespaces.CONFIG);
             rootAttributes.addNamespaceDeclaration("ooo", OfficeNamespaces.OO2004_NS);
             rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version",
-                   OfficeDocumentReportTarget.ODF_VERSION);
+                    OfficeDocumentReportTarget.ODF_VERSION);
             final OutputStream outputStream = getOutputRepository().createOutputStream("settings.xml", "text/xml");
             final XmlWriter xmlWriter = new XmlWriter(new OutputStreamWriter(outputStream, "UTF-8"), createTagDescription());
             xmlWriter.setAlwaysAddNamespace(true);
@@ -1291,20 +1292,7 @@ public class TextRawReportTarget extends OfficeDocumentReportTarget
             xmlWriter.writeCloseTag();
             xmlWriter.close();
 
-            // now copy the meta.xml
-            if (getInputRepository().isReadable("meta.xml"))
-            {
-                final InputStream inputStream = getInputRepository().createInputStream("meta.xml");
-                try
-                {
-                    final OutputStream outputMetaStream = getOutputRepository().createOutputStream("meta.xml", "text/xml");
-                    IOUtils.getInstance().copyStreams(inputStream, outputMetaStream);
-                    outputMetaStream.close();
-                } finally
-                {
-                    inputStream.close();
-                }
-            }
+            copyMeta();
         }
         catch (IOException ioe)
         {
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
index 11ca5fcd8ae4..fa350df051ce 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
@@ -27,142 +27,746 @@
   -->
 <style-mapper-definition
     xmlns="http://jfreereport.sourceforge.net/namespaces/engine/openoffice/stylemapper">
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="p"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             attribute-name="style-name"
-             style-family="paragraph"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="p"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             attribute-name="class-names"
-             style-family="paragraph"
-             type="styleNameRefs"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="list"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             attribute-name="style-name"
-             style-family="paragraph"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="section"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="a"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="text"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="alphabetical-index"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="alphabetical-index-entry-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="bibliography"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="bibliography-entry-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="h"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="illustration-index"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="illustration-index-entry-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-bibliography"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-chapter"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-link-end"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-link-start"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-page-number"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-span"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-tab-stop"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-entry-text"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-source-style"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-title"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="index-title-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="linenumbering-configuration"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="text"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="list"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="list"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="list-level-style-bullet"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="text"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="list-level-style-number"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="numbered-paragraph"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="list"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+             element-name="object-index"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
              attribute-name="style-name"
              style-family="section"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="span"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             attribute-name="style-name"
-             style-family="text"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="span"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             attribute-name="class-names"
-             style-family="text"
-             type="styleNameRefs"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="ruby"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             attribute-name="style-name"
-             style-family="ruby"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             element-name="ruby-text"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-             attribute-name="style-name"
-             style-family="paragraph"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-             element-name="table"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-             attribute-name="style-name"
-             style-family="table"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-             element-name="table-column"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-             attribute-name="style-name"
-             style-family="table-column"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-             element-name="table-row"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-             attribute-name="style-name"
-             style-family="table-row"
-             type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-             element-name="table-cell"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="object-index-entry-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="outline-level-style"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="character"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="p"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="p"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="class-names"
+           style-family="paragraph"
+           type="styleNameRefs"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="ruby"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="ruby"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="ruby-text"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="section"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="span"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="text"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="span"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="class-names"
+           style-family="text"
+           type="styleNameRefs"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="table-index"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="table-index-entry-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="table-of-content"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="table-of-content-entry-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="user-index"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="section"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           element-name="user-index-entry-template"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+           attribute-name="style-name"
+           style-family="paragraph"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="table"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="background"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="body"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="covered-table-cell"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="even-columns"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="even-rows"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="first-column"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="first-row"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="last-column"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="last-row"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="odd-columns"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="odd-rows"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="table-cell"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-cell"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="table-column"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-column"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           element-name="table-row"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+           attribute-name="style-name"
+           style-family="table-row"
+           type="styleNameRef"/>
+
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="cube"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="extrude"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="rotate"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="scene"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="sphere"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="caption"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="circle"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="connector"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="control"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="custom-shape"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+         element-name="ellipse"
+         attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+         attribute-name="style-name"
+         style-family="graphic"
+         type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="frame"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="g"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="line"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="measure"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="page"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="page-thumbnail"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+             element-name="path"
+             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
              attribute-name="style-name"
-             style-family="table-cell"
+             style-family="graphic"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-             element-name="custom-shape"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="polygon"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="polyline"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+             element-name="rect"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
              attribute-name="style-name"
              style-family="graphic"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-             element-name="frame"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="regular-polygon"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+           element-name="annotation"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+             element-name="notes"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
              attribute-name="style-name"
              style-family="graphic"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="chart"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+           element-name="handout-master"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+           element-name="master-page"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="graphic"
+           type="styleNameRef"/>
+
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="cube"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="extrude"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="rotate"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="scene"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+           element-name="sphere"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="caption"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="circle"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="connector"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="custom-shape"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+         element-name="ellipse"
+         attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+         attribute-name="style-name"
+         style-family="presentation"
+         type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="frame"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="g"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="line"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="measure"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="page-thumbnail"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+             element-name="path"
+             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
              attribute-name="style-name"
-             style-family="chart"
+             style-family="presentation"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="title"
-             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="polygon"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="polyline"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+             element-name="rect"
+             attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
              attribute-name="style-name"
-             style-family="chart"
+             style-family="presentation"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+           element-name="regular-polygon"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+           element-name="annotation"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+           attribute-name="style-name"
+           style-family="presentation"
+           type="styleNameRef"/>
+
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              element-name="axis"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              attribute-name="style-name"
              style-family="chart"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="series"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+             element-name="chart"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              attribute-name="style-name"
              style-family="chart"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="wall"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+             element-name="data-label"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              attribute-name="style-name"
              style-family="chart"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="floor"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+             element-name="data-point"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              attribute-name="style-name"
              style-family="chart"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="legend"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+             element-name="equation"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              attribute-name="style-name"
              style-family="chart"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="plot-area"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+             element-name="error-indicator"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              attribute-name="style-name"
              style-family="chart"
              type="styleNameRef"/>
-    <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-             element-name="grid"
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="floor"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+             element-name="footer"
              attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
              attribute-name="style-name"
              style-family="chart"
              type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="grid"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="legend"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="mean-value"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="plot-area"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="regression-curve"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="series"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="stock-gain-marker"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="stock-loss-marker"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="stock-range-line"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="subtitle"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="title"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           element-name="wall"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+           attribute-name="style-name"
+           style-family="chart"
+           type="styleNameRef"/>
+  <mapping element-namespace="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+           element-name="drop-cap"
+           attribute-namespace="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+           attribute-name="style-name"
+           style-family="text"
+           type="styleNameRef"/>
 </style-mapper-definition>
diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk
index 8361ee6bfbf7..70e290e4884e 100644
--- a/reportbuilder/java/com/sun/star/report/util/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk
@@ -32,12 +32,16 @@ PACKAGE = com$/sun$/star$/report$/util
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 #----- compile .java files -----------------------------------------
 
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES   = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR)
 .ELSE
-JARFILES        = libbase-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar
+JARFILES += \
+    libbase-$(LIBBASE_VERSION).jar                      \
+    libxml-$(LIBXML_VERSION).jar						\
+    flow-engine-$(FLOW_ENGINE_VERSION).jar
 .ENDIF
 
 JAVAFILES       = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java ManifestWriter.java
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 17f894e35e31..17f894e35e31 100755..100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
diff --git a/reportbuilder/util/hidother.src b/reportbuilder/util/hidother.src
deleted file mode 100644
index a06b9d89a4ec..000000000000
--- a/reportbuilder/util/hidother.src
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "../inc/helpids.hrc"
-#include "../inc/rptui_slotid.hrc"
-
-#ifndef _SBASLTID_HRC
-#include <svx/svxids.hrc>
-#endif
-
-hidspecial UID_RPT_RPT_APP_VIEW                                 { HelpId = UID_RPT_RPT_APP_VIEW     ; };
-hidspecial UID_RPT_SCROLLWINDOW                                 { HelpId = UID_RPT_SCROLLWINDOW ; };
-hidspecial UID_RPT_REPORTWINDOW                                 { HelpId = UID_RPT_REPORTWINDOW ; };
-hidspecial HID_RPT_HORZ_RULER                                   { HelpId = HID_RPT_HORZ_RULER       ; };
-hidspecial UID_RPT_SECTIONSWINDOW                               { HelpId = UID_RPT_SECTIONSWINDOW   ; };
-hidspecial UID_RPT_VIEWSWINDOW                                  { HelpId = UID_RPT_VIEWSWINDOW      ; };
-hidspecial HID_RPT_ENDMARKER                                    { HelpId = HID_RPT_ENDMARKER        ; };
-hidspecial HID_RPT_SPLITTER                                     { HelpId = HID_RPT_SPLITTER     ; };
-hidspecial HID_REPORTSECTION                                { HelpId = HID_REPORTSECTION    ; };
-hidspecial HID_RPT_HORZ_SCROLLBAR                               { HelpId = HID_RPT_HORZ_SCROLLBAR   ; };
-hidspecial HID_RPT_VERT_SCROLLBAR                               { HelpId = HID_RPT_VERT_SCROLLBAR   ; };
-hidspecial HID_RPT_STARTMARKER                                  { HelpId = HID_RPT_STARTMARKER      ; };
-
-hidspecial SID_RPT_SHOWREPORTEXPLORER                       { HelpId = SID_RPT_SHOWREPORTEXPLORER   ; };
-hidspecial SID_PAGEHEADERFOOTER                             { HelpId = SID_PAGEHEADERFOOTER         ; };
-hidspecial SID_REPORTHEADERFOOTER                           { HelpId = SID_REPORTHEADERFOOTER       ; };
-hidspecial SID_SORTINGANDGROUPING                           { HelpId = SID_SORTINGANDGROUPING       ; };
-hidspecial SID_INSERT_FLD_PGNUMBER                          { HelpId = SID_INSERT_FLD_PGNUMBER      ; };
-hidspecial SID_CONDITIONALFORMATTING                        { HelpId = SID_CONDITIONALFORMATTING    ; };
-hidspecial SID_PAGEDIALOG                                   { HelpId = SID_PAGEDIALOG               ; };
-hidspecial SID_SETCONTROLDEFAULTS                           { HelpId = SID_SETCONTROLDEFAULTS       ; };
-hidspecial SID_INSERTBREAK                                  { HelpId = SID_INSERTBREAK              ; };
-hidspecial HID_RPT_FIELDEXPRESSION                              { HelpId = HID_RPT_FIELDEXPRESSION          ; };
-hidspecial HID_RPT_SORTORDER                                    { HelpId = HID_RPT_SORTORDER                ; };
-hidspecial HID_RPT_GROUPSBRW                                    { HelpId = HID_RPT_GROUPSBRW                ; };
-hidspecial HID_RPT_GROUPSSORTING_DLG                            { HelpId = HID_RPT_GROUPSSORTING_DLG        ; };
-hidspecial HID_RPT_PAGENUMBERS_DLG                              { HelpId = HID_RPT_PAGENUMBERS_DLG          ; };
-hidspecial HID_RPT_DATETIME_DLG                                 { HelpId = HID_RPT_DATETIME_DLG             ; };
-hidspecial HID_RPT_CONDFORMAT_DLG                               { HelpId = HID_RPT_CONDFORMAT_DLG           ; };
-hidspecial HID_RPT_CRTL_FORMAT_PREVIEW                          { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW      ; };
-hidspecial HID_RPT_COND_DLG                                     { HelpId = HID_RPT_COND_DLG                 ; };
-hidspecial HID_RPT_POPUP_COLOR_CTRL                         { HelpId = HID_RPT_POPUP_COLOR_CTRL     ; };
-hidspecial HID_RPT_POPUP_COLOR                              { HelpId = HID_RPT_POPUP_COLOR          ; };
-hidspecial SID_ESCAPE                                       { HelpId = SID_ESCAPE                   ; };
-hidspecial HID_RPT_PROPDLG_TAB_GENERAL                          { HelpId = HID_RPT_PROPDLG_TAB_GENERAL      ; };
-hidspecial HID_RPT_PROPDLG_TAB_DATA                             { HelpId = HID_RPT_PROPDLG_TAB_DATA         ; };
-
-hidspecial HID_RPT_PROP_FORCENEWPAGE { HelpId = HID_RPT_PROP_FORCENEWPAGE; };
-hidspecial HID_RPT_PROP_NEWROWORCOL { HelpId = HID_RPT_PROP_NEWROWORCOL; };
-hidspecial HID_RPT_PROP_KEEPTOGETHER { HelpId = HID_RPT_PROP_KEEPTOGETHER; };
-hidspecial HID_RPT_PROP_CANGROW { HelpId = HID_RPT_PROP_CANGROW; };
-hidspecial HID_RPT_PROP_CANSHRINK { HelpId = HID_RPT_PROP_CANSHRINK; };
-hidspecial HID_RPT_PROP_REPEATSECTION { HelpId = HID_RPT_PROP_REPEATSECTION; };
-hidspecial HID_RPT_PROP_PRINTREPEATEDVALUES { HelpId = HID_RPT_PROP_PRINTREPEATEDVALUES; };
-hidspecial HID_RPT_PROP_CONDITIONALPRINTEXPRESSION { HelpId = HID_RPT_PROP_CONDITIONALPRINTEXPRESSION; };
-hidspecial HID_RPT_PROP_STARTNEWCOLUMN { HelpId = HID_RPT_PROP_STARTNEWCOLUMN; };
-hidspecial HID_RPT_PROP_STARTNEWPAGE { HelpId = HID_RPT_PROP_STARTNEWPAGE; };
-hidspecial HID_RPT_PROP_RESETPAGENUMBER { HelpId = HID_RPT_PROP_RESETPAGENUMBER; };
-hidspecial HID_RPT_PROP_MINHEIGHTNEWPAGE { HelpId = HID_RPT_PROP_MINHEIGHTNEWPAGE; };
-hidspecial HID_RPT_PROP_PRINTWHENGROUPCHANGE { HelpId = HID_RPT_PROP_PRINTWHENGROUPCHANGE; };
-hidspecial HID_RPT_PROP_VISIBLE { HelpId = HID_RPT_PROP_VISIBLE; };
-hidspecial HID_RPT_PROP_GROUPKEEPTOGETHER { HelpId = HID_RPT_PROP_GROUPKEEPTOGETHER; };
-hidspecial HID_RPT_PROP_PAGEHEADEROPTION { HelpId = HID_RPT_PROP_PAGEHEADEROPTION; };
-hidspecial HID_RPT_PROP_PAGEFOOTEROPTION { HelpId = HID_RPT_PROP_PAGEFOOTEROPTION; };
-hidspecial UID_RPT_PROP_DLG_LINE_STYLE { HelpId = UID_RPT_PROP_DLG_LINE_STYLE; };
-hidspecial HID_RPT_PROP_RPT_POSITIONX { HelpId = HID_RPT_PROP_RPT_POSITIONX; };
-hidspecial HID_RPT_PROP_RPT_POSITIONY { HelpId = HID_RPT_PROP_RPT_POSITIONY; };
-hidspecial HID_RPT_PROP_RPT_WIDTH { HelpId = HID_RPT_PROP_RPT_WIDTH; };
-hidspecial HID_RPT_PROP_RPT_HEIGHT { HelpId = HID_RPT_PROP_RPT_HEIGHT; };
-hidspecial HID_RPT_START_TITLE { HelpId = HID_RPT_START_TITLE; };
-hidspecial HID_RPT_START_IMAGE { HelpId = HID_RPT_START_IMAGE; };
-hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; };
-
-hidspecial SID_RPT_TEXTDOCUMENT { HelpId = SID_RPT_TEXTDOCUMENT; };
-hidspecial SID_RPT_SPREADSHEET { HelpId = SID_RPT_SPREADSHEET; };
-hidspecial HID_RPT_PROP_DEEPTRAVERSING { HelpId = HID_RPT_PROP_DEEPTRAVERSING; };
-hidspecial HID_RPT_PROP_PREEVALUATED { HelpId = HID_RPT_PROP_PREEVALUATED; };
-hidspecial HID_RPT_NAVIGATOR_DLG { HelpId = HID_RPT_NAVIGATOR_DLG; };
-hidspecial HID_REPORT_NAVIGATOR_TREE { HelpId = HID_REPORT_NAVIGATOR_TREE; };
-hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; };
-hidspecial HID_RPT_PROP_FORMULA { HelpId = HID_RPT_PROP_FORMULA; };
-hidspecial HID_RPT_PROP_INITIALFORMULA { HelpId = HID_RPT_PROP_INITIALFORMULA; };x
-hidspecial HID_RPT_PROP_DATAFIELD { HelpId = HID_RPT_PROP_DATAFIELD; };
-hidspecial HID_RPT_PROP_RPT_FONT { HelpId = HID_RPT_PROP_RPT_FONT; };
-hidspecial UID_RPT_RPT_PROP_DLG_FONT_TYPE { HelpId = UID_RPT_RPT_PROP_DLG_FONT_TYPE; };
-hidspecial HID_RPT_PROP_BACKCOLOR { HelpId = HID_RPT_PROP_BACKCOLOR; };
-hidspecial HID_RPT_PROP_PRESERVEIRI { HelpId = HID_RPT_PROP_PRESERVEIRI; };
-
-hidspecial SID_OBJECT_SMALLESTWIDTH     { HelpId = SID_OBJECT_SMALLESTWIDTH; };
-hidspecial SID_OBJECT_SMALLESTHEIGHT    { HelpId = SID_OBJECT_SMALLESTHEIGHT; };
-hidspecial SID_OBJECT_GREATESTWIDTH     { HelpId = SID_OBJECT_GREATESTWIDTH; };
-hidspecial SID_OBJECT_GREATESTHEIGHT    { HelpId = SID_OBJECT_GREATESTHEIGHT; };
-
-hidspecial HID_RPT_PROP_BACKTRANSPARENT    { HelpId = HID_RPT_PROP_BACKTRANSPARENT; };
-hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT    { HelpId = HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT; };
-
-hidspecial SID_ARRANGEMENU    { HelpId = SID_ARRANGEMENU; };
-hidspecial SID_SELECTALL_IN_SECTION    { HelpId = SID_SELECTALL_IN_SECTION; };
-hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; };
-hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; };
-hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; };
-hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; };
-hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; };
-hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; };
-hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; };
-hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; };
-hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; };
-
-hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; };
-hidspecial HID_RPT_PROP_CHARTTYPE { HelpId = HID_RPT_PROP_CHARTTYPE; };
-hidspecial HID_RPT_FIELD_SEL_WIN { HelpId = HID_RPT_FIELD_SEL_WIN; };
-hidspecial HID_RPT_FIELD_SEL { HelpId = HID_RPT_FIELD_SEL; };
-hidspecial HID_RPT_PROP_FORMULALIST { HelpId = HID_RPT_PROP_FORMULALIST; };
-hidspecial HID_RPT_PROP_SCOPE { HelpId = HID_RPT_PROP_SCOPE; };
-hidspecial HID_RPT_PROP_TYPE { HelpId = HID_RPT_PROP_TYPE; };
-hidspecial UID_RPT_PROP_DLG_LINKFIELDS { HelpId = UID_RPT_PROP_DLG_LINKFIELDS; };
-hidspecial HID_RPT_PROP_MASTERFIELDS { HelpId = HID_RPT_PROP_MASTERFIELDS; };
-hidspecial HID_RPT_PROP_DETAILFIELDS { HelpId = HID_RPT_PROP_DETAILFIELDS; };
-hidspecial HID_RPT_PROP_PREVIEW_COUNT { HelpId = HID_RPT_PROP_PREVIEW_COUNT; };
-hidspecial HID_RPT_PROP_AREA { HelpId = HID_RPT_PROP_AREA; };
-hidspecial UID_RPT_RPT_PROP_DLG_AREA { HelpId = UID_RPT_RPT_PROP_DLG_AREA; };
-hidspecial HID_RPT_PROP_MIMETYPE { HelpId = HID_RPT_PROP_MIMETYPE; };
\ No newline at end of file
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 55ba88c3cf6f..9dcb8b41326f 100755..100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -38,6 +38,8 @@ EXTENSION_VERSION_BASE=1.2.1
 
 # --- Settings ----------------------------------
 .INCLUDE :  makefile.pmk
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
+
 .IF "$(L10N_framework)"==""
 # ------------------------------------------------------------------
 # calready set in util$/makefile.pmk
@@ -94,16 +96,16 @@ COMPONENT_EXTJARFILES = \
 
 .IF "$(SYSTEM_JFREEREPORT)" != "YES"
 COMPONENT_EXTJARFILES += \
-    $(EXTENSIONDIR)$/flute-1.3.0.jar				            \
-    $(EXTENSIONDIR)$/libserializer-1.0.0.jar				    \
-    $(EXTENSIONDIR)$/libbase-1.0.0.jar                          \
-    $(EXTENSIONDIR)$/libfonts-1.0.0.jar							\
-    $(EXTENSIONDIR)$/libformula-0.2.0.jar						\
-    $(EXTENSIONDIR)$/liblayout-0.2.9.jar						\
-    $(EXTENSIONDIR)$/libloader-1.0.0.jar						\
-    $(EXTENSIONDIR)$/librepository-1.0.0.jar					\
-    $(EXTENSIONDIR)$/libxml-1.0.0.jar							\
-    $(EXTENSIONDIR)$/flow-engine-0.9.2.jar 	                    \
+    $(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar				            \
+    $(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar			\
+    $(EXTENSIONDIR)$/libbase-$(LIBBASE_VERSION).jar                     \
+    $(EXTENSIONDIR)$/libfonts-$(LIBFONTS_VERSION).jar					\
+    $(EXTENSIONDIR)$/libformula-$(LIBFORMULA_VERSION).jar						\
+    $(EXTENSIONDIR)$/liblayout-$(LIBLAYOUT_VERSION).jar					\
+    $(EXTENSIONDIR)$/libloader-$(LIBLOADER_VERSION).jar					\
+    $(EXTENSIONDIR)$/librepository-$(LIBREPOSITORY_VERSION).jar			\
+    $(EXTENSIONDIR)$/libxml-$(LIBXML_VERSION).jar						\
+    $(EXTENSIONDIR)$/flow-engine-$(FLOW_ENGINE_VERSION).jar 	        \
     $(EXTENSIONDIR)$/sac.jar
 .ENDIF
 .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk
index 566132247f9f..566132247f9f 100644..100755
--- a/reportbuilder/util/makefile.pmk
+++ b/reportbuilder/util/makefile.pmk