CWS-TOOLING: integrate CWS rptfix04

2009-02-23 01:59:54 +0100 rene  r268341 : #i10000# fix system-jfreereport build
2009-02-13 10:17:16 +0100 oj  r267696 : #i98549# integrate zip form pentaho package
2009-02-03 14:48:34 +0100 oj  r267330 : set formula locale to doc locale
2009-02-03 14:45:54 +0100 oj  r267329 : set formula locale to doc locale
2009-02-03 11:50:03 +0100 oj  r267311 : set formula locale to doc locale
2009-02-03 08:55:02 +0100 oj  r267297 : unix line ends
2009-01-28 11:21:24 +0100 rene  r267043 : #i98549# s/DESIGN/BUILDER/ also for Sun
2009-01-27 17:17:50 +0100 rene  r267012 : merge builfix from trunk
2009-01-27 14:16:30 +0100 rene  r266991 : #i10000# fix rebase which left out the whole changes in former config_office; sync variable names (s/LIB_//) and some other things
2009-01-27 10:01:09 +0100 oj  r266959 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266944 (milestone: DEV300:m40)
2009-01-27 08:00:16 +0100 oj  r266951 : conflict in mergeinfo
2009-01-26 12:23:03 +0100 oj  r266914 : #i98383# fix grouping
2009-01-23 22:03:03 +0100 rene  r266852 : fix --enable-report-builder description
2009-01-23 10:37:27 +0100 oj  r266778 : set escape processing when set at query
2009-01-23 09:17:16 +0100 fs  r266770 : add CWS name to version
2009-01-21 13:57:35 +0100 oj  r266669 : merge for build bots
2009-01-20 09:07:24 +0100 oj  r266552 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-20 08:34:16 +0100 oj  r266551 : rebase
2009-01-20 08:33:59 +0100 oj  r266550 : rebase
2009-01-20 08:32:50 +0100 oj  r266549 : rebase
2009-01-20 08:30:13 +0100 oj  r266548 : rebase
2009-01-20 08:29:30 +0100 oj  r266547 : rebase
2009-01-20 08:22:33 +0100 oj  r266546 : merge short cuts from dba31g
2009-01-19 21:04:08 +0100 rene  r266525 : #i10000# we need officecfg for component-update.dtd
2009-01-19 21:01:26 +0100 rene  r266524 : #i10000# fix import
2009-01-19 20:26:20 +0100 rene  r266523 : #i10000# remove svn conflicts markers; fix build
2009-01-19 14:23:56 +0100 rene  r266496 : libbase depends on apache-commons..
2009-01-19 14:00:42 +0100 oj  r266495 : merge from m39
2009-01-19 12:39:00 +0100 oj  r266489 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-16 11:47:04 +0100 oj  r266410 : #i97560# add , between expressions
2009-01-09 17:11:38 +0100 rene  r266103 : don't show "checking which Apache commons-* libs to use" when we neither build the wiki editor nor  the SRB
2009-01-09 16:48:02 +0100 rene  r266099 : #i10000# reportbuilder needs apache-commons
2009-01-09 15:43:35 +0100 oj  r266093 : use of new nspaces
2009-01-09 15:41:34 +0100 oj  r266092 : use of new nspaces
2009-01-09 14:44:15 +0100 rene  r266088 : fix typo/description
2009-01-09 12:48:51 +0100 rene  r266074 : #i10000# fix install
2009-01-09 11:52:53 +0100 rene  r266070 : #i10000# more build fixes
2009-01-09 10:53:13 +0100 rene  r266062 : #i10000# ENABLE_REPORTBUILDER also in set_soenv.in, fix typo
2009-01-09 10:40:24 +0100 rene  r266060 : #i10000# configure fix for new reportbuilder module, typo fix at libfonts
2009-01-09 10:01:52 +0100 rene  r266055 : #i10000# adapt to current configure.in
2009-01-09 09:59:32 +0100 oj  r266054 : add new pentaho jars
2009-01-09 09:47:54 +0100 oj  r266049 : merge changes from DEV300_m39
2009-01-09 09:14:08 +0100 oj  r266048 : merge from DEV300_m39
2009-01-09 08:28:43 +0100 oj  r266045 : merge changes from dba31g
2009-01-09 07:58:10 +0100 oj  r266044 : replace JCOMMON with LIB
2009-01-08 13:42:24 +0100 oj  r266005 : move ext to reportbuilder
2009-01-08 13:41:38 +0100 oj  r266004 : add dep for license
2009-01-08 13:27:56 +0100 oj  r266001 : new module for Sun report Builder extension
2009-01-07 12:58:13 +0100 oj  r265960 : CWS-TOOLING: rebase CWS rptfix04 to trunk@265758 (milestone: DEV300:m38)
2008-12-15 13:47:18 +0100 oj  r265481 : new pentaho resources
2008-12-15 10:04:01 +0100 oj  r265462 : integrate new pentaho sources
2008-12-15 10:02:54 +0100 oj  r265461 : #i96888# fix date time function
2008-12-12 09:23:29 +0100 oj  r265389 : #97174# check of res < 0 removed
2008-12-12 09:15:54 +0100 oj  r265388 : #i9716# fix for DayFunction
2008-12-11 12:24:24 +0100 oj  r265281 : integrate new pentaho sources
2008-12-11 11:49:16 +0100 oj  r265273 : integrate new pentaho sources
2008-12-11 09:34:07 +0100 oj  r265248 : integrate new pentaho sources
2008-12-10 18:58:06 +0100 oj  r265227 : introduce new pentaho sources
2008-12-10 18:56:43 +0100 oj  r265226 : introduce new pentaho sources
2008-12-10 18:54:26 +0100 oj  r265225 : introduce new pentaho sources
2008-12-10 18:42:59 +0100 oj  r265221 : introduce new pentaho sources
2008-12-10 17:24:23 +0100 oj  r265212 : introduce new pentaho sources
2008-12-10 17:24:07 +0100 oj  r265211 : new pentaho sources
2008-12-10 17:23:00 +0100 oj  r265210 : introduce new pentaho sources

