Tag: cws_oog680_dba231a User: oj Date: 2007-10-22 06:49:37+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/star-report.css dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
Log: #i79167# merge changs from reportdesign01 into this one File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: star-report.css Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/star-report.css?r1=1.2&r2=1.2.36.1 Delta lines: +5 -5 ------------------- --- star-report.css 2007-07-09 11:56:04+0000 1.2 +++ star-report.css 2007-10-22 06:49:34+0000 1.2.36.1 @@ -22,11 +22,11 @@ display: table-cell; } -table|table-cell[number-cols-spanned], -table|table-cell[number-cols-spanned], -table|table-columns[number-cols-spanned], -table|table-column[number-cols-spanned] { - -x-liblayout-colspan: attr("table|number-cols-spanned"); +table|table-cell[number-columns-spanned], +table|table-cell[number-columns-spanned], +table|table-columns[number-columns-spanned], +table|table-column[number-columns-spanned] { + -x-liblayout-colspan: attr("table|number-columns-spanned"); } table|table-cell[number-rows-spanned], Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: ImageElementLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java?r1=1.2&r2=1.2.36.1 Delta lines: +10 -8 -------------------- --- ImageElementLayoutController.java 2007-07-09 11:56:05+0000 1.2 +++ ImageElementLayoutController.java 2007-10-22 06:49:34+0000 1.2.36.1 @@ -141,7 +141,7 @@ final int rowSpan = TextUtilities.parseInt ((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "number-rows-spanned"), 1); final int colSpan = TextUtilities.parseInt - ((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "number-cols-spanned"), 1); + ((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "number-columns-spanned"), 1); if (rowSpan < 1 || colSpan < 1) { Log.warn("Rowspan or colspan for image-size calculation was invalid."); @@ -158,7 +158,7 @@ // we are now making the assumption, that the row is a section, that contains the table-cell. // This breaks the ability to return nodes or to construct reports on the fly, but the OO-report format // is weird anyway and wont support such advanced techniques for the next few centuries .. - final int columnPos = findNodeInSection(tableRow, tableCell); + final int columnPos = findNodeInSection(tableRow, tableCell,"covered-table-cell"); if (columnPos == -1) { Log.warn("Table-Cell is not a direct child of the table-row. Unable to calculate the image-size."); @@ -212,7 +212,7 @@ } // finally search the styles for the row now. - final int rowPos = findNodeInSection(table, tableRow); + final int rowPos = findNodeInSection(table, tableRow,null); if (rowPos == -1) { Log.warn("Table-Cell is not a direct child of the table-row. Unable to calculate the image-size."); @@ -249,7 +249,8 @@ } private int findNodeInSection(final Section tableRow, - final Element tableCell) + final Element tableCell, + final String secondType) { int retval = 0; final Node[] nodes = tableRow.getNodeArray(); @@ -264,7 +265,8 @@ } final Element child = (Element) node; if (ObjectUtilities.equal(child.getNamespace(), namespace) == false || - ObjectUtilities.equal(child.getType(), type) == false) + (ObjectUtilities.equal(child.getType(), type) == false + && (secondType == null || ObjectUtilities.equal(child.getType(), secondType) == false)) ) { continue; } Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: ImageReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java?r1=1.2&r2=1.2.36.1 Delta lines: +5 -3 ------------------- --- ImageReadHandler.java 2007-07-09 11:56:09+0000 1.2 +++ ImageReadHandler.java 2007-10-22 06:49:35+0000 1.2.36.1 @@ -75,6 +75,8 @@ super.startParsing(attrs); final String formula = attrs.getValue (OfficeNamespaces.OOREPORT_NS, "formula"); + final String preserveIRI = attrs.getValue + (OfficeNamespaces.OOREPORT_NS, "preserve-IRI"); if (formula != null && formula.length() != 0) { // now, the evaulated content ends up in the 'content' attribute of the --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
