RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-29 16:56:03 +03:00
Code Issues Projects Releases Wiki Activity
992 Commits 14 Branches 14 Tags 22 MiB
983843d50c
Commit Graph

717 Commits

Author SHA1 Message Date
Mark Baker
6a057497d7 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-03-29 00:00:14 +00:00
Mark Baker
0042e47c0b GH-347 Using $this in static context in Calculation engine 2014-03-28 23:59:38 +00:00
gondo
eb768751c6 removed unnecessary break 2014-03-28 22:53:04 +01:00
André Tannús
557ca47a6b Fixes html entities to prevent parsing error of generated documentation. 
The html output contained "<style> and </style>" which causes a parse
error on stricter html validators. The solution was to swap < and > for
the equivalent html entities &lt; and &gt; respectivelly.

Signed-off-by: André Tannús <atannus@epungo.com.br>
 2014-03-05 18:42:30 -03:00
Scott Arciszewski
be24d5d30f Update BaseDrawing.php 
Avoid division by zero
 2014-02-25 16:20:43 -05:00
Scott Arciszewski
758f48baac Update Excel2007.php 
Fix output corruption
 2014-02-24 11:34:08 -05:00
Mark Baker
0322690991 Merge pull request #305 from PowerKiKi/fix_SUMIF_condition_including_double_quote 
Double quote support for SUMIF() condition
 2014-02-23 16:02:10 +00:00
Mark Baker
e892215970 Bugfix: Work item GH321, GH158, CP17824 - LibreOffice created XLSX files results in an empty file. 
Bugfix: Work item CP20760 - Formula references to cell on another sheet in ODS files
 2014-02-23 15:35:05 +00:00
Mark Baker
2caeb22122 Bugfix: Work item CP20760 - Formula references to cell on another sheet in ODS files 2014-02-22 12:30:36 +00:00
Mark Baker
8f265a9342 Added XXE protection to HTML Reader 2014-02-21 11:08:57 +00:00
Mark Baker
6c8884b2eb Hopefully final tweak for XXE to prevent displaying errors if SimpleXML isn't available 2014-02-21 10:28:17 +00:00
Maarten Balliauw
81c1c55149 Merge pull request #323 from maartenba/develop 
When libxmlloader options are the default values, disable the entity loader as well. CVE-2014-2054 by MITRE
 2014-02-21 11:07:35 +01:00
Maarten Balliauw
fdc4532bc7 When libxmlloader options are teh default values, disable the entity loader as well. CVE-2014-2054 by MITRE 2014-02-21 11:06:44 +01:00
Mark Baker
1abf061df3 AS we're using simpleXML for xml reading still, we need to use libxml_disable_entity_loader(true); for XXE security patch 2014-02-21 10:01:44 +00:00
Maarten Balliauw
1dad681142 Disabled libxml external entity loading by default. 
If you want to allow loading external entity references in XML, call PHPExcel_Settings::setLibXmlLoaderOptions(0).
 2014-02-21 09:23:55 +01:00
