Commit Graph

183 Commits

Author SHA1 Message Date
Yegor Kozlov
3e6278bdb2 moved FontUnderline to interfaces-jdk15
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@708506 13f79535-47bb-0310-9956-ffa450edef68
2008-10-28 10:18:02 +00:00
Yegor Kozlov
9148feb877 1. moved ooxml enums into interfaces-jdk15, they are common and should be in the place as the interfaces 2. removed obsolete and deprecated classes 3. Fixed XSSFWorkbook.cloneSheet. Now it makes a 'true' deep copy of a sheet 4. ooxml has a compile-time dependency on scratchpad, fixed build.xml to reflect that
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@708497 13f79535-47bb-0310-9956-ffa450edef68
2008-10-28 10:03:51 +00:00
Yegor Kozlov
6175b9b1fb improved XSSFName:check for name uniqueness, validate name name, more unit tests and javadocs
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@708306 13f79535-47bb-0310-9956-ffa450edef68
2008-10-27 20:28:44 +00:00
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
82a4bc8cb1 cleanup of POIXMLDocument constructors and related sub-classes
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@706032 13f79535-47bb-0310-9956-ffa450edef68
2008-10-19 15:31:28 +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
96d360ff21 applied patches #46004 and #46006 submitted by Gisella Bronzetti
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@705684 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 17:44:53 +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
9c094be425 refactored POIXMLFactory and related classes; simplified XSSFRelation - now it's just a set of definitions of XSSF relations, all read/load stuff is not used anymore and was removed. Also, removed Workbook.getCustomPallete() - it's OLE-specific
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703814 13f79535-47bb-0310-9956-ffa450edef68
2008-10-12 13:10:30 +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
Josh Micich
78504dfa20 Merged revisions 703092 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk

........
  r703092 | josh | 2008-10-09 00:44:37 -0700 (Thu, 09 Oct 2008) | 1 line
  
  converted short HSSFCell.getCellNum to int getColumnIndex
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703096 13f79535-47bb-0310-9956-ffa450edef68
2008-10-09 08:03:43 +00:00
Josh Micich
f7acb6bb7c Merged revisions 703063 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk

........
  r703063 | josh | 2008-10-08 23:07:36 -0700 (Wed, 08 Oct 2008) | 1 line
  
  Performance optimisation for EvaluationCache.  Changed to use HSSFCell as key into cache entry map.  Reduced dependency information storage for blank cells.  Introduced EvaluationSheet and EvaluationCell interfaces.  Modified HSSFFormulaEvaluator API to have simpler notify~ methods
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703083 13f79535-47bb-0310-9956-ffa450edef68
2008-10-09 07:20:46 +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
96cb7321ba Merged revisions 699178,699487,699489,699761 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk

........
  r699178 | josh | 2008-09-25 21:49:20 -0700 (Thu, 25 Sep 2008) | 1 line
  
  Changed HSSFEvaluationWorkbook to avoid re-parsing cell formulas during execution. (working towards fix for bug 45865)
........
  r699487 | josh | 2008-09-26 13:25:45 -0700 (Fri, 26 Sep 2008) | 1 line
  
  Fix formula parser to properly support the range operator. Small fixes to parsing of sheet names and full column references.
........
  r699489 | josh | 2008-09-26 13:32:06 -0700 (Fri, 26 Sep 2008) | 1 line
  
  Code cleanup in junit
........
  r699761 | josh | 2008-09-27 19:04:31 -0700 (Sat, 27 Sep 2008) | 1 line
  
  Bug 45865 - modified Formula Parser/Evaluator to handle cross-worksheet formulas
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700234 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 20:09:09 +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
0c602f354f Clean-up of generics in XSSFRelation
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699990 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 05:40:48 +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
6beba5ccc0 Merged revisions 698047 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk

........
  r698047 | josh | 2008-09-22 17:40:22 -0700 (Mon, 22 Sep 2008) | 1 line
  
  Optimised the FormulaEvaluator to take cell dependencies into account
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698370 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 21:52:49 +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
500a5d918d merged 696075,696084 from trunk - (Fix for bug 45805 - 16-bit signed/unsigned problems in HSSFSheet.getColWidth() etc)
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696475 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 21:54:32 +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
Yegor Kozlov
d0f181df99 utility to dump ooxml files into file system
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695828 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 12:22:55 +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
Nick Burch
8f5ffb8256 Merged revisions 695264,695303,695420 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk

........
  r695264 | josh | 2008-09-14 19:55:28 +0100 (Sun, 14 Sep 2008) | 1 line
  
  Fix for bug 45978 - removed eager initialisation of SheetReferences
