Changeset 11167

Timestamp:

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

Author:

sys

Message:

Fermeture odFile.

Location:

trunk

Files:

• Jav_CO/com/scenari/s/co/transform/oo/ooTransformations.jar (modified) (previous)
• Jav_Oo/com/scenari/s/oo/transform/TransformerExportOdfViaDraw.java (modified) (3 diffs)
• Jav_Oo/com/scenari/s/oo/transform/TransformerExportOdg.java (modified) (2 diffs)
• Jav_Oo/com/scenari/s/oo/transform/TransformerExportOdsViaDraw.java (modified) (2 diffs)
• Jav_Oo/com/scenari/s/oo/transform/TransformerMml2Odf.java (modified) (3 diffs)
• Jav_Oo/com/scenari/s/oo/transform/TransformerOdg2Img.java (modified) (2 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) {
                                                 //
                                         }

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

@@ -144 +144 @@
                                 IHSourceElem vNewContent = null;
                                 OutputStream vDst = new FileOutputStream(vTempFile);
+                                OdFile vSrcOri = new OdFile();
                                 try {
-                                        OdFile vSrcOri = new OdFile();
                                         vSrcOri.initFromOdFile((File) pSrc);
                                         vNewContent = BugsOoFilter.getFilteredContent(vSrcOri.getSourceEntry("content.xml"));
@@ -156 +156 @@
                                                 //
                                         }
-                                        vDst.close();
+                                        try {
+                                                vDst.close();
+                                        }catch  (Exception e) {
+                                                //
+                                        }
+                                        try {
+                                                vSrcOri.close();
+                                        } catch  (Exception e) {
+                                                //
+                                        }
                                 }
                         }

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

@@ -153 +153 @@
                                 //Création de l'ODS intermédiaire hacké (contournements bugs OO pour export SVM).
                                 OdFile vFilteredOds = new OdFile();
-                                vFilteredOds.initFromOdFile((File) pSrc);
                                 IHSourceElem vNewContent = null;
                                 try {
+                                        vFilteredOds.initFromOdFile((File) pSrc);
                                         vNewContent = BugsOoFilter.getFilteredContent(vFilteredOds.getSourceEntry("content.xml"));
                                         vFilteredOds.addFile("content.xml", vNewContent);
@@ -169 +169 @@
                                                 vNewContent.hRemove();
                                         } catch (Exception e) {
+                                                //
+                                        }
+                                        try{
+                                                vFilteredOds.close();
+                                        } catch  (Exception e) {
                                                 //
                                         }

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

@@ -90 +90 @@
                 IHSourceElem vNewSettings = null;
                 OoSrc vSrc = OoSrc.getOoSrc(pSrc);
+                OdFile vOdf = new OdFile();
                 try {
                         //Font size par défaut
@@ -95 +96 @@
 
                         //Construction du fichier ODF
-                        OdFile vOdf = new OdFile();
                         vOdf.initFromOdFile(getMasterOdf());
                         vOdf.addFile("content.xml", vSrc.getAsSource());
@@ -114 +114 @@
                                 }
                         }
-                        vSrc.close();
+                        try {
+                                vSrc.close();
+                        } catch  (Exception e) {
+                                //
+                        }
+                        try {
+                                vOdf.close();
+                        } catch  (Exception e) {
+                                //
+                        }
                 }
         }

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

@@ -126 +126 @@
                                 IHSourceElem vNewContent = null;
                                 OutputStream vDst = new FileOutputStream(vTmpF);
+                                OdFile vSrcOri = new OdFile();
                                 try {
-                                        OdFile vSrcOri = new OdFile();
                                         vSrcOri.initFromOdFile(vSrc.getAsFile());
                                         vNewContent = BugsOoFilter.getFilteredContent(vSrcOri.getSourceEntry("content.xml"));
@@ -140 +140 @@
                                                 }
                                         }
-                                        vDst.close();
+                                        try {
+                                                vDst.close();
+                                        } catch  (Exception e) {
+                                                //
+                                        }
+                                        try {
+                                                vSrcOri.close();
+                                        } catch  (Exception e) {
+                                                //
+                                        }
                                 }
                                 vSrc.setNewTempFile(vTmpF);