diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-06-22 11:27:46 +0200 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-06-22 11:27:46 +0200 |
| commit | fe8e4404a5310fe5cf0c6ea38a08562c48404f3b (patch) | |
| tree | 83724362f7478e4a79553898c576cfa63df663f0 /reportbuilder/java/com/sun/star/report/pentaho/parser/text | |
| parent | Automated merge with file:///net/so-cwsserv01/export/cws/hg_clean/ooo/DEV300 (diff) | |
| parent | CWS-TOOLING: integrate CWS impress190 (diff) | |
| download | core-fe8e4404a5310fe5cf0c6ea38a08562c48404f3b.tar.gz core-fe8e4404a5310fe5cf0c6ea38a08562c48404f3b.zip | |
srb1: merge from DEv300:m83
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/pentaho/parser/text')
2 files changed, 11 insertions, 9 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java index dc2eee157b7d..95ba86623639 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java @@ -3,23 +3,27 @@ */ package com.sun.star.report.pentaho.parser.text; -import java.util.ArrayList; - +import com.sun.star.report.OfficeToken; +import com.sun.star.report.pentaho.OfficeNamespaces; import com.sun.star.report.pentaho.parser.ElementReadHandler; import com.sun.star.report.pentaho.parser.rpt.FixedContentReadHandler; import com.sun.star.report.pentaho.parser.rpt.FormattedTextReadHandler; import com.sun.star.report.pentaho.parser.rpt.ImageReadHandler; -import com.sun.star.report.pentaho.OfficeNamespaces; -import com.sun.star.report.OfficeToken; import com.sun.star.report.pentaho.parser.rpt.SubDocumentReadHandler; + +import java.util.ArrayList; import java.util.List; -import org.jfree.report.structure.Section; + import org.jfree.report.structure.Element; +import org.jfree.report.structure.Section; import org.jfree.report.structure.StaticText; + import org.pentaho.reporting.libraries.xmlns.parser.XmlReadHandler; + import org.xml.sax.Attributes; import org.xml.sax.SAXException; + /** * This is a generic implementation that accepts all input and adds special * handlers for the report-elements. diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java index 19af5196fa2b..ae0c29f13d3c 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: TextContentReadHandler.java,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -31,6 +28,7 @@ package com.sun.star.report.pentaho.parser.text; import org.jfree.report.structure.Section; import org.jfree.report.structure.StaticText; + import org.xml.sax.SAXException; /** |