Commit Graph

693 Commits

Author SHA1 Message Date
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 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
nicoder ff6643f627 fix typo in phpdoc 2013-01-30 10:55:16 +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 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
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 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