You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by sa...@apache.org on 2003/11/12 02:34:31 UTC
cvs commit: jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/sprm SectionSprmCompressor.java SprmBuffer.java
sackley 2003/11/11 17:34:31
Modified: src/scratchpad/src/org/apache/poi/hwpf/sprm
SectionSprmCompressor.java SprmBuffer.java
Log:
latest changes
Revision Changes Path
1.3 +274 -54 jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
Index: SectionSprmCompressor.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SectionSprmCompressor.java 11 Nov 2003 11:41:50 -0000 1.2
+++ SectionSprmCompressor.java 12 Nov 2003 01:34:30 -0000 1.3
@@ -1,59 +1,278 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache POI" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache POI", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
+///* ====================================================================
+// * The Apache Software License, Version 1.1
+// *
+// * Copyright (c) 2003 The Apache Software Foundation. All rights
+// * reserved.
+// *
+// * Redistribution and use in source and binary forms, with or without
+// * modification, are permitted provided that the following conditions
+// * are met:
+// *
+// * 1. Redistributions of source code must retain the above copyright
+// * notice, this list of conditions and the following disclaimer.
+// *
+// * 2. Redistributions in binary form must reproduce the above copyright
+// * notice, this list of conditions and the following disclaimer in
+// * the documentation and/or other materials provided with the
+// * distribution.
+// *
+// * 3. The end-user documentation included with the redistribution,
+// * if any, must include the following acknowledgment:
+// * "This product includes software developed by the
+// * Apache Software Foundation (http://www.apache.org/)."
+// * Alternately, this acknowledgment may appear in the software itself,
+// * if and wherever such third-party acknowledgments normally appear.
+// *
+// * 4. The names "Apache" and "Apache Software Foundation" and
+// * "Apache POI" must not be used to endorse or promote products
+// * derived from this software without prior written permission. For
+// * written permission, please contact apache@apache.org.
+// *
+// * 5. Products derived from this software may not be called "Apache",
+// * "Apache POI", nor may "Apache" appear in their name, without
+// * prior written permission of the Apache Software Foundation.
+// *
+// * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+// * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+// * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+// * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+// * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+// * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+// * SUCH DAMAGE.
+// * ====================================================================
+// *
+// * This software consists of voluntary contributions made by many
+// * individuals on behalf of the Apache Software Foundation. For more
+// * information on the Apache Software Foundation, please see
+// * <http://www.apache.org/>.
+// */
+//
package org.apache.poi.hwpf.sprm;
+//
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//
+//import org.apache.poi.hwpf.model.hdftypes.definitions.SEPAbstractType;
+//import org.apache.poi.hwpf.usermodel.SectionProperties;
+//import org.apache.poi.util.LittleEndian;
+//
+//
+//public class SectionSprmCompressor
+//{
+// private final static SectionProperties DEFAULT_SEP = new SectionProperties();
+// public SectionSprmCompressor()
+// {
+// }
+// public static byte[] compressSectionProperty(SectionProperties newSEP,
+// SectionProperties oldSEP)
+// {
+// int size = 0;
+// ArrayList sprmList = new ArrayList();
+//
+// if (newSEP.getCnsPgn() != DEFAULT_SEP.getCnsPgn())
+// {
+// size += SprmUtils.addSprm((short)0x3000, newSEP.getCnsPgn(), null, sprmList);
+// }
+// if (newSEP.getIHeadingPgn() != DEFAULT_SEP.getIHeadingPgn())
+// {
+// size += SprmUtils.addSprm((short)0x3001, newSEP.getIHeadingPgn(), null, sprmList);
+// }
+// if (!Arrays.equals(newSEP.getOlstAnm(), DEFAULT_SEP.getOlstAnm()))
+// {
+// size += SprmUtils.addSprm((short)0xD202, 0, newSEP.getOlstAnm(), sprmList);
+// }
+// if (newSEP.getFEvenlySpaced() != DEFAULT_SEP.getFEvenlySpaced())
+// {
+// size += SprmUtils.addSprm((short)0x3005, newSEP.getFEvenlySpaced() ? 1 : 0, null, sprmList);
+// }
+// if (newSEP.getFUnlocked() != DEFAULT_SEP.getFUnlocked())
+// {
+// size += SprmUtils.addSprm((short)0x3006, newSEP.getFUnlocked() ? 1 :0, null, sprmList);
+// }
+// if (newSEP.getDmBinFirst() != DEFAULT_SEP.getDmBinFirst())
+// {
+// size += SprmUtils.addSprm((short)0x5007, newSEP.getDmBinFirst(), null, sprmList);
+// }
+// if (newSEP.getDmBinOther() != DEFAULT_SEP.getDmBinOther())
+// {
+// size += SprmUtils.addSprm((short)0x5008, newSEP.getDmBinOther(), null, sprmList);
+// }
+// if (newSEP.getBkc() != DEFAULT_SEP.getBkc())
+// {
+// size += SprmUtils.addSprm((short)0x3009, newSEP.getBkc(), null, sprmList);
+// }
+// if (newSEP.getFTitlePage() != DEFAULT_SEP.getFTitlePage())
+// {
+// size += SprmUtils.addSprm((short)0x300A, newSEP.getFTitlePage() ? 1 : 0, null, sprmList);
+// }
+// if (newSEP.getCcolM1() != DEFAULT_SEP.getCcolM1())
+// {
+// size += SprmUtils.addSprm((short)0x500B, newSEP.getCcolM1(), null, sprmList);
+// }
+// if (newSEP.getDxaColumns() != DEFAULT_SEP.getDxaColumns())
+// {
+// size += SprmUtils.addSprm((short)0x900C, newSEP.getDxaColumns(), null, sprmList);
+// }
+// if (newSEP.getFAutoPgn() != DEFAULT_SEP.getFAutoPgn())
+// {
+// size += SprmUtils.addSprm((short)0x300D, newSEP.getFAutoPgn() ? 1 : 0, null, sprmList);
+// }
+// if (newSEP.getNfcPgn() != DEFAULT_SEP.getNfcPgn())
+// {
+// size += SprmUtils.addSprm((short)0x300E, newSEP.getNfcPgn(), null, sprmList);
+// }
+// if (newSEP.getDyaPgn() != DEFAULT_SEP.getDyaPgn())
+// {
+// size += SprmUtils.addSprm((short)0xB00F, newSEP.getDyaPgn(), null, sprmList);
+// }
+// if (newSEP.getDxaPgn() != DEFAULT_SEP.getDxaPgn())
+// {
+// size += SprmUtils.addSprm((short)0xB010, newSEP.getDxaPgn(), null, sprmList);
+// }
+// if (newSEP.getFPgnRestart() != DEFAULT_SEP.getFPgnRestart())
+// {
+// size += SprmUtils.addSprm((short)0x3011, newSEP.getFPgnRestart() ? 1 : 0, null, sprmList);
+// }
+// if (newSEP.getFEndNote() != DEFAULT_SEP.getFEndNote())
+// {
+// size += SprmUtils.addSprm((short)0x3012, newSEP.getFEndNote() ? 1 : 0, null, sprmList);
+// }
+// if (newSEP.getLnc() != DEFAULT_SEP.getLnc())
+// {
+// size += SprmUtils.addSprm((short)0x3013, newSEP.getLnc(), null, sprmList);
+// }
+// if (newSEP.getGrpfIhdt() != DEFAULT_SEP.getGrpfIhdt())
+// {
+// size += SprmUtils.addSprm((short)0x3014, newSEP.getGrpfIhdt(), null, sprmList);
+// }
+// if (newSEP.getNLnnMod() != DEFAULT_SEP.getNLnnMod())
+// {
+// size += SprmUtils.addSprm((short)0x5015, newSEP.getNLnnMod(), null, sprmList);
+// }
+// if (newSEP.getDxaLnn() != DEFAULT_SEP.getDxaLnn())
+// {
+// size += SprmUtils.addSprm((short)0x9016, newSEP.getDxaLnn(), null, sprmList);
+// }
+// if (newSEP.getDyaHdrTop() != DEFAULT_SEP.getDyaHdrTop())
+// {
+// size += SprmUtils.addSprm((short)0xB017, newSEP.getDyaHdrTop(), null, sprmList);
+// }
+// if (newSEP.getDyaHdrBottom() != DEFAULT_SEP.getDyaHdrBottom())
+// {
+// size += SprmUtils.addSprm((short)0xB018, newSEP.getDyaHdrBottom(), null, sprmList);
+// }
+// if (newSEP.getFLBetween() != DEFAULT_SEP.getFLBetween())
+// {
+// size += SprmUtils.addSprm((short)0x3019, newSEP.getFLBetween() ? 1 : 0, null, sprmList);
+// }
+// if (newSEP.getVjc() != DEFAULT_SEP.getVjc())
+// {
+// size += SprmUtils.addSprm((short)0x301A, newSEP.getVjc(), null, sprmList);
+// }
+// if (newSEP.getLnnMin() != DEFAULT_SEP.getLnnMin())
+// {
+// size += SprmUtils.addSprm((short)0x501B, newSEP.getLnnMin(), null, sprmList);
+// }
+// if (newSEP.getPgnStart() != DEFAULT_SEP.getPgnStart())
+// {
+// size += SprmUtils.addSprm((short)0x501C, newSEP.getPgnStart(), null, sprmList);
+// }
+// if (newSEP.getDmOrientPage() != DEFAULT_SEP.getDmOrientPage())
+// {
+// size += SprmUtils.addSprm((short)0x301D, newSEP.getDmOrientPage(), null, sprmList);
+// }
+// if (newSEP.getXaPage() != DEFAULT_SEP.getXaPage())
+// {
+// size += SprmUtils.addSprm((short)0xB01F, newSEP.getXaPage(), null, sprmList);
+// }
+// if (newSEP.getYaPage() != DEFAULT_SEP.getYaPage())
+// {
+// size += SprmUtils.addSprm((short)0xB020, newSEP.getYaPage(), null, sprmList);
+// }
+// if (newSEP.getDxaLeft() != DEFAULT_SEP.getDxaLeft())
+// {
+// size += SprmUtils.addSprm((short)0xB021, newSEP.getDxaLeft(), null, sprmList);
+// }
+// if (newSEP.getDxaRight() != DEFAULT_SEP.getDxaRight())
+// {
+// size += SprmUtils.addSprm((short)0xB022, newSEP.getDxaRight(), null, sprmList);
+// }
+// if (newSEP.getDyaTop() != DEFAULT_SEP.getDyaTop())
+// {
+// size += SprmUtils.addSprm((short)0x9023, newSEP.getDyaTop(), null, sprmList);
+// }
+// if (newSEP.getDyaBottom() != DEFAULT_SEP.getDyaBottom())
+// {
+// size += SprmUtils.addSprm((short)0x9024, newSEP.getDyaBottom(), null, sprmList);
+// }
+// if (newSEP.getDzaGutter() != DEFAULT_SEP.getDzaGutter())
+// {
+// size += SprmUtils.addSprm((short)0xB025, newSEP.getDzaGutter(), null, sprmList);
+// }
+// if (newSEP.getDmPaperReq() != DEFAULT_SEP.getDmPaperReq())
+// {
+// size += SprmUtils.addSprm((short)0x5026, newSEP.getDmPaperReq(), null, sprmList);
+// }
+// if (newSEP.getFPropMark() != DEFAULT_SEP.getFPropMark() ||
+// newSEP.getIbstPropRMark() != DEFAULT_SEP.getIbstPropRMark() ||
+// newSEP.getDttmPropRMark() != DEFAULT_SEP.getDttmPropRMark())
+// {
+// byte[] buf = new byte[7];
+// buf[0] = (byte)(newSEP.getFPropMark() ? 1 : 0);
+// int offset = LittleEndian.BYTE_SIZE;
+// LittleEndian.putShort(buf, (short)newSEP.getIbstPropRMark());
+// offset += LittleEndian.SHORT_SIZE;
+// LittleEndian.putInt(buf, newSEP.getDttmPropRMark());
+// size += SprmUtils.addSprm((short)0xD227, -1, buf, sprmList);
+// }
+// if (!Arrays.equals(newSEP.getBrcTop(), DEFAULT_SEP.getBrcTop()))
+// {
+// size += SprmUtils.addSprm((short)0x702B, SprmUtils.convertBrcToInt(newSEP.getBrcTop()), null, sprmList);
+// }
+// if (!Arrays.equals(newSEP.getBrcLeft(), DEFAULT_SEP.getBrcLeft()))
+// {
+// size += SprmUtils.addSprm((short)0x702C, SprmUtils.convertBrcToInt(newSEP.getBrcLeft()), null, sprmList);
+// }
+// if (!Arrays.equals(newSEP.getBrcBottom(), DEFAULT_SEP.getBrcBottom()))
+// {
+// size += SprmUtils.addSprm((short)0x702D, SprmUtils.convertBrcToInt(newSEP.getBrcBottom()), null, sprmList);
+// }
+// if (!Arrays.equals(newSEP.getBrcRight(), DEFAULT_SEP.getBrcRight()))
+// {
+// size += SprmUtils.addSprm((short)0x702E, SprmUtils.convertBrcToInt(newSEP.getBrcRight()), null, sprmList);
+// }
+// if (newSEP.getPgbProp() != DEFAULT_SEP.getPgbProp())
+// {
+// size += SprmUtils.addSprm((short)0x522F, newSEP.getPgbProp(), null, sprmList);
+// }
+// if (newSEP.getDxtCharSpace() != DEFAULT_SEP.getDxtCharSpace())
+// {
+// size += SprmUtils.addSprm((short)0x7030, newSEP.getDxtCharSpace(), null, sprmList);
+// }
+// if (newSEP.getDyaLinePitch() != DEFAULT_SEP.getDyaLinePitch())
+// {
+// size += SprmUtils.addSprm((short)0x9031, newSEP.getDyaLinePitch(), null, sprmList);
+// }
+// if (newSEP.getClm() != DEFAULT_SEP.getClm())
+// {
+// size += SprmUtils.addSprm((short)0x5032, newSEP.getClm(), null, sprmList);
+// }
+// if (newSEP.getWTextFlow() != DEFAULT_SEP.getWTextFlow())
+// {
+// size += SprmUtils.addSprm((short)0x5033, newSEP.getWTextFlow(), null, sprmList);
+// }
+//
+// return SprmUtils.getGrpprl(sprmList, size);
+// }
+//}
+
+
import java.util.ArrayList;
import java.util.Arrays;
@@ -270,3 +489,4 @@
return SprmUtils.getGrpprl(sprmList, size);
}
}
+
1.2 +2 -1 jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
Index: SprmBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SprmBuffer.java 10 Nov 2003 11:53:03 -0000 1.1
+++ SprmBuffer.java 12 Nov 2003 01:34:30 -0000 1.2
@@ -63,7 +63,8 @@
public SprmBuffer(byte[] buf)
{
- _offset = _buf.length;
+ _offset = buf.length;
+ _buf = buf;
}
public void addSprm(short opcode, byte operand)
---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: poi-dev-help@jakarta.apache.org