Changeset 11167 for trunk/Jav_Oo/com/scenari/s/oo/transform/TransformerExportOdfViaDraw.java

Timestamp:

06/09/08 15:57:55 (4 years ago)

Author:

sys

Message:

Fermeture odFile.

File:

• trunk/Jav_Oo/com/scenari/s/oo/transform/TransformerExportOdfViaDraw.java (modified) (3 diffs)

trunk/Jav_Oo/com/scenari/s/oo/transform/TransformerExportOdfViaDraw.java

@@ -146 +146 @@
                                 vTmpOdf = File.createTempFile("transformOdfViaDraw", ".odf");
                                 OdFile vOdf = new OdFile();
-                                vOdf.initFromOdFile(getMasterOdf());
-                                vOdf.addFile("content.xml", new WSourceElemFs(((File) pSrc).getPath()));
-                                vOdf.export(new FileOutputStream(vTmpOdf));
-                                pSrc = vTmpOdf;
+                                try {
+                                        vOdf.initFromOdFile(getMasterOdf());
+                                        vOdf.addFile("content.xml", new WSourceElemFs(((File) pSrc).getPath()));
+                                        vOdf.export(new FileOutputStream(vTmpOdf));
+                                        pSrc = vTmpOdf;
+                                } catch  (Exception e) {
+                                        vOdf.close();
+                                }
                         }
 
@@ -155 +159 @@
                         if (vFontSize != null) {
                                 OdFile vModifyOdf = new OdFile();
-                                vModifyOdf.initFromOdFile((File) pSrc);
                                 IHSourceElem vNewSettings = null;
                                 try {
+                                        vModifyOdf.initFromOdFile((File) pSrc);
                                         vNewSettings = FormulaSettings.getFilteredContent(vModifyOdf.getSourceEntry("settings.xml"), vFontSize);
                                         vModifyOdf.addFile("settings.xml", vNewSettings);
@@ -167 +171 @@
                                                 vNewSettings.hRemove();
                                         } catch (Exception e) {
+                                                //
+                                        }
+                                        try {
+                                                vModifyOdf.close();
+                                        }catch  (Exception e) {
                                                 //
                                         }