nicolaken 02/04/08 00:32:36
Modified:
src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
EPCell.java
Log:
[PATCH] HSSF Serializer support new Gnumeric 1.04+ "contentless cells"
by [EMAIL PROTECTED] (Andy Oliver) Bug#: 7813
Revision Changes Path
1.2 +70 -62
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
Index: EPCell.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EPCell.java 6 Mar 2002 16:58:02 -0000 1.1
+++ EPCell.java 8 Apr 2002 07:32:36 -0000 1.2
@@ -1,68 +1,55 @@
-
/*
- * =========================================================================
- *
- * The POI Project Software License, Version 1.1
- * (based on APL 1.1)
- * Copyright (c) 2002 SuperLink Software, Inc. and Marcus Johnson
- * All rights reserved.
- *
- * =========================================================================
- *
- * Redistribution and use in source and binary forms, with or without modi-
- * fication, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any,
- * must include the following acknowlegement:
- *
- * "This product includes software developed by SuperLink
- * Software, Inc. <www.superlinksoftware.com> and Marcus Johnson as
- * well as other POI project <poi.sourceforge.net> contributers"
- *
- * Alternately, this acknowlegement may appear in the software itself, if
- * and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "POI", "HSSF", "SuperLink Software, Inc." and "Marcus
- * Johnson" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact <andyoliver at yahoo dot com>.
- *
- * 5. Products derived from this software may not be called "POI" nor may
- * "POI" appear in their names without prior written permission of
- * SuperLink Software, Inc.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE SUPERLINK SOFTWARE, INC., ANDREW C. OLIVER OR THE CONTRIBUTORS TO
- * THE POI PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * =========================================================================
- *
- * This software consists of voluntary contributions made by many indivi-
- * duals on behalf of SuperLink Software, Inc. For more information
- * on the SuperLink Software, Inc, please see
- * <http://www.superlinksoftware.com/>. For more information on the POI
- * project see <www.sf.net/projects/poi>.
- *
- * =========================================================================
- */
-package org.apache.cocoon.components.elementprocessor.impl.poi.hssf.elements;
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
+ used to endorse or promote products derived from this software without
+ prior written permission. For written permission, please contact
+ [EMAIL PROTECTED]
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many individuals
+ on behalf of the Apache Software Foundation and was originally created by
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
+*/
+
+package org.apache.cocoon.components.elementprocessor.impl.poi.hssf.elements;
import org.apache.cocoon.components.elementprocessor.types.Attribute;
import org.apache.cocoon.components.elementprocessor.ElementProcessor;
@@ -309,6 +296,27 @@
cellType);
+ }
+
+ public String getContent()
+ {
+ String content = getData();
+ return content;
+ }
+
+ /**
+ * end processing -- pass their content up to their cell
+ *
+ * @exception IOException
+ */
+
+ public void endProcessing() throws IOException
+ {
+ String content = getContent();
+ if (content != null && !content.trim().equals(""))
+ {
+ getCell().setContent(getContent());
+ }
}
/**
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
