diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-04 10:50:21 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-04 10:50:21 +0000 |
commit | ffda431a766aa843b0307fffb45afd97c310cd00 (patch) | |
tree | a125b3ff2bf24eeab66211a93bbf77976e6ce8aa /xmerge/source/aportisdoc | |
parent | 53c34c3dc8a5ce69294cc40f51da3b7256a4e4ce (diff) |
INTEGRATION: CWS xsltfilter07 (1.4.14); FILE MERGED
2007/04/17 14:24:05 sus 1.4.14.1: #i65831 Patch for URL encoding of Names
Diffstat (limited to 'xmerge/source/aportisdoc')
-rw-r--r-- | xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java index 83dc716bf026..70ef5964202e 100644 --- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java +++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocumentSerializerImpl.java @@ -4,9 +4,9 @@ * * $RCSfile: DocumentSerializerImpl.java,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2006-08-02 10:32:39 $ + * last change: $Author: ihi $ $Date: 2007-06-04 11:50:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,6 +41,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Element; import java.io.IOException; +import java.net.URLDecoder; import org.openoffice.xmerge.Document; import org.openoffice.xmerge.ConvertData; @@ -48,6 +49,7 @@ import org.openoffice.xmerge.ConvertException; import org.openoffice.xmerge.DocumentSerializer; import org.openoffice.xmerge.converter.xml.OfficeConstants; import org.openoffice.xmerge.converter.xml.sxw.SxwDocument; +import org.openoffice.xmerge.converter.xml.sxw.aportisdoc.DocConstants; import org.openoffice.xmerge.converter.palm.PdbEncoder; import org.openoffice.xmerge.converter.palm.PdbDecoder; import org.openoffice.xmerge.converter.palm.PalmDB; @@ -112,7 +114,7 @@ public final class DocumentSerializerImpl // get the server document name - String docName = sxwDoc.getName(); + String docName = URLDecoder.decode(sxwDoc.getName(), DocConstants.ENCODING); // get DOM document |