Mark Baker
220da7485e Bugfix: Work item CP20703 - Calculation engine incorrectly evaluates empty cells as #VALUE 2014-02-09 16:08:17 +00:00
Adrien Crivelli
a0da3e32ec Double quote support for SUMIF() condition 
SUMIF() condition can have double quote, such as '=SUMIF(A2:A4,">""",B2:B4)'.
This formula purpose is to compare the character double quote (").

In our previous patch (commit f1a1f525) we wrongly assumed that
PHPExcel_Calculation_MathTrig::SUMIF() expected the condition to escaped ('>""'),
but this is actually not the case in real use of PHPExcel, so the unit tests were
modified accordingly to use non-escaped condition ('>"').
 2014-01-17 21:01:57 +09:00
Mark Baker
496b76e70a Bugfix: Work Item CP20604 - Adding Sheet to Workbook Bug 2014-01-08 10:15:07 +00:00
Mark Baker
992aee683a Update to copyright year in file headers 2013-12-31 18:36:33 +00:00
Mark Baker
93b3b8eed2 Bugfix: Work Item GH-290 - AdvancedValueBinder "Division by zero"-error 2013-12-31 01:13:06 +00:00
Mark Baker
4a18c9cf58 Merge pull request #279 from EliuFlorez/patch-1 
Update Calculation.php
 2013-12-30 16:04:26 -08:00
Mark Baker
dc97d2f46b Improve fluent interface in charting methods 2013-12-30 23:44:42 +00:00
Mark Baker
8cd6f56fdd Bugfix: (Jazzo) Work Item GH-248 - Excel2007 does not correctly mark rows as hidden 2013-12-30 22:19:05 +00:00
Mark Baker
2bcaa01ecc Bugfix: Work Item GH-193 - Fix to empty worksheet garbage collection when using cell caching 2013-12-29 23:48:42 +00:00
Mark Baker
30070f35c2 Bugfix: Work Item GH-257 - Passing an array of cells to _generateRow() in the HTML/PDF Writer causes caching problems with last cell in the range 2013-12-28 13:40:24 +00:00
Mark Baker
56eae54a4b Minor fix to chart layout 2013-12-23 08:13:12 +00:00
Mark Baker
fcb794e2e2 Bugfix: Work Item GH-275 - Insert New Row/Column Before is not correctly updating formula references 2013-12-09 23:45:45 +00:00
Mark Baker
e79181cb4d Bugfix: Work Item GH-275 - Insert New Row/Column Before is not correctly updating formula references 2013-12-09 22:33:45 +00:00
Eliu Florez
b9907446a3 Update Calculation.php 
PHPExcel Fatal error: Call to a member function cellExists() line: 3327
 2013-12-04 22:46:55 -04:30
Mark Baker
7a90c5b888 Mods to handle encrypted files on both 32-bit and 64-bit versions of PHP - currently only tested on 32-bit Windows 2013-12-03 13:51:40 +00:00
Mark Baker
9f93cab6c5 Merge pull request #276 from infojunkie/OOCalcReaderXML 
Convert properties to string in OOCalc reader
 2013-12-01 03:34:54 -08:00
Mark Baker
c7a6431e09 Feature: (trvrnrth) Work Item GH-261 - Add support for reading protected (RC4 encrypted) .xls files (tweaked for PHP 5.2 compatibility) 2013-11-28 23:43:57 +00:00
infojunkie
b671d8376f Convert properties to string in OOCalc reader 2013-11-25 16:18:46 -08:00
Mark Baker
56c9d079d1 Merge pull request #270 from PowerKiKi/issue_31 
Binary comparaison of strings are case insensitive
 2013-11-23 13:36:16 -08:00
Adrien Crivelli
5d6687b6ce ISTEXT() return wrong result if referencing an empty but formatted cell 
ISTEXT should always return FALSE for empty cells, however PHPExcel returns
TRUE if the cell is formatted. This can be reproduced in Excel by choosing
formatting category "Text" for cell A1, and then in cell B1 input the
formula '=ISTEXT(A1)'. B1 will display FALSE, but PHPExcel will return TRUE.

This patch fix the NULL value being incorrectly cast to an empty string, and
thus eliminating ISTEXT() issue (and probably several others).
 2013-11-22 19:33:56 +09:00
Adrien Crivelli
f2e24ecdd4 Comparison operators on strings are usually case insensitive 
Excel, Gnumeric and Google Spreadsheet are case insensitive, so the
default behavior of PHPExcel is modified accordingly.

However OpenOffice is case sensitive and is also supported via the
compatibility mode of PHPExcel.

Fixes #31
 2013-11-21 16:04:59 +09:00
bolovincev
f505648ec5 Update Worksheet.php getStyleByColumnAndRow() 
http://phpexcel.codeplex.com/discussions/263626

$objPHPExcel->getActiveSheet()->getStyleByColumnAndRow(1, 2, 5, 2)->applyFromArray($styleArray);

It is very convenient in cycles
 2013-11-19 22:51:11 +03:00
Mark Baker
f5bd6dc0f2 Bugfix: (IndrekHaav) Work Item CP16208 - Fixed undefined variable error due to $styleArray being used before it's initialised 2013-11-18 14:28:22 +00:00
Mark Baker
9c6287a323 Bugfix: (IndrekHaav) Work Item GH-212 - Fix for formulae that reference a sheet whose name begins with a digit: 
these were erroneously identified as numeric values, causing the parser to throw an undefined variable error.
 2013-11-18 14:20:37 +00:00
Mark Baker
30459d260d General: (RomanSyroeshko) GB-265 - PHPExcel_Shared_String.IsUTF8 returns FALSE for Cyrillic UTF-8 input 2013-11-18 08:00:49 +00:00
Mark Baker
f3755a0965 Documentation fix: (PowerKiKi) GH-224 - Minor fix in DocBlock 2013-11-17 19:43:47 +00:00
Mark Baker
4eefabf7a0 Modify OOCalc reader to work with PCLZip rather than ZipArchive if configured to do so 2013-11-17 17:45:21 +00:00
Mark Baker
0d8a5d1f0b General: (adamriyadi) Work Item GH-247 - Modify PHPExcel_Reader_Excel2007 to use zipClass from PHPExcel_Settings::getZipClass() 
This allows the use of PCLZip when reading for people that don't have access to ZipArchive
 2013-11-17 17:33:56 +00:00
Mark Baker
7fb98dbcd5 Fix to new PCLZip wrapper locateName() method 2013-11-17 14:15:22 +00:00
Mark Baker
51a1661c79 Feature: (adamriyadi) GH-247 - Add locateName() and getFromName() to PHPExcel_Shared_ZipArchive 2013-11-17 13:09:11 +00:00
Mark Baker
732cb11e0c Feature: (LWol) Work Item GH-252 - Adding support for macros, Ribbon in Excel 2007 2013-11-17 00:11:45 +00:00
Mark Baker
fe84015077 On the chance that a cell doesn't have a defined style but it's still trying to be formatted 2013-11-16 10:38:30 +00:00
Mark Baker
968bfef0a2 Bugfix: When duplicating conditional styles, styles shifted by one column to the right 2013-11-15 19:24:51 +00:00
Gemorroj
df592cc7c4 When duplicating styles, styles shifted by one column to the right. 
PHPExcel_Cell::rangeBoundaries -> PHPExcel_Cell::columnIndexFromString (Column index (base 1 !!!))
PHPExcel_Cell::stringFromColumnIndex Column index (base 0 !!!)
 2013-11-15 12:29:21 +03:00
Mark Baker
74f8efc1f8 Modified getHighest calls for row/column at Worksheet level to accept optional column/row arguments 2013-11-09 10:21:54 +00:00
Mark Baker
13a98ef631 General: (dresenhista) Work Item GH-242 - Functionality to getHighestRow() for a specified column, and getHighestColumn() for a specified row 2013-11-09 00:40:59 +00:00
Mark Baker
23c1b6c597 Merge pull request #267 from RomanSyroeshko/PHPExcel#258 
CHOOSE() returns "#VALUE!" if the 1st entry is chosen
 2013-11-08 11:43:14 -08:00
Mark Baker
2bd1c10b21 Further fix to regexp for preventing update of absolute rows when adjusting row references 2013-11-07 23:24:04 +00:00
Mark Baker
94a1a69373 Bugfix: Work item 20397 - Serious bug in absolute cell reference used in shared formula 
Would also have affected insert/delete column/row
 2013-11-07 23:14:39 +00:00
Roman Syroeshko
ded0f6dc13 https://github.com/PHPOffice/PHPExcel/issues/258 
CHOOSE() returns "#VALUE!" if the 1st entry is chosen
 2013-11-03 21:24:10 -08:00
Mark Baker
f20049c37e Merge pull request #261 from trvrnrth/excel5CryptoRC4 
Add support for reading protected (RC4 encrypted) .xls files
 2013-11-03 14:43:14 -08:00
Mark Baker
8d51b6e90a Merge pull request #228 from PowerKiKi/patch-sumif 
Double quote support for SUMIF()
 2013-10-31 07:03:07 -07:00
Mark Baker
acadff4b7b Merge pull request #256 from trik/develop 
Excel 2007 fail with headers and footers containing multiple images
 2013-10-30 15:01:58 -07:00
Mark Baker
6fd27196f0 Bugfix: (tavoarcila) Work Item GH-259 - Bug fix reading Open Office files 2013-10-30 13:50:40 +00:00
Trevor North
233021529c Implement Excel 5 RC4 stream decryption 
The decryption functions and objects implemented here are are
based on the source of Spreadsheet-ParseExcel:
http://search.cpan.org/~jmcnamara/Spreadsheet-ParseExcel/
 2013-10-29 11:25:36 +00:00
Mark Baker
f86458630f Trap for scientific format masks with "0" or "#" before the "E" 2013-10-28 19:13:59 +00:00
Mark Baker
bff907a1b8 Number format mask test for dates: test for "General" format should be case-insensitive, and scientific format mask shouldn't return a positive for date 2013-10-28 19:05:26 +00:00
Marco Marche
a90b711edd Fixed problem in Excel 2007 reader with headers and footers containing multiple images. All images were substituted with the first one. 2013-10-17 10:50:14 +02:00
Mark Baker
9d22445673 Eliminate some code duplication 2013-10-13 17:09:09 +01:00
Mark Baker
b6e09de195 Fixed silly missing ; typo 2013-10-13 11:54:24 +01:00
Mark Baker
ea18123aea Added an isFormula() method to the cell object 2013-10-13 11:37:00 +01:00
Mark Baker
4f82ad4160 Case-sensitivity fix 2013-10-09 12:48:41 +01:00
Mark Baker
68a0918ceb General: Fix to calculation properties for Excel2007 so that the opening application will only recalculate on load if it's actually required 
General: Modified Excel2007 Writer to default preCalculateFormulas to false
         Note that autosize columns will still recalculate affected formulae internally
 2013-10-04 20:48:15 +01:00
Mark Baker
555a4ab828 In code comments for stock chart improvements 2013-09-15 18:11:48 +01:00
Mark Baker
47f3888664 Fixed rendering of stock charts with jpgraph 2013-09-15 12:44:39 +01:00
Mark Baker
cb5fc9532f Fixes to stock charts 2013-09-14 23:13:17 +01:00
Mark Baker
a11a8da417 Issue 19827 - Unknown codepage: 10008 2013-08-23 09:06:15 +01:00
Mark Baker
29746bb995 General: (cdhutch) Work item 20055 - remove array_shift in ReferenceHelper::insertNewBefore improves column or row delete speed 2013-08-18 12:32:40 +01:00
Mark Baker
44f953b69d Fixes to style duplication 2013-08-15 23:28:51 +01:00
Mark Baker
b726b23411 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2013-08-15 18:13:43 +01:00
Mark Baker
60c9bf391c Excel compatibility mode for CSV Writer 2013-08-15 18:10:29 +01:00
Adrien Crivelli
f1a1f525ea Double quote support for SUMIF() 
SUMIF() should handle double quotes properly in both criteria and
cells values. This is especially useful when we need to compare string
containing themselve double quote(s).
 2013-08-08 12:17:00 +09:00
Mark Baker
2dcff606f7 Merge pull request #216 from nickypn/patch-1 
Bulgarian localisation
 2013-08-07 09:06:05 -07:00
Andreas Scheibleger
2d39be32cb Check whether margin-left is set in excel file when reading 2013-07-23 14:16:40 +02:00
Nikolay Ninkov
d4277abd85 Bulgarian localisation 
Start translation to Bulgarian language.
 2013-07-15 09:28:47 +03:00
Mark Baker
d62615fbeb INDIRECT and OFFSET call to get worksheet rather than cell collection 2013-07-11 08:28:42 +01:00
Mark Baker
509bfd39e2 Added Horizontal FILL alignment for Excel5 and Excel2007 Readers/Writers, and Horizontal DISTRIBUTED alignment for Excel2007 Reader/Writer 2013-07-02 13:13:07 +01:00
Mark Baker
39953ff49f Feature: Added "Quote Prefix" to style settings (Excel2007 Reader and Writer only) 2013-06-25 23:13:13 +01:00
Mark Baker
6cea3bbf7b Minor fix to HTML Reader canRead method (even developers have brainfarts occasionally) 2013-06-21 22:52:29 +01:00
Mark Baker
da7cd71be8 Minor performance tweaks 2013-06-17 12:01:51 +01:00
Mark Baker
98e5ac2b24 Performance improvements 2013-06-17 11:37:29 +01:00
Mark Baker
2296a48349 Merge branch 'develop_1.7.9' of https://github.com/PHPOffice/PHPExcel into develop_1.7.9 2013-06-16 21:35:55 +01:00
Mark Baker
6216d2855c Performance tweaks 2013-06-16 21:35:35 +01:00
Mark Baker
90eff17853 Performance tweaks 2013-06-16 21:34:17 +01:00
Mark Baker
333c811c5e Minor performance tweaks to calculation engine 2013-06-16 16:24:34 +01:00
Mark Baker
a0859fd7d0 Fix to number format masking for scientific notation 2013-06-16 15:13:05 +01:00
Mark Baker
8f7db244de Eliminate unnecessary version checks 2013-06-16 10:26:16 +01:00
Mark Baker
4d92e77d00 Eliminate need for use of money_format() function; various fixes to HLOOKUP, VLOOKUP and DOLLAR functions + unit tests 2013-06-15 12:15:03 +01:00
Mark Baker
dfc74f8b95 Feature: (amerov) - Implementation of the Excel HLOOKUP() function 2013-06-14 23:57:50 +01:00
Mark Baker
2c8bd2471b Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2013-06-10 23:21:48 +01:00
Mark Baker
9a36ddb1a2 Quick bugfix to PDF merge cell styling 2013-06-10 23:20:58 +01:00
Mark Baker
aeec8ef23c Fix to clone worksheet 2013-06-03 22:28:32 +01:00
Mark Baker
f44b412420 Fix to rewind filepointer when testing BOM marker 2013-06-03 13:39:58 +01:00
Mark Baker
7a7634fba6 Only read first 8 bytes of a file when validating, rather than load the entire file into memory at that point 2013-05-24 12:57:42 +01:00
Mark Baker
b880b5ff9d Excel2007 reader wasn't always reading the print_titles properly, fix courtesy of watermark86 2013-05-24 09:29:43 +01:00