From commits-return-2749-apmail-poi-commits-archive=poi.apache.org@poi.apache.org Sat Jun 18 08:57:37 2011 Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EEC1166E2 for ; Sat, 18 Jun 2011 08:57:37 +0000 (UTC) Received: (qmail 37887 invoked by uid 500); 18 Jun 2011 08:57:37 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 37853 invoked by uid 500); 18 Jun 2011 08:57:37 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 37846 invoked by uid 99); 18 Jun 2011 08:57:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Jun 2011 08:57:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_FOLLOW2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Jun 2011 08:57:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3283D2388A33; Sat, 18 Jun 2011 08:57:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1137143 [2/2] - in /poi/trunk/src: documentation/content/xdocs/ scratchpad/src/org/apache/poi/hwpf/model/types/ scratchpad/src/org/apache/poi/hwpf/sprm/ scratchpad/src/org/apache/poi/hwpf/usermodel/ types/definitions/ Date: Sat, 18 Jun 2011 08:57:11 -0000 To: commits@poi.apache.org From: yegor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110618085711.3283D2388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java?rev=1137143&r1=1137142&r2=1137143&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java Sat Jun 18 08:57:10 2011 @@ -19,303 +19,272 @@ package org.apache.poi.hwpf.usermodel; import org.apache.poi.hwpf.model.types.PAPAbstractType; -public final class ParagraphProperties extends PAPAbstractType implements Cloneable { +public final class ParagraphProperties extends PAPAbstractType implements + Cloneable { - public ParagraphProperties() - { - field_21_lspd = new LineSpacingDescriptor(); - field_24_phe = new byte[12]; - field_46_brcTop = new BorderCode(); - field_47_brcLeft = new BorderCode(); - field_48_brcBottom = new BorderCode(); - field_49_brcRight = new BorderCode(); - field_50_brcBetween = new BorderCode(); - field_51_brcBar = new BorderCode(); - field_60_anld = new byte[84]; - this.field_17_fWidowControl = 1; - this.field_21_lspd.setMultiLinespace((short)1); - this.field_21_lspd.setDyaLine((short)240); - this.field_58_lvl = (byte)9; - this.field_66_rgdxaTab = new int[0]; - this.field_67_rgtbd = new byte[0]; - this.field_63_dttmPropRMark = new DateAndTime(); - - } - - public int getJustification() - { - return super.getJc(); - } - - public void setJustification(byte jc) - { - super.setJc(jc); - } - - public boolean keepOnPage() - { - return super.getFKeep() != 0; - } - - public void setKeepOnPage(boolean fKeep) - { - super.setFKeep((byte)(fKeep ? 1 : 0)); - } - - public boolean keepWithNext() - { - return super.getFKeepFollow() != 0; - } - - public void setKeepWithNext(boolean fKeepFollow) - { - super.setFKeepFollow((byte)(fKeepFollow ? 1 : 0)); - } - - public boolean pageBreakBefore() - { - return super.getFPageBreakBefore() != 0; - } - - public void setPageBreakBefore(boolean fPageBreak) - { - super.setFPageBreakBefore((byte)(fPageBreak ? 1 : 0)); - } - - public boolean isLineNotNumbered() - { - return super.getFNoLnn() != 0; - } - - public void setLineNotNumbered(boolean fNoLnn) - { - super.setFNoLnn((byte)(fNoLnn ? 1 : 0)); - } - - public boolean isSideBySide() - { - return super.getFSideBySide() != 0; - } - - public void setSideBySide(boolean fSideBySide) - { - super.setFSideBySide((byte)(fSideBySide ? 1 : 0)); - } - - public boolean isAutoHyphenated() - { - return super.getFNoAutoHyph() == 0; - } - - public void setAutoHyphenated(boolean auto) - { - super.setFNoAutoHyph((byte)(!auto ? 1 : 0)); - } - - public boolean isWidowControlled() - { - return super.getFWidowControl() != 0; - } - - public void setWidowControl(boolean widowControl) - { - super.setFWidowControl((byte)(widowControl ? 1 : 0)); - } - - public int getIndentFromRight() - { - return super.getDxaRight(); - } - - public void setIndentFromRight(int dxaRight) - { - super.setDxaRight(dxaRight); - } - - public int getIndentFromLeft() - { - return super.getDxaLeft(); - } - - public void setIndentFromLeft(int dxaLeft) - { - super.setDxaLeft(dxaLeft); - } - - public int getFirstLineIndent() - { - return super.getDxaLeft1(); - } - - public void setFirstLineIndent(int first) - { - super.setDxaLeft1(first); - } - - public LineSpacingDescriptor getLineSpacing() - { - return super.getLspd(); - } - - public void setLineSpacing(LineSpacingDescriptor lspd) - { - super.setLspd(lspd); - } - - public int getSpacingBefore() - { - return super.getDyaBefore(); - } - - public void setSpacingBefore(int before) - { - super.setDyaBefore(before); - } - - public int getSpacingAfter() - { - return super.getDyaAfter(); - } - - public void setSpacingAfter(int after) - { - super.setDyaAfter(after); - } - - public boolean isKinsoku() - { - return super.getFKinsoku() != 0; - } - - public void setKinsoku(boolean kinsoku) - { - super.setFKinsoku((byte)(kinsoku ? 1 : 0)); - } - - public boolean isWordWrapped() - { - return super.getFWordWrap() != 0; - } - - public void setWordWrapped(boolean wrap) - { - super.setFWordWrap((byte)(wrap ? 1 : 0)); - } - - public int getFontAlignment() - { - return super.getWAlignFont(); - } - - public void setFontAlignment(int align) - { - super.setWAlignFont(align); - } - - public boolean isVertical() - { - return super.isFVertical(); - } - - public void setVertical(boolean vertical) - { - super.setFVertical(vertical); - } - - public boolean isBackward() - { - return super.isFBackward(); - } - - public void setBackward(boolean bward) - { - super.setFBackward(bward); - } - - public BorderCode getTopBorder() - { - return super.getBrcTop(); - } - - public void setTopBorder(BorderCode top) - { - super.setBrcTop(top); - } - - public BorderCode getLeftBorder() - { - return super.getBrcLeft(); - } - - public void setLeftBorder(BorderCode left) - { - super.setBrcLeft(left); - } - - public BorderCode getBottomBorder() - { - return super.getBrcBottom(); - } - - public void setBottomBorder(BorderCode bottom) - { - super.setBrcBottom(bottom); - } - - public BorderCode getRightBorder() - { - return super.getBrcRight(); - } - - public void setRightBorder(BorderCode right) - { - super.setBrcRight(right); - } - - public BorderCode getBarBorder() - { - return super.getBrcBar(); - } - - public void setBarBorder(BorderCode bar) - { - super.setBrcBar(bar); - } - - public ShadingDescriptor getShading() - { - return super.getShd(); - } - - public void setShading(ShadingDescriptor shd) - { - super.setShd(shd); - } - - public DropCapSpecifier getDropCap() - { - return super.getDcs(); - } - - public void setDropCap(DropCapSpecifier dcs) - { - super.setDcs(dcs); - } - - public Object clone() - throws CloneNotSupportedException - { - ParagraphProperties pp = (ParagraphProperties)super.clone(); - pp.field_21_lspd = (LineSpacingDescriptor)field_21_lspd.clone(); - pp.field_24_phe = field_24_phe.clone(); - pp.field_46_brcTop = (BorderCode)field_46_brcTop.clone(); - pp.field_47_brcLeft = (BorderCode)field_47_brcLeft.clone(); - pp.field_48_brcBottom = (BorderCode)field_48_brcBottom.clone(); - pp.field_49_brcRight = (BorderCode)field_49_brcRight.clone(); - pp.field_50_brcBetween = (BorderCode)field_50_brcBetween.clone(); - pp.field_51_brcBar = (BorderCode)field_51_brcBar.clone(); - pp.field_60_anld = field_60_anld.clone(); - return pp; - } + private boolean jcLogical = false; + + public ParagraphProperties() { + setLspd(new LineSpacingDescriptor()); + setPhe(new byte[12]); + setBrcTop(new BorderCode()); + setBrcLeft(new BorderCode()); + setBrcBottom(new BorderCode()); + setBrcRight(new BorderCode()); + setBrcBetween(new BorderCode()); + setBrcBar(new BorderCode()); + setAnld(new byte[84]); + + setWidowControl(true); + getLspd().setMultiLinespace((short) 1); + getLspd().setDyaLine((short) 240); + setLvl((byte) 9); + setRgdxaTab(new int[0]); + setRgtbd(new byte[0]); + setDttmPropRMark(new DateAndTime()); + } + + public int getJustification() { + if (jcLogical) { + if (getFBiDi() == 0) { + return getJc(); + } + + switch (getJc()) { + case 0: + return 2; + case 2: + return 0; + default: + return getJc(); + } + } + + return getJc(); + } + + public void setJustification(byte jc) { + super.setJc(jc); + this.jcLogical = false; + } + + public void setJustificationLogical(byte jc) { + super.setJc(jc); + this.jcLogical = true; + } + + public boolean keepOnPage() { + return super.getFKeep() != 0; + } + + public void setKeepOnPage(boolean fKeep) { + super.setFKeep((byte) (fKeep ? 1 : 0)); + } + + public boolean keepWithNext() { + return super.getFKeepFollow() != 0; + } + + public void setKeepWithNext(boolean fKeepFollow) { + super.setFKeepFollow((byte) (fKeepFollow ? 1 : 0)); + } + + public boolean pageBreakBefore() { + return super.getFPageBreakBefore() != 0; + } + + public void setPageBreakBefore(boolean fPageBreak) { + super.setFPageBreakBefore((byte) (fPageBreak ? 1 : 0)); + } + + public boolean isLineNotNumbered() { + return super.getFNoLnn() != 0; + } + + public void setLineNotNumbered(boolean fNoLnn) { + super.setFNoLnn((byte) (fNoLnn ? 1 : 0)); + } + + public boolean isSideBySide() { + return super.getFSideBySide() != 0; + } + + public void setSideBySide(boolean fSideBySide) { + super.setFSideBySide((byte) (fSideBySide ? 1 : 0)); + } + + public boolean isAutoHyphenated() { + return super.getFNoAutoHyph() == 0; + } + + public void setAutoHyphenated(boolean auto) { + super.setFNoAutoHyph((byte) (!auto ? 1 : 0)); + } + + public boolean isWidowControlled() { + return super.getFWidowControl() != 0; + } + + public void setWidowControl(boolean widowControl) { + super.setFWidowControl((byte) (widowControl ? 1 : 0)); + } + + public int getIndentFromRight() { + return super.getDxaRight(); + } + + public void setIndentFromRight(int dxaRight) { + super.setDxaRight(dxaRight); + } + + public int getIndentFromLeft() { + return super.getDxaLeft(); + } + + public void setIndentFromLeft(int dxaLeft) { + super.setDxaLeft(dxaLeft); + } + + public int getFirstLineIndent() { + return super.getDxaLeft1(); + } + + public void setFirstLineIndent(int first) { + super.setDxaLeft1(first); + } + + public LineSpacingDescriptor getLineSpacing() { + return super.getLspd(); + } + + public void setLineSpacing(LineSpacingDescriptor lspd) { + super.setLspd(lspd); + } + + public int getSpacingBefore() { + return super.getDyaBefore(); + } + + public void setSpacingBefore(int before) { + super.setDyaBefore(before); + } + + public int getSpacingAfter() { + return super.getDyaAfter(); + } + + public void setSpacingAfter(int after) { + super.setDyaAfter(after); + } + + public boolean isKinsoku() { + return super.getFKinsoku() != 0; + } + + public void setKinsoku(boolean kinsoku) { + super.setFKinsoku((byte) (kinsoku ? 1 : 0)); + } + + public boolean isWordWrapped() { + return super.getFWordWrap() != 0; + } + + public void setWordWrapped(boolean wrap) { + super.setFWordWrap((byte) (wrap ? 1 : 0)); + } + + public int getFontAlignment() { + return super.getWAlignFont(); + } + + public void setFontAlignment(int align) { + super.setWAlignFont(align); + } + + public boolean isVertical() { + return super.isFVertical(); + } + + public void setVertical(boolean vertical) { + super.setFVertical(vertical); + } + + public boolean isBackward() { + return super.isFBackward(); + } + + public void setBackward(boolean bward) { + super.setFBackward(bward); + } + + public BorderCode getTopBorder() { + return super.getBrcTop(); + } + + public void setTopBorder(BorderCode top) { + super.setBrcTop(top); + } + + public BorderCode getLeftBorder() { + return super.getBrcLeft(); + } + + public void setLeftBorder(BorderCode left) { + super.setBrcLeft(left); + } + + public BorderCode getBottomBorder() { + return super.getBrcBottom(); + } + + public void setBottomBorder(BorderCode bottom) { + super.setBrcBottom(bottom); + } + + public BorderCode getRightBorder() { + return super.getBrcRight(); + } + + public void setRightBorder(BorderCode right) { + super.setBrcRight(right); + } + + public BorderCode getBarBorder() { + return super.getBrcBar(); + } + + public void setBarBorder(BorderCode bar) { + super.setBrcBar(bar); + } + + public ShadingDescriptor getShading() { + return super.getShd(); + } + + public void setShading(ShadingDescriptor shd) { + super.setShd(shd); + } + + public DropCapSpecifier getDropCap() { + return super.getDcs(); + } + + public void setDropCap(DropCapSpecifier dcs) { + super.setDcs(dcs); + } + + public Object clone() throws CloneNotSupportedException { + ParagraphProperties pp = (ParagraphProperties) super.clone(); + pp.setLspd((LineSpacingDescriptor) this.getLspd().clone()); + pp.setPhe(getPhe().clone()); + pp.setBrcTop((BorderCode) getBrcTop().clone()); + pp.setBrcLeft((BorderCode) getBrcLeft().clone()); + pp.setBrcBottom((BorderCode) getBrcBottom().clone()); + pp.setBrcRight((BorderCode) getBrcRight().clone()); + pp.setBrcBetween((BorderCode) getBrcBetween().clone()); + pp.setBrcBar((BorderCode) getBrcBar().clone()); + pp.setAnld(getAnld().clone()); + return pp; + } } Modified: poi/trunk/src/types/definitions/pap_type.xml URL: http://svn.apache.org/viewvc/poi/trunk/src/types/definitions/pap_type.xml?rev=1137143&r1=1137142&r2=1137143&view=diff ============================================================================== --- poi/trunk/src/types/definitions/pap_type.xml (original) +++ poi/trunk/src/types/definitions/pap_type.xml Sat Jun 18 08:57:10 2011 @@ -23,33 +23,56 @@ Paragraph Properties. S. Ryan Ackley - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - @@ -62,38 +85,57 @@ + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - + - + + + + + --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org