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
1,050 Commits 14 Branches 14 Tags 22 MiB
ab49033479
Commit Graph

759 Commits

Author SHA1 Message Date
MarkBaker
134bd0fda6 Feature - New methods added for testing cell status within merge groups 2014-07-24 22:50:53 +01:00
MarkBaker
dff9880582 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-07-22 23:48:52 +01:00
MarkBaker
9065cab60c DOMDocument not domDocument 2014-07-22 23:48:32 +01:00
matteofilippetto
38ff5a49f8 again division by zero 
$this->_width and $this->_height are defined as float so !== will return TRUE also if the value is 0 ( as !== use OR )
 2014-07-22 17:40:31 +02:00
Yves Maerschalck
0787e56d41 XML External Entity (XXE) Processing 
https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing

change simplexml_load_file to
simplexml_load_string(file_get_contents()) because load_file doesn't
work when
http://php.net/manual/en/function.libxml-disable-entity-loader.php is
true
 2014-07-16 09:28:33 +02:00
MarkBaker
87be8d3d8e Bugfix to ensure that current cell is maintained when executing formula calculations 2014-07-15 23:33:06 +01:00
MarkBaker
c6d0a4d3d0 Additional divide by zero handling 2014-07-14 23:45:46 +01:00
Mark Baker
311d03b4c3 Merge pull request #329 from sarciszewski/patch-2 
Update BaseDrawing.php
 2014-07-14 23:37:03 +01:00
Mark Baker
b21fdba7ea Merge pull request #389 from CQD/develop 
Add Mac CJK codepage definition.
 2014-07-14 23:12:05 +01:00
Mark Baker
abd0db5ba7 Merge pull request #403 from frost-nzcr4/ft-157-ODF-comments 
ODS read/write comments in the cell
 2014-07-14 23:04:21 +01:00
Mark Baker
0e14e41299 Merge pull request #397 from goncons/develop 
Open Document cell with not numeric formula
 2014-07-14 23:01:13 +01:00
Mark Baker
11f906d932 Merge pull request #404 from WiktrzGE/develop 
--Added 3 new classes: PHPExcel_Chart_Axis, PHPExcel_Chart_GridLines, PH...
 2014-07-14 22:52:17 +01:00
Wiktor
568038c5bf --Added 3 new classes: PHPExcel_Chart_Axis, PHPExcel_Chart_GridLines, PHPExcel_Chart_Properties.php 
--Modified Chart.php and Writer/Excel2007/Chart.php for using new classes
--Now it is possible to set some (most of existing) options of Axis, Major Grid-lines and Minor Grid-lines
--No need to use that feature
 2014-07-14 16:59:53 +02:00
Alexander Pervakov
524c093895 Fix reader when comment within text:p element 2014-07-14 17:55:46 +04:00
Alexander Pervakov
a81a7da661 Add cell comment 2014-07-14 17:55:46 +04:00
goncons
d03ffd6776 Open Document cell with not numeric formula 
Trying to write a Open Document with non numeric formula in a cell this exception was generated:
"XMLWriter::writeAttribute() expects parameter 2 to be string, array given"
The problem was that writer was using
PHPExcel_Calculation::getInstance()->calculateCellValue($cell);
instead of
$cell->getCalculatedValue();
 2014-07-06 18:48:07 -04:30
MarkBaker
59ef7c3325 Don't cache column width adjustment, because it should be based on the font size being used for a cell, and so should be dynamic 2014-07-03 01:01:39 +01:00
MarkBaker
ddec5e9706 Improve speed of calculation for autosize columns to reduce save time 2014-07-03 00:43:29 +01:00
CQD
ae2e4c9a01 Add MAC CJK codepage 
Refering to 
http://msdn.microsoft.com/en-us/library/system.text.encodinginfo.codepage%28v=vs.110%29.aspx
 2014-06-23 14:18:48 +08:00
