User: kz Date: 2008-05-05 13:49:57+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
Log: INTEGRATION: CWS dba30beta (1.6.6); FILE MERGED 2008/04/22 10:30:26 oj 1.6.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: FormattedTextLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java?r1=1.6&r2=1.7 Delta lines: +129 -130 ----------------------- --- FormattedTextLayoutController.java 2008-04-10 17:23:18+0000 1.6 +++ FormattedTextLayoutController.java 2008-05-05 13:49:42+0000 1.7 @@ -27,11 +27,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.layoutprocessor; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; import com.sun.star.report.pentaho.model.FormattedTextElement; import com.sun.star.report.pentaho.model.OfficeDocument; import com.sun.star.report.pentaho.model.OfficeStyle; @@ -59,6 +58,7 @@ public class FormattedTextLayoutController extends AbstractReportElementLayoutController { + public FormattedTextLayoutController() { } @@ -125,7 +125,7 @@ } final String valueType = computeValueType(); - variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS, "value-type", valueType); + variablesGet.setAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE, valueType); target.startElement(variablesGet); target.endElement(variablesGet); @@ -143,7 +143,6 @@ return join(getFlowController()); } - private OfficeDocument getDocument() { LayoutController parent = getParent(); @@ -182,7 +181,7 @@ return null; } - final String cellStyleName = (String) tce.getAttribute(OfficeNamespaces.TABLE_NS, "style-name"); + final String cellStyleName = (String) tce.getAttribute(OfficeNamespaces.TABLE_NS, OfficeToken.STYLE_NAME); if (cellStyleName == null) { return null; @@ -206,7 +205,7 @@ throw new IllegalStateException("A formatted text element must be a child of a Table-Cell."); } - final String type = (String) tce.getAttribute(OfficeNamespaces.OFFICE_NS, "value-type"); + final String type = (String) tce.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE); if (type == null) { Log.error("The Table-Cell does not have a office:value attribute defined. Your content will be messed up."); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
