From cb520e8046c0e27e2b9c0921bcf17b3bcd4dff85 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 19 Nov 2025 13:58:03 +0100 Subject: [PATCH] remove deprecated getCodepoints method (#940) --- .../poi/hslf/extractor/TestExtractor.java | 7 ----- .../poi/sl/extractor/SlideShowExtractor.java | 30 ------------------- 2 files changed, 37 deletions(-) diff --git a/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java index 4d70257650..2120e65498 100644 --- a/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java +++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java @@ -30,7 +30,6 @@ import java.io.IOException; import java.io.InputStream; import java.security.MessageDigest; import java.util.Base64; -import java.util.BitSet; import java.util.List; import com.zaxxer.sparsebits.SparseBitSet; @@ -495,12 +494,6 @@ public final class TestExtractor { sb.setLength(0); - BitSet l1 = ppt.getCodepoints(font, null, null); - l1.stream().mapToObj(Character::toChars).forEach(sb::append); - assertEquals(cps, sb.toString()); - - sb.setLength(0); - SparseBitSet l2 = ppt.getCodepointsInSparseBitSet(font, null, null); int cp = 0; while ((cp = l2.nextSetBit(cp+1)) != -1) { diff --git a/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java b/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java index 7579f8a9f8..3aa1681c41 100644 --- a/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java +++ b/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java @@ -18,7 +18,6 @@ package org.apache.poi.sl.extractor; import java.util.ArrayList; -import java.util.BitSet; import java.util.LinkedList; import java.util.List; import java.util.function.Consumer; @@ -46,7 +45,6 @@ import org.apache.poi.sl.usermodel.TextRun; import org.apache.poi.sl.usermodel.TextShape; import org.apache.poi.util.Internal; import org.apache.poi.util.LocaleUtil; -import org.apache.poi.util.Removal; /** * Common SlideShow extractor @@ -383,34 +381,6 @@ public class SlideShowExtractor< return txt; } - /** - * Extract the used codepoints for font embedding / subsetting - * @param typeface the typeface/font family of the textruns to examine - * @param italic use {@code true} for italic TextRuns, {@code false} for non-italic ones and - * {@code null} if it doesn't matter - * @param bold use {@code true} for bold TextRuns, {@code false} for non-bold ones and - * {@code null} if it doesn't matter - * @return a bitset with the marked/used codepoints - * @deprecated use {@link #getCodepointsInSparseBitSet(String, Boolean, Boolean)} - */ - @Deprecated - @Removal(version = "6.0.0") - public BitSet getCodepoints(String typeface, Boolean italic, Boolean bold) { - final BitSet glyphs = new BitSet(); - - Predicate filterOld = filter; - try { - filter = o -> filterFonts(o, typeface, italic, bold); - slideshow.getSlides().forEach(slide -> - getText(slide, s -> s.codePoints().forEach(glyphs::set)) - ); - } finally { - filter = filterOld; - } - - return glyphs; - } - /** * Extract the used codepoints for font embedding / subsetting. This method is not intended for public use. *