Author: fanningpj
Date: Sun May 11 10:55:31 2025
New Revision: 1925497
URL: http://svn.apache.org/viewvc?rev=1925497&view=rev
Log:
refactor font test
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java?rev=1925497&r1=1925496&r2=1925497&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
Sun May 11 10:55:31 2025
@@ -59,17 +59,7 @@ public class XSSFTextRun {
}
public void setFontColor(Color color) {
- CTTextCharacterProperties rPr = getRPr();
- CTSolidColorFillProperties fill = rPr.isSetSolidFill() ?
rPr.getSolidFill() : rPr.addNewSolidFill();
- CTSRgbColor clr = fill.isSetSrgbClr() ? fill.getSrgbClr() :
fill.addNewSrgbClr();
- clr.setVal(new byte[]{(byte)color.getRed(), (byte)color.getGreen(),
(byte)color.getBlue()});
-
- if(fill.isSetHslClr()) fill.unsetHslClr();
- if(fill.isSetPrstClr()) fill.unsetPrstClr();
- if(fill.isSetSchemeClr()) fill.unsetSchemeClr();
- if(fill.isSetScrgbClr()) fill.unsetScrgbClr();
- if(fill.isSetSysClr()) fill.unsetSysClr();
-
+ setFontColor(new byte[]{(byte)color.getRed(), (byte)color.getGreen(),
(byte)color.getBlue()});
}
/**
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java?rev=1925497&r1=1925496&r2=1925497&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
Sun May 11 10:55:31 2025
@@ -45,11 +45,17 @@ class TestXSSFTextRun {
assertNotNull(run.getXmlObject());
assertNotNull(run.getRPr());
- assertEquals(new Color(0, 0, 0), run.getFontColor());
+ assertArrayEquals(new byte[]{0, 0, 0}, run.getFontColorAsBytes());
+ final byte[] colorBytes = new byte[]{0, (byte) 255, (byte) 255};
Color color = new Color(0, 255, 255);
run.setFontColor(color);
assertEquals(color, run.getFontColor());
+ assertArrayEquals(colorBytes, run.getFontColorAsBytes());
+
+ run.setFontColor(colorBytes);
+ assertEquals(color, run.getFontColor());
+ assertArrayEquals(colorBytes, run.getFontColorAsBytes());
assertEquals(11.0, run.getFontSize(), 0.01);
run.setFontSize(12.32);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
