User: kz      
Date: 2008-05-05 15:01:04+0000
Modified:
   
dba/reportdesign/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java

Log:
 INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED
 2008/04/22 10:30:30 oj 1.3.6.1: #i88503# merge changes from rptchart02

File Changes:

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

File [changed]: ObjectOleReadHandler.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java?r1=1.3&r2=1.4
Delta lines:  +6 -2
-------------------
--- ObjectOleReadHandler.java   2008-04-10 17:45:09+0000        1.3
+++ ObjectOleReadHandler.java   2008-05-05 15:00:55+0000        1.4
@@ -43,7 +43,9 @@
 public class ObjectOleReadHandler extends ElementReadHandler
 {
 
-    private ObjectOleElement element;
+    private final static String RPT_CHART_CLASS_ID = 
"80243D39-6741-46C5-926E-069164FF87BB";
+    private final static String OOO_CHART_CLASS_ID = 
"12DCAE26-281F-416F-A234-C3086127382E";
+    private final ObjectOleElement element;
 
     public ObjectOleReadHandler(final ObjectOleElement element)
     {
@@ -66,9 +68,11 @@
             element.setUrl(url);
         }
 
-        final String classid = attrs.getValue(OfficeNamespaces.DRAWING_NS, 
"class-id");
+        String classid = attrs.getValue(OfficeNamespaces.DRAWING_NS, 
"class-id");
         if (classid != null)
         {
+            if ( classid.equalsIgnoreCase(RPT_CHART_CLASS_ID))
+                classid = OOO_CHART_CLASS_ID;
             element.setClassId(classid);
         }
     }




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

Reply via email to