Commit Graph

850 Commits

Author SHA1 Message Date
Uwe Schindler bb7a24769a Merged revision(s) 1617849 from poi/trunk:
More cleanups for bug #56814 and some more external entity leaks of #56164

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/REL_3_10_BRANCH@1617854 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 23:13:43 +00:00
Uwe Schindler 5e40f3cfc3 Merged revision(s) 1617453 from poi/trunk:
Add some extra safety test to check that external entities are not loaded by xmlbeans

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/REL_3_10_BRANCH@1617455 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 11:36:02 +00:00
Uwe Schindler f538bf1587 Redefine constant for secure processing, because it missing is stupid stax-api.jar and Java 5 itsself.
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/REL_3_10_BRANCH@1617109 13f79535-47bb-0310-9956-ffa450edef68
2014-08-10 14:29:45 +00:00
Uwe Schindler 103b45073c Merged revision(s) 1569991, 1615720, 1615731, 1615780-1615781, 1615893, 1589759 from poi/trunk:
Apply suggestions from Uwe Schindler for more secure xml defaults for #54764 and #56164, for xml parsers which support them
........
Add another test file for #54764, and a test that uses it
........
Change the default XMLBeans version used for running to be 2.6, leave 2.3 for compiling the schemas (for maximum compatibility)
........
Before parsing an OOXML document, reset the xmlbeans sax parser to avoid the risk of getting one in an error state (due to XMLBEANS-512). Should be a minimal extra overhead pending a proper fix. Allows us to finish enabling the unit tests for #54764
........
Correct xmlbeans 2.6 url

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/REL_3_10_BRANCH@1616509 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 15:25:17 +00:00
Andreas Beeker bd3cd2243e TreeSet without JDK 6 method usages
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1561511 13f79535-47bb-0310-9956-ffa450edef68
2014-01-26 16:26:59 +00:00
Andreas Beeker e790281425 This patch is not working as of license incompatibility - see http://www.apache.org/licenses/GPL-compatibility.html
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1561507 13f79535-47bb-0310-9956-ffa450edef68
2014-01-26 15:38:11 +00:00
Andreas Beeker 6f6c6cda34 As Jdk 1.5 doesn't provide NavigableMap/Set classes of JDK 1.6, we temporarily use the open jdk classes instead, until POI has switched to JDK 1.6
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1561500 13f79535-47bb-0310-9956-ffa450edef68
2014-01-26 15:01:12 +00:00
Andreas Beeker 30d9106d9a - Bug 51585 - WorkbookFactory.create() hangs when creating a workbook
- adapted relevant test-classes to Junit4 to support timeout handling
- tab / space cleanup

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1561435 13f79535-47bb-0310-9956-ffa450edef68
2014-01-26 02:18:53 +00:00
Andreas Beeker 439ad29071 Added license headers
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1559297 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 00:38:04 +00:00
Andreas Beeker 1eba8faedb Bug 35897 - Password protected files
+ Junit4 modifications, needed for expected exceptions

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1557281 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 23:14:03 +00:00
Dominik Stadler d714d0da65 Bug 55723: Make HSSFSheet.setAutoFilter() behave equal to XSSF, also make XSSF work when setAutoFilter is called multiple times
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1554688 13f79535-47bb-0310-9956-ffa450edef68
2014-01-01 22:15:44 +00:00
Dominik Stadler 5e77641784 remove some unused imports and some useless TODOs, slightly more
coverage, @Overrides, more info on failing test, fix some Eclipse
warnings

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1554535 13f79535-47bb-0310-9956-ffa450edef68
2013-12-31 15:12:30 +00:00
Dominik Stadler 1e4c1770d7 Bug 51158: clear out Memory-based part before writing to it,
except for PictureData items, which keep the original image
data in the Part-object directly.
Add reproducer-unit tests and enhance some related unit tests

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553525 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 17:55:36 +00:00
Dominik Stadler f8969e8d83 Remove unnecessary separate length, an array already has one
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553522 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 17:54:49 +00:00
Dominik Stadler aaa4029cd5 Remove unused members and make others private
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553464 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 09:31:25 +00:00
Andreas Beeker 2788aca235 javadoc and compiler warning house-keeping
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553428 13f79535-47bb-0310-9956-ffa450edef68
2013-12-25 23:24:04 +00:00
Andreas Beeker 3ccd728544 javadoc house-keeping
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553422 13f79535-47bb-0310-9956-ffa450edef68
2013-12-25 22:18:53 +00:00
kiwiwings 3a36da330a JCE policy fix
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553342 13f79535-47bb-0310-9956-ffa450edef68
2013-12-25 01:04:29 +00:00
kiwiwings 82958a11cb Fix jdk-differences for encryption patch
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553340 13f79535-47bb-0310-9956-ffa450edef68
2013-12-24 23:55:17 +00:00
kiwiwings ad9cecae59 Patch for Bug/Enhancement 55818 - add encryption support
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553336 13f79535-47bb-0310-9956-ffa450edef68
2013-12-24 23:13:21 +00:00
Nick Burch 01378c8acc Don't use the degree symbol in comments, as it upsets the compiler, and causes the javadoc tool to error. Use the word degrees instead, much safer
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1550351 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 05:29:11 +00:00
Dominik Stadler 76c0cfc2c9 Refactor XSSFExportToXml a bit, split code into more methods
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1549008 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 08:39:10 +00:00
Dominik Stadler 2a08a1dd10 Bug 55850: fix NullPointerException during extraction from XSSF
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1549007 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 08:35:20 +00:00
Dominik Stadler 18f9a3e88e Bug 55640, added reproducer, a fix for the Exception cases and some verify-tests to ensure future
changes are checked via unit tests. There might be more work pending to
make grouping fully work the same way as Excel does.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1547153 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:14:03 +00:00
Dominik Stadler 5511c6dbcc Bug 55745: fix handling of tables in XSSF if there are comments as well, add testcase which was committed to the wrong tag
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1546458 13f79535-47bb-0310-9956-ffa450edef68
2013-11-28 21:19:34 +00:00
Dominik Stadler 6618473e64 Bug 55745: fix handling of tables in XSSF if there are comments as well, there is not much sense in leaving the loop on the first instance of comment table and skipping all the other tables.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1546385 13f79535-47bb-0310-9956-ffa450edef68
2013-11-28 15:15:59 +00:00
Cédric Walter 73ee268e56 Bug 55768: added Line charts support and setting axis tick marks, title
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1544628 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:26:11 +00:00
Cédric Walter e9b8faa748 Bug 54676: added new chart axis type: Category axis
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1544612 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 17:45:00 +00:00
Nick Burch 44c9f41cc9 Patch from Andreas Beeker from bug #53475 - Switch XWPF test to JUnit 4, so that we can skip one part of the tests if the JVM doesn't support larger keys
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1544121 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 11:18:23 +00:00
Nick Burch d1118ce0d5 Patch from Andreas Beeker from bug #53475 - further OOXML Encryption support, covering more ciphers
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1541009 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 11:37:45 +00:00
Nick Burch e2e04b0ebc Fix whitespace
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1541005 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 11:32:10 +00:00
Nick Burch 16eb9990bc More JavaDoc tweaks, and suppress deprecated warnings where these are expected
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1540989 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 09:55:46 +00:00
Nick Burch c6dde74f4f Consistent indenting, based on current POI style guide
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1540987 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 09:53:57 +00:00
Nick Burch 381cc611d7 Fix some JavaDocs, and add a generic constructor based on ZipEntrySource
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1540986 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 09:51:13 +00:00
Nick Burch 6780a911e2 Reduce duplication by replacing lots of deprecated methods with calls to their replacement (which is basically the same code anyway)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1540878 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 23:08:36 +00:00
Nick Burch 0457300fdf Try to make a few OPCPackage error messages more helpful, and slightly reform the configure code block to make it hopefully easier to read
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1540877 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 23:03:00 +00:00
Yegor Kozlov 9b3a2ccb82 Patch 53176 - Fixed auto shapes render problem in pptx files
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1540290 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 11:32:55 +00:00
Nick Burch 4ae76ffddc Unit tests for Shrink To Fit cell style support (#55661)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1539850 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 22:39:11 +00:00
Nick Burch c6177274af Start on HSSF/XSSF Shrink To Fit support, see bug #55661
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1539848 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 22:28:06 +00:00
Nick Burch f7b44f5e9f Patch from Andreas Beeker from bug #53475 - CSPName may not always be present on OOXML encrypted documents, plus test
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1539828 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 21:29:14 +00:00
Cédric Walter 3976993fda Bug 54696: Add overlay setting to ChartLegend
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1539169 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 22:35:54 +00:00
Nick Burch a6b301e485 Fix bug #55733 - XWPFWordExtractor need
s to handle .docx files with neither headers nor footers

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1538044 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 19:43:46 +00:00
Dominik Stadler d08ab9dc0d Slightly more test-coverage in HSSFSheet/XSSFSheet/SXSSFSheet and fix some Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1537331 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 22:26:13 +00:00
Dominik Stadler 0342f9602d Add reproducer tests for Bug 53515, disabled as we do not fix any of the
reported issues. Also fix some Ecliipse warnings.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1535959 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 10:05:24 +00:00
Dominik Stadler 5644fcbaa0 Bug 49940: Apply patch to avoid XmlValueDisconnectedException when
saving a file twice and enable reproducing unit test

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1535938 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 07:31:47 +00:00
Dominik Stadler 5ad89d96b6 Fix some Eclipse warnings, remove trailing whitespaces
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1535517 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 19:58:19 +00:00
Nick Burch b646166b6c Have HSSFWorkbook check for an encrypted .xlsx file when opening, and give a helpful error if found, plus tests. Fixes #55692
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1534967 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 09:43:28 +00:00
Nick Burch 5ac455fd72 Patch from bug #55650 from Andrej - Avoid AIOOBE if a non-existant Xfs is requested for a styleAvoid AIOOBE if a non-existant Xfs is requested for a style
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1534818 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 22:04:16 +00:00
Dominik Stadler 1bf79ee0cf Bug 55369: Add support for collapsing rows in SXSSF
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1533932 13f79535-47bb-0310-9956-ffa450edef68
2013-10-20 18:04:08 +00:00
Dominik Stadler 3b4538cfb4 Bug 55658: don't fail in SXSSF if a numeric cell is overwritten with a string
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1532873 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 19:47:21 +00:00