Commit Graph

131 Commits

Author SHA1 Message Date
Yegor Kozlov
b09c6e3031 applied patches #46079, #46080 and #46081 by Gisella Bronzetti
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@707843 13f79535-47bb-0310-9956-ffa450edef68
2008-10-25 13:39:43 +00:00
Yegor Kozlov
97ceedbbf7 more cleanup and refactoring of the ooxml code:1. removed deprecated methods from xssf and interfaces
2. minimized the accessibility of internal constructors
3. more javadocs


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@707839 13f79535-47bb-0310-9956-ffa450edef68
2008-10-25 11:48:50 +00:00
Yegor Kozlov
dfb6d9f84f 1. important algorithmic improvements of XSSFRow and XSSFSheet, removed LinkedList in favor of TreeMap, that allowed O(Log(N)) performance instead of O(N) when adding new rows and cells2. Revised cell value accessors in XSSFCell. Now both HSSF and XSSF handle various cell types equally. The same exceptions are thrown in case of type mismatch, same behaviour when setting nulls, etc.
3. Moved FormulaError codes out of the Cell interface into enum. Interface isn't a proper place for it
4. Finally finished javadoc on XSSFRow and XSSFCell


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@707445 13f79535-47bb-0310-9956-ffa450edef68
2008-10-23 18:57:28 +00:00
Yegor Kozlov
b15942d4a8 1. implemented XSSFSheet.autosizeColumn(), for now mostly duplicated HSSF code, will be refactored in future.2. fixed bug #45974: XSSFCell.getCellStyle can return null3. more code cleanup and reaftoring, removed usages of obsolete XSSFCell.getCellNum() in favor of XSSFCell.getColumnIndex(), also more javadoc in core classes
4. fixed a blocker: calling XSSFSheet.getNumMergedRegions() resulted in unreadable workbook, this methods structurally modified worksheet and added unnecessary data 

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@706691 13f79535-47bb-0310-9956-ffa450edef68
2008-10-21 17:56:34 +00:00
Yegor Kozlov
26ec85202e more code cleanup and refactoring: (a) removed references to ooxml schemas from XSSF enums, they should not depend on ooxml-schemas.jar
(b) removed "for testing only" constructors, the goal is to have a single, maximum 2 constructors for objects inherited from POIXMLDocumentPart
(c) more javadocs 


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@706003 13f79535-47bb-0310-9956-ffa450edef68
2008-10-19 12:54:40 +00:00
Yegor Kozlov
f90843cd7f applied patch #46003 by Gisella Bronzetti
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@705701 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 18:43:37 +00:00
Yegor Kozlov
59b02716ac more progress on SpreadsheetML drawing layer;finished XSSFPicture, auto-sizing is supported; implemented initial support for shape groups. Common HSSF-XSSF drawing interfaces are still TODO.
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@705638 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 15:14:00 +00:00
Yegor Kozlov
1a700918d8 applied patch #45967 by Gisella Bronzetti: support for XSSFPrintSetup object
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703778 13f79535-47bb-0310-9956-ffa450edef68
2008-10-12 10:25:58 +00:00
Yegor Kozlov
6153569465 Initial support for SpreadsheetML drawings,implemented XSSFPicture, added ability to add pictures to workbook, refactored XSSFPictureData to be a subclass of POIXMLDocumentPart. Also refactored misc odds and ends in order to produce xml better compatible with what MS Office produces
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703490 13f79535-47bb-0310-9956-ffa450edef68
2008-10-10 14:54:32 +00:00
Yegor Kozlov
cdfa36cada applied patch #45492 submitted by Gisella Bronzetti,also performed major cleanup of StylesTable and its components, the goal was to ensure that StylesTable works as a cache of styling components, not just a regular store of fill patterns and cell styles.
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@701797 13f79535-47bb-0310-9956-ffa450edef68
2008-10-05 13:56:28 +00:00
Yegor Kozlov
0d051eb3c2 applied patches provided by Gisella Bronzetti in bugs #45918, #45917 and #45920
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700844 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 17:15:02 +00:00
Yegor Kozlov
0afe659835 iterator over sheet data in XSSFReader returns sheets in logical order, i.e. as they are defined in workbook.xml (was in physical order, as they were stored in the relationship table)
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700821 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:14:39 +00:00
Yegor Kozlov
baa56c4fc8 refactored POIXMLDocument to be a composite of POIXMLDocumentPart, this way XSSFWorkbook is a root of a tree: XSSFSheets are children, XSSFDrawings are children of worksheets, etc,
Also, performed major cleanup of core XSSF classes and test cases

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700472 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 13:57:36 +00:00
Josh Micich
0d50343293 Cleaned up test code
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699991 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 05:46:06 +00:00
Josh Micich
29e0439f39 Applied patch 45899 - XSSFWorkbook getActiveSheetIndex / setActiveSheet
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699989 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 04:50:20 +00:00
Josh Micich
72d626f2b2 Applied patch 45898 - fixed XSSFCellFill getFillBackgroundColor and getFillForegroundColor to not throw NPE if fill has not been set. Some other code clean up.
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699984 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 04:28:55 +00:00
Yegor Kozlov
84e3bbd179 applied patches #45894 and #45892, also major cleanup of XSSFSheet and related classes
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699185 13f79535-47bb-0310-9956-ffa450edef68
2008-09-26 06:02:38 +00:00
Yegor Kozlov
36e20d8073 misc ooxml improvements:"
1. preserve themes across read-write
2. properly set default properties of a new worksheet


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698838 13f79535-47bb-0310-9956-ffa450edef68
2008-09-25 06:51:18 +00:00
Yegor Kozlov
dca93e084f patch #45881 from Sourcesense: implemented cell fills and borders, added examples
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698674 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 17:53:29 +00:00
Yegor Kozlov
6130d5cb83 XSSFFont improvements from patch #45874
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698651 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 16:56:12 +00:00
Josh Micich
e188e7737d Merged revisions 696860,696898 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk

