[dba-cvs] CVS update [mws_bea300]: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java

[obo]

Tag: mws_bea300
User: obo     
Date: 2008-04-28 15:18:11+0000
Modified:
   
dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java

Log:
 INTEGRATION: CWS dba30beta_BEA300 (1.4.6); FILE MERGED
 2008/04/22 10:30:26 oj 1.4.6.1: #i88503# merge changes from rptchart02

File Changes:

Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/
==============================================================================

File [changed]: OfficeGroupSectionLayoutController.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java?r1=1.4&r2=1.4.4.1
Delta lines:  +6 -5
-------------------
--- OfficeGroupSectionLayoutController.java     2008-04-10 17:25:06+0000        
1.4
+++ OfficeGroupSectionLayoutController.java     2008-04-28 15:18:09+0000        
1.4.4.1
@@ -42,6 +42,7 @@
 import org.jfree.report.ReportDataFactoryException;
 import org.jfree.layouting.util.AttributeMap;
 import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.model.OfficeGroupSection;
 
 /**
@@ -65,18 +66,18 @@
       throws DataSourceException, ReportProcessingException, 
ReportDataFactoryException
   {
     final OfficeGroupSection section = (OfficeGroupSection) getElement();
-    if (section.isRepeatSection() == false)
+    if (!section.isRepeatSection())
     {
       return super.startElement(target);
     }
 
     final LayoutController controller = getParent();
-    if (controller instanceof OfficeGroupLayoutController == false)
+    if (!(controller instanceof OfficeGroupLayoutController))
     {
       return super.startElement(target);
     }
     final OfficeGroupLayoutController oglc = (OfficeGroupLayoutController) 
controller;
-    if (oglc.isNormalFlowProcessing() == false)
+    if (!oglc.isNormalFlowProcessing())
     {
       return super.startElement(target);
     }
@@ -94,7 +95,7 @@
   {
     final AttributeMap attrs = super.computeAttributes(fc, element, target);
     final LayoutController controller = getParent();
-    if (controller instanceof OfficeGroupLayoutController == false)
+    if (!(controller instanceof OfficeGroupLayoutController))
     {
       return attrs;
     }
@@ -104,7 +105,7 @@
       return attrs;
     }
 
-    attrs.setAttribute(OfficeNamespaces.INTERNAL_NS, "repeated-section", 
"true");
+    attrs.setAttribute(OfficeNamespaces.INTERNAL_NS, "repeated-section", 
OfficeToken.TRUE);
     return attrs;
   }
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]