5 files changed, 678 insertions, 0 deletions

diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
new file mode 100644
index 000000000000..acb6a9e5da2b
--- /dev/null
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
@@ -0,0 +1,91 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: BodyReadHandler.java,v $
+ * $Revision: 1.5 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+package com.sun.star.report.pentaho.parser.office;
+
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import com.sun.star.report.pentaho.parser.rpt.ReportReadHandler;
+import org.jfree.report.structure.Element;
+import org.jfree.report.structure.Section;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+public class BodyReadHandler extends ElementReadHandler
+{
+
+    private ElementReadHandler reportReadHandler;
+    private final Section body;
+
+    public BodyReadHandler()
+    {
+        body = new Section();
+    }
+
+    /**
+     * Returns the handler for a child element.
+     *
+     * @param tagName the tag name.
+     * @param atts    the attributes.
+     * @return the handler or null, if the tagname is invalid.
+     *
+     * @throws org.xml.sax.SAXException if there is a parsing error.
+     */
+    protected XmlReadHandler getHandlerForChild(final String uri, final String tagName,
+            final Attributes atts)
+            throws SAXException
+    {
+        if (OfficeNamespaces.OFFICE_NS.equals(uri) && "report".equals(tagName))
+        {
+            reportReadHandler = new ReportReadHandler();
+            return reportReadHandler;
+        }
+
+        return null;
+    }
+
+    /**
+     * Done parsing.
+     *
+     * @throws org.xml.sax.SAXException if there is a parsing error.
+     */
+    protected void doneParsing() throws SAXException
+    {
+        if (reportReadHandler != null)
+        {
+            body.addNode(reportReadHandler.getElement());
+        }
+    }
+
+    public Element getElement()
+    {
+        return body;
+    }
+}
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
new file mode 100644
index 000000000000..9d1b4e1a9d14
--- /dev/null
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
@@ -0,0 +1,234 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocumentContentReadHandler.java,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+package com.sun.star.report.pentaho.parser.office;
+
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.model.OfficeDocument;
+import com.sun.star.report.pentaho.model.OfficeStylesCollection;
+import com.sun.star.report.pentaho.parser.style.OfficeStylesReadHandler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jfree.report.JFreeReport;
+import org.pentaho.reporting.libraries.resourceloader.Resource;
+import org.pentaho.reporting.libraries.resourceloader.ResourceException;
+import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
+import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
+import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
+import org.pentaho.reporting.libraries.xmlns.parser.AbstractXmlReadHandler;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * This is the root handler for the document context. The
+ * 'office:document-context' element is encountered, if the document is split
+ * into separate files.
+ * <p/>
+ * Alternativly, there is the option to keep everything in one file. The root
+ * element for that format is 'office:document'.
+ */
+public class DocumentContentReadHandler extends AbstractXmlReadHandler
+{
+    private static final Log LOGGER = LogFactory.getLog(DocumentContentReadHandler.class);
+    private OfficeDocument report;
+    private FontFaceDeclsReadHandler fontFaceReadHandler;
+    private BodyReadHandler bodyReadHandler;
+    private OfficeStylesCollection officeStylesCollection;
+
+    public DocumentContentReadHandler()
+    {
+    }
+
+    /**
+     * Starts parsing.
+     *
+     * @param attrs the attributes.
+     * @throws org.xml.sax.SAXException if there is a parsing error.
+     */
+    protected void startParsing(final Attributes attrs)
+            throws SAXException
+    {
+        super.startParsing(attrs);
+        // parse the external 'styles.xml' if it exists
+        // parse the external 'meta.xml' if it exists
+        // parse the external 'settings.xml' if it exists
+        this.report = parseContentXml();
+        this.report.setVirtual(true);
+        this.report.setType("document-content");
+        this.report.setNamespace(OfficeNamespaces.OFFICE_NS);
+        this.report.setVirtual(true);
+        this.officeStylesCollection = parseStylesXml();
+    }
+
+    private OfficeStylesCollection parseStylesXml()
+    {
+        final ResourceKey contextKey = getRootHandler().getContext();
+        final ResourceManager resourceManager = getRootHandler().getResourceManager();
+
+        try
+        {
+            final ResourceKey key =
+                    resourceManager.deriveKey(contextKey, "styles.xml");
+            final Resource resource =
+                    resourceManager.create(key, contextKey, OfficeStylesCollection.class);
+            final OfficeStylesCollection styles =
+                    (OfficeStylesCollection) resource.getResource();
+            if (styles != null)
+            {
+                return styles;
+            }
+        }
+        catch (ResourceKeyCreationException e)
+        {
+            // ignore ..
+            LOGGER.debug("Failed to create resource-key for 'styles.xml'. Ignoring.", e);
+        }
+        catch (ResourceException e)
+        {
+            // ignore ..
+            LOGGER.debug("Failed to parse resource for 'styles.xml'. Ignoring.", e);
+        }
+
+        return new OfficeStylesCollection();
+    }
+
+    private OfficeDocument parseContentXml()
+    {
+        // Check whether this is a content.xml.
+        if (!OfficeNamespaces.OFFICE_NS.equals(getUri()) || "document-content".equals(getTagName()))
+        {
+            return new OfficeDocument();
+        }
+
+        // we may have to parse an existing content.xml.
+        final ResourceKey contextKey = getRootHandler().getContext();
+        final ResourceManager resourceManager = getRootHandler().getResourceManager();
+        try
+        {
+            final ResourceKey key =
+                    resourceManager.deriveKey(contextKey, "content.xml");
+            final Resource resource =
+                    resourceManager.create(key, contextKey, JFreeReport.class);
+            final OfficeDocument doc = (OfficeDocument) resource.getResource();
+            if (doc != null)
+            {
+                return doc;
+            }
+        }
+        catch (ResourceKeyCreationException e)
+        {
+            // ignore ..
+            LOGGER.debug("Failed to create resource-key for 'content.xml'. Ignoring.");
+        }
+        catch (ResourceException e)
+        {
+            // ignore ..
+            LOGGER.debug("Failed to parse resource for 'content.xml'. Ignoring.");
+        }
+        return new OfficeDocument();
+
+    }
+
+    /**
+     * Returns the handler for a child element.
+     *
+     * @param tagName the tag name.
+     * @param atts    the attributes.
+     * @return the handler or null, if the tagname is invalid.
+     *
+     * @throws org.xml.sax.SAXException if there is a parsing error.
+     */
+    protected XmlReadHandler getHandlerForChild(final String uri,
+            final String tagName,
+            final Attributes atts)
+            throws SAXException
+    {
+        if (OfficeNamespaces.OFFICE_NS.equals(uri))
+        {
+            if ("font-face-decls".equals(tagName))
+            {
+                if (fontFaceReadHandler == null)
+                {
+                    fontFaceReadHandler = new FontFaceDeclsReadHandler(officeStylesCollection.getFontFaceDecls());
+                }
+                return fontFaceReadHandler;
+            }
+            else if ("automatic-styles".equals(tagName))
+            {
+                return new OfficeStylesReadHandler(officeStylesCollection.getAutomaticStyles());
+            }
+            else if ("styles".equals(tagName))
+            {
+                return new OfficeStylesReadHandler(officeStylesCollection.getCommonStyles());
+            }
+            else if ("master-styles".equals(tagName))
+            {
+                return new MasterStylesReadHandler(officeStylesCollection.getMasterStyles());
+            }
+            else if ("body".equals(tagName))
+            {
+                bodyReadHandler = new BodyReadHandler();
+                return bodyReadHandler;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Done parsing.
+     *
+     * @throws org.xml.sax.SAXException if there is a parsing error.
+     */
+    protected void doneParsing()
+            throws SAXException
+    {
+        // The office-document is the only node of the report. It allows us to
+        // switch the layout-processing implementation later on.
+
+        report.setStylesCollection(officeStylesCollection);
+
+        if (bodyReadHandler != null)
+        {
+            report.addNode(bodyReadHandler.getElement());
+        }
+    }
+
+    /**
+     * Returns the object for this element or null, if this element does not
+     * create an object.
+     *
+     * @return the object.
+     */
+    public Object getObject()
+            throws SAXException
+    {
+        return report;
+    }
+}
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
new file mode 100644
index 000000000000..33591203573f
--- /dev/null
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: DocumentStylesReadHandler.java,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+
+package com.sun.star.report.pentaho.parser.office;
+
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.model.OfficeStylesCollection;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import com.sun.star.report.pentaho.parser.style.OfficeStylesReadHandler;
+import org.jfree.report.structure.Element;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * The root parser for a 'styles.xml' document. This generates the global
+ * (or common) style collection. These styles contain the named common styles
+ * and the page layouts.
+ *
+ * @author Thomas Morgner
+ * @since 08.03.2007
+ */
+public class DocumentStylesReadHandler extends ElementReadHandler
+{
+  private final OfficeStylesCollection officeStylesCollection;
+  private FontFaceDeclsReadHandler fontFaceReadHandler;
+
+  public DocumentStylesReadHandler()
+  {
+    officeStylesCollection = new OfficeStylesCollection();
+  }
+
+
+  /**
+   * Returns the handler for a child element.
+   *
+   * @param tagName the tag name.
+   * @param atts    the attributes.
+   * @return the handler or null, if the tagname is invalid.
+   *
+   * @throws org.xml.sax.SAXException if there is a parsing error.
+   */
+  protected XmlReadHandler getHandlerForChild(final String uri,
+                                              final String tagName,
+                                              final Attributes atts)
+      throws SAXException
+  {
+    if (!OfficeNamespaces.OFFICE_NS.equals(uri))
+    {
+      return null;
+    }
+
+    if ("font-face-decls".equals(tagName))
+    {
+      if (fontFaceReadHandler == null)
+      {
+        fontFaceReadHandler = new FontFaceDeclsReadHandler
+            (officeStylesCollection.getFontFaceDecls());
+      }
+      return fontFaceReadHandler;
+    }
+    else if ("automatic-styles".equals(tagName))
+    {
+      return new OfficeStylesReadHandler(officeStylesCollection.getAutomaticStyles());
+    }
+    else if ("styles".equals(tagName))
+    {
+      return new OfficeStylesReadHandler(officeStylesCollection.getCommonStyles());
+    }
+    else if ("master-styles".equals(tagName))
+    {
+      return new MasterStylesReadHandler(officeStylesCollection.getMasterStyles());
+    }
+    return null;
+  }
+
+
+  public Element getElement()
+  {
+    return officeStylesCollection;
+  }
+}
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
new file mode 100644
index 000000000000..c11bf6385bc9
--- /dev/null
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
@@ -0,0 +1,119 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: FontFaceDeclsReadHandler.java,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+
+package com.sun.star.report.pentaho.parser.office;
+
+import java.util.ArrayList;
+
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.pentaho.model.FontFaceDeclsSection;
+import com.sun.star.report.pentaho.model.FontFaceElement;
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import com.sun.star.report.pentaho.parser.style.FontFaceReadHandler;
+import java.util.List;
+import org.jfree.report.structure.Element;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * Reads the font-face declarations section. This one can only contain
+ * font-face elements.
+ *
+ * @author Thomas Morgner
+ * @since 13.03.2007
+ */
+public class FontFaceDeclsReadHandler extends ElementReadHandler
+{
+  private final FontFaceDeclsSection fontFaceDecls;
+  private final List fontFaceReadHandlers;
+
+  public FontFaceDeclsReadHandler(final FontFaceDeclsSection fontFaceDecls)
+  {
+    this.fontFaceDecls = fontFaceDecls;
+    this.fontFaceReadHandlers = new ArrayList();
+  }
+
+  public FontFaceDeclsSection getFontFaceDecls()
+  {
+    return fontFaceDecls;
+  }
+
+
+  /**
+   * Returns the handler for a child element.
+   *
+   * @param tagName the tag name.
+   * @param atts    the attributes.
+   * @return the handler or null, if the tagname is invalid.
+   *
+   * @throws org.xml.sax.SAXException if there is a parsing error.
+   */
+  protected XmlReadHandler getHandlerForChild(final String uri,
+                                              final String tagName,
+                                              final Attributes atts)
+      throws SAXException
+  {
+    if (!OfficeNamespaces.STYLE_NS.equals(uri) )
+    {
+      return null;
+    }
+
+    if ("font-face".equals(tagName))
+    {
+      final FontFaceReadHandler frh = new FontFaceReadHandler();
+      fontFaceReadHandlers.add(frh);
+      return frh;
+    }
+    return null;
+  }
+
+  /**
+   * Done parsing.
+   *
+   * @throws org.xml.sax.SAXException if there is a parsing error.
+   */
+  protected void doneParsing()
+      throws SAXException
+  {
+    for (int i = 0; i < fontFaceReadHandlers.size(); i++)
+    {
+      final FontFaceReadHandler handler = (FontFaceReadHandler) fontFaceReadHandlers.get(i);
+      fontFaceDecls.addFontFace((FontFaceElement) handler.getElement());
+    }
+  }
+
+  public Element getElement()
+  {
+    return fontFaceDecls;
+  }
+
+}
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
new file mode 100644
index 000000000000..deed7bdc0d84
--- /dev/null
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: MasterStylesReadHandler.java,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+package com.sun.star.report.pentaho.parser.office;
+
+import java.util.ArrayList;
+
+import com.sun.star.report.pentaho.parser.ElementReadHandler;
+import com.sun.star.report.pentaho.parser.style.StyleDefinitionReadHandler;
+import com.sun.star.report.pentaho.parser.style.MasterPageReadHandler;
+import com.sun.star.report.pentaho.model.OfficeMasterStyles;
+import com.sun.star.report.pentaho.OfficeNamespaces;
+import java.util.List;
+import org.jfree.report.structure.Element;
+import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+/**
+ * Todo: Document me!
+ *
+ * @author Thomas Morgner
+ * @since 13.03.2007
+ */
+public class MasterStylesReadHandler extends ElementReadHandler
+{
+
+    private final OfficeMasterStyles masterStyles;
+    private final List otherHandlers;
+    private final List masterPageHandlers;
+
+    public MasterStylesReadHandler(final OfficeMasterStyles masterStyles)
+    {
+        this.masterStyles = masterStyles;
+        this.masterPageHandlers = new ArrayList();
+        this.otherHandlers = new ArrayList();
+    }
+
+    public OfficeMasterStyles getMasterStyles()
+    {
+        return masterStyles;
+    }
+
+    /**
+     * Returns the handler for a child element.
+     *
+     * @param tagName the tag name.
+     * @param atts    the attributes.
+     * @return the handler or null, if the tagname is invalid.
+     *
+     * @throws org.xml.sax.SAXException if there is a parsing error.
+     */
+    protected XmlReadHandler getHandlerForChild(final String uri,
+            final String tagName,
+            final Attributes atts)
+            throws SAXException
+    {
+        if (OfficeNamespaces.STYLE_NS.equals(uri) && "master-page".equals(tagName))
+        {
+            final MasterPageReadHandler mrh = new MasterPageReadHandler();
+            masterPageHandlers.add(mrh);
+            return mrh;
+        }
+
+        final StyleDefinitionReadHandler readHandler =
+                new StyleDefinitionReadHandler();
+        otherHandlers.add(readHandler);
+        return readHandler;
+    }
+
+    /**
+     * Done parsing.
+     *
+     * @throws org.xml.sax.SAXException if there is a parsing error.
+     */
+    protected void doneParsing()
+            throws SAXException
+    {
+        for (int i = 0; i < otherHandlers.size(); i++)
+        {
+            final ElementReadHandler handler =
+                    (ElementReadHandler) otherHandlers.get(i);
+            masterStyles.getOtherNodes().addNode(handler.getElement());
+        }
+
+        for (int i = 0; i < masterPageHandlers.size(); i++)
+        {
+            final MasterPageReadHandler handler =
+                    (MasterPageReadHandler) masterPageHandlers.get(i);
+            masterStyles.addMasterPage(handler.getMasterPage());
+        }
+    }
+
+    public Element getElement()
+    {
+        return masterStyles;
+    }
+}