cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r707379 - in /cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements: EPCell.java EPMerge.java EPStyleRegion.java
Date Thu, 23 Oct 2008 14:25:49 GMT
Author: felixk
Date: Thu Oct 23 07:25:48 2008
New Revision: 707379

URL: http://svn.apache.org/viewvc?rev=707379&view=rev
Log:
Fix swapped C'tor arguments

Modified:
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPMerge.java
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java?rev=707379&r1=707378&r2=707379&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
(original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
Thu Oct 23 07:25:48 2008
@@ -231,7 +231,8 @@
         }
         
         if(getColumns() != -1 && getRows() != -1) {
-            getSheet().addMergedRegion(new CellRangeAddress(getRow(),getColumn(),getRow()
+ getRows() - 1,(getColumn() + getColumns() - 1)));
+            getSheet().addMergedRegion(new CellRangeAddress(getRow(), getRow() + getRows()
- 1,
+                    getColumn(), (getColumn() + getColumns() - 1)));
         }
 
     }

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPMerge.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPMerge.java?rev=707379&r1=707378&r2=707379&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPMerge.java
(original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPMerge.java
Thu Oct 23 07:25:48 2008
@@ -68,7 +68,7 @@
                     + fromCol + ")" + " to Row (" + toRow + ") Col (" + toCol
                     + ")");
         }
-        CellRangeAddress cellRangeAddress = new CellRangeAddress(fromRow, fromCol, toRow,
toCol);
+        CellRangeAddress cellRangeAddress = new CellRangeAddress(fromRow, toRow, fromCol,
toCol);
         sheet.addMergedRegion(cellRangeAddress);
     }
 

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java?rev=707379&r1=707378&r2=707379&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java
(original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/src/main/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPStyleRegion.java
Thu Oct 23 07:25:48 2008
@@ -80,8 +80,8 @@
                 final ElementProcessor parent) throws IOException {
         super.initialize(attributes, parent);
 
-        CellRangeAddress cellRangeAddress = new CellRangeAddress(getStartRow(), getStartCol(),
-                getEndRow(), getEndCol());
+        CellRangeAddress cellRangeAddress = new CellRangeAddress(getStartRow(), getEndRow(),
+                getStartCol(), getEndCol());
 
         getLogger().debug("region area is " + getArea(cellRangeAddress));
         if (getArea(cellRangeAddress) < MAX_AREA) {
@@ -91,7 +91,8 @@
             getLogger().debug("region added");
             _style = getSheet().addStyleRegion(cellRangeAddress); //test
         } else {
-            getLogger().debug("Region NOT added!. Reason: getArea(cellRangeAddress) = " +
getArea(cellRangeAddress) + " > " + MAX_AREA);
+            getLogger().debug("Region NOT added!. Reason: getArea(cellRangeAddress) = " 
+                    + getArea(cellRangeAddress) + " > " + MAX_AREA);
             invalid = true;
         }
         colorhash = ((EPStyles)parent).getColorHash();



Mime
View raw message