CQD
05dbc90392 Code formating 2014-06-23 14:13:27 +08:00
CQD
0ff99cb6ab Code formating 2014-06-23 14:10:09 +08:00
Progi1984
78a065754d Merge pull request #387 from trxndynamics/develop 
Minor Docblock update: corrected the return value from PHPExcel_Shared_Date::ExcelToPHPObject updated to reflect the PHP DateTime object that is to be returned.
 2014-06-15 21:26:15 +02:00
Martin Evans
487888414a Minor Docblock update: corrected the return value from PHPExcel_Shared_Date::ExcelToPHPObject updated to reflect the PHP DateTime object that is to be returned. 2014-06-15 18:05:51 +01:00
Mark Baker
a396ec09bb Merge pull request #383 from alex-ception/develop 
Fixed bug on jpgraph dependencies
 2014-06-14 10:33:56 +01:00
Martin Evans
a6672451a5 Minor Docblock update: return values on load function for PHPExcel_Reader_IReader and Excel2007 now listed as @return PHPExcel in order to utilize auto complete via IDE. 2014-06-12 09:20:16 +01:00
Mark Baker
b2da39fc5d Merge pull request #367 from januarsiregar/develop 
change sequential validation for orientation dompdf
 2014-06-08 18:00:25 +01:00
Mark Baker
afb0101a32 Merge pull request #349 from luxbet/poisson_fix 
Allow value of 0 to be passed into POISSON formula
 2014-06-08 17:57:42 +01:00
Mark Baker
5c708feba8 Merge pull request #378 from frost-nzcr4/ft-157-ODF 
Add basic ODS writing functionality
 2014-06-08 17:52:35 +01:00
Mark Baker
cef1b274cd Merge pull request #352 from ke20/patch-1 
Bug "Undefined variable: options"
 2014-06-08 17:48:36 +01:00
MarkBaker
4935236f7b Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-06-06 23:57:40 +01:00
MarkBaker
5ab877958f Reduce memory usage after an xls load 2014-06-06 23:56:57 +01:00
Alexandre ANDRÉ
f5c0d0a3fd Fixed bug on jpgraph dependencies (It's suggested to use composer jpgraph/jpgraph instead of requiring these files) 2014-06-06 15:56:40 +02:00
Shawn Welch
5569c92449 Invalid Index 
This happened when I tried to load an Excel doc that was exported by Google Docs. I'm guessing there is no author information or something? I dunno but this fixed worked.
 2014-05-30 16:46:44 -04:00
Alexander Pervakov
a6f00db9c6 Change the getter/setter for zeroHeight to camel case 2014-05-30 14:37:11 +04:00
Alexander Pervakov
f51ed2c709 Implements basic writing functionality 2014-05-30 11:57:39 +04:00
Alexander Pervakov
2376bef3c2 Implement empty ODF archive 
Work item CP1930, GH-157
 2014-05-30 11:57:24 +04:00
Travis Paul
08c1f4b19a Prevent autoload clash when previous code has used spl_autoload_register 2014-05-14 16:31:09 -04:00
januar
6d72423579 change sequential validation for orientation dompdf 2014-05-10 18:24:51 +07:00
Kevin Auvinet
9a38a531da Bug "Undefined variable: options" 
There is a bug for the var `$option`:

    Notice: Undefined variable: options in [...]/vendor/phpoffice/phpexcel/Classes/PHPExcel/Settings.php on line 384

This bug is fixed with `self::$_libXmlLoaderOptions == (LIBXML_DTDLOAD | LIBXML_DTDATTR)` instead of `$options == (LIBXML_DTDLOAD | LIBXML_DTDATTR)`
 2014-04-15 15:07:06 +02:00
Bobby Sciacchitano
83e024da99 Allow value of 0 to be passed into POISSON formula 2014-04-08 11:52:02 +10:00
MarkBaker
c2a277c447 DocBlock updates 2014-04-03 17:59:47 +01:00
Mark Baker
b4a4062a5d GH-343 Error with PCLZip temporary directory 2014-03-29 00:06:50 +00:00
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