RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-25 23:06:03 +03:00
Code Issues Projects Releases Wiki Activity
1,275 Commits 14 Branches 14 Tags 22 MiB
1.8
Commit Graph

907 Commits

Author SHA1 Message Date
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
Mark Baker
de2248d1d4 Fix for SUMIF(), COUNTIF() and related functions if condition references a blank cell, courtesy of watermark86 2013-05-24 09:19:13 +01:00
Mark Baker
9331422a8a SQLite caching - fix error message 2013-05-23 22:34:08 +01:00
Mark Baker
4ac95ac24c GH-186 - sqlite OOP doesn't have a close method, need to use a procedural close 2013-05-23 12:37:02 +01:00
Mark Baker
c17a4a62a3 Improvements to formatting numbers with more complex masks 2013-05-21 18:00:57 +01:00
Mark Baker
9f575aff68 Manual PR merge to remove redundant brackets after throw in 2 files, courtesy of kachkaev 2013-05-15 18:02:24 +01:00
Mark Baker
6a4be7da3c Update to copyright year in file headers, and minor documentation updates 2013-05-14 12:20:28 +01:00
Andreas Heiberg
9a06b8a6fc Removed duplicate declaration of getStyle() 2013-05-11 00:14:19 +02:00
Mark Baker
c6c99bd990 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2013-05-10 20:09:26 +01:00
Mark Baker
04c1608f3f Feature: Added getStyle() method to Cell object 2013-05-10 14:21:23 +01:00
Mark Baker
69dc096fe7 Added getStyle() method to Cell object 2013-05-09 22:28:23 +01:00
Mark Baker
b1c61d1be0 Fix file rewind in SYLK reader 2013-05-07 12:50:42 +01:00
Mark Baker
fd2a3773d8 Refactoring of canRead function in Readers, and minor fixes to Examples and documentation updates 2013-05-06 23:39:49 +01:00
Mark Baker
216ef82a14 Yet more docblock fixes 2013-04-30 12:45:13 +01:00
Mark Baker
c2bbafb4d9 Docblock fixes 2013-04-29 23:09:39 +01:00
Mark Baker
73d2757728 Fix for quoted worksheet names in INDIRECT and OFFSET methods; and Docblock fixes 2013-04-29 22:47:36 +01:00
Mark Baker
9ecce7f009 Minor performance tweak 2013-04-29 00:06:06 +01:00
Mark Baker
91eb758a6d Yet more docblock fixes 2013-04-28 16:02:46 +01:00
Mark Baker
d4e7026c95 docblocks 2013-04-27 23:36:39 +01:00
Gabriel Machado
212b7acc79 Update IWriter.php 
Fixing a typo
 2013-04-27 18:17:14 -03:00
Mark Baker
e9a09c8903 Document blocks 2013-04-27 21:57:30 +01:00
Mark Baker
c660492446 Docblocks 2013-04-27 18:07:12 +01:00
Mark Baker
28f266bbba Docblock comments 2013-04-27 16:02:07 +01:00
Mark Baker
cfdd19e47c Docblock modifications 2013-04-27 14:49:08 +01:00
Mark Baker
8debf76a8a Minor performance tweaks 2013-04-26 12:44:47 +01:00
Mark Baker
8a05ee8896 Added Docblocks for cell address and column sort callback functions 2013-04-26 07:46:50 +01:00
Mark Baker
d96364fda6 PHPDoc blocks 2013-04-25 23:44:15 +01:00
Mark Baker
7f7b520652 Some refactoring of insert/delete row/column reference methods 2013-04-25 17:53:29 +01:00
Mark Baker
db1fcd5cd6 Additional work on GH-161 for Breaks 2013-04-23 17:42:40 +01:00
Mark Baker
097ae1706e Additional work on GH-161 - Fix: Hyperlinks break when removing rows 2013-04-21 16:03:25 +01:00
Mark Baker
ab01a6c6dc Additional work on bugfix GH-161: Hyperlinks break when removing rows 2013-04-20 23:53:25 +01:00
Mark Baker
e76673bcc0 Bugfix: (Shanto) Work item GH-161 - Fix: Hyperlinks break when removing rows 2013-04-20 11:46:20 +01:00
jgilliland
0a09b235ee Close tbody after images and charts 2013-04-16 17:29:19 -05:00
jgilliland
af01842f78 Remove empty row from empty charts and images 2013-04-16 17:27:20 -05:00
Mark Baker
db7b99ac8e Bugfix: (alexgann) Work item GH-154 - Fix merged-cell borders on HTML/PDF output 2013-04-01 17:26:26 +01:00
Mark Baker
663b8a1903 General: Modify cell's getCalculatedValue() method to return the content of RichText objects rather than the RichText object itself 2013-03-29 11:15:36 +00:00
Phill Sparks
0c15e8abb7 Fix Excel5 category 
Update Excel5.php to remove hard-coded "Test result file" category
 2013-03-27 16:12:35 +00:00
