latest changes

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

diff --git a/src/types/definitions/chp_type.xml b/src/types/definitions/chp_type.xml
index e2e57f0e8bdc26b5d782b4c602b333ccefc83035..8e1977b1a54b19b4c498275e10abf2b2fa0d91c5 100644 (file)
--- a/src/types/definitions/chp_type.xml
+++ b/src/types/definitions/chp_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101B" name="CHP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
+<record id="0x101B" name="CHP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Character Properties.</description>

diff --git a/src/types/definitions/dop_type.xml b/src/types/definitions/dop_type.xml
index 0cb162d1693f82598b6d8bbef3264d569f691114..94647451d7837b47880f62a6a86fa1d361b935da 100644 (file)
--- a/src/types/definitions/dop_type.xml
+++ b/src/types/definitions/dop_type.xml
@@ -1,4 +1,4 @@
-<record fromfile="true" name="DOP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
+<record fromfile="true" name="DOP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Document Properties.</description>

diff --git a/src/types/definitions/fib_type.xml b/src/types/definitions/fib_type.xml
index af4e4b1b176e6fa7563ca109c38fee3f9d6858d9..c6afa48c5c153fcae45b22e6c1da9a0c3f176f3a 100644 (file)
--- a/src/types/definitions/fib_type.xml
+++ b/src/types/definitions/fib_type.xml
@@ -1,4 +1,4 @@
-<record fromfile="true" name="FIB" package="org.apache.poi.hwpf.model.hdftypes.definitions">
+<record fromfile="true" name="FIB" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>File information Block.</description>
@@ -45,7 +45,7 @@
     <field type="int" size="2" name="chsTables" longname="default extcharset"/>
     <field type="int" size="4" name="fcMin" longname="offset first char"/>
     <field type="int" size="4" name="fcMac" longname="offset last char"/>
-    <field type="int" size="2" name="csw" longname="count shorts"/>
+    <!--<field type="int" size="2" name="csw" longname="count shorts"/>
 
     <field type="int" size="2" name="wMagicCreated" longname="creator id or beg shorts"/>
     <field type="int" size="2" name="wMagicRevised" longname="revisor id"/>
@@ -246,14 +246,14 @@
     <field type="int" size="4" name="fcSttbAutoCaption"/>
     <field type="int" size="4" name="lcbSttbAutoCaption"/>
     <field type="int" size="4" name="fcPlcfwkb"/>
-    <field type="int" size="4" name="lcbPlcfwkb"/>
+    <field type="int" size="4" name="lcbPlcfwkb"/> -->
     <!--
         possible typo - was
         <field type="int" size="4" name="fcPlcfsplfcPlcfspl"/>
 
         documented as fcPlcfspl in MS Word Binary Format doc
     -->
-    <field type="int" size="4" name="fcPlcfspl"/>
+    <!--<field type="int" size="4" name="fcPlcfspl"/>
     <field type="int" size="4" name="lcbPlcfspl"/>
 
     <field type="int" size="4" name="fcPlcftxbxTxt"/>
@@ -270,14 +270,14 @@
     <field type="int" size="4" name="fcSttbttmbd"/>
     <field type="int" size="4" name="cbSttbttmbd"/>
     <field type="int" size="4" name="fcUnused"/>
-    <field type="int" size="4" name="lcbUnused"/>
+    <field type="int" size="4" name="lcbUnused"/> -->
     <!--
         Bug - this field is meant to be an array that "overlays"
               the following fields.  See MS Word Binary Format doc
               for details.
         <field type="int" size="4" name="rgpgdbkd"/>
     -->
-    <field type="int" size="4" name="fcPgdMother"/>
+    <!--<field type="int" size="4" name="fcPgdMother"/>
     <field type="int" size="4" name="lcbPgdMother"/>
     <field type="int" size="4" name="fcBkdMother"/>
     <field type="int" size="4" name="lcbBkdMother"/>
@@ -328,14 +328,14 @@
     <field type="int" size="4" name="fcPlcocx"/>
     <field type="int" size="4" name="lcbPlcocx"/>
     <field type="int" size="4" name="fcPlcfbteLvc"/>