Quite a lot of manual fixing required. Also moved CellValue to top level class.  
........
  r696860 | josh | 2008-09-18 17:02:21 -0700 (Thu, 18 Sep 2008) | 1 line
  
  code clean-up (removed compiler warnings/unused methods)
........
  r696898 | josh | 2008-09-18 19:19:58 -0700 (Thu, 18 Sep 2008) | 1 line
  
  Partitioning common formula logic.  Introduced FormulaParsingWorkbook and EvaluationWorkbook interfaces to make merge with ooxml branch easier
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696961 13f79535-47bb-0310-9956-ffa450edef68
2008-09-19 07:32:34 +00:00
Yegor Kozlov
a6af3789b7 removed extra line that caused compilation error
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696762 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 18:49:08 +00:00
Yegor Kozlov
40f525ecbd 1. initial support for rich text in xssf"
2. cleaned common ooxml-ole2 interfaces, removed ole2-specific stuff
3. added new examples from the quick guide
4. misc xssf refactoring, tending to use enums intstead of final static constants
5. refactored XSSFFont
6. included test-ooxml and jar-ooxml in the dist target, they are part of release and should be there

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696584 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 07:42:40 +00:00
Josh Micich
bb3bf964bd Minor fixes to get junits working after r695832. Updates to align with new sample.xlsx, and moved SharedStringSource out of usermodel API.
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696415 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 19:52:55 +00:00
Josh Micich
e2c8b4f4d4 minor improvements to junits
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696401 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 19:05:39 +00:00
Yegor Kozlov
bb1235e2e5 include rich text in the unit test
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696377 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 17:39:33 +00:00
Yegor Kozlov
9a49637d5f unit tests for SharedStringsTable
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695833 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 12:27:05 +00:00
Yegor Kozlov
6a3bc9352b Preserve rich text across read-write of SharedStringsTable, also improved performance and removed obsolete ole2-specific stuff
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695832 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 12:25:54 +00:00
Nick Burch
4ed42be22f Fix bug #45518 - Fix up ColumnHelper to output valid col tags, by making 1 based and 0 based bits clearer, and using the right ones
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695620 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 20:54:49 +00:00
Yegor Kozlov
b832a6411d refactored cell align accessors in xssf and added samples based on the quick guide
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695411 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 10:39:37 +00:00
Yegor Kozlov
419df8bc3f more ooxml progress from SourseSense developers
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@694288 13f79535-47bb-0310-9956-ffa450edef68
2008-09-11 15:11:57 +00:00
Nick Burch
28834dbe1f Update test to track change in hssf
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@693511 13f79535-47bb-0310-9956-ffa450edef68
2008-09-09 16:53:24 +00:00
Josh Micich
d84d5e0b58 fixed bug in junit which was exposed due to new caching feature of the formula evaluator
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@693179 13f79535-47bb-0310-9956-ffa450edef68
2008-09-08 18:04:34 +00:00
Nick Burch
6c3a086277 Initial ExtractorFactory support for building TextExtractors for embeded documents
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@691351 13f79535-47bb-0310-9956-ffa450edef68
2008-09-02 19:37:52 +00:00
Nick Burch
c36fec3a22 Support stripping XSSF header and footer fields (eg page number) out of header and footer text if required
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@686059 13f79535-47bb-0310-9956-ffa450edef68
2008-08-14 22:09:47 +00:00
Nick Burch
518bcf380a Add POIXMLPropertiesTextExtractor, which provides to the OOXML file formats a similar function to HPSF's HPSFPropertiesExtractor
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@685315 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 20:58:31 +00:00
Nick Burch
d36f6623f1 Have XWPFWordExtractor extract headers and footers
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@684276 13f79535-47bb-0310-9956-ffa450edef68
2008-08-09 15:08:11 +00:00
Nick Burch
0740316520 Improve paragraph text stuff, and further header tests
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@684273 13f79535-47bb-0310-9956-ffa450edef68
2008-08-09 14:50:16 +00:00
Nick Burch
c96a79fdf9 Improve how XWPF headers and footers work
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@684269 13f79535-47bb-0310-9956-ffa450edef68
2008-08-09 14:21:21 +00:00
Nick Burch
de3eb33bd3 Improve how XWPFParagraph works, so it is child order aware
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@684239 13f79535-47bb-0310-9956-ffa450edef68
2008-08-09 12:15:32 +00:00
Nick Burch
15cced0478 Start on xwpf header/footer support
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@684229 13f79535-47bb-0310-9956-ffa450edef68
2008-08-09 11:27:29 +00:00
Nick Burch
2d50615c87 Patch from bug #45592 - improve xwpf text extraction
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@684219 13f79535-47bb-0310-9956-ffa450edef68
2008-08-09 10:45:19 +00:00
Nick Burch
2f42314b55 Fix bug #45545 - Improve XSLF usermodel support, and include XSLF comments in extracted text
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@682843 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 18:05:29 +00:00
Nick Burch
8d438e8b41 Test to show that bug #45544 is incorrect
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@682769 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 16:03:51 +00:00
Nick Burch
b118d1afb9 Fix bug #45540 - Fix XSSF header and footer support, and include headers and footers in the output of XSSFExcelExtractor
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@682674 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 11:26:38 +00:00
Nick Burch
cd56a91ef9 Improve support, tests and documentation for xssf headers and footers
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@682662 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 10:22:13 +00:00
Nick Burch
1acb09f9bd Start on bug 45540, not fixed yet though
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@682655 13f79535-47bb-0310-9956-ffa450edef68
2008-08-05 09:50:05 +00:00
Nick Burch
647537c626 Change how we do the control and drawing write out, so that XSSFRelation can do much more of the work for us
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@680889 13f79535-47bb-0310-9956-ffa450edef68
2008-07-30 00:29:55 +00:00
Nick Burch
613f361d61 Tidying up of some xssfmodel stuff, by doing more work generically in XSSFRelation
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@680882 13f79535-47bb-0310-9956-ffa450edef68
2008-07-29 23:37:35 +00:00
Nick Burch
233d99fc4d More work on bug #45431 - Support for .xlsm files, sufficient for simple files to be loaded by excel without warning
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@680871 13f79535-47bb-0310-9956-ffa450edef68
2008-07-29 23:03:25 +00:00