Mark Baker
d79bdc5b19 iconv rather than mbstring for convert encoding 2013-03-24 21:56:06 +00:00
Mark Baker
b42d4a353c Fix reference to worksheet/cell collection from cell in isDateTime() 2013-03-20 13:48:25 +00:00
Mark Baker
80e3c46f3a iconv() is more efficient than mb_convert_encoding() 2013-03-16 00:18:38 +00:00
Mark Baker
316f86e03c Docblock comments 2013-03-10 23:15:57 +00:00
Mark Baker
d41e68b919 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2013-03-06 21:39:54 +00:00
Mark Baker
fb16712e13 Some work on page margins for HTML Writer, and initial elements for DomPDF PDF Writer 2013-03-06 21:38:42 +00:00
Mark Baker
5940e40362 Make prepared statements re-usable 2013-03-06 17:43:12 +00:00
Mark Baker
8a97503f17 Bugfix: Add DROP TABLE in destructor for SQLite and SQLite3 cache controllers 2013-03-06 17:19:22 +00:00
Mark Baker
65f6ebf049 Merge branch 'develop' into calcEngine 2013-03-01 21:39:33 +00:00
Mark Baker
6145cf326b Bugfix: (ccorliss) Work item GH-105 - Fixed number format fatal error 2013-03-01 21:38:13 +00:00
Mark Baker
5144932a8b Make consistent use of prepared statements 2013-03-01 13:50:06 +00:00
Mark Baker
e5613be860 Ensure that values returned get getCalculatedValue aren't array values, irrespective of the returnArrayAsType setting 2013-02-28 12:22:10 +00:00
Mark Baker
b15fa68fb5 Merge branch 'develop' into calcEngine 2013-02-28 00:23:20 +00:00
Mark Baker
ae9d9fd758 Add move cell method for SQLite. 
TODO - modify SQLite3 to use parameterised statements consistently throughout
 2013-02-27 23:13:49 +00:00
Mark Baker
4e52db40dd Merge branch 'calcEngine' of https://github.com/PHPOffice/PHPExcel into calcEngine 2013-02-27 20:06:08 +00:00
Mark Baker
429ad59284 Method for moving cells in the cell cache without needing to access the cell itself 
TODO Sqlite cell cache needs equivalent method for updating cache database rather than simply the indexed cache array
 2013-02-27 17:54:45 +00:00
Mark Baker
e47b543c89 Bugfix: Work item GH-80 - "Sheet index is out of bounds." Exception 2013-02-27 12:18:34 +00:00
Dominik Bonsch
7b922bbf77 changed NULL to null 2013-02-21 19:34:41 +01:00
Matthias Laug
6ae1a501c5 Fatal Error on non object in Worksheet.php 
the disconnectCells method is not always fully initialized with the attribute 
_cellCollection, so a check needs to be done. Otherwise a fatal error occurs.
happens if multiple xsl are created from csv file
 2013-02-21 14:35:59 +01:00
