Changeset 1681

Timestamp:

10/07/11 05:32:00 (8 months ago)

Author:

jharrop

Message:

Additional xlsx parts

Location:

trunk/docx4j/src

Files:

• main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java (modified) (1 diff)
• main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java (modified) (3 diffs)
• xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/ConnectionsPart.java (added)
• xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/JaxbSmlPart.java (modified) (1 diff)
• xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/QueryTablePart.java (added)
• xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/TablePart.java (added)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java

@@ -272 +272 @@
                 "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml";
 
+        // /xl/queryTables/queryTable1.xml
+        public final static String SPREADSHEETML_QUERY_TABLE =
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml";
+        
+        // /xl/tables/table1.xml
+        public final static String SPREADSHEETML_TABLE =
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml";
+        
         // /xl/comments1.xml
         public final static String SPREADSHEETML_COMMENTS =
                 "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml";
         
+        // /xl/connections.xml
+        public final static String SPREADSHEETML_CONNECTIONS =
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml";  
         
         // /xl/charts/chart1.xml

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java

@@ -235 +235 @@
         ///xl/drawings/drawing1.xml
         public final static String SPREADSHEETML_DRAWING =
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing";
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing";
         
         ///xl/charts/chart1.xml
@@ -241 +241 @@
         // since it is also used in PresentationML
         public final static String SPREADSHEETML_CHART =
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
 
         // /xl/comments1.xml 
@@ -249 +249 @@
         ///xl/pivotTables/pivotTable1.xml
         public final static String SPREADSHEETML_PIVOT_TABLE =
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable";
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable";
+
+        // /xl/queryTables/queryTable1.xml
+        public final static String SPREADSHEETML_QUERY_TABLE =
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable";
+        
+        // /xl/tables/table1.xml
+        public final static String SPREADSHEETML_TABLE =
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table";
+        
+        // /xl/connections.xml
+        public final static String SPREADSHEETML_CONNECTIONS =
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections";      
         
         ///xl/pivotCache/pivotCacheDefinition1.xml
         public final static String SPREADSHEETML_PIVOT_CACHE_DEFINITION =
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition";
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition";
         
         ///xl/pivotCache/pivotCacheRecords1.xml
         public final static String SPREADSHEETML_PIVOT_CACHE_RECORDS =
-        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords";
+                "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords";
             
 //      public final static String NS_OFFICE = "urn:schemas-microsoft-com:office:office";

trunk/docx4j/src/xlsx4j/java/org/docx4j/openpackaging/parts/SpreadsheetML/JaxbSmlPart.java

@@ -45 +45 @@
                 } else if (contentType.equals(ContentTypes.SPREADSHEETML_COMMENTS)) {
                         return new CommentsPart(new PartName(partName));
+                } else if (contentType.equals(ContentTypes.SPREADSHEETML_CONNECTIONS)) {
+                        return new ConnectionsPart(new PartName(partName));
+                } else if (contentType.equals(ContentTypes.SPREADSHEETML_TABLE)) {
+                        return new TablePart(new PartName(partName));
+                } else if (contentType.equals(ContentTypes.SPREADSHEETML_QUERY_TABLE)) {
+                        return new QueryTablePart(new PartName(partName));
                 } else {
                         throw new PartUnrecognisedException("No subclass found for "