Commit Graph

6307 Commits

Author SHA1 Message Date
Nick Burch a9d73389b6 Icon set / multi-state constants #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691100 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 22:33:05 +00:00
Nick Burch bd45a3b915 More CF colour tests
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691094 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 21:54:28 +00:00
Nick Burch 1596a62368 Start checking the CF colours in the unit tests
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691092 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 21:45:23 +00:00
Nick Burch b2d6118eeb Fix javadoc warnings
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691084 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 21:22:44 +00:00
Nick Burch 13065c6b4c #58138 CF Border colour getters and setters on Color objects as well as shorts
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691083 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 21:19:13 +00:00
Nick Burch da1abea6b9 Support unsetting the XSSF CF pattern colours
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691081 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 21:10:14 +00:00
Nick Burch d7e781d349 #58138 Color object support for HSSF CF borders
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691079 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 20:52:07 +00:00
Nick Burch 6dc77bc7b3 Unset the border formattings when set to 0
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691078 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 20:40:15 +00:00
Nick Burch 8f66417979 Fix inconsistent whitespace/indents
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691076 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 20:37:27 +00:00
Nick Burch 15cece14c2 Prepare HSSFBorderFormatting for #58138
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691075 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 20:36:10 +00:00
Nick Burch 71eeb0c3f8 Cleaner code for checking and casting the Color objects
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691064 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 19:29:18 +00:00
Nick Burch b13c6bf699 Fix inconsistent whitespace/formatting
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691049 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 18:35:04 +00:00
Nick Burch 316abbdabc Provide format-agnostic conditional formatting patter colour getters and setters
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691047 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 18:32:35 +00:00
Nick Burch 9f1cecbdd7 Fix inconsistent whitespace/formatting
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691046 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 18:14:50 +00:00
Nick Burch fbfe65d52d Provide format-agnostic conditional formatting font colour getter and setter
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691045 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 18:05:28 +00:00
Nick Burch 08007fbaad Constant for the Office 2010 Conditional Formatting extensions namespace
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1691015 13f79535-47bb-0310-9956-ffa450edef68
2015-07-14 16:12:40 +00:00
Andreas Beeker 07f40b539d Bug 58133 - Agile encryption - wrong checksum calculation
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690837 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 22:49:59 +00:00
Nick Burch 57fb8da868 Check more of the complex CF cases from the test files
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690813 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 20:25:52 +00:00
Nick Burch de845ceae2 Consistent whitespace/indents
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690809 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 20:12:50 +00:00
Nick Burch 02b090e416 Move some test checks to using ConditionType instead of raw bytes
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690808 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 20:11:47 +00:00
Nick Burch 7d58f2297b Enable CF2007 test for XLSX too
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690805 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 19:56:09 +00:00
Nick Burch d3da8a2ea7 Provide a Conditional Formatting type class, and deprecate the byte-based types, to better work with the wider range
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690803 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 19:47:21 +00:00
Nick Burch 0ae3cb9de0 Have the HSSF ConditionalFormattingTable look for CF12 records as well, and begin more detailed testing of the high level rules #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690796 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:55:42 +00:00
Nick Burch efdadf909f Fix inconsistent indents/whitespace
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690794 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:40:25 +00:00
Nick Burch 00129c4158 Begin updating the HSSF CF code to work on the base types, so it can handle both CF and CF12
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690793 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:38:15 +00:00
Nick Burch 94f52e3edb More clone support
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690791 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:34:50 +00:00
Nick Burch f5ce1eb174 Fix inconsistent indents
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690790 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:28:05 +00:00
Nick Burch 768acdd838 Fix generics, and use base types
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690789 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:27:06 +00:00
Nick Burch 35e6255609 Enable CFRule12 use #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690783 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:09:12 +00:00
Nick Burch d33eaaf645 More helpful output if a re-write test fails
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690780 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 18:00:28 +00:00
Nick Burch 33562b30da CFRule12 tests
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690778 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 17:54:28 +00:00
Nick Burch d3f4225d1a New future record interface, and more CFRule12 toString output
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690773 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 17:32:05 +00:00
Nick Burch cc9d459c30 Allow dumping of null arrays
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690772 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 17:31:04 +00:00
Nick Burch 3a55a386f1 Further CFRule12 parsing
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690742 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 16:07:39 +00:00
Nick Burch ba6335fcee CFRule12 can have standard formats too, so push logic to base class #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690686 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 14:51:36 +00:00
David North 3e36081b87 Add Sheet.getMergedRegions to obtain them all as a list. Implement this for XSSF using "deprecated" methods in XMLBeans which allow the operation to be linear in the number of regions rather than n-squared.
Fixes #57893

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690661 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 13:00:35 +00:00
Dominik Stadler bae4602fa6 Bug 58113: Fix regression: NullPointerException when setting cell value to null
add unit tests which verifies this for all three SS-implementations

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690652 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 12:17:52 +00:00
David North 1c69d7596c Patch from Chris Boyle to add basic support for .xlsm (macro-enabled) workbooks. The binary blob containing the VBA macros may be copied from one such workbook into another.
Fixes #58036

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690593 13f79535-47bb-0310-9956-ffa450edef68
2015-07-13 09:05:17 +00:00
Nick Burch 1646914d22 Template IDs from which CFs can be based
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690534 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 21:34:18 +00:00
Nick Burch 003e2db3f7 Add some more conditional formatted styles in the test workbooks #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690530 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 20:47:32 +00:00
Nick Burch 192d798a0f Refactor some of the CFRuleRecord logic out to CFRuleBase, and begin work on CFRule12Record #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690527 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 20:38:57 +00:00
Nick Burch 5d31aa3a79 Fix formatting/indents/comments
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690512 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 19:28:27 +00:00
Nick Burch 275d551956 Introduce a CFHeaderBase common parent #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690503 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 18:35:33 +00:00
Nick Burch d7666dba2d Update FtrHeader and CFHeader clone/create
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690500 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 18:16:13 +00:00
Nick Burch 0f52d448b0 More whitespace / indent updates
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690497 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 18:06:34 +00:00
Nick Burch d141ffd773 Fix indent/whitespace
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690495 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 18:02:50 +00:00
Nick Burch 239998a88c Start to support CF12 headers for #58130
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690494 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 17:58:27 +00:00
Nick Burch c35e0c1902 Javadocs, and more record names
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690490 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 17:31:54 +00:00
Nick Burch 2b85de98fd Javadoc and comment updates for CFs
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690486 13f79535-47bb-0310-9956-ffa450edef68
2015-07-12 17:06:45 +00:00
Nick Burch 28ca2d4f76 Some new-style conditional formattings, with gradients and icons
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690409 13f79535-47bb-0310-9956-ffa450edef68
2015-07-11 21:26:11 +00:00