Mark Baker
d42361e8bf Correct attachment of cells to cache collection as parent rather than worksheet 2013-02-21 11:44:33 +00:00
Mark Baker
db75c5981a Fixes to Advanced Value Binder for cell restructuring 2013-02-21 11:29:32 +00:00
Mark Baker
76ba3cbcd3 Merge branch 'develop' into calcEngine 2013-02-20 22:28:38 +00:00
Mark Baker
3ea55ce287 Fix for composite charts indexing and ordering for each group 
Added example for generating a composite chart
 2013-02-19 12:23:38 +00:00
Mark Baker
9434700799 Simplify getRed, Green and Blue methods for colour styles 2013-02-17 14:57:42 +00:00
Mark Baker
be5551d29e Refactor the cyclic reference stack as an object so that we can inject it into the logger constructor rather than having to pass it at every call 2013-02-16 10:59:19 +00:00
Mark Baker
3886c47ebe Refactoring of calculation engine using the multiton pattern to eliminate caching issues when working with multiple workbooks 
Refactoring of calculation engine for improved performance and memory usage
Refactoring of cell object to eliminate data duplication and reduce memory
 2013-02-15 15:42:06 +00:00
Mark Baker
6fd6b4d044 Fix PHPExcel object destructor 2013-02-13 13:17:16 +00:00
Mark Baker
5451b63cdc Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into calcEngine 
Conflicts:
	Classes/PHPExcel.php
	Classes/PHPExcel/Worksheet.php
 2013-02-13 09:09:28 +00:00
Mark Baker
245a1dc832 __destroy methods for Excel and Worksheet objects 2013-02-13 09:01:36 +00:00
Mark Baker
b589fab56b Selective calculation cache clearance and adjustment for unsetting or renaming worksheets 2013-02-12 12:44:31 +00:00
Mark Baker
f05f66fa82 Eliminate some code duplication 2013-02-11 14:11:36 +00:00
Dominik Bonsch
4e8dea7883 Merge remote-tracking branch 'origin/experimental' into develop 2013-02-09 12:32:03 +01:00
Dominik Bonsch
49783efbd2 PSR-2 2013-02-09 12:26:15 +01:00
Dominik Bonsch
b9970417c3 PSR-2 2013-02-09 12:24:19 +01:00
Dominik Bonsch
94967a7cf9 PSR-2 2013-02-09 12:18:30 +01:00
Dominik Bonsch
4771c30ef1 PSR-2 2013-02-09 12:17:58 +01:00
Dominik Bonsch
caced1a5be PSR-2 2013-02-09 12:15:01 +01:00
Dominik Bonsch
086d12e7af phpdoc replaced array of by […] 2013-02-09 12:09:28 +01:00
Dominik Bonsch
e250e466f9 PSR-2 2013-02-09 11:55:38 +01:00
Mark Baker
abb076a817 Use direct reference to workbook in Calc Engine rather than cell's parent's parent 2013-02-05 09:52:28 +00:00
Mark Baker
6f4cfcc8c6 Ensure that writers access the workbook rather than the global calculation engine 2013-02-04 23:16:39 +00:00
Mark Baker
1e1a6ac361 Convert singleton calculation engine to multiton 2013-02-04 17:26:27 +00:00
Mark Baker
242f69bb29 Performance tweaks 2013-02-01 13:29:13 +00:00
Mark Baker
3c3e910d74 Performance tweaks and modification to style checking for hh:mm or mm:ss time formats to differentiate correctly from mm months 2013-02-01 12:45:21 +00:00
nicoder
1b96fcc8dd fix typo in comment 2013-02-01 11:48:10 +01:00
Mark Baker
ff12698185 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2013-01-31 12:13:58 +00:00
Mark Baker
9a085abd7d Minor memory and performance improvements 2013-01-31 12:13:31 +00:00
Progi1984
debead542d Merge pull request #136 from nicoder/patch-2 
fix typo in phpdoc
 2013-01-30 02:36:33 -08:00