-    <field type="int" size="4" name="lcbPlcfbteLvc"/>
+    <field type="int" size="4" name="lcbPlcfbteLvc"/> -->
     <!--
         Bug - this field is meant to "overlay" the following
               two fields.  See MS Word Binary Format doc
               for details.
         <field type="int" size="4" name="ftModified"/>
     -->
-    <field type="int" size="4" name="dwLowDateTime"/>
+    <!--<field type="int" size="4" name="dwLowDateTime"/>
     <field type="int" size="4" name="dwHighDateTime"/>
     <field type="int" size="4" name="fcPlcflvc"/>
     <field type="int" size="4" name="lcbPlcflvc"/>
@@ -347,7 +347,7 @@
     <field type="int" size="4" name="fcSttbListNames"/>
     <field type="int" size="4" name="lcbSttbListNames"/>
     <field type="int" size="4" name="fcSttbfUssr"/>
-    <field type="int" size="4" name="lcbSttbfUssr"/>
+    <field type="int" size="4" name="lcbSttbfUssr"/> -->
 
 
     </fields>

diff --git a/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml
index 89500352e0e092c7b02bf9bcacea2b87ec3b2a2f..077a282ecf44d946a630439833d11f45c7d064e4 100644 (file)
--- a/src/types/definitions/pap_type.xml
+++ b/src/types/definitions/pap_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101A" name="PAP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
+<record id="0x101A" name="PAP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Paragraph Properties.</description>
@@ -63,8 +63,8 @@
         <field type="int" size="4" name="dyaFromText"/>
         <field type="int" size="2" name="dyaHeight"/>
         <field type="byte" size="1" name="fMinHeight"/>
-        <field type="short" size="2" name="shd"/>
-        <field type="short" size="2" name="dcs"/>
+        <field type="ShadingDescriptor" size="2" name="shd"/>
+        <field type="DropCapSpecifier" size="2" name="dcs"/>
         <field type="byte" size="1" name="lvl"/>
         <field type="byte" size="1" name="fNumRMIns"/>
         <field type="byte[]" size="84" name="anld"/>
@@ -75,5 +75,8 @@
         <field type="int" size="2" name="itbdMac"/>
         <field type="int[]" size="128" name="rgdxaTab"/>
         <field type="byte[]" size="128" name="rgtbd"/>
+        <field type="byte" size="1" name="tableLevel"/>
+        <field type="byte" size="1" name="fTtpEmbedded"/>
+        <field type="byte" size="1" name="embeddedCellMark"/>
     </fields>
 </record>

diff --git a/src/types/definitions/sep_type.xml b/src/types/definitions/sep_type.xml
index 5b07b8b53386d9c1bfa3ae887873335760d440b4..3c23d35002f2c70603361a9682be2d58efc25d96 100644 (file)
--- a/src/types/definitions/sep_type.xml
+++ b/src/types/definitions/sep_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101B" name="SEP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
+<record id="0x101B" name="SEP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Section Properties.</description>

diff --git a/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml
index 156d15f5c35f1267c7b41135d45b31752fede217..73d976ace756422323a04241ee0cafd04cb6a7a3 100644 (file)
--- a/src/types/definitions/tap_type.xml
+++ b/src/types/definitions/tap_type.xml
@@ -1,4 +1,4 @@
-<record id="0x101B" name="TAP" package="org.apache.poi.hwpf.model.hdftypes.definitions">
+<record id="0x101B" name="TAP" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Table Properties.</description>

diff --git a/src/types/definitions/tc_type.xml b/src/types/definitions/tc_type.xml
index 653d280645d9d0a96396b0adcda365639f876202..c37007f93cb9a0bff59ac6bc0b399b8b461ea2d3 100644 (file)
--- a/src/types/definitions/tc_type.xml
+++ b/src/types/definitions/tc_type.xml
@@ -1,4 +1,4 @@
-<record fromfile="true" id="0x101B" name="TC" package="org.apache.poi.hwpf.model.hdftypes.definitions">
+<record fromfile="true" id="0x101B" name="TC" package="org.apache.poi.hwpf.model.types">
     <suffix>AbstractType</suffix>
     <extends>HDFType</extends>
     <description>Table Cell Descriptor.</description>