aboutsummaryrefslogtreecommitdiffstats
path: root/src/ooxml
diff options
context:
space:
mode:
authorJaven O'Neal <onealj@apache.org>2016-06-20 03:40:32 +0000
committerJaven O'Neal <onealj@apache.org>2016-06-20 03:40:32 +0000
commit80eac0c70e6f9ce389d0315daebbb3c05d89ba3b (patch)
tree89342720d3e51fc0a8977b94060002f4b11b18e0 /src/ooxml
parent46b3d8eaeea557d4c623474a1dc6177ad47aa2e3 (diff)
downloadpoi-80eac0c70e6f9ce389d0315daebbb3c05d89ba3b.tar.gz
poi-80eac0c70e6f9ce389d0315daebbb3c05d89ba3b.zip
bug 59730: promote XSSFSheet#removeMergedRegions to Sheet interface
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1749258 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/ooxml')
-rw-r--r--src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java11
-rw-r--r--src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
index 7d0b6fc746..1ca6a5f147 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
@@ -463,6 +463,17 @@ public class SXSSFSheet implements Sheet, Cloneable
{
_sh.removeMergedRegion(index);
}
+
+ /**
+ * Removes a merged region of cells (hence letting them free)
+ *
+ * @param indices of the regions to unmerge
+ */
+ @Override
+ public void removeMergedRegions(Collection<Integer> indices)
+ {
+ _sh.removeMergedRegions(indices);
+ }
/**
* Returns the number of merged regions
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index edc8000a4e..f8be5b0efb 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -1867,6 +1867,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
*
* @param indices A set of the regions to unmerge
*/
+ @Override
public void removeMergedRegions(Collection<Integer> indices) {
if (!worksheet.isSetMergeCells()) return;