nicoder
ff6643f627 fix typo in phpdoc 2013-01-30 10:55:16 +01:00
nicoder
2ce7553e28 fix typo in phpdoc 2013-01-30 10:04:04 +01:00
Mark Baker
0baa487442 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2013-01-22 21:43:59 +00:00
Mark Baker
3bd2b89ff6 Bugfix: Work item GH-130 - Single cell print area 2013-01-22 21:43:31 +00:00
Dominik Bonsch
2863152399 Merge branch 'develop' into experimental 2013-01-22 21:21:22 +01:00
Dominik Bonsch
765fba9d4a #131 added a check if the constant IDENTIFIER_OLE allready exists, 
thx to @prolic
 2013-01-22 21:20:32 +01:00
Dominik Bonsch
c3bb8796ab replaced tabs by 4 spaces 2013-01-22 21:06:17 +01:00
Dominik Bonsch
ace1796330 reformated the docblock comments (looked a litle strange after 
replacing the tabs)
 2013-01-22 21:05:13 +01:00
Dominik Bonsch
8ccc3a40a0 replaced tabs by 4 spaces 2013-01-22 20:58:54 +01:00
Dominik Bonsch
b102d52c58 replaced tabs by 4 spaces 2013-01-22 20:56:41 +01:00
Dominik Bonsch
7dbe92b821 Improved the phrasing of the error messages. 2013-01-22 20:43:49 +01:00
Dominik Bonsch
acca05f1cf minor architecture improvement 
- used strtoupper to get rid of case sensitive name checks
  - added "else if", it's not nessecary to check for the second "if", if
the first one was allready true
 2013-01-22 20:39:45 +01:00
Dominik Bonsch
aadc933827 Still improving the out of bounds error messages in the exceptions. 2013-01-22 20:19:06 +01:00
Dominik Bonsch
9926c64314 added the requested index to the out of bounds exception 2013-01-22 20:12:12 +01:00
Dominik Bonsch
756dfad85a added the actual number of sheets in the out of bounds exception 2013-01-22 20:10:01 +01:00
Mark Baker
9de3d5a62b Set correct active sheet when setReadDataOnly(true) and only loading a selection of two or more worksheets rather than all worksheets 2013-01-21 12:56:21 +00:00
Mark Baker
092fc7b5f7 General: (dbonsch) Work item GH-78 - Restructuring of PHPExcel Exceptions 2013-01-15 21:42:28 +00:00
Mark Baker
907ad1ef66 Modify listWorksheetNames() and listWorksheetInfo to use XMLReader with streamed XML rather than SimpleXML 2013-01-13 23:36:04 +00:00
Mark Baker
0ad3f67da6 Initial modifications for XML-based sheet readers to use XMLReader via streaming for large files in the listWorksheetNames() and listWorksheetInfo() methods... still needs some additional work for merged cells to work correctly, but gives a hell of a memory boost and executes more quickly - the same principles will be applied to the core data readers, but that still requires a lot more work. However, when completed, the effort should be worth it for both speed and memory usage, and the code should be a lot cleaner for the core data reader as well 2013-01-12 12:52:00 +00:00
Mark Baker
3d3543cb17 Bugfix: Work item GH-113 - canRead() Error for GoogleDocs ODS files: in ODS files from Google Docs there is no mimetype file 2013-01-03 17:49:56 +00:00
Mark Baker
979aa760c0 Only load list of locale files for calculation engine if setLocale() is explicitly called 2012-12-24 15:32:17 +00:00
Progi1984
da8ec6f86b Fix GH-8 / CP-11704 (Conditional formatting in Excel 5) 2012-12-18 00:46:53 +01:00
Mark Baker
d13ca1f790 Bugfix: Work item GH-104 - echo statements in HTML.php 2012-12-11 21:55:46 +00:00
Mark Baker
62bf1b7a93 Bugfix: (teso) Work item 18551 - Rich Text containing UTF-8 characters creating unreadable content with Excel5 Writer 2012-12-11 17:54:23 +00:00
Mark Baker
487f4b79ec Bugfix: (manual merge from a pull request from amironov) Work item GH-82 - PHPExcel_Worksheet::getCellCollection() may not return last cached cell 2012-11-29 23:57:12 +00:00
Mark Baker
a032194211 Minor style changes, and added timings to Examples 2012-11-28 21:30:58 +00:00
Mark Baker
b98f27f4a7 Performance and memory improvements to Excel5 OLE Reader 
Temporary fix to XML flush until I get it working correctly
Use of PHPExcel_Exception
 2012-11-26 18:01:15 +00:00
