WebSVN - OpenConcerto - Diff - Rev 144 and 174 - /trunk/OpenConcerto/src/org/openconcerto/openoffice/ODPackage.java

 import static org.openconcerto.openoffice.ODPackage.RootElement.CONTENT;
 import static org.openconcerto.openoffice.ODPackage.RootElement.META;
 import static org.openconcerto.openoffice.ODPackage.RootElement.STYLES;
+import org.openconcerto.openoffice.spreadsheet.CellStyle;
 import org.openconcerto.openoffice.spreadsheet.SpreadSheet;
+import org.openconcerto.openoffice.style.data.DataStyle;
 import org.openconcerto.openoffice.text.TextDocument;
 import org.openconcerto.utils.CopyUtils;
 import org.openconcerto.utils.ExceptionUtils;
 import org.openconcerto.utils.FileUtils;
 import org.openconcerto.utils.ProductInfo;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import org.jdom.DocType;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.Namespace;
+import org.jdom.input.SAXBuilder;
 import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 import net.jcip.annotations.GuardedBy;
     private ContentTypeVersioned type;
     private XMLFormatVersion version;
     private ODMeta meta;
     private File file;
     private ODDocument doc;
+    private Locale locale;
     public ODPackage() {
         this.files = new HashMap<String, ODPackageEntry>();
         this.type = null;
         this.version = null;
         new ZippedFilesProcessor() {
             @Override
             protected void processEntry(ZipEntry entry, InputStream in) throws IOException {
                 final String name = entry.getName();
                 final Object res;
+                out.reset();
+                StreamUtils.copy(in, out);
                 if (subdocNames.contains(name)) {
                     try {
-                        res = OOUtils.getBuilder().build(in);
+                        final SAXBuilder builder = OOUtils.getBuilder();
+                        // bytes are read fully first in order to be compatible
+                        // with SAXParser like Piccolo
+                        res = builder.build(new ByteArrayInputStream(out.toByteArray()));
                     } catch (JDOMException e) {
                         // always correct
-                        throw new IllegalStateException("parse error", e);
+                        throw new IllegalStateException("parse error on " + name, e);
+                    }
                 } else {
-                    out.reset();
-                    StreamUtils.copy(in, out);
                     res = out.toByteArray();
+                }
                 // we don't know yet the types
                 putFile(name, res, null, entry.getMethod() == ZipEntry.DEFLATED);
+            }
         if (newType == null)
             throw new IllegalStateException("Missing " + (b ? "" : "non-") + "template for " + this.type);
         this.setContentType(newType);
+    }
+    public final void setLocale(Locale locale) {
+        this.locale = locale;
+    }
+    // http://help.libreoffice.org/Common/Selecting_the_Document_Language
+    // The document language is set by default-style/text-properties and is not used for formatting.
+    // The formatting used to fill cell content is set by the editor application not read from the
+    // document.
+    public final Locale getLocale() {
+        return this.locale == null ? Locale.getDefault() : this.locale;
+    }
+    public final String formatNumber(Number n, final CellStyle defaultStyle) {
+        return formatNumber(NumberFormat.getNumberInstance(getLocale()), n, defaultStyle);
+    }
+    public final String formatPercent(Number n, final CellStyle defaultStyle) {
+        return formatNumber(NumberFormat.getPercentInstance(getLocale()), n, defaultStyle);
+    }
+    public final String formatCurrency(Number n, final CellStyle defaultStyle) {
+        return formatNumber(NumberFormat.getCurrencyInstance(getLocale()), n, defaultStyle);
+    }
+    private final String formatNumber(NumberFormat format, Number n, final CellStyle defaultStyle) {
+        synchronized (format) {
+            final int decPlaces = DataStyle.getDecimalPlaces(defaultStyle);
+            format.setMinimumFractionDigits(0);
+            format.setMaximumFractionDigits(decPlaces);
+            return format.format(n);
+        }
+    }
     /**
      * Call {@link Validator#isValid()} on each XML subdocuments.
+     *
      * @return all problems indexed by package entry names, i.e. empty if all OK, <code>null</code>
      *         if validation couldn't occur.

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/openoffice/ODPackage.java @ 180 - Rev 144 → 174