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

739 Commits

Author SHA1 Message Date
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