Mark Baker
d8debd0966 Minor tweaks and bugfixes 2012-11-25 17:56:27 +00:00
Mark Baker
7760d5ffc6 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2012-11-25 12:27:36 +00:00
Mark Baker
7854955cff Bugfix: Work item 18963 - getSheetNames() fails on numeric (floating point style) names with trailing zeroes 2012-11-25 12:26:48 +00:00
Mark Baker
46b03b62b5 Merge pull request #93 from Slamdunk/hotfix/utf8-bom 
Remove BOM
 2012-11-25 03:30:09 -08:00
Filippo Tessarotto
e525c695dd Fix key dereferencing 2012-11-25 09:01:45 +01:00
Filippo Tessarotto
06132e75b3 Remove BOM 2012-11-25 08:38:57 +01:00
Mark Baker
6bc4199675 Various tweaks and fixes 2012-11-24 22:48:44 +00:00
karak
0fd8af9cd8 add read/write page-break-preview in Excel5 2012-11-22 14:57:47 +09:00
karak
c9610c936f read PageViewLayout 2012-11-22 14:49:55 +09:00
Mark Baker
fd4161dcaa Bugfix: Work item 17976 - Fix to Excel2007 Reader for hyperlinks with an anchor fragment (following a #), otherwise they were treated as sheet references 2012-11-21 10:37:16 +00:00
Mark Baker
91de8c54e4 Modified applyFromArray() method of PHPExcel_Style to use PHPExcel::cellXfExists() call instead of expensive hash test. 2012-11-20 23:55:18 +00:00
Mark Baker
d1ee820c10 Merge pull request #84 from amironov/duplicateStyle-search-by-identity 
Search style by identity in PHPExcel_Worksheet::duplicateStyle()
 2012-11-20 14:57:20 -08:00
Mark Baker
8a967b2996 Bugfix: Work item GH-67 - Cache directory for DiscISAM cache storage cannot be set 2012-11-20 22:25:12 +00:00
Mark Baker
4f070fc349 General: Work items 17936 and 17840 - Fix for environments where there is no access to /tmp but to upload_tmp_dir 
Provided an option to set the sys_get_temp_dir() call to use the upload_tmp_dir; though by default the standard temp directory will still be used
 2012-11-20 21:34:24 +00:00
Andrey Mironov
7884495d5d Use in_array in PHPExcel::cellXfExists() 2012-11-20 01:28:01 +06:00
Andrey Mironov
db2a7cbabf Search style by identity in PHPExcel_Worksheet::duplicateStyle() 2012-11-20 01:28:00 +06:00
Progi1984
9a29129ec7 Fix GH-22 (Support of SheetView in Excel5 Writer) 2012-11-13 23:01:49 +01:00
Progi1984
9f04d888a1 IMPROVED : PHPDoc 2012-11-13 22:58:33 +01:00
Mark Baker
9907ef9030 Remove original JAMA tests 2012-11-09 09:46:36 +00:00
Mark Baker
f2803e8690 Remove JAMA example files 2012-11-09 09:45:37 +00:00
Mark Baker
1f601e0ecf Bugfix: Work item 18844 - cache_in_memory_gzip "eats" last worksheet line, cache_in_memory doesn't 2012-11-09 01:24:44 +00:00
Mark Baker
d2a6b4bc85 Added example using cell caching 2012-11-09 00:57:46 +00:00
Mark Baker
52099aabb2 Use temporary folder for temporary chart images in HTML Writer 2012-11-08 09:29:55 +00:00
Gemorroj
b0d553909a fixed regression f3c4d056ed (L1R621) 
minor phpdoc fixes
 2012-11-08 11:46:54 +03:00
Mark Baker
2d6f3979d9 Test $this->_includeCharts before including charts in HTML Writer 2012-11-07 23:21:18 +00:00
Mark Baker
5a32eee110 z-indexing for charts in HTML Writer 2012-11-07 22:41:44 +00:00
Mark Baker
6934665c1b Additional work on chart functionality for HTML and PDF Writers 
Examples for HTML and PDF chart writing
Various Docblock fixes
 2012-11-07 19:57:25 +00:00
Mark Baker
a33926431d Validate additional booleans attributes in LibreOffice saved xlsx files for 'true'/'false' instead of '1'/'0' 2012-11-07 10:13:45 +00:00
Mark Baker
9c213cc1cb xlsx files written by LibreOffice use "true" and "false" for boolean properties rather than "1" and "0" found in MS Excel generated xlsx files; modify Excel2007 Reader to handle both options 2012-11-07 09:34:31 +00:00
Mark Baker
f3c4d056ed Move UTF-8 StrToUpper(), StrToLower() and StrToTitle() methods from Text Calculation class to Shared String Class 
Doc comments for methods in writer abstract
 2012-11-06 22:53:58 +00:00
Mark Baker
cce77bad0e Cleanup of refactored writers 2012-11-05 23:34:02 +00:00
Mark Baker
59a938c4dd Refactor common writer settings/methods into an abstract writer class 2012-11-05 22:42:58 +00:00
Mark Baker
d50e73f066 Refactor common reader settings/methods into an abstract reader class 2012-11-05 21:23:38 +00:00
Mark Baker
f7268cdd65 Initial (as yet untested) code to include Excel charts in HTML and PDF output 2012-11-05 00:50:21 +00:00
Mark Baker
016ee6e4d8 Some refactoring of PDF renderer wrappers and PDF Writer 2012-11-03 23:44:10 +00:00
Mark Baker
0ad1c8b585 Factor timezone methods to a separate helper class 2012-11-03 21:52:55 +00:00
Mark Baker
53a32ce7f7 Providing support for timezone adjustments in date/time conversion methods 2012-11-02 23:07:01 +00:00
Mark Baker
63c5cbc98e Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2012-10-31 22:01:09 +00:00
Mark Baker
531803a919 Change Writer exceptions to PHPExcel_Writer_Exception 2012-10-31 22:00:40 +00:00
Mark Baker
f4e949e3a1 Merge pull request #63 from alexgann/patch-1 
Fix to cellExists for non-existent namedRanges. Thanks for the catch
 2012-10-30 14:17:01 -07:00
Progi1984
4a76eeb5dd IMPROVED : Encoding UTF-8 for generating PHPDoc 2012-10-30 09:32:49 +01:00
Mark Baker
e0529485b7 Change Reader exceptions to PHPExcel_Reader_Exception 2012-10-29 23:51:09 +00:00
Mark Baker
8f3640e44c Change reader exceptions to PHPExcel_Reader_Exception 2012-10-29 23:48:29 +00:00
Mark Baker
d66f61bfbb Merge pull request #70 from techhead/fix_insertNewBefore 
Fixed formula/formatting bug when removing rows
 2012-10-28 13:57:51 -07:00
Mark Baker
12525c804b Merge pull request #69 from kea/AVB_currency 
Improved AdvancedValueBinder for currency
 2012-10-27 01:35:18 -07:00
Mark Baker
9be433af58 Minor charting fixes 2012-10-27 00:02:38 +01:00
Mark Baker
a3303cd05e Ensure that signature of bindParent() in style class overrides matches the signature of bindParent() in the supervisor 2012-10-26 14:56:58 +01:00
Jonathan Hawkes
f99fc61e0d Fixed formula/formatting bug when removing rows 2012-10-25 09:54:12 -04:00
Mark Baker
45f2829a33 Bugfix: Work item GH-66 - Wrong check for maximum number of rows in Excel5 Writer 2012-10-25 12:57:48 +01:00
Manuel Kea Baldassarri
d1f172d8d6 Improved AdvancedValueBinder for currency. 2012-10-25 12:44:47 +02:00
Mark Baker
701ff5adf1 Upload missing style supervisor 2012-10-24 17:07:55 +01:00
Mark Baker
163a9ca5b9 Refactoring of style classes to use an abstract supervisor 2012-10-23 13:16:30 +01:00
alexgann
4748b88d9c Fix to cellExists for non-existent namedRanges 
Found an issue where cellExists was failing on a non-existent namedRange
as it was flowing down to the coordinateFromString (1217) call.  Proposed
change trusts the REGEXP check and if $namedRange == NULL after all
then simply return false (ie the cell does not exist).
 2012-10-19 13:38:26 -03:00
Marcus Bointon
037c2748f3 Change use of is_a() to use instanceof 
While is_a() is no longer deprecated, there are bound to be some people using PHP versions that still have it marked as deprecated.
This is the only occurrence of is_a in the whole of PHPExcel; everywhere else it's using instanceof, so I figured it would be sensible to make it consistent.
 2012-10-18 17:11:45 +03:00
Mark Baker
b2a26349d4 Bugfix: Work item 18794 - CSV files without a file extension being identified as HTML 2012-10-16 13:39:59 +01:00
Mark Baker
7b8533a504 Minor bugfix to calculation engine formula validation (unbalanced braces) 2012-10-13 22:07:36 +01:00
Mark Baker
e46513043e Fix to X-Axis labels when writing chart DataSeriesValues.php 
Addition of an example for creating a radar chart
 2012-10-13 17:24:11 +01:00
Mark Baker
dfcd839e61 Suppress jpgraph rendered legend if not displayed in Excel; ensure that left or right legends display as single column for each entry 2012-10-10 13:03:14 +01:00
Mark Baker
364f581ee4 Fix to x-axis labels for chart rendering 
Fix to page orientation for DomPDF renderer
 2012-10-10 12:31:05 +01:00
Mark Baker
3f981d84d4 Move calculator token stack class into its own file 2012-10-07 11:31:08 +01:00
Mark Baker
a62b133540 Fix to colour settings in jpgraph renderer and initial version of example code for rendering 
charts as images
 2012-10-07 10:30:15 +01:00
Mark Baker
8900a49d4e Minor bugfixes 2012-10-04 21:48:27 +01:00
Mark Baker
4c88a30abd Feature: Allow call to font setUnderline() for underline format to specify a simple boolean for UNDERLINE_NONE or UNDERLINE_SINGLE 2012-09-25 12:41:25 +01:00
Mark Baker
f2bfda68e9 Fixed the OOCalc Reader that I broke a few days ago 2012-09-24 11:42:20 +01:00
Mark Baker
072dd6f23e Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2012-09-20 00:28:23 +01:00
Mark Baker
660e7e723b Example of creating Pie and Donut charts 
Bugfix: Discard single cell merge ranges when reading (stupid that Excel allows them in the first place)
Bugfix: Discard hidden autoFilter named ranges
 2012-09-20 00:26:49 +01:00
Mark Baker
9f042a8540 Feature: Added fraction tests to advanced value binder 2012-09-18 22:43:09 +01:00
Mark Baker
d7e4aaf80b Data labels for charts 2012-09-17 23:23:55 +01:00
Mark Baker
fb6ad92fd4 Minor bugfixes 2012-09-16 23:28:03 +01:00
Mark Baker
0f5b94daeb Row zeroHeight should default to false 2012-09-14 12:12:15 +01:00
Mark Baker
893086df31 Turkish language pack 2012-09-14 00:52:10 +01:00
Mark Baker
0dac1e1ab5 General: (Raghav1981) ZeroHeight for rows in sheet format 2012-09-09 11:38:32 +01:00
Mark Baker
23fe9937fe Bugfix: Work item 18598 - Cannot access private property PHPExcel_CachedObjectStorageFactory::$_cacheStorageMethod 2012-09-06 23:40:39 +01:00
Mark Baker
f87ca1419d Use class_exists() with FALSE second argument 2012-09-06 22:56:56 +01:00
Mark Baker
9820b46649 Merge pull request #40 from qpautrat/fix-file-exist 
Fix condition on existing file
 2012-09-05 17:12:30 -07:00
Mark Baker
2d6ad66f0c Feature: Excel compatibility option added for writing CSV files 
While Excel 2010 can read CSV files with a simple UTF-8 BOM, Excel2007 and earlier require UTF-16LE encoded tab-separated files.
The new setExcelCompatibility(TRUE) option for the CSV Writer will generate files with this formatting for easy import into Excel2007 and below.
 2012-09-05 14:12:00 +01:00
qpautrat
5af0226a66 Fix condition on existing file 2012-09-05 13:12:51 +02:00
Mark Baker
a376606bd2 - Bugfix: Work item 18425 - Problems with $_activeSheetIndex when decreased below 0. 2012-09-04 12:46:30 +01:00
Mark Baker
13f227c4f2 Additional chart creation examples 2012-09-02 12:06:48 +01:00
Mark Baker
5ed20761c6 Handle custom blank autofilter rule in show/hide 2012-08-29 13:20:33 +01:00
Mark Baker
2f4620c3f9 Improve cloning of worksheet to handle autoFilter area cleanly 2012-08-29 00:24:13 +01:00
Mark Baker
dbe64c5044 New chart examples, and column ordering in autofilter expressions 2012-08-25 14:40:25 +01:00
Mark Baker
e419b92765 Autofilter expressions - TopTen, and minor patches 2012-08-24 23:38:18 +01:00
Mark Baker
ef3ea158e4 Add a couple of test examples for autofilter expressions 2012-08-23 23:40:51 +01:00
Mark Baker
85eabc21aa Various bugfixes including Excel2007 Writer order of font style elements to conform with Excel2003 using compatibility pack 2012-08-23 00:16:40 +01:00
Mark Baker
8c688358ba Elimination of a potential XSS vulnerability in JAMA documentation 
JAMA docs are no longer up-to-date anyway
 2012-08-21 23:15:17 +01:00
Mark Baker
ef2de9cc5e Github Issue #32 - Insert column VS autofilter 2012-08-21 22:32:16 +01:00
Mark Baker
2b91cb0c2c Suppress autofilter row show/hide while diagnostics still in code 2012-08-19 23:59:22 +01:00
Mark Baker
83b8e9dad3 Bugfix: (wolf5x) Work item 18492 - load file failed if the file has no extensionType 2012-08-19 23:57:16 +01:00
Mark Baker
b00f6d4c4c AutoFilter unit tests 2012-08-19 23:17:12 +01:00
Mark Baker
61bc7c8e98 Autofilter show/hide for all dynamic types now complete (still with 
debugs)
 2012-08-19 11:14:34 +01:00
Mark Baker
f9a1267697 Dynamic autofilter show/hide rows for this/next/last 
week/month/quarter/year etc
 2012-08-18 23:41:16 +01:00
Mark Baker
960f5a32a2 Range argument tests with default value in cell range methods, and further 
AutoFilter expression evaluation for dynamic filters
 2012-08-16 22:53:13 +01:00
Mark Baker
bb0d413a67 Fix to dynamic autofilter expression in writer, preventing writing 
blanks="1"
 2012-08-16 00:29:07 +01:00
Mark Baker
83afa87bf3 Fixed broken build after recent autofilter changes 2012-08-15 13:20:34 +01:00
Mark Baker
18920d60c7 Merge pull request #25 from alexgann/patch-2 
Add cell indent to html rendering
 2012-08-13 05:09:42 -07:00
Mark Baker
db1f8c98f0 The bulk of the autofilter expressions work for Excel2007, including 
documentation
 2012-08-13 00:14:51 +01:00
alexgann
dae529615e Add cell indent to html rendering 
Quick one-liner to render cell indents in html as padding. 9px seems to be what Excel uses internally
 2012-08-10 21:34:39 -03:00
unknown
303a6443ed Initial Writer code for autofilter selections 2012-08-09 21:26:33 +01:00