........
  r695303 | nick | 2008-09-14 23:19:06 +0100 (Sun, 14 Sep 2008) | 1 line
  
  Make a start on exposing the StyleRecord details into HSSFCellStyle, but not fully there yet
........
  r695420 | nick | 2008-09-15 12:02:18 +0100 (Mon, 15 Sep 2008) | 1 line
  
  Finish exposing the name of Named Cell Styles via HSSFCellStyle (normally held on the parent style though)
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695549 13f79535-47bb-0310-9956-ffa450edef68
2008-09-15 17:01:46 +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
Nick Burch
633a9cf563 Update to match interface
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@694948 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 13:56:04 +00:00
Nick Burch
968d5deb12 Merged revisions 693591,693639,693658,693939,693941,693947,693990,694050,694065,694153,694534,694615,694619-694620,694631,694643,694877,694881 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk

........
  r693591 | josh | 2008-09-09 21:25:16 +0100 (Tue, 09 Sep 2008) | 1 line
  
  Added support for parsing array constants in formulas. (Helping investigation for bug 45752)
........
  r693639 | josh | 2008-09-09 23:26:28 +0100 (Tue, 09 Sep 2008) | 1 line
  
  removed debug code accidentally submitted with r693591
........
  r693658 | josh | 2008-09-10 00:46:46 +0100 (Wed, 10 Sep 2008) | 2 lines
  
  Fixed special cases of INDEX function (single columns / single rows, and errors)
........
  r693939 | josh | 2008-09-10 20:23:43 +0100 (Wed, 10 Sep 2008) | 1 line
  
  Fixing error value handling for numeric functions. Refactored hierarchy.
........
  r693941 | josh | 2008-09-10 20:27:24 +0100 (Wed, 10 Sep 2008) | 1 line
  
  (Should have been submitted with 693939) Fixing error value handling for numeric functions. Refactored hierarchy.
........
  r693947 | josh | 2008-09-10 20:33:58 +0100 (Wed, 10 Sep 2008) | 1 line
  
  (Should have been submitted with 693939) Fixing error value handling for numeric functions. Refactored hierarchy.
........
  r693990 | josh | 2008-09-10 22:21:28 +0100 (Wed, 10 Sep 2008) | 1 line
  
  Refactored hierarchy of MultiOperandNumericFunction. Fixed error value handling.  Enabled error value check in TestFormulasFromSpreadsheet
........
  r694050 | josh | 2008-09-10 23:43:30 +0100 (Wed, 10 Sep 2008) | 1 line
  
  Refactored finance functions.
........
  r694065 | josh | 2008-09-11 00:37:22 +0100 (Thu, 11 Sep 2008) | 1 line
  
  fixed special cases of MODE function
........
  r694153 | josh | 2008-09-11 08:16:20 +0100 (Thu, 11 Sep 2008) | 1 line
  
  Refactoring MultiOperandNumericFunction - removed Ref2DEval.
........
  r694534 | josh | 2008-09-12 00:18:50 +0100 (Fri, 12 Sep 2008) | 1 line
  
  Fix for bug 45639 - cleaned up index logic inside ColumnInfoRecordsAggregate
........
  r694615 | josh | 2008-09-12 07:14:07 +0100 (Fri, 12 Sep 2008) | 1 line
  
  small tweak to unit test which was silently creating UnknownPtgs 
........
  r694619 | josh | 2008-09-12 07:58:52 +0100 (Fri, 12 Sep 2008) | 1 line
  
  Removed trailing comma from output of HexDump.toHex()
........
  r694620 | josh | 2008-09-12 08:03:00 +0100 (Fri, 12 Sep 2008) | 1 line
  
  clarification of ArrayPtg size increment
........
  r694631 | josh | 2008-09-12 08:43:20 +0100 (Fri, 12 Sep 2008) | 1 line
  
  Extended support for cached results of formula cells
........
  r694643 | josh | 2008-09-12 09:18:54 +0100 (Fri, 12 Sep 2008) | 2 lines
  
  Made HSSFFormulaEvaluator no longer require initialisation with sheet or row.
........
  r694877 | josh | 2008-09-13 06:14:26 +0100 (Sat, 13 Sep 2008) | 1 line
  
  Refactored TextFunctions. Some minor fixes - test cases added.
........
  r694881 | josh | 2008-09-13 06:43:41 +0100 (Sat, 13 Sep 2008) | 1 line
  
  Added toString methods formatAsString to CellValue. Changed deprecation on CellValue.getRichTextStringValue
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@694947 13f79535-47bb-0310-9956-ffa450edef68
2008-09-13 13:48:27 +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