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/11 12:41:07 UTC
cvs commit: jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes StyleDescription.java StyleSheet.java
sackley 2003/11/11 03:41:07
Modified: src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes
StyleDescription.java StyleSheet.java
Log:
latest changes
Revision Changes Path
1.7 +8 -8 jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/StyleDescription.java
Index: StyleDescription.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/StyleDescription.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StyleDescription.java 10 Nov 2003 11:51:01 -0000 1.6
+++ StyleDescription.java 11 Nov 2003 11:41:07 -0000 1.7
@@ -59,8 +59,8 @@
import java.io.UnsupportedEncodingException;
import java.util.Arrays;
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
+import org.apache.poi.hwpf.usermodel.CharacterRun;
+import org.apache.poi.hwpf.usermodel.Paragraph;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.BitField;
/**
@@ -96,8 +96,8 @@
UPX[] _upxs;
String _name;
- ParagraphProperties _pap;
- CharacterProperties _chp;
+ Paragraph _pap;
+ CharacterRun _chp;
public StyleDescription()
{
@@ -203,19 +203,19 @@
return null;
}
}
- public ParagraphProperties getPAP()
+ public Paragraph getPAP()
{
return _pap;
}
- public CharacterProperties getCHP()
+ public CharacterRun getCHP()
{
return _chp;
}
- void setPAP(ParagraphProperties pap)
+ void setPAP(Paragraph pap)
{
_pap = pap;
}
- void setCHP(CharacterProperties chp)
+ void setCHP(CharacterRun chp)
{
_chp = chp;
}
1.5 +10 -10 jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/StyleSheet.java
Index: StyleSheet.java
===================================================================
RCS file: /home/cvs/jakarta-poi/src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/StyleSheet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StyleSheet.java 10 Nov 2003 11:51:09 -0000 1.4
+++ StyleSheet.java 11 Nov 2003 11:41:07 -0000 1.5
@@ -62,8 +62,8 @@
import org.apache.poi.util.LittleEndian;
import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-import org.apache.poi.hwpf.usermodel.CharacterProperties;
-import org.apache.poi.hwpf.usermodel.ParagraphProperties;
+import org.apache.poi.hwpf.usermodel.CharacterRun;
+import org.apache.poi.hwpf.usermodel.Paragraph;
import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor;
import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor;
@@ -248,12 +248,12 @@
private void createPap(int istd)
{
StyleDescription sd = _styleDescriptions[istd];
- ParagraphProperties pap = sd.getPAP();
+ Paragraph pap = sd.getPAP();
byte[] papx = sd.getPAPX();
int baseIndex = sd.getBaseStyle();
if(pap == null && papx != null)
{
- ParagraphProperties parentPAP = new ParagraphProperties();
+ Paragraph parentPAP = new Paragraph();
if(baseIndex != NIL_STYLE)
{
@@ -266,7 +266,7 @@
}
- pap = (ParagraphProperties)ParagraphSprmUncompressor.uncompressPAP(parentPAP, papx, 2);
+ pap = (Paragraph)ParagraphSprmUncompressor.uncompressPAP(parentPAP, papx, 2);
sd.setPAP(pap);
}
}
@@ -283,12 +283,12 @@
private void createChp(int istd)
{
StyleDescription sd = _styleDescriptions[istd];
- CharacterProperties chp = sd.getCHP();
+ CharacterRun chp = sd.getCHP();
byte[] chpx = sd.getCHPX();
int baseIndex = sd.getBaseStyle();
if(chp == null && chpx != null)
{
- CharacterProperties parentCHP = new CharacterProperties();
+ CharacterRun parentCHP = new CharacterRun();
if(baseIndex != NIL_STYLE)
{
@@ -301,7 +301,7 @@
}
- chp = (CharacterProperties)CharacterSprmUncompressor.uncompressCHP(parentCHP, chpx, 0);
+ chp = (CharacterRun)CharacterSprmUncompressor.uncompressCHP(parentCHP, chpx, 0);
sd.setCHP(chp);
}
}
@@ -316,12 +316,12 @@
return _styleDescriptions[x];
}
- public CharacterProperties getCharacterStyle(int x)
+ public CharacterRun getCharacterStyle(int x)
{
return (_styleDescriptions[x] != null ? _styleDescriptions[x].getCHP() : null);
}
- public ParagraphProperties getParagraphStyle(int x)
+ public Paragraph getParagraphStyle(int x)
{
return (_styleDescriptions[x] != null ? _styleDescriptions[x].getPAP() : null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: poi-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: poi-dev-help@jakarta.apache.org