You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2017/10/31 01:45:03 UTC
svn commit: r1813841 -
/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Author: onealj
Date: Tue Oct 31 01:45:03 2017
New Revision: 1813841
URL: http://svn.apache.org/viewvc?rev=1813841&view=rev
Log:
consolidate duplicated code: XSSFWorkbook#setBookViewsIfMissing()
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1813841&r1=1813840&r2=1813841&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Tue Oct 31 01:45:03 2017
@@ -275,11 +275,7 @@ public class XSSFWorkbook extends POIXML
load(XSSFFactory.getInstance());
// some broken Workbooks miss this...
- if(!workbook.isSetBookViews()) {
- CTBookViews bvs = workbook.addNewBookViews();
- CTBookView bv = bvs.addNewWorkbookView();
- bv.setActiveTab(0);
- }
+ setBookViewsIfMissing();
}
/**
@@ -297,19 +293,7 @@ public class XSSFWorkbook extends POIXML
* </code></pre>
*/
public XSSFWorkbook(InputStream is) throws IOException {
- super(PackageHelper.open(is));
-
- beforeDocumentRead();
-
- // Build a tree of POIXMLDocumentParts, this workbook being the root
- load(XSSFFactory.getInstance());
-
- // some broken Workbooks miss this...
- if(!workbook.isSetBookViews()) {
- CTBookViews bvs = workbook.addNewBookViews();
- CTBookView bv = bvs.addNewWorkbookView();
- bv.setActiveTab(0);
- }
+ this(PackageHelper.open(is));
}
/**
@@ -459,9 +443,7 @@ public class XSSFWorkbook extends POIXML
CTWorkbookPr workbookPr = workbook.addNewWorkbookPr();
workbookPr.setDate1904(false);
- CTBookViews bvs = workbook.addNewBookViews();
- CTBookView bv = bvs.addNewWorkbookView();
- bv.setActiveTab(0);
+ setBookViewsIfMissing();
workbook.addNewSheets();
POIXMLProperties.ExtendedProperties expProps = getProperties().getExtendedProperties();
@@ -476,6 +458,14 @@ public class XSSFWorkbook extends POIXML
sheets = new ArrayList<>();
pivotTables = new ArrayList<>();
}
+
+ private void setBookViewsIfMissing() {
+ if(!workbook.isSetBookViews()) {
+ CTBookViews bvs = workbook.addNewBookViews();
+ CTBookView bv = bvs.addNewWorkbookView();
+ bv.setActiveTab(0);
+ }
+ }
/**
* Create a new SpreadsheetML package and setup the default minimal content
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org