Skip to content

Fix: XSLFTableCell.setBorderColor Overwrites #1052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
micahsmith wants to merge 1 commit into
base: trunk
Choose a base branch
from
+23 −1
Open

Fix: XSLFTableCell.setBorderColor Overwrites #1052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,10 @@ public void setBorderColor(BorderEdge edge, Color color) {
throw new IllegalArgumentException("Colors need to be specified.");
}

CTLineProperties ln = setBorderDefaults(edge);
final CTLineProperties ln = setBorderDefaults(edge);
if (ln.isSetSolidFill()) {
ln.unsetSolidFill();
}
CTSolidColorFillProperties fill = ln.addNewSolidFill();
XSLFColor c = new XSLFColor(fill, getSheet().getTheme(), fill.getSchemeClr(), getSheet());
c.setColor(color);
Expand Down
19 changes: 19 additions & 0 deletions poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,25 @@ void testCreate() throws IOException {
ppt2.close();
}

@Test
void testBorderColorOverwrite() throws IOException {
XMLSlideShow ppt = new XMLSlideShow();
XSLFSlide slide = ppt.createSlide();
XSLFTable tbl = slide.createTable();
XSLFTableRow row = tbl.addRow();
XSLFTableCell cell = row.addCell();

for (BorderEdge edge : BorderEdge.values()) {
cell.setBorderColor(edge, Color.yellow);
assertEquals(Color.yellow, cell.getBorderColor(edge));
// additional calls to setBorderColor do not add multiple solidFill elements
cell.setBorderColor(edge, Color.red);
assertEquals(Color.red, cell.getBorderColor(edge));
}

ppt.close();
}

@Test
void removeTable() throws IOException {
XMLSlideShow ss = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
Expand Down