INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED

2008/04/22 10:30:33 oj 1.3.6.1: #i88503# merge changes from rptchart02

3 files changed, 16 insertions, 19 deletions

diff --git a/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java b/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
index 48f1086fb166..fca9edd38d33 100644
--- a/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
+++ b/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ColumnWidthMapper.java,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,10 +45,10 @@ public class ColumnWidthMapper implements StyleMapper
   {
   }
 
-  public void updateStyle(String uri,
-                          String attrName,
-                          String attrValue,
-                          CSSDeclarationRule targetRule)
+  public void updateStyle(final String uri,
+                          final String attrName,
+                          final String attrValue,
+                          final CSSDeclarationRule targetRule)
   {
     targetRule.setPropertyValueAsString(BoxStyleKeys.WIDTH, attrValue);
   }
diff --git a/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java b/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
index 3561d0cb3bd1..c305a85a1e05 100644
--- a/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
+++ b/reportdesign/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: RowHeightMapper.java,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,10 +45,10 @@ public class RowHeightMapper implements StyleMapper
   {
   }
 
-  public void updateStyle(String uri,
-                          String attrName,
-                          String attrValue,
-                          CSSDeclarationRule targetRule)
+  public void updateStyle(final String uri,
+                          final String attrName,
+                          final String attrValue,
+                          final CSSDeclarationRule targetRule)
   {
     targetRule.setPropertyValueAsString(BoxStyleKeys.HEIGHT, attrValue);
   }
diff --git a/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java b/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
index 1971563fc21e..66143b496426 100644
--- a/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
+++ b/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: TableRowsReadHandler.java,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -38,6 +38,8 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.OfficeToken;
+import java.util.List;
 
 /**
  *
@@ -46,8 +48,8 @@ import com.sun.star.report.pentaho.OfficeNamespaces;
 public class TableRowsReadHandler extends ElementReadHandler
 {
 
-    private ArrayList rows;
-    private Section tableRows;
+    private final List rows;
+    private final Section tableRows;
 
     public TableRowsReadHandler()
     {
@@ -68,12 +70,7 @@ public class TableRowsReadHandler extends ElementReadHandler
             final Attributes atts)
             throws SAXException
     {
-        if (OfficeNamespaces.TABLE_NS.equals(uri) == false)
-        {
-            return null;
-        }
-
-        if ("table-row".equals(tagName))
+        if (OfficeNamespaces.TABLE_NS.equals(uri) && OfficeToken.TABLE_ROW.equals(tagName))
         {
             final TableRowReadHandler readHandler = new TableRowReadHandler();
             rows.add(readHandler);