removed duplicates of PICTURE_TYPE_* constants defined in the parent Workbook interface

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@958561 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index cf73e62752340f39998382cb8c47f12f5d12c95b..e51c49d65349fd7bf232d17b353c85de8b5b8fa0 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -136,8 +136,6 @@ under the License.
     <property name="ooxml.jsr173.url"
               value="${repository.m2}/maven2/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0/geronimo-stax-api_1.0_spec-1.0.jar"/>
     <property name="ooxml.schemas.jar" location="${ooxml.lib}/ooxml-schemas-1.1.jar"/>
-    <property name="ooxml.schemas.url"
-              value="${repository.m2}/maven2/org/apache/poi/ooxml-schemas/1.1/ooxml-schemas-1.1.jar"/>
 
     <!-- See http://www.ecma-international.org/publications/standards/Ecma-376.htm -->
     <!-- "Copy these file(s), free of charge" -->
@@ -341,10 +339,6 @@ under the License.
             <param name="sourcefile" value="${ooxml.jsr173.url}"/>
             <param name="destfile" value="${ooxml.jsr173.jar}"/>
         </antcall>
-        <antcall target="downloadfile">
-            <param name="sourcefile" value="${ooxml.schemas.url}"/>
-            <param name="destfile" value="${ooxml.schemas.jar}"/>
-        </antcall>
     </target>
 
     <target name="check-ooxml-xsds">

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index 97e534be2a38d604ab0c2dc7341ae6cb700f4814..141f1a9db94dd21cac890d3be6afa2ee0dda195a 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -146,21 +146,6 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      */
     private MissingCellPolicy missingCellPolicy = HSSFRow.RETURN_NULL_AND_BLANK;
 
-
-    /** Extended windows meta file */
-    public static final int PICTURE_TYPE_EMF = 2;
-    /** Windows Meta File */
-    public static final int PICTURE_TYPE_WMF = 3;
-    /** Mac PICT format */
-    public static final int PICTURE_TYPE_PICT = 4;
-    /** JPEG format */
-    public static final int PICTURE_TYPE_JPEG = 5;
-    /** PNG format */
-    public static final int PICTURE_TYPE_PNG = 6;
-    /** Device independant bitmap */
-    public static final int PICTURE_TYPE_DIB = 7;
-
-
     private static POILogger log = POILogFactory.getLogger(HSSFWorkbook.class);
 
     public static HSSFWorkbook create(InternalWorkbook book) {