[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11861] Merge 11857:11860 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11861] Merge 11857:11860 from trunk |
Date: |
Mon, 24 Mar 2014 17:46:51 +0000 |
Revision: 11861
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11861
Author: sigurdne
Date: 2014-03-24 17:46:51 +0000 (Mon, 24 Mar 2014)
Log Message:
-----------
Merge 11857:11860 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/APC.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/CyclicReferenceStack.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/Logger.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Database.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/DateTime.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Engineering.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Financial.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaParser.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaToken.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Function.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Functions.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Logical.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/LookupRef.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/MathTrig.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Statistical.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/TextData.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Token/Stack.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataType.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataValidation.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/Hyperlink.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/IValueBinder.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeries.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeriesValues.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Layout.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Legend.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/PlotArea.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Title.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Comment.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentProperties.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentSecurity.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/HashTable.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IComparable.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IOFactory.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/NamedRange.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Abstract.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/CSV.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2003XML.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5/Escher.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Gnumeric.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/HTML.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/IReadFilter.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/IReader.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/OOCalc.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/SYLK.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/ReferenceHelper.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/ITextElement.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/Run.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText/TextElement.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/RichText.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Settings.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/CodePage.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Date.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Drawing.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer/SpContainer.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DgContainer.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE/Blip.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher/DggContainer.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Escher.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Excel5.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/File.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/Font.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLERead.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/PasswordHasher.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/String.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/TimeZone.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/XMLWriter.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/ZipArchive.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/ZipStreamWrapper.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/bestFitClass.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/exponentialBestFitClass.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/linearBestFitClass.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/logarithmicBestFitClass.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/polynomialBestFitClass.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/powerBestFitClass.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/trend/trendClass.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Alignment.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Border.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Borders.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Color.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Conditional.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Fill.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Font.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/NumberFormat.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Protection.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Supervisor.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter/Column/Rule.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter/Column.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/AutoFilter.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/BaseDrawing.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/CellIterator.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/ColumnDimension.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Drawing/Shadow.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Drawing.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/HeaderFooter.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/HeaderFooterDrawing.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/MemoryDrawing.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/PageMargins.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/PageSetup.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Protection.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/Row.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/RowDimension.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/RowIterator.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet/SheetView.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Worksheet.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/WorksheetIterator.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Abstract.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/CSV.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Chart.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Comments.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/ContentTypes.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/DocProps.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Drawing.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Rels.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/StringTable.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Style.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Theme.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Workbook.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/Worksheet.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/WriterPart.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/BIFFwriter.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Escher.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Font.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Parser.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Workbook.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Worksheet.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5/Xf.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel5.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/HTML.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/IWriter.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/Core.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/DomPDF.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/mPDF.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF/tcPDF.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/PDF.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/cs/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/cs/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/da/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/da/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/de/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/de/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/en/uk/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/es/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/es/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/fi/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/fi/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/fr/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/fr/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/hu/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/hu/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/it/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/it/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/nl/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/nl/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/no/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/no/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/pl/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/pl/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/pt/br/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/pt/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/ru/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/ru/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/sv/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/tr/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/tr/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/install.txt
branches/Version-1_0-branch/property/inc/class.sorequest.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice2.inc.php
branches/Version-1_0-branch/property/js/portico/ajax_invoice.js
branches/Version-1_0-branch/property/templates/base/invoice2.xsl
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5/MD5.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel5/RC4.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/RelsRibbon.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Excel2007/RelsVBA.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/bg/
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
PHPExcel_Autoloader::Register();
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Autoloader
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/APC.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/APC.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/APC.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_APC extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -61,7 +61,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty && !empty($this->_currentObjectID)) {
$this->_currentObject->detach();
if
(!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime))
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
abstract class PHPExcel_CachedObjectStorage_CacheBase {
@@ -254,23 +254,52 @@
/**
* Get highest worksheet column
*
- * @return string Highest column name
+ * @param string $row Return the highest column for the
specified row,
+ * or the highest column of any row if
no row number is passed
+ * @return string Highest column name
*/
- public function getHighestColumn()
+ public function getHighestColumn($row = null)
{
- $colRow = $this->getHighestRowAndColumn();
- return $colRow['column'];
- }
+ if ($row == null) {
+ $colRow = $this->getHighestRowAndColumn();
+ return $colRow['column'];
+ }
+ $columnList = array(1);
+ foreach ($this->getCellList() as $coord) {
+ sscanf($coord,'%[A-Z]%d', $c, $r);
+ if ($r != $row) {
+ continue;
+ }
+ $columnList[] = PHPExcel_Cell::columnIndexFromString($c);
+ }
+ return PHPExcel_Cell::stringFromColumnIndex(max($columnList) - 1);
+ }
+
/**
* Get highest worksheet row
*
- * @return int Highest row number
+ * @param string $column Return the highest row for the
specified column,
+ * or the highest row of any column if
no column letter is passed
+ * @return int Highest row number
*/
- public function getHighestRow()
+ public function getHighestRow($column = null)
{
- $colRow = $this->getHighestRowAndColumn();
- return $colRow['row'];
+ if ($column == null) {
+ $colRow = $this->getHighestRowAndColumn();
+ return $colRow['row'];
+ }
+
+ $rowList = array(0);
+ foreach ($this->getCellList() as $coord) {
+ sscanf($coord,'%[A-Z]%d', $c, $r);
+ if ($c != $column) {
+ continue;
+ }
+ $rowList[] = $r;
+ }
+
+ return max($rowList);
}
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_DiscISAM extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -65,7 +65,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
fseek($this->_fileHandle,0,SEEK_END);
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
interface PHPExcel_CachedObjectStorage_ICache
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Igbinary extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -43,7 +43,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
$this->_cellCache[$this->_currentObjectID] =
igbinary_serialize($this->_currentObject);
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Memcache extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -65,7 +65,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
$obj = serialize($this->_currentObject);
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Memory extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -96,7 +96,7 @@
$newCollection = array();
foreach($this->_cellCache as $k => &$cell) {
$newCollection[$k] = clone $cell;
- $newCollection[$k]->attach($parent);
+ $newCollection[$k]->attach($this);
}
$this->_cellCache = $newCollection;
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_MemoryGZip extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -43,7 +43,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
$this->_cellCache[$this->_currentObjectID] =
gzdeflate(serialize($this->_currentObject));
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_MemorySerialized extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -43,7 +43,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
$this->_cellCache[$this->_currentObjectID] =
serialize($this->_currentObject);
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_PHPTemp extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -57,7 +57,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
fseek($this->_fileHandle,0,SEEK_END);
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_SQLite extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -57,7 +57,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
if (!$this->_DBHandle->queryExec("INSERT OR REPLACE
INTO kvp_".$this->_TableName."
VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_SQLite3 extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -85,7 +85,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
$this->_insertQuery->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Wincache extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -58,7 +58,7 @@
* @throws PHPExcel_Exception
*/
protected function _storeData() {
- if ($this->_currentCellIsDirty) {
+ if ($this->_currentCellIsDirty &&
!empty($this->_currentObjectID)) {
$this->_currentObject->detach();
$obj = serialize($this->_currentObject);
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -3,7 +3,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -21,9 +21,9 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -32,7 +32,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorageFactory
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/CyclicReferenceStack.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/CyclicReferenceStack.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/CyclicReferenceStack.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel_CalcEngine_CyclicReferenceStack
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CalcEngine_CyclicReferenceStack {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/Logger.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/Logger.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/Logger.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
/**
@@ -30,7 +30,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CalcEngine_Logger {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Database.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Database.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Database.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Database {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/DateTime.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/DateTime.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/DateTime.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_DateTime {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Engineering.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Engineering.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Engineering.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -45,7 +45,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Engineering {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Exception.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Exception.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Exception.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
/**
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
/**
@@ -30,7 +30,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_ExceptionHandler {
/**
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Financial.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Financial.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Financial.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -48,7 +48,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Financial {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaParser.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaParser.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaParser.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -54,7 +54,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_FormulaParser {
/* Character constants */
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaToken.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaToken.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaToken.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -55,7 +55,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_FormulaToken {
/* Token types */
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Function.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Function.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Function.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Function {
/* Function categories */
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Functions.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Functions.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Functions.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -54,7 +54,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Functions {
@@ -270,7 +270,7 @@
*
* @access public
* @category Error Returns
- * @return string #REF!
+ * @return string #NULL!
*/
public static function NULL() {
return self::$_errorCodes['null'];
@@ -316,7 +316,12 @@
} else {
preg_match('/([<>=]+)(.*)/',$condition,$matches);
list(,$operator,$operand) = $matches;
- if (!is_numeric($operand)) { $operand =
PHPExcel_Calculation::_wrapResult(strtoupper($operand)); }
+
+ if (!is_numeric($operand)) {
+ $operand = str_replace('"', '""', $operand);
+ $operand =
PHPExcel_Calculation::_wrapResult(strtoupper($operand));
+ }
+
return $operator.$operand;
}
} // function _ifCondition()
@@ -491,7 +496,7 @@
* @return string Version information
*/
public static function VERSION() {
- return 'PHPExcel 1.7.9, 2013-06-02';
+ return 'PHPExcel 1.8.0, 2014-03-02';
} // function VERSION()
@@ -689,101 +694,7 @@
} // function atanh()
}
-if (!function_exists('money_format')) {
- function money_format($format, $number) {
- $regex = array(
'/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?(?:#([0-9]+))?',
- '(?:\.([0-9]+))?([in%])/'
- );
- $regex = implode('', $regex);
- if (setlocale(LC_MONETARY, null) == '') {
- setlocale(LC_MONETARY, '');
- }
- $locale = localeconv();
- $number = floatval($number);
- if (!preg_match($regex, $format, $fmatch)) {
- trigger_error("No format specified or invalid format",
E_USER_WARNING);
- return $number;
- }
- $flags = array( 'fillchar' => preg_match('/\=(.)/',
$fmatch[1], $match) ? $match[1] : ' ',
- 'nogroup' =>
preg_match('/\^/', $fmatch[1]) > 0,
- 'usesignal' =>
preg_match('/\+|\(/', $fmatch[1], $match) ? $match[0] : '+',
- 'nosimbol' =>
preg_match('/\!/', $fmatch[1]) > 0,
- 'isleft' =>
preg_match('/\-/', $fmatch[1]) > 0
- );
- $width = trim($fmatch[2]) ? (int)$fmatch[2] : 0;
- $left = trim($fmatch[3]) ? (int)$fmatch[3] : 0;
- $right = trim($fmatch[4]) ? (int)$fmatch[4] :
$locale['int_frac_digits'];
- $conversion = $fmatch[5];
- $positive = true;
- if ($number < 0) {
- $positive = false;
- $number *= -1;
- }
- $letter = $positive ? 'p' : 'n';
- $prefix = $suffix = $cprefix = $csuffix = $signal = '';
- if (!$positive) {
- $signal = $locale['negative_sign'];
- switch (true) {
- case $locale['n_sign_posn'] == 0 ||
$flags['usesignal'] == '(':
- $prefix = '(';
- $suffix = ')';
- break;
- case $locale['n_sign_posn'] == 1:
- $prefix = $signal;
- break;
- case $locale['n_sign_posn'] == 2:
- $suffix = $signal;
- break;
- case $locale['n_sign_posn'] == 3:
- $cprefix = $signal;
- break;
- case $locale['n_sign_posn'] == 4:
- $csuffix = $signal;
- break;
- }
- }
- if (!$flags['nosimbol']) {
- $currency = $cprefix;
- $currency .= ($conversion == 'i' ?
$locale['int_curr_symbol'] : $locale['currency_symbol']);
- $currency .= $csuffix;
- $currency = iconv('ISO-8859-1','UTF-8',$currency);
- } else {
- $currency = '';
- }
- $space = $locale["{$letter}_sep_by_space"] ? ' ' : '';
- if (!isset($locale['mon_decimal_point']) ||
empty($locale['mon_decimal_point'])) {
- $locale['mon_decimal_point'] =
(!isset($locale['decimal_point']) || empty($locale['decimal_point'])) ?
-
$locale['decimal_point'] :
-
'.';
- }
-
- $number = number_format($number, $right,
$locale['mon_decimal_point'], $flags['nogroup'] ? '' :
$locale['mon_thousands_sep'] );
- $number = explode($locale['mon_decimal_point'], $number);
-
- $n = strlen($prefix) + strlen($currency);
- if ($left > 0 && $left > $n) {
- if ($flags['isleft']) {
- $number[0] .= str_repeat($flags['fillchar'],
$left - $n);
- } else {
- $number[0] = str_repeat($flags['fillchar'],
$left - $n) . $number[0];
- }
- }
- $number = implode($locale['mon_decimal_point'], $number);
- if ($locale["{$letter}_cs_precedes"]) {
- $number = $prefix . $currency . $space . $number .
$suffix;
- } else {
- $number = $prefix . $number . $space . $currency .
$suffix;
- }
- if ($width > 0) {
- $number = str_pad($number, $width, $flags['fillchar'],
$flags['isleft'] ? STR_PAD_RIGHT : STR_PAD_LEFT);
- }
- $format = str_replace($fmatch[0], $number, $format);
- return $format;
- } // function money_format()
-}
-
-
//
// Strangely, PHP doesn't have a mb_str_replace multibyte function
// As we'll only ever use this function with UTF-8 characters, we can
simply "hard-code" the character set
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Logical.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Logical.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Logical.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Logical {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/LookupRef.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/LookupRef.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/LookupRef.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_LookupRef {
@@ -316,9 +316,9 @@
if (strpos($cellAddress,'!') !== FALSE) {
list($sheetName, $cellAddress) =
explode('!',$cellAddress);
$sheetName = trim($sheetName, "'");
- $pSheet =
$pCell->getParent()->getParent()->getSheetByName($sheetName);
+ $pSheet =
$pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
} else {
- $pSheet = $pCell->getParent();
+ $pSheet = $pCell->getWorksheet();
}
return
PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet,
FALSE);
@@ -327,9 +327,9 @@
if (strpos($cellAddress,'!') !== FALSE) {
list($sheetName,$cellAddress) =
explode('!',$cellAddress);
$sheetName = trim($sheetName, "'");
- $pSheet =
$pCell->getParent()->getParent()->getSheetByName($sheetName);
+ $pSheet =
$pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
} else {
- $pSheet = $pCell->getParent();
+ $pSheet = $pCell->getWorksheet();
}
return
PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet,
FALSE);
@@ -421,9 +421,9 @@
}
if ($sheetName !== NULL) {
- $pSheet =
$pCell->getParent()->getParent()->getSheetByName($sheetName);
+ $pSheet =
$pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
} else {
- $pSheet = $pCell->getParent();
+ $pSheet = $pCell->getWorksheet();
}
return
PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet,
False);
@@ -462,7 +462,7 @@
return PHPExcel_Calculation_Functions::VALUE();
}
$chosenEntry = floor($chosenEntry);
- if (($chosenEntry <= 0) || ($chosenEntry > $entryCount)) {
+ if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
return PHPExcel_Calculation_Functions::VALUE();
}
@@ -721,7 +721,8 @@
$rowNumber = $rowValue = False;
foreach($lookup_array as $rowKey => $rowData) {
- if (strtolower($rowData[$firstColumn]) >
strtolower($lookup_value)) {
+ if ((is_numeric($lookup_value) &&
is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value))
||
+ (!is_numeric($lookup_value) &&
!is_numeric($rowData[$firstColumn]) && (strtolower($rowData[$firstColumn]) >
strtolower($lookup_value)))) {
break;
}
$rowNumber = $rowKey;
@@ -734,7 +735,11 @@
return PHPExcel_Calculation_Functions::NA();
} else {
// otherwise return the appropriate value
- return $lookup_array[$rowNumber][$returnColumn];
+ $result =
$lookup_array[$rowNumber][$returnColumn];
+ if ((is_numeric($lookup_value) &&
is_numeric($result)) ||
+ (!is_numeric($lookup_value) &&
!is_numeric($result))) {
+ return $result;
+ }
}
}
@@ -742,6 +747,70 @@
} // function VLOOKUP()
+/**
+ * HLOOKUP
+ * The HLOOKUP function searches for value in the top-most row of
lookup_array and returns the value in the same column based on the index_number.
+ * @param lookup_value The value that you want to match in
lookup_array
+ * @param lookup_array The range of cells being searched
+ * @param index_number The row number in table_array from which the
matching value must be returned. The first row is 1.
+ * @param not_exact_match Determines if you are looking for an exact
match based on lookup_value.
+ * @return mixed The value of the found cell
+ */
+ public static function HLOOKUP($lookup_value, $lookup_array,
$index_number, $not_exact_match=true) {
+ $lookup_value =
PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
+ $index_number =
PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
+ $not_exact_match =
PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
+
+ // index_number must be greater than or equal to 1
+ if ($index_number < 1) {
+ return PHPExcel_Calculation_Functions::VALUE();
+ }
+
+ // index_number must be less than or equal to the number of columns in
lookup_array
+ if ((!is_array($lookup_array)) || (empty($lookup_array))) {
+ return PHPExcel_Calculation_Functions::REF();
+ } else {
+ $f = array_keys($lookup_array);
+ $firstRow = array_pop($f);
+ if ((!is_array($lookup_array[$firstRow])) || ($index_number >
count($lookup_array[$firstRow]))) {
+ return PHPExcel_Calculation_Functions::REF();
+ } else {
+ $columnKeys = array_keys($lookup_array[$firstRow]);
+ $firstkey = $f[0] - 1;
+ $returnColumn = $firstkey + $index_number;
+ $firstColumn = array_shift($f);
+ }
+ }
+
+ if (!$not_exact_match) {
+ $firstRowH = asort($lookup_array[$firstColumn]);
+ }
+
+ $rowNumber = $rowValue = False;
+ foreach($lookup_array[$firstColumn] as $rowKey => $rowData) {
+ if ((is_numeric($lookup_value) && is_numeric($rowData)
&& ($rowData > $lookup_value)) ||
+ (!is_numeric($lookup_value) &&
!is_numeric($rowData) && (strtolower($rowData) > strtolower($lookup_value)))) {
+ break;
+ }
+ $rowNumber = $rowKey;
+ $rowValue = $rowData;
+ }
+
+ if ($rowNumber !== false) {
+ if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
+ // if an exact match is required, we have what we need to
return an appropriate response
+ return PHPExcel_Calculation_Functions::NA();
+ } else {
+ // otherwise return the appropriate value
+ $result = $lookup_array[$returnColumn][$rowNumber];
+ return $result;
+ }
+ }
+
+ return PHPExcel_Calculation_Functions::NA();
+ } // function HLOOKUP()
+
+
/**
* LOOKUP
* The LOOKUP function searches for value either from a one-row or
one-column range or from an array.
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/MathTrig.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/MathTrig.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/MathTrig.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_MathTrig {
@@ -1164,7 +1164,11 @@
$condition =
PHPExcel_Calculation_Functions::_ifCondition($condition);
// Loop through arguments
foreach ($aArgs as $key => $arg) {
- if (!is_numeric($arg)) { $arg =
PHPExcel_Calculation::_wrapResult(strtoupper($arg)); }
+ if (!is_numeric($arg)) {
+ $arg = str_replace('"', '""', $arg);
+ $arg =
PHPExcel_Calculation::_wrapResult(strtoupper($arg));
+ }
+
$testCondition = '='.$arg.$condition;
if
(PHPExcel_Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
// Is it a value within our criteria
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Statistical.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Statistical.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Statistical.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -57,7 +57,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Statistical {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/TextData.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/TextData.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/TextData.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_TextData {
@@ -208,16 +208,17 @@
}
$decimals = floor($decimals);
+ $mask = '$#,##0';
if ($decimals > 0) {
- return money_format('%.'.$decimals.'n',$value);
+ $mask .= '.' . str_repeat('0',$decimals);
} else {
$round = pow(10,abs($decimals));
if ($value < 0) { $round = 0-$round; }
- $value =
PHPExcel_Calculation_MathTrig::MROUND($value,$round);
- // The implementation of money_format used if the
standard PHP function is not available can't handle decimal places of 0,
- // so we display to 1 dp and chop off that
character and the decimal separator using substr
- return substr(money_format('%.1n',$value),0,-2);
+ $value = PHPExcel_Calculation_MathTrig::MROUND($value,
$round);
}
+
+ return PHPExcel_Style_NumberFormat::toFormattedString($value,
$mask);
+
} // function DOLLAR()
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Token/Stack.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Token/Stack.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Token/Stack.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel_Calculation_Token_Stack
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Token_Stack {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -57,7 +57,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation {
@@ -841,7 +841,7 @@
'argumentCount' => '1,2'
),
'HLOOKUP' =>
array('category' =>
PHPExcel_Calculation_Function::CATEGORY_LOOKUP_AND_REFERENCE,
-
'functionCall' =>
'PHPExcel_Calculation_Functions::DUMMY',
+
'functionCall' =>
'PHPExcel_Calculation_LookupRef::HLOOKUP',
'argumentCount' => '3,4'
),
'HOUR' =>
array('category' =>
PHPExcel_Calculation_Function::CATEGORY_DATE_AND_TIME,
@@ -2738,10 +2738,10 @@
$pCellParent = ($pCell !== NULL) ? $pCell->getWorksheet() :
NULL;
$regexpMatchString = '/^('.self::CALCULATION_REGEXP_FUNCTION.
+
'|'.self::CALCULATION_REGEXP_CELLREF.
'|'.self::CALCULATION_REGEXP_NUMBER.
'|'.self::CALCULATION_REGEXP_STRING.
'|'.self::CALCULATION_REGEXP_OPENBRACE.
-
'|'.self::CALCULATION_REGEXP_CELLREF.
'|'.self::CALCULATION_REGEXP_NAMEDRANGE.
'|'.self::CALCULATION_REGEXP_ERROR.
')/si';
@@ -3324,7 +3324,8 @@
// echo
'$cellRef='.$cellRef.' in worksheet '.$matches[2].'<br />';
$this->_debugLog->writeDebugLog('Evaluating Cell ', $cellRef, ' in worksheet ',
$matches[2]);
if ($pCellParent !==
NULL) {
- if
($this->_workbook->getSheetByName($matches[2])->cellExists($cellRef)) {
+ $cellSheet =
$this->_workbook->getSheetByName($matches[2]);
+ if ($cellSheet
&& $cellSheet->cellExists($cellRef)) {
$cellValue = $this->extractCellRange($cellRef,
$this->_workbook->getSheetByName($matches[2]), FALSE);
$pCell->attach($pCellParent);
} else {
@@ -3486,6 +3487,13 @@
private function _validateBinaryOperand($cellID, &$operand, &$stack) {
+ if (is_array($operand)) {
+ if ((count($operand, COUNT_RECURSIVE) -
count($operand)) == 1) {
+ do {
+ $operand = array_pop($operand);
+ } while (is_array($operand));
+ }
+ }
// Numbers, matrices and booleans can pass straight
through, as they're already valid
if (is_string($operand)) {
// We only need special validations for the
operand if it is a string
@@ -3550,15 +3558,37 @@
if (is_string($operand1) && $operand1 > '' && $operand1{0} ==
'"') { $operand1 = self::_unwrapResult($operand1); }
if (is_string($operand2) && $operand2 > '' && $operand2{0} ==
'"') { $operand2 = self::_unwrapResult($operand2); }
+ // Use case insensitive comparaison if not OpenOffice mode
+ if (PHPExcel_Calculation_Functions::getCompatibilityMode() !=
PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE)
+ {
+ if (is_string($operand1)) {
+ $operand1 = strtoupper($operand1);
+ }
+
+ if (is_string($operand2)) {
+ $operand2 = strtoupper($operand2);
+ }
+ }
+
+ $useLowercaseFirstComparison = is_string($operand1) &&
is_string($operand2) && PHPExcel_Calculation_Functions::getCompatibilityMode()
== PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE;
+
// execute the necessary operation
switch ($operation) {
// Greater than
case '>':
- $result = ($operand1 > $operand2);
+ if ($useLowercaseFirstComparison) {
+ $result =
$this->strcmpLowercaseFirst($operand1, $operand2) > 0;
+ } else {
+ $result = ($operand1 > $operand2);
+ }
break;
// Less than
case '<':
- $result = ($operand1 < $operand2);
+ if ($useLowercaseFirstComparison) {
+ $result =
$this->strcmpLowercaseFirst($operand1, $operand2) < 0;
+ } else {
+ $result = ($operand1 < $operand2);
+ }
break;
// Equality
case '=':
@@ -3566,11 +3596,19 @@
break;
// Greater than or equal
case '>=':
- $result = ($operand1 >= $operand2);
+ if ($useLowercaseFirstComparison) {
+ $result =
$this->strcmpLowercaseFirst($operand1, $operand2) >= 0;
+ } else {
+ $result = ($operand1 >= $operand2);
+ }
break;
// Less than or equal
case '<=':
- $result = ($operand1 <= $operand2);
+ if ($useLowercaseFirstComparison) {
+ $result =
$this->strcmpLowercaseFirst($operand1, $operand2) <= 0;
+ } else {
+ $result = ($operand1 <= $operand2);
+ }
break;
// Inequality
case '<>':
@@ -3585,31 +3623,34 @@
return TRUE;
} // function _executeBinaryComparisonOperation()
+ /**
+ * Compare two strings in the same way as strcmp() except that
lowercase come before uppercase letters
+ * @param string $str1
+ * @param string $str2
+ * @return integer
+ */
+ private function strcmpLowercaseFirst($str1, $str2)
+ {
+ $from = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+ $to = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+ $inversedStr1 = strtr($str1, $from, $to);
+ $inversedStr2 = strtr($str2, $from, $to);
+ return strcmp($inversedStr1, $inversedStr2);
+ }
+
private function
_executeNumericBinaryOperation($cellID,$operand1,$operand2,$operation,$matrixFunction,&$stack)
{
// Validate the two operands
if (!$this->_validateBinaryOperand($cellID,$operand1,$stack))
return FALSE;
if (!$this->_validateBinaryOperand($cellID,$operand2,$stack))
return FALSE;
- $executeMatrixOperation = FALSE;
// If either of the operands is a matrix, we need to treat
them both as matrices
// (converting the other operand to a matrix if
need be); then perform the required
// matrix operation
if ((is_array($operand1)) || (is_array($operand2))) {
- // Ensure that both operands are arrays/matrices
- $executeMatrixOperation = TRUE;
- $mSize = array();
- list($mSize[],$mSize[],$mSize[],$mSize[]) =
self::_checkMatrixOperands($operand1,$operand2,2);
+ // Ensure that both operands are arrays/matrices
of the same size
+ self::_checkMatrixOperands($operand1, $operand2, 2);
- // But if they're both single cell matrices, then
we can treat them as simple values
- if (array_sum($mSize) == 4) {
- $executeMatrixOperation = FALSE;
- $operand1 = $operand1[0][0];
- $operand2 = $operand2[0][0];
- }
- }
-
- if ($executeMatrixOperation) {
try {
// Convert operand 1 from a PHP array to a
matrix
$matrix = new
PHPExcel_Shared_JAMA_Matrix($operand1);
@@ -3622,22 +3663,23 @@
}
} else {
if
((PHPExcel_Calculation_Functions::getCompatibilityMode() !=
PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) &&
- ((is_string($operand1) &&
!is_numeric($operand1)) || (is_string($operand2) && !is_numeric($operand2)))) {
+ ((is_string($operand1) &&
!is_numeric($operand1) && strlen($operand1)>0) ||
+ (is_string($operand2) && !is_numeric($operand2) &&
strlen($operand2)>0))) {
$result =
PHPExcel_Calculation_Functions::VALUE();
} else {
// If we're dealing with non-matrix
operations, execute the necessary operation
switch ($operation) {
// Addition
case '+':
- $result = $operand1+$operand2;
+ $result = $operand1 + $operand2;
break;
// Subtraction
case '-':
- $result = $operand1-$operand2;
+ $result = $operand1 - $operand2;
break;
// Multiplication
case '*':
- $result = $operand1*$operand2;
+ $result = $operand1 * $operand2;
break;
// Division
case '/':
@@ -3647,12 +3689,12 @@
$this->_debugLog->writeDebugLog('Evaluation Result is ',
$this->_showTypeDetails('#DIV/0!'));
return FALSE;
} else {
- $result =
$operand1/$operand2;
+ $result = $operand1 /
$operand2;
}
break;
// Power
case '^':
- $result =
pow($operand1,$operand2);
+ $result = pow($operand1,
$operand2);
break;
}
}
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/AdvancedValueBinder.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Cell_AdvancedValueBinder extends
PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
{
@@ -80,7 +80,7 @@
}
// Check for fraction
- if (preg_match('/^([+-]?) *([0-9]*)\s?\/\s*([0-9]*)$/', $value,
$matches)) {
+ if (preg_match('/^([+-]?)\s*([0-9]+)\s?\/\s*([0-9]+)$/', $value,
$matches)) {
// Convert value to number
$value = $matches[2] / $matches[3];
if ($matches[1] == '-') $value = 0 - $value;
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataType.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataType.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataType.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Cell_DataType
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataValidation.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataValidation.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DataValidation.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Cell_DataValidation
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/DefaultValueBinder.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/Hyperlink.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/Hyperlink.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/Hyperlink.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Cell_Hyperlink
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/IValueBinder.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/IValueBinder.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell/IValueBinder.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
interface PHPExcel_Cell_IValueBinder
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Cell.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Cell
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Cell
{
@@ -233,10 +233,12 @@
{
// set the value according to data type
switch ($pDataType) {
+ case PHPExcel_Cell_DataType::TYPE_NULL:
+ $this->_value = $pValue;
+ break;
case PHPExcel_Cell_DataType::TYPE_STRING2:
$pDataType =
PHPExcel_Cell_DataType::TYPE_STRING;
case PHPExcel_Cell_DataType::TYPE_STRING:
- case PHPExcel_Cell_DataType::TYPE_NULL:
case PHPExcel_Cell_DataType::TYPE_INLINE:
$this->_value =
PHPExcel_Cell_DataType::checkString($pValue);
break;
@@ -370,6 +372,16 @@
return $this->notifyCacheController();
}
+ /**
+ * Identify if the cell contains a formula
+ *
+ * @return boolean
+ */
+ public function isFormula()
+ {
+ return $this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA;
+ }
+
/**
* Does this cell contain Data validation rules?
*
@@ -469,7 +481,7 @@
/**
* Get parent worksheet
*
- * @return PHPExcel_Worksheet
+ * @return PHPExcel_CachedObjectStorage_CacheBase
*/
public function getParent() {
return $this->_parent;
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeries.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeries.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeries.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_DataSeries
{
@@ -52,6 +52,7 @@
const TYPE_RADARCHART = 'radarChart';
const TYPE_BUBBLECHART = 'bubbleChart';
const TYPE_STOCKCHART = 'stockChart';
+ const TYPE_CANDLECHART = self::TYPE_STOCKCHART; //
Synonym
const GROUPING_CLUSTERED = 'clustered';
const GROUPING_STACKED = 'stacked';
@@ -169,9 +170,11 @@
* Set Plot Type
*
* @param string $plotType
+ * @return PHPExcel_Chart_DataSeries
*/
public function setPlotType($plotType = '') {
$this->_plotType = $plotType;
+ return $this;
}
/**
@@ -187,9 +190,11 @@
* Set Plot Grouping Type
*
* @param string $groupingType
+ * @return PHPExcel_Chart_DataSeries
*/
public function setPlotGrouping($groupingType = null) {
$this->_plotGrouping = $groupingType;
+ return $this;
}
/**
@@ -205,9 +210,11 @@
* Set Plot Direction
*
* @param string $plotDirection
+ * @return PHPExcel_Chart_DataSeries
*/
public function setPlotDirection($plotDirection = null) {
$this->_plotDirection = $plotDirection;
+ return $this;
}
/**
@@ -280,9 +287,11 @@
* Set Plot Style
*
* @param string $plotStyle
+ * @return PHPExcel_Chart_DataSeries
*/
public function setPlotStyle($plotStyle = null) {
$this->_plotStyle = $plotStyle;
+ return $this;
}
/**
@@ -331,9 +340,11 @@
* Set Smooth Line
*
* @param boolean $smoothLine
+ * @return PHPExcel_Chart_DataSeries
*/
public function setSmoothLine($smoothLine = TRUE) {
$this->_smoothLine = $smoothLine;
+ return $this;
}
public function refresh(PHPExcel_Worksheet $worksheet) {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeriesValues.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeriesValues.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/DataSeriesValues.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_DataSeriesValues
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Exception.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Exception.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Exception.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_Exception extends PHPExcel_Exception {
/**
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Layout.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Layout.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Layout.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_Layout
{
@@ -167,9 +167,11 @@
* Set Layout Target
*
* @param Layout Target $value
+ * @return PHPExcel_Chart_Layout
*/
public function setLayoutTarget($value) {
$this->_layoutTarget = $value;
+ return $this;
}
/**
@@ -185,9 +187,11 @@
* Set X-Mode
*
* @param X-Mode $value
+ * @return PHPExcel_Chart_Layout
*/
public function setXMode($value) {
$this->_xMode = $value;
+ return $this;
}
/**
@@ -196,16 +200,18 @@
* @return string
*/
public function getYMode() {
- return $this->_xMode;
+ return $this->_yMode;
}
/**
* Set Y-Mode
*
* @param Y-Mode $value
+ * @return PHPExcel_Chart_Layout
*/
public function setYMode($value) {
- $this->_xMode = $value;
+ $this->_yMode = $value;
+ return $this;
}
/**
@@ -221,9 +227,11 @@
* Set X-Position
*
* @param X-Position $value
+ * @return PHPExcel_Chart_Layout
*/
public function setXPosition($value) {
$this->_xPos = $value;
+ return $this;
}
/**
@@ -239,9 +247,11 @@
* Set Y-Position
*
* @param Y-Position $value
+ * @return PHPExcel_Chart_Layout
*/
public function setYPosition($value) {
$this->_yPos = $value;
+ return $this;
}
/**
@@ -257,9 +267,11 @@
* Set Width
*
* @param Width $value
+ * @return PHPExcel_Chart_Layout
*/
public function setWidth($value) {
$this->_width = $value;
+ return $this;
}
/**
@@ -275,9 +287,11 @@
* Set Height
*
* @param Height $value
+ * @return PHPExcel_Chart_Layout
*/
public function setHeight($value) {
$this->_height = $value;
+ return $this;
}
@@ -295,9 +309,11 @@
* Specifies that legend keys should be shown in data labels.
*
* @param boolean $value Show legend key
+ * @return PHPExcel_Chart_Layout
*/
public function setShowLegendKey($value) {
$this->_showLegendKey = $value;
+ return $this;
}
/**
@@ -314,9 +330,11 @@
* Specifies that the value should be shown in data labels.
*
* @param boolean $value Show val
+ * @return PHPExcel_Chart_Layout
*/
public function setShowVal($value) {
$this->_showVal = $value;
+ return $this;
}
/**
@@ -333,9 +351,11 @@
* Specifies that the category name should be shown in data labels.
*
* @param boolean $value Show cat name
+ * @return PHPExcel_Chart_Layout
*/
public function setShowCatName($value) {
$this->_showCatName = $value;
+ return $this;
}
/**
@@ -351,10 +371,12 @@
* Set show ser name
* Specifies that the series name should be shown in data labels.
*
- * @param boolean $value Show ser name
+ * @param boolean $value Show series name
+ * @return PHPExcel_Chart_Layout
*/
public function setShowSerName($value) {
$this->_showSerName = $value;
+ return $this;
}
/**
@@ -371,9 +393,11 @@
* Specifies that the percentage should be shown in data labels.
*
* @param boolean $value Show percentage
+ * @return PHPExcel_Chart_Layout
*/
public function setShowPercent($value) {
$this->_showPercent = $value;
+ return $this;
}
/**
@@ -390,9 +414,11 @@
* Specifies that the bubble size should be shown in data labels.
*
* @param boolean $value Show bubble size
+ * @return PHPExcel_Chart_Layout
*/
public function setShowBubbleSize($value) {
$this->_showBubbleSize = $value;
+ return $this;
}
/**
@@ -409,9 +435,11 @@
* Specifies that leader lines should be shown in data labels.
*
* @param boolean $value Show leader lines
+ * @return PHPExcel_Chart_Layout
*/
public function setShowLeaderLines($value) {
$this->_showLeaderLines = $value;
+ return $this;
}
}
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Legend.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Legend.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Legend.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_Legend
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/PlotArea.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/PlotArea.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/PlotArea.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_PlotArea
{
@@ -111,9 +111,12 @@
* Set Plot Series
*
* @param [PHPExcel_Chart_DataSeries]
+ * @return PHPExcel_Chart_PlotArea
*/
public function setPlotSeries($plotSeries = array()) {
$this->_plotSeries = $plotSeries;
+
+ return $this;
}
public function refresh(PHPExcel_Worksheet $worksheet) {
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Renderer/jpgraph.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -3,7 +3,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -21,9 +21,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart_Renderer
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -35,7 +35,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart_Renderer
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_Renderer_jpgraph
{
@@ -517,20 +517,38 @@
private function _renderPlotStock($groupID) {
$seriesCount =
$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
$plotOrder =
$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
- $seriesPlots = array();
$dataValues = array();
- // Loop through each data series in turn
- for($i = 0; $i < $seriesCount; ++$i) {
- $dataValuesY =
$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
- $dataValuesX =
$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+ // Loop through each data series in turn and build the
plot arrays
+ foreach($plotOrder as $i => $v) {
+ $dataValuesX =
$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
+ foreach($dataValuesX as $j => $dataValueX) {
+ $dataValues[$plotOrder[$i]][$j] = $dataValueX;
+ }
+ }
+ if(empty($dataValues)) {
+ return;
+ }
- foreach($dataValuesX as $j => $dataValueX)
- $dataValues[$j][$plotOrder[$i]] = $dataValueX;
+ $dataValuesPlot = array();
+ // Flatten the plot arrays to a single dimensional array to work with
jpgraph
+ for($j = 0; $j < count($dataValues[0]); $j++) {
+ for($i = 0; $i < $seriesCount; $i++) {
+ $dataValuesPlot[] = $dataValues[$i][$j];
+ }
}
- $seriesPlot = new StockPlot($dataValues);
+ // Set the x-axis labels
+ $labelCount =
count($this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount());
+ if ($labelCount > 0) {
+ $datasetLabels =
$this->_chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+ $datasetLabels = $this->_formatDataSetLabels($groupID,
$datasetLabels, $labelCount);
+ $this->_graph->xaxis->SetTickLabels($datasetLabels);
+ }
+ $seriesPlot = new StockPlot($dataValuesPlot);
+ $seriesPlot->SetWidth(20);
+
$this->_graph->Add($seriesPlot);
} // function _renderPlotStock()
@@ -681,9 +699,9 @@
private function _renderStockChart($groupCount) {
require_once('jpgraph_stock.php');
- $this->_renderCartesianPlotArea();
+ $this->_renderCartesianPlotArea('intint');
- for($groupID = 0; $groupID < $groupCount; ++$i) {
+ for($groupID = 0; $groupID < $groupCount; ++$groupID) {
$this->_renderPlotStock($groupID);
}
} // function _renderStockChart()
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Title.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Title.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart/Title.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart_Title
{
@@ -72,9 +72,12 @@
* Set caption
*
* @param string $caption
+ * @return PHPExcel_Chart_Title
*/
public function setCaption($caption = null) {
$this->_caption = $caption;
+
+ return $this;
}
/**
Modified: branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Chart.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Chart
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Chart
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Comment.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Comment.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Comment.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Comment implements PHPExcel_IComparable
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentProperties.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentProperties.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentProperties.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_DocumentProperties
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentSecurity.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentSecurity.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/DocumentSecurity.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_DocumentSecurity
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Exception.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Exception.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Exception.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Exception extends Exception {
/**
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/HashTable.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/HashTable.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/HashTable.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_HashTable
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IComparable.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IComparable.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IComparable.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -18,9 +18,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -29,7 +29,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
interface PHPExcel_IComparable
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IOFactory.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IOFactory.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/IOFactory.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -40,7 +40,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_IOFactory
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/NamedRange.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/NamedRange.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/NamedRange.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_NamedRange
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Abstract.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Abstract.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Abstract.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/CSV.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/CSV.php
2014-03-24 17:43:30 UTC (rev 11860)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/CSV.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -40,7 +40,7 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements
PHPExcel_Reader_IReader
{
@@ -144,28 +144,28 @@
*/
protected function _skipBOM()
{
- rewind($fileHandle);
+ rewind($this->_fileHandle);
switch ($this->_inputEncoding) {
case 'UTF-8':
fgets($this->_fileHandle, 4) == "\xEF\xBB\xBF" ?
- fseek($this->_fileHandle, 3) :
fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 3) :
fseek($this->_fileHandle, 0);
break;
case 'UTF-16LE':
fgets($this->_fileHandle, 3) == "\xFF\xFE" ?
- fseek($this->_fileHandle, 2) :
fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 2) :
fseek($this->_fileHandle, 0);
break;
case 'UTF-16BE':
fgets($this->_fileHandle, 3) == "\xFE\xFF" ?
- fseek($this->_fileHandle, 2) :
fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 2) :
fseek($this->_fileHandle, 0);
break;
case 'UTF-32LE':
fgets($this->_fileHandle, 5) ==
"\xFF\xFE\x00\x00" ?
- fseek($this->_fileHandle, 4) :
fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 4) :
fseek($this->_fileHandle, 0);
break;
case 'UTF-32BE':
fgets($this->_fileHandle, 5) ==
"\x00\x00\xFE\xFF" ?
- fseek($this->_fileHandle, 4) :
fseek($this->_fileHandle, 0);
+ fseek($this->_fileHandle, 4) :
fseek($this->_fileHandle, 0);
break;
default:
break;
@@ -187,7 +187,7 @@
throw new PHPExcel_Reader_Exception($pFilename . " is
an Invalid Spreadsheet file.");
}
$fileHandle = $this->_fileHandle;
-
+
// Skip BOM, if any
$this->_skipBOM();
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/DefaultReadFilter.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -40,7 +40,7 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Reader_DefaultReadFilter implements PHPExcel_Reader_IReadFilter
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2003XML.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2003XML.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2003XML.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -40,7 +40,7 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements
PHPExcel_Reader_IReader
{
@@ -137,7 +137,7 @@
$worksheetNames = array();
- $xml = simplexml_load_file($pFilename);
+ $xml = simplexml_load_file($pFilename, 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions());
$namespaces = $xml->getNamespaces(true);
$xml_ss = $xml->children($namespaces['ss']);
@@ -165,7 +165,7 @@
$worksheetInfo = array();
- $xml = simplexml_load_file($pFilename);
+ $xml = simplexml_load_file($pFilename, 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions());
$namespaces = $xml->getNamespaces(true);
$worksheetID = 1;
@@ -330,7 +330,7 @@
throw new PHPExcel_Reader_Exception($pFilename . " is
an Invalid Spreadsheet file.");
}
- $xml = simplexml_load_file($pFilename);
+ $xml = simplexml_load_file($pFilename, 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions());
$namespaces = $xml->getNamespaces(true);
$docProps = $objPHPExcel->getProperties();
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Chart.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Reader_Excel2007
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
/**
@@ -30,7 +30,7 @@
*
* @category PHPExcel
* @package PHPExcel_Reader_Excel2007
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Reader_Excel2007_Chart
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007/Theme.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Reader_Excel2007
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Reader_Excel2007
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Reader_Excel2007_Theme
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007.php
2014-03-24 17:43:30 UTC (rev 11860)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Excel2007.php
2014-03-24 17:46:51 UTC (rev 11861)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2013 PHPExcel
+ * Copyright (c) 2006 - 2014 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +20,9 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.9, 2013-06-02
+ * @version 1.8.0, 2014-03-02
*/
@@ -40,7 +40,7 @@
*
* @category PHPExcel
* @package PHPExcel_Reader
- * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2014 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements
PHPExcel_Reader_IReader
{
@@ -59,16 +59,16 @@
private static $_theme = NULL;
- /**
- * Create a new PHPExcel_Reader_Excel2007 instance
- */
- public function __construct() {
- $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
- $this->_referenceHelper =
PHPExcel_ReferenceHelper::getInstance();
- }
-
-
/**
+ * Create a new PHPExcel_Reader_Excel2007 instance
+ */
+ public function __construct() {
+ $this->_readFilter = new PHPExcel_Reader_DefaultReadFilter();
+ $this->_referenceHelper =
PHPExcel_ReferenceHelper::getInstance();
+ }
+
+
+ /**
* Can the current PHPExcel_Reader_IReader read the file?
*
* @param string $pFilename
@@ -82,17 +82,19 @@
throw new PHPExcel_Reader_Exception("Could not open " .
$pFilename . " for reading! File does not exist.");
}
+ $zipClass = PHPExcel_Settings::getZipClass();
+
// Check if zip class exists
- if (!class_exists('ZipArchive',FALSE)) {
- throw new PHPExcel_Reader_Exception("ZipArchive library
is not enabled");
- }
+// if (!class_exists($zipClass, FALSE)) {
+// throw new PHPExcel_Reader_Exception($zipClass . "
library is not enabled");
+// }
$xl = false;
// Load file
- $zip = new ZipArchive;
+ $zip = new $zipClass;
if ($zip->open($pFilename) === true) {
// check if it is an OOXML archive
- $rels =
simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels"));
+ $rels =
simplexml_load_string($this->_getFromZipArchive($zip, "_rels/.rels"),
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
if ($rels !== false) {
foreach ($rels->Relationship as $rel) {
switch ($rel["Type"]) {
@@ -111,7 +113,7 @@
return $xl;
}
-
+
/**
* Reads names of the worksheets from a file, without parsing the whole
file to a PHPExcel object
*
@@ -127,18 +129,20 @@
$worksheetNames = array();
- $zip = new ZipArchive;
+ $zipClass = PHPExcel_Settings::getZipClass();
+
+ $zip = new $zipClass;
$zip->open($pFilename);
// The files we're looking at here are small enough that
simpleXML is more efficient than XMLReader
$rels = simplexml_load_string(
- $this->_getFromZipArchive($zip, "_rels/.rels")
+ $this->_getFromZipArchive($zip, "_rels/.rels",
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions())
); //~
http://schemas.openxmlformats.org/package/2006/relationships");
foreach ($rels->Relationship as $rel) {
switch ($rel["Type"]) {
case
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
$xmlWorkbook = simplexml_load_string(
- $this->_getFromZipArchive($zip,
"{$rel['Target']}")
+ $this->_getFromZipArchive($zip,
"{$rel['Target']}", 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions())
); //~
http://schemas.openxmlformats.org/spreadsheetml/2006/main");
if ($xmlWorkbook->sheets) {
@@ -156,54 +160,56 @@
}
- /**
- * Return worksheet info (Name, Last Column Letter, Last Column Index,
Total Rows, Total Columns)
- *
- * @param string $pFilename
- * @throws PHPExcel_Reader_Exception
- */
- public function listWorksheetInfo($pFilename)
- {
- // Check if file exists
- if (!file_exists($pFilename)) {
- throw new PHPExcel_Reader_Exception("Could not open " .
$pFilename . " for reading! File does not exist.");
- }
-
- $worksheetInfo = array();
-
- $zip = new ZipArchive;
- $zip->open($pFilename);
-
- $rels = simplexml_load_string($this->_getFromZipArchive($zip,
"_rels/.rels")); //~
http://schemas.openxmlformats.org/package/2006/relationships");
- foreach ($rels->Relationship as $rel) {
- if ($rel["Type"] ==
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument")
{
- $dir = dirname($rel["Target"]);
- $relsWorkbook =
simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" .
basename($rel["Target"]) . ".rels")); //~
http://schemas.openxmlformats.org/package/2006/relationships");
- $relsWorkbook->registerXPathNamespace("rel",
"http://schemas.openxmlformats.org/package/2006/relationships");
-
- $worksheets = array();
- foreach ($relsWorkbook->Relationship as $ele) {
- if ($ele["Type"] ==
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet")
{
- $worksheets[(string)
$ele["Id"]] = $ele["Target"];
- }
- }
-
- $xmlWorkbook =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
- if ($xmlWorkbook->sheets) {
- $dir = dirname($rel["Target"]);
- foreach ($xmlWorkbook->sheets->sheet as
$eleSheet) {
- $tmpInfo = array(
- 'worksheetName' =>
(string) $eleSheet["name"],
- 'lastColumnLetter' =>
'A',
- 'lastColumnIndex' => 0,
- 'totalRows' => 0,
- 'totalColumns' => 0,
+ /**
+ * Return worksheet info (Name, Last Column Letter, Last Column Index,
Total Rows, Total Columns)
+ *
+ * @param string $pFilename
+ * @throws PHPExcel_Reader_Exception
+ */
+ public function listWorksheetInfo($pFilename)
+ {
+ // Check if file exists
+ if (!file_exists($pFilename)) {
+ throw new PHPExcel_Reader_Exception("Could not open " .
$pFilename . " for reading! File does not exist.");
+ }
+
+ $worksheetInfo = array();
+
+ $zipClass = PHPExcel_Settings::getZipClass();
+
+ $zip = new $zipClass;
+ $zip->open($pFilename);
+
+ $rels = simplexml_load_string($this->_getFromZipArchive($zip,
"_rels/.rels"), 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions()); //~
http://schemas.openxmlformats.org/package/2006/relationships");
+ foreach ($rels->Relationship as $rel) {
+ if ($rel["Type"] ==
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument")
{
+ $dir = dirname($rel["Target"]);
+ $relsWorkbook =
simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" .
basename($rel["Target"]) . ".rels"), 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions()); //~
http://schemas.openxmlformats.org/package/2006/relationships");
+ $relsWorkbook->registerXPathNamespace("rel",
"http://schemas.openxmlformats.org/package/2006/relationships");
+
+ $worksheets = array();
+ foreach ($relsWorkbook->Relationship as $ele) {
+ if ($ele["Type"] ==
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet")
{
+ $worksheets[(string)
$ele["Id"]] = $ele["Target"];
+ }
+ }
+
+ $xmlWorkbook =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"),
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~
http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+ if ($xmlWorkbook->sheets) {
+ $dir = dirname($rel["Target"]);
+ foreach ($xmlWorkbook->sheets->sheet as
$eleSheet) {
+ $tmpInfo = array(
+ 'worksheetName' =>
(string) $eleSheet["name"],
+ 'lastColumnLetter' =>
'A',
+ 'lastColumnIndex' => 0,
+ 'totalRows' => 0,
+ 'totalColumns' => 0,
);
-
- $fileWorksheet =
$worksheets[(string)
self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"),
"id")];
+ $fileWorksheet =
$worksheets[(string)
self::array_item($eleSheet->attributes("http://schemas.openxmlformats.org/officeDocument/2006/relationships"),
"id")];
+
$xml = new XMLReader();
- $res =
$xml->open('zip://'.PHPExcel_Shared_File::realpath($pFilename).'#'."$dir/$fileWorksheet");
+ $res =
$xml->open('zip://'.PHPExcel_Shared_File::realpath($pFilename).'#'."$dir/$fileWorksheet",
null, PHPExcel_Settings::getLibXmlLoaderOptions());
$xml->setParserProperty(2,true);
$currCells = 0;
@@ -223,20 +229,20 @@
$tmpInfo['lastColumnIndex'] =
$tmpInfo['totalColumns'] - 1;
$tmpInfo['lastColumnLetter'] =
PHPExcel_Cell::stringFromColumnIndex($tmpInfo['lastColumnIndex']);
- $worksheetInfo[] = $tmpInfo;
- }
- }
- }
- }
-
- $zip->close();
-
- return $worksheetInfo;
- }
-
-
+ $worksheetInfo[] = $tmpInfo;
+ }
+ }
+ }
+ }
+
+ $zip->close();
+
+ return $worksheetInfo;
+ }
+
+
private static function _castToBool($c) {
-// echo 'Initial Cast to Boolean<br />';
+// echo 'Initial Cast to Boolean', PHP_EOL;
$value = isset($c->v) ? (string) $c->v : NULL;
if ($value == '0') {
return FALSE;
@@ -248,50 +254,48 @@
return $value;
} // function _castToBool()
-
+
private static function _castToError($c) {
-// echo 'Initial Cast to Error<br />';
+// echo 'Initial Cast to Error', PHP_EOL;
return isset($c->v) ? (string) $c->v : NULL;
} // function _castToError()
-
+
private static function _castToString($c) {
-// echo 'Initial Cast to String<br />';
+// echo 'Initial Cast to String, PHP_EOL;
return isset($c->v) ? (string) $c->v : NULL;
} // function _castToString()
-
+
private function
_castToFormula($c,$r,&$cellDataType,&$value,&$calculatedValue,&$sharedFormulas,$castBaseType)
{
-// echo 'Formula<br />';
-// echo '$c->f is '.$c->f.'<br />';
+// echo 'Formula', PHP_EOL;
+// echo '$c->f is ', $c->f, PHP_EOL;
$cellDataType = 'f';
$value = "={$c->f}";
$calculatedValue = self::$castBaseType($c);
// Shared formula?
if (isset($c->f['t']) && strtolower((string)$c->f['t']) ==
'shared') {
-// echo 'SHARED FORMULA<br />';
+// echo 'SHARED FORMULA', PHP_EOL;
$instance = (string)$c->f['si'];
-// echo 'Instance ID = '.$instance.'<br />';
+// echo 'Instance ID = ', $instance, PHP_EOL;
//
-// echo 'Shared Formula Array:<pre>';
+// echo 'Shared Formula Array:', PHP_EOL;
// print_r($sharedFormulas);
-// echo '</pre>';
if (!isset($sharedFormulas[(string)$c->f['si']])) {
-// echo 'SETTING NEW SHARED FORMULA<br />';
-// echo 'Master is '.$r.'<br />';
-// echo 'Formula is '.$value.'<br />';
+// echo 'SETTING NEW SHARED FORMULA', PHP_EOL;
+// echo 'Master is ', $r, PHP_EOL;
+// echo 'Formula is ', $value, PHP_EOL;
$sharedFormulas[$instance] = array(
'master' => $r,
'formula' => $value
);
-// echo 'New Shared Formula Array:<pre>';
+// echo 'New Shared Formula Array:', PHP_EOL;
// print_r($sharedFormulas);
-// echo '</pre>';
} else {
-// echo 'GETTING SHARED FORMULA<br />';
-// echo 'Master is
'.$sharedFormulas[$instance]['master'].'<br />';
-// echo 'Formula is
'.$sharedFormulas[$instance]['formula'].'<br />';
+// echo 'GETTING SHARED FORMULA', PHP_EOL;
+// echo 'Master is ',
$sharedFormulas[$instance]['master'], PHP_EOL;
+// echo 'Formula is ',
$sharedFormulas[$instance]['formula'], PHP_EOL;
$master =
PHPExcel_Cell::coordinateFromString($sharedFormulas[$instance]['master']);
$current =
PHPExcel_Cell::coordinateFromString($r);
@@ -304,13 +308,13 @@
$difference[0],
$difference[1]
);
-// echo 'Adjusted Formula is '.$value.'<br />';
+// echo 'Adjusted Formula is ', $value, PHP_EOL;
}
}
}
-
- public function _getFromZipArchive(ZipArchive $archive, $fileName = '')
+
+ public function _getFromZipArchive($archive, $fileName = '')
{
// Root-relative paths
if (strpos($fileName, '//') !== false)
@@ -329,7 +333,7 @@
return $contents;
}
-
+
/**
* Loads PHPExcel from file
*
@@ -350,23 +354,26 @@
$excel->removeCellStyleXfByIndex(0); // remove the
default style
$excel->removeCellXfByIndex(0); // remove the default
style
}
- $zip = new ZipArchive;
+
+ $zipClass = PHPExcel_Settings::getZipClass();
+
+ $zip = new $zipClass;
$zip->open($pFilename);
// Read the theme first, because we need the colour scheme
when reading the styles
- $wbRels = simplexml_load_string($this->_getFromZipArchive($zip,
"xl/_rels/workbook.xml.rels")); //~
http://schemas.openxmlformats.org/package/2006/relationships");
+ $wbRels = simplexml_load_string($this->_getFromZipArchive($zip,
"xl/_rels/workbook.xml.rels"), 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions()); //~
http://schemas.openxmlformats.org/package/2006/relationships");
foreach ($wbRels->Relationship as $rel) {
switch ($rel["Type"]) {
case
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme":
$themeOrderArray =
array('lt1','dk1','lt2','dk2');
$themeOrderAdditional =
count($themeOrderArray);
- $xmlTheme =
simplexml_load_string($this->_getFromZipArchive($zip, "xl/{$rel['Target']}"));
+ $xmlTheme =
simplexml_load_string($this->_getFromZipArchive($zip, "xl/{$rel['Target']}"),
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
if (is_object($xmlTheme)) {
$xmlThemeName =
$xmlTheme->attributes();
$xmlTheme =
$xmlTheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
$themeName =
(string)$xmlThemeName['name'];
-
+
$colourScheme =
$xmlTheme->themeElements->clrScheme->attributes();
$colourSchemeName =
(string)$colourScheme['name'];
$colourScheme =
$xmlTheme->themeElements->clrScheme->children("http://schemas.openxmlformats.org/drawingml/2006/main");
@@ -391,11 +398,11 @@
}
}
- $rels = simplexml_load_string($this->_getFromZipArchive($zip,
"_rels/.rels")); //~
http://schemas.openxmlformats.org/package/2006/relationships");
+ $rels = simplexml_load_string($this->_getFromZipArchive($zip,
"_rels/.rels"), 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions()); //~
http://schemas.openxmlformats.org/package/2006/relationships");
foreach ($rels->Relationship as $rel) {
switch ($rel["Type"]) {
case
"http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties":
- $xmlCore =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
+ $xmlCore =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"),
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
if (is_object($xmlCore)) {
$xmlCore->registerXPathNamespace("dc", "http://purl.org/dc/elements/1.1/");
$xmlCore->registerXPathNamespace("dcterms", "http://purl.org/dc/terms/");
@@ -414,7 +421,7 @@
break;
case
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties":
- $xmlCore =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
+ $xmlCore =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"),
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
if (is_object($xmlCore)) {
$docProps =
$excel->getProperties();
if (isset($xmlCore->Company))
@@ -425,7 +432,7 @@
break;
case
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties":
- $xmlCore =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"));
+ $xmlCore =
simplexml_load_string($this->_getFromZipArchive($zip, "{$rel['Target']}"),
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
if (is_object($xmlCore)) {
$docProps =
$excel->getProperties();
foreach ($xmlCore as
$xmlProperty) {
@@ -442,15 +449,21 @@
}
}
break;
-
+ //Ribbon
+ case
"http://schemas.microsoft.com/office/2006/relationships/ui/extensibility":
+ $customUI = $rel['Target'];
+ if(!is_null($customUI)){
+ $this->_readRibbon($excel,
$customUI, $zip);
+ }
+ break;
case
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument":
$dir = dirname($rel["Target"]);
- $relsWorkbook =
simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" .
basename($rel["Target"]) . ".rels")); //~
http://schemas.openxmlformats.org/package/2006/relationships");
+ $relsWorkbook =
simplexml_load_string($this->_getFromZipArchive($zip, "$dir/_rels/" .
basename($rel["Target"]) . ".rels"), 'SimpleXMLElement',
PHPExcel_Settings::getLibXmlLoaderOptions()); //~
http://schemas.openxmlformats.org/package/2006/relationships");
$relsWorkbook->registerXPathNamespace("rel",
"http://schemas.openxmlformats.org/package/2006/relationships");
$sharedStrings = array();
$xpath =
self::array_item($relsWorkbook->xpath("rel:address@hidden'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings']"));
- $xmlStrings =
simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]"));
//~ http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+ $xmlStrings =
simplexml_load_string($this->_getFromZipArchive($zip, "$dir/$xpath[Target]"),
'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions()); //~
http://schemas.openxmlformats.org/spreadsheetml/2006/main");
if (isset($xmlStrings) &&
isset($xmlStrings->si)) {
foreach ($xmlStrings->si as
$val) {
if (isset($val->t)) {
@@ -462,16 +475,34 @@
}
$worksheets = array();
+ $macros = $customUI = NULL;
foreach ($relsWorkbook->Relationship as
$ele) {
- if ($ele["Type"] ==
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet")
{
+ switch($ele['Type']){
+ case
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
$worksheets[(string)
$ele["Id"]] = $ele["Target"];
+ break;
+ // a vbaProject ? (: some
macros)
+ case
"http://schemas.microsoft.com/office/2006/relationships/vbaProject":
+ $macros =
$ele["Target"];
+ break;
}
}
+ if(!is_null($macros)){
@@ Diff output truncated at 153600 characters. @@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11861] Merge 11857:11860 from trunk,
Sigurd Nes <=