[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11355] Merge 11347:11354 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11355] Merge 11347:11354 from trunk |
|
Date: |
Mon, 07 Oct 2013 13:42:22 +0000 |
Revision: 11355
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11355
Author: sigurdne
Date: 2013-10-07 13:42:22 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
Merge 11347:11354 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/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/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/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/JAMA/CholeskyDecomposition.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/LUDecomposition.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/Matrix.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/QRDecomposition.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/JAMA/utils/Maths.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/ChainedBlockStream.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE/PPS/Root.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/OLE.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/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.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/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/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/br/functions
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/pt/config
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/locale/pt/functions
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/sv/functions
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/phpgwapi/inc/phpexcel/license.txt
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-1_0-branch/property/inc/hook_config.inc.php
branches/Version-1_0-branch/property/js/yahoo/invoice.paid.index.js
branches/Version-1_0-branch/property/templates/base/config.tpl
branches/Version-1_0-branch/sms/bin/default/set_workorder_status.php
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CalcEngine/
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Abstract.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Reader/Exception.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Shared/TimeZone.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Style/Supervisor.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Abstract.php
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Writer/Exception.php
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
+
/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
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
2013-10-07 13:37:40 UTC (rev 11354)
+++ branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Autoloader.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,18 +20,18 @@
*
* @category PHPExcel
* @package PHPExcel
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
PHPExcel_Autoloader::Register();
-// As we always try to run the autoloader before anything else, we can use
it to do a few
-// simple checks and initialisations
-PHPExcel_Shared_ZipStreamWrapper::register();
+// As we always try to run the autoloader before anything else, we can use
it to do a few
+// simple checks and initialisations
+//PHPExcel_Shared_ZipStreamWrapper::register();
// check mbstring.func_overload
if (ini_get('mbstring.func_overload') & 2) {
- throw new Exception('Multibyte function overloading in PHP must be
disabled for string functions (2).');
+ throw new PHPExcel_Exception('Multibyte function overloading in PHP must
be disabled for string functions (2).');
}
PHPExcel_Shared_String::buildCharacterSets();
@@ -39,47 +39,47 @@
/**
* PHPExcel_Autoloader
*
- * @category PHPExcel
- * @package PHPExcel
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @category PHPExcel
+ * @package PHPExcel
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Autoloader
{
- /**
- * Register the Autoloader with SPL
- *
- */
- public static function Register() {
- if (function_exists('__autoload')) {
- // Register any existing autoloader function with
SPL, so we don't get any clashes
- spl_autoload_register('__autoload');
- }
- // Register ourselves with SPL
- return spl_autoload_register(array('PHPExcel_Autoloader',
'Load'));
- } // function Register()
+ /**
+ * Register the Autoloader with SPL
+ *
+ */
+ public static function Register() {
+ if (function_exists('__autoload')) {
+ // Register any existing autoloader function with SPL, so we
don't get any clashes
+ spl_autoload_register('__autoload');
+ }
+ // Register ourselves with SPL
+ return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'));
+ } // function Register()
- /**
- * Autoload a class identified by name
- *
- * @param string $pClassName Name of the object to
load
- */
- public static function Load($pClassName){
- if ((class_exists($pClassName,FALSE)) || (strpos($pClassName,
'PHPExcel') !== 0)) {
- // Either already loaded, or not a PHPExcel class
request
- return FALSE;
- }
+ /**
+ * Autoload a class identified by name
+ *
+ * @param string $pClassName Name of the object to load
+ */
+ public static function Load($pClassName){
+ if ((class_exists($pClassName,FALSE)) || (strpos($pClassName,
'PHPExcel') !== 0)) {
+ // Either already loaded, or not a PHPExcel class request
+ return FALSE;
+ }
- $pClassFilePath = PHPEXCEL_ROOT .
-
str_replace('_',DIRECTORY_SEPARATOR,$pClassName) .
- '.php';
+ $pClassFilePath = PHPEXCEL_ROOT .
+ str_replace('_',DIRECTORY_SEPARATOR,$pClassName) .
+ '.php';
- if ((file_exists($pClassFilePath) === false) ||
(is_readable($pClassFilePath) === false)) {
- // Can't load
- return FALSE;
- }
+ if ((file_exists($pClassFilePath) === FALSE) ||
(is_readable($pClassFilePath) === FALSE)) {
+ // Can't load
+ return FALSE;
+ }
- require($pClassFilePath);
- } // function Load()
+ require($pClassFilePath);
+ } // function Load()
-}
\ No newline at end of file
+}
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/APC.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -1,280 +1,295 @@
-<?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @category PHPExcel
- * @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
- * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
- */
-
-
-/**
- * PHPExcel_CachedObjectStorage_APC
- *
- * @category PHPExcel
- * @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_APC extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
-
- /**
- * Prefix used to uniquely identify cache data for this worksheet
- *
- * @access private
- * @var string
- */
- private $_cachePrefix = null;
-
- /**
- * Cache timeout
- *
- * @access private
- * @var integer
- */
- private $_cacheTime = 600;
-
-
- /**
- * Store cell data in cache for the current cell object if it's "dirty",
- * and the 'nullify' the current cell object
- *
- * @access private
- * @return void
- * @throws Exception
- */
- private function _storeData() {
- if ($this->_currentCellIsDirty) {
- $this->_currentObject->detach();
-
- if
(!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime))
{
- $this->__destruct();
- throw new Exception('Failed to store cell
'.$this->_currentObjectID.' in APC');
- }
- $this->_currentCellIsDirty = false;
- }
- $this->_currentObjectID = $this->_currentObject = null;
- } // function _storeData()
-
-
- /**
- * Add or Update a cell in cache identified by coordinate address
- *
- * @access public
- * @param string $pCoord Coordinate address of
the cell to update
- * @param PHPExcel_Cell $cell Cell to update
- * @return void
- * @throws Exception
- */
- public function addCacheData($pCoord, PHPExcel_Cell $cell) {
- if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
- $this->_storeData();
- }
- $this->_cellCache[$pCoord] = true;
-
- $this->_currentObjectID = $pCoord;
- $this->_currentObject = $cell;
- $this->_currentCellIsDirty = true;
-
- return $cell;
- } // function addCacheData()
-
-
- /**
- * Is a value set in the current PHPExcel_CachedObjectStorage_ICache
for an indexed cell?
- *
- * @access public
- * @param string $pCoord Coordinate address of
the cell to check
- * @return void
- * @return boolean
- */
- public function isDataSet($pCoord) {
- // Check if the requested entry is the current object, or
exists in the cache
- if (parent::isDataSet($pCoord)) {
- if ($this->_currentObjectID == $pCoord) {
- return true;
- }
- // Check if the requested entry still exists in apc
- $success =
apc_fetch($this->_cachePrefix.$pCoord.'.cache');
- if ($success === false) {
- // Entry no longer exists in APC, so clear
it from the cache array
- parent::deleteCacheData($pCoord);
- throw new Exception('Cell entry '.$pCoord.' no
longer exists in APC');
- }
- return true;
- }
- return false;
- } // function isDataSet()
-
-
- /**
- * Get cell at a specific coordinate
- *
- * @access public
- * @param string $pCoord Coordinate of the cell
- * @throws Exception
- * @return PHPExcel_Cell Cell that was found, or null if not
found
- */
- public function getCacheData($pCoord) {
- if ($pCoord === $this->_currentObjectID) {
- return $this->_currentObject;
- }
- $this->_storeData();
-
- // Check if the entry that has been requested actually
exists
- if (parent::isDataSet($pCoord)) {
- $obj = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
- if ($obj === false) {
- // Entry no longer exists in APC, so clear
it from the cache array
- parent::deleteCacheData($pCoord);
- throw new Exception('Cell entry '.$pCoord.' no
longer exists in APC');
- }
- } else {
- // Return null if requested entry doesn't exist in
cache
- return null;
- }
-
- // Set current entry to the requested entry
- $this->_currentObjectID = $pCoord;
- $this->_currentObject = unserialize($obj);
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
-
- // Return requested entry
- return $this->_currentObject;
- } // function getCacheData()
-
-
- /**
- * Delete a cell in cache identified by coordinate address
- *
- * @access public
- * @param string $pCoord Coordinate address of
the cell to delete
- * @throws Exception
- */
- public function deleteCacheData($pCoord) {
- // Delete the entry from APC
- apc_delete($this->_cachePrefix.$pCoord.'.cache');
-
- // Delete the entry from our cell address array
- parent::deleteCacheData($pCoord);
- } // function deleteCacheData()
-
-
- /**
- * Clone the cell collection
- *
- * @access public
- * @param PHPExcel_Worksheet $parent The new
worksheet
- * @return void
- */
- public function copyCellCollection(PHPExcel_Worksheet $parent) {
- parent::copyCellCollection($parent);
- // Get a new id for the new file name
- $baseUnique = $this->_getUniqueID();
- $newCachePrefix = substr(md5($baseUnique),0,8).'.';
- $cacheList = $this->getCellList();
- foreach($cacheList as $cellID) {
- if ($cellID != $this->_currentObjectID) {
- $obj =
apc_fetch($this->_cachePrefix.$cellID.'.cache');
- if ($obj === false) {
- // Entry no longer exists in APC,
so clear it from the cache array
- parent::deleteCacheData($cellID);
- throw new Exception('Cell entry
'.$cellID.' no longer exists in APC');
- }
- if
(!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) {
- $this->__destruct();
- throw new Exception('Failed to store
cell '.$cellID.' in APC');
- }
- }
- }
- $this->_cachePrefix = $newCachePrefix;
- } // function copyCellCollection()
-
-
- /**
- * Clear the cell collection and disconnect from our parent
- *
- * @return void
- */
- public function unsetWorksheetCells() {
- if ($this->_currentObject !== NULL) {
- $this->_currentObject->detach();
- $this->_currentObject = $this->_currentObjectID = null;
- }
-
- // Flush the APC cache
- $this->__destruct();
-
- $this->_cellCache = array();
-
- // detach ourself from the worksheet, so that it can then
delete this object successfully
- $this->_parent = null;
- } // function unsetWorksheetCells()
-
-
- /**
- * Initialise this new cell collection
- *
- * @param PHPExcel_Worksheet $parent The worksheet
for this cell collection
- * @param array of mixed $arguments Additional
initialisation arguments
- */
- public function __construct(PHPExcel_Worksheet $parent, $arguments) {
- $cacheTime = (isset($arguments['cacheTime'])) ?
$arguments['cacheTime'] : 600;
-
- if ($this->_cachePrefix === NULL) {
- $baseUnique = $this->_getUniqueID();
- $this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
- $this->_cacheTime = $cacheTime;
-
- parent::__construct($parent);
- }
- } // function __construct()
-
-
- /**
- * Destroy this cell collection
- */
- public function __destruct() {
- $cacheList = $this->getCellList();
- foreach($cacheList as $cellID) {
- apc_delete($this->_cachePrefix.$cellID.'.cache');
- }
- } // function __destruct()
-
-
- /**
- * Identify whether the caching method is currently available
- * Some methods are dependent on the availability of certain extensions
being enabled in the PHP build
- *
- * @return boolean
- */
- public static function cacheMethodIsAvailable() {
- if (!function_exists('apc_store')) {
- return false;
- }
- if (apc_sma_info() === false) {
- return false;
- }
-
- return true;
- }
-
-}
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @category PHPExcel
+ * @package PHPExcel_CachedObjectStorage
+ * @copyright Copyright (c) 2006 - 2013 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
+ */
+
+
+/**
+ * PHPExcel_CachedObjectStorage_APC
+ *
+ * @category PHPExcel
+ * @package PHPExcel_CachedObjectStorage
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_CachedObjectStorage_APC extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
+
+ /**
+ * Prefix used to uniquely identify cache data for this worksheet
+ *
+ * @access private
+ * @var string
+ */
+ private $_cachePrefix = null;
+
+ /**
+ * Cache timeout
+ *
+ * @access private
+ * @var integer
+ */
+ private $_cacheTime = 600;
+
+
+ /**
+ * Store cell data in cache for the current cell object if it's "dirty",
+ * and the 'nullify' the current cell object
+ *
+ * @access private
+ * @return void
+ * @throws PHPExcel_Exception
+ */
+ protected function _storeData() {
+ if ($this->_currentCellIsDirty) {
+ $this->_currentObject->detach();
+
+ if
(!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime))
{
+ $this->__destruct();
+ throw new PHPExcel_Exception('Failed to store cell
'.$this->_currentObjectID.' in APC');
+ }
+ $this->_currentCellIsDirty = false;
+ }
+ $this->_currentObjectID = $this->_currentObject = null;
+ } // function _storeData()
+
+
+ /**
+ * Add or Update a cell in cache identified by coordinate address
+ *
+ * @access public
+ * @param string $pCoord Coordinate address of the cell to
update
+ * @param PHPExcel_Cell $cell Cell to update
+ * @return void
+ * @throws PHPExcel_Exception
+ */
+ public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+ if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID
!== null)) {
+ $this->_storeData();
+ }
+ $this->_cellCache[$pCoord] = true;
+
+ $this->_currentObjectID = $pCoord;
+ $this->_currentObject = $cell;
+ $this->_currentCellIsDirty = true;
+
+ return $cell;
+ } // function addCacheData()
+
+
+ /**
+ * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for
an indexed cell?
+ *
+ * @access public
+ * @param string $pCoord Coordinate address of the cell to check
+ * @return void
+ * @return boolean
+ */
+ public function isDataSet($pCoord) {
+ // Check if the requested entry is the current object, or exists in
the cache
+ if (parent::isDataSet($pCoord)) {
+ if ($this->_currentObjectID == $pCoord) {
+ return true;
+ }
+ // Check if the requested entry still exists in apc
+ $success = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
+ if ($success === FALSE) {
+ // Entry no longer exists in APC, so clear it from the
cache array
+ parent::deleteCacheData($pCoord);
+ throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer
exists in APC cache');
+ }
+ return true;
+ }
+ return false;
+ } // function isDataSet()
+
+
+ /**
+ * Get cell at a specific coordinate
+ *
+ * @access public
+ * @param string $pCoord Coordinate of the cell
+ * @throws PHPExcel_Exception
+ * @return PHPExcel_Cell Cell that was found, or null if not found
+ */
+ public function getCacheData($pCoord) {
+ if ($pCoord === $this->_currentObjectID) {
+ return $this->_currentObject;
+ }
+ $this->_storeData();
+
+ // Check if the entry that has been requested actually exists
+ if (parent::isDataSet($pCoord)) {
+ $obj = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
+ if ($obj === FALSE) {
+ // Entry no longer exists in APC, so clear it from the
cache array
+ parent::deleteCacheData($pCoord);
+ throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer
exists in APC cache');
+ }
+ } else {
+ // Return null if requested entry doesn't exist in cache
+ return null;
+ }
+
+ // Set current entry to the requested entry
+ $this->_currentObjectID = $pCoord;
+ $this->_currentObject = unserialize($obj);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
+
+ // Return requested entry
+ return $this->_currentObject;
+ } // function getCacheData()
+
+
+ /**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
+ /**
+ * Delete a cell in cache identified by coordinate address
+ *
+ * @access public
+ * @param string $pCoord Coordinate address of the cell to delete
+ * @throws PHPExcel_Exception
+ */
+ public function deleteCacheData($pCoord) {
+ // Delete the entry from APC
+ apc_delete($this->_cachePrefix.$pCoord.'.cache');
+
+ // Delete the entry from our cell address array
+ parent::deleteCacheData($pCoord);
+ } // function deleteCacheData()
+
+
+ /**
+ * Clone the cell collection
+ *
+ * @access public
+ * @param PHPExcel_Worksheet $parent The new worksheet
+ * @throws PHPExcel_Exception
+ * @return void
+ */
+ public function copyCellCollection(PHPExcel_Worksheet $parent) {
+ parent::copyCellCollection($parent);
+ // Get a new id for the new file name
+ $baseUnique = $this->_getUniqueID();
+ $newCachePrefix = substr(md5($baseUnique),0,8).'.';
+ $cacheList = $this->getCellList();
+ foreach($cacheList as $cellID) {
+ if ($cellID != $this->_currentObjectID) {
+ $obj = apc_fetch($this->_cachePrefix.$cellID.'.cache');
+ if ($obj === FALSE) {
+ // Entry no longer exists in APC, so clear it from the
cache array
+ parent::deleteCacheData($cellID);
+ throw new PHPExcel_Exception('Cell entry '.$cellID.' no
longer exists in APC');
+ }
+ if
(!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) {
+ $this->__destruct();
+ throw new PHPExcel_Exception('Failed to store cell
'.$cellID.' in APC');
+ }
+ }
+ }
+ $this->_cachePrefix = $newCachePrefix;
+ } // function copyCellCollection()
+
+
+ /**
+ * Clear the cell collection and disconnect from our parent
+ *
+ * @return void
+ */
+ public function unsetWorksheetCells() {
+ if ($this->_currentObject !== NULL) {
+ $this->_currentObject->detach();
+ $this->_currentObject = $this->_currentObjectID = null;
+ }
+
+ // Flush the APC cache
+ $this->__destruct();
+
+ $this->_cellCache = array();
+
+ // detach ourself from the worksheet, so that it can then delete
this object successfully
+ $this->_parent = null;
+ } // function unsetWorksheetCells()
+
+
+ /**
+ * Initialise this new cell collection
+ *
+ * @param PHPExcel_Worksheet $parent The worksheet for this cell
collection
+ * @param array of mixed $arguments Additional initialisation
arguments
+ */
+ public function __construct(PHPExcel_Worksheet $parent, $arguments) {
+ $cacheTime = (isset($arguments['cacheTime'])) ?
$arguments['cacheTime'] : 600;
+
+ if ($this->_cachePrefix === NULL) {
+ $baseUnique = $this->_getUniqueID();
+ $this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
+ $this->_cacheTime = $cacheTime;
+
+ parent::__construct($parent);
+ }
+ } // function __construct()
+
+
+ /**
+ * Destroy this cell collection
+ */
+ public function __destruct() {
+ $cacheList = $this->getCellList();
+ foreach($cacheList as $cellID) {
+ apc_delete($this->_cachePrefix.$cellID.'.cache');
+ }
+ } // function __destruct()
+
+
+ /**
+ * Identify whether the caching method is currently available
+ * Some methods are dependent on the availability of certain extensions
being enabled in the PHP build
+ *
+ * @return boolean
+ */
+ public static function cacheMethodIsAvailable() {
+ if (!function_exists('apc_store')) {
+ return FALSE;
+ }
+ if (apc_sma_info() === FALSE) {
+ return FALSE;
+ }
+
+ return TRUE;
+ }
+
+}
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/CacheBase.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
abstract class PHPExcel_CachedObjectStorage_CacheBase {
@@ -87,6 +87,16 @@
/**
+ * Return the parent worksheet for this cell collection
+ *
+ * @return PHPExcel_Worksheet
+ */
+ public function getParent()
+ {
+ return $this->_parent;
+ }
+
+ /**
* Is a value set in the current PHPExcel_CachedObjectStorage_ICache
for an indexed cell?
*
* @param string $pCoord Coordinate address of
the cell to check
@@ -101,12 +111,33 @@
} // function isDataSet()
+ /**
+ * Move a cell object from one address to another
+ *
+ * @param string $fromAddress Current address of the
cell to move
+ * @param string $toAddress Destination
address of the cell to move
+ * @return boolean
+ */
+ public function moveCell($fromAddress, $toAddress) {
+ if ($fromAddress === $this->_currentObjectID) {
+ $this->_currentObjectID = $toAddress;
+ }
+ $this->_currentCellIsDirty = true;
+ if (isset($this->_cellCache[$fromAddress])) {
+ $this->_cellCache[$toAddress] =
&$this->_cellCache[$fromAddress];
+ unset($this->_cellCache[$fromAddress]);
+ }
+
+ return TRUE;
+ } // function moveCell()
+
+
/**
* Add or Update a cell in cache
*
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function updateCacheData(PHPExcel_Cell $cell) {
return $this->addCacheData($cell->getCoordinate(),$cell);
@@ -117,7 +148,7 @@
* Delete a cell in cache identified by coordinate address
*
* @param string $pCoord Coordinate address of
the cell to delete
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function deleteCacheData($pCoord) {
if ($pCoord === $this->_currentObjectID) {
@@ -151,7 +182,7 @@
public function getSortedCellList() {
$sortKeys = array();
foreach ($this->getCellList() as $coord) {
- list($column,$row) = sscanf($coord,'%[A-Z]%d');
+ sscanf($coord,'%[A-Z]%d', $column, $row);
$sortKeys[sprintf('%09d%3s',$row,$column)] = $coord;
}
ksort($sortKeys);
@@ -172,7 +203,7 @@
$col = array('A' => '1A');
$row = array(1);
foreach ($this->getCellList() as $coord) {
- list($c,$r) = sscanf($coord,'%[A-Z]%d');
+ sscanf($coord,'%[A-Z]%d', $c, $r);
$row[$r] = $r;
$col[$c] = strlen($c).$c;
}
@@ -189,6 +220,38 @@
/**
+ * Return the cell address of the currently active cell object
+ *
+ * @return string
+ */
+ public function getCurrentAddress()
+ {
+ return $this->_currentObjectID;
+ }
+
+ /**
+ * Return the column address of the currently active cell object
+ *
+ * @return string
+ */
+ public function getCurrentColumn()
+ {
+ sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
+ return $column;
+ }
+
+ /**
+ * Return the row address of the currently active cell object
+ *
+ * @return string
+ */
+ public function getCurrentRow()
+ {
+ sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
+ return $row;
+ }
+
+ /**
* Get highest worksheet column
*
* @return string Highest column name
@@ -232,9 +295,12 @@
* @return void
*/
public function copyCellCollection(PHPExcel_Worksheet $parent) {
+ $this->_currentCellIsDirty;
+ $this->_storeData();
+
$this->_parent = $parent;
if (($this->_currentObject !== NULL) &&
(is_object($this->_currentObject))) {
- $this->_currentObject->attach($parent);
+ $this->_currentObject->attach($this);
}
} // function copyCellCollection()
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/DiscISAM.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_DiscISAM extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -40,14 +40,14 @@
*
* @var string
*/
- private $_fileName = null;
+ private $_fileName = NULL;
/**
* File handle for this cache file
*
* @var resource
*/
- private $_fileHandle = null;
+ private $_fileHandle = NULL;
/**
* Directory/Folder where the cache file is located
@@ -62,9 +62,9 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
@@ -86,7 +86,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -105,7 +105,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -124,8 +124,8 @@
$this->_currentObjectID = $pCoord;
fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
$this->_currentObject =
unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -133,6 +133,20 @@
/**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
+ /**
* Clone the cell collection
*
* @param PHPExcel_Worksheet $parent The new
worksheet
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/ICache.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
interface PHPExcel_CachedObjectStorage_ICache
{
@@ -41,7 +41,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell);
@@ -50,7 +50,7 @@
*
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function updateCacheData(PHPExcel_Cell $cell);
@@ -59,7 +59,7 @@
*
* @param string $pCoord Coordinate address of
the cell to retrieve
* @return PHPExcel_Cell Cell that was found, or null if not found
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function getCacheData($pCoord);
@@ -67,7 +67,7 @@
* Delete a cell in cache identified by coordinate address
*
* @param string $pCoord Coordinate address of
the cell to delete
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function deleteCacheData($pCoord);
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Igbinary.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Igbinary extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -40,9 +40,9 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
@@ -59,7 +59,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -78,7 +78,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -96,8 +96,8 @@
// Set current entry to the requested entry
$this->_currentObjectID = $pCoord;
$this->_currentObject =
igbinary_unserialize($this->_cellCache[$pCoord]);
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -105,6 +105,20 @@
/**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
+ /**
* Clear the cell collection and disconnect from our parent
*
* @return void
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memcache.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Memcache extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -62,9 +62,9 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
@@ -72,7 +72,7 @@
if
(!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime))
{
if
(!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime))
{
$this->__destruct();
- throw new Exception('Failed to store
cell '.$this->_currentObjectID.' in MemCache');
+ throw new PHPExcel_Exception('Failed to
store cell '.$this->_currentObjectID.' in MemCache');
}
}
$this->_currentCellIsDirty = false;
@@ -87,7 +87,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -121,7 +121,7 @@
if ($success === false) {
// Entry no longer exists in Memcache, so
clear it from the cache array
parent::deleteCacheData($pCoord);
- throw new Exception('Cell entry '.$pCoord.' no
longer exists in MemCache');
+ throw new PHPExcel_Exception('Cell entry
'.$pCoord.' no longer exists in MemCache');
}
return true;
}
@@ -133,7 +133,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -148,7 +148,7 @@
if ($obj === false) {
// Entry no longer exists in Memcache, so
clear it from the cache array
parent::deleteCacheData($pCoord);
- throw new Exception('Cell entry '.$pCoord.' no
longer exists in MemCache');
+ throw new PHPExcel_Exception('Cell entry
'.$pCoord.' no longer exists in MemCache');
}
} else {
// Return null if requested entry doesn't exist in
cache
@@ -158,19 +158,33 @@
// Set current entry to the requested entry
$this->_currentObjectID = $pCoord;
$this->_currentObject = unserialize($obj);
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
} // function getCacheData()
+ /**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
/**
* Delete a cell in cache identified by coordinate address
*
* @param string $pCoord Coordinate address of
the cell to delete
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function deleteCacheData($pCoord) {
// Delete the entry from Memcache
@@ -199,11 +213,11 @@
if ($obj === false) {
// Entry no longer exists in
Memcache, so clear it from the cache array
parent::deleteCacheData($cellID);
- throw new Exception('Cell entry
'.$cellID.' no longer exists in MemCache');
+ throw new PHPExcel_Exception('Cell
entry '.$cellID.' no longer exists in MemCache');
}
if
(!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime))
{
$this->__destruct();
- throw new Exception('Failed to store
cell '.$cellID.' in MemCache');
+ throw new PHPExcel_Exception('Failed to
store cell '.$cellID.' in MemCache');
}
}
}
@@ -250,7 +264,7 @@
// Set a new Memcache object and connect to the
Memcache server
$this->_memcache = new Memcache();
if (!$this->_memcache->addServer($memcacheServer,
$memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
- throw new Exception('Could not connect to
MemCache server at '.$memcacheServer.':'.$memcachePort);
+ throw new PHPExcel_Exception('Could not connect
to MemCache server at '.$memcacheServer.':'.$memcachePort);
}
$this->_cacheTime = $cacheTime;
@@ -264,10 +278,10 @@
*
* @param string $host Memcache server
* @param integer $port Memcache port
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function failureCallback($host, $port) {
- throw new Exception('memcache '.$host.':'.$port.' failed');
+ throw new PHPExcel_Exception('memcache '.$host.':'.$port.'
failed');
}
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Memory.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,20 +31,32 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Memory extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
/**
+ * Dummy method callable from CacheBase, but unused by Memory cache
+ *
+ * @return void
+ */
+ protected function _storeData() {
+ } // function _storeData()
+
+ /**
* Add or Update a cell in cache identified by coordinate address
*
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
- * @return void
- * @throws Exception
+ * @return PHPExcel_Cell
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
$this->_cellCache[$pCoord] = $cell;
+
+ // Set current entry to the new/updated entry
+ $this->_currentObjectID = $pCoord;
+
return $cell;
} // function addCacheData()
@@ -53,16 +65,20 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
// Check if the entry that has been requested actually
exists
if (!isset($this->_cellCache[$pCoord])) {
+ $this->_currentObjectID = NULL;
// Return null if requested entry doesn't exist in
cache
return null;
}
+ // Set current entry to the requested entry
+ $this->_currentObjectID = $pCoord;
+
// Return requested entry
return $this->_cellCache[$pCoord];
} // function getCacheData()
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemoryGZip.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_MemoryGZip extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -40,9 +40,9 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
@@ -59,7 +59,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -78,7 +78,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -96,8 +96,8 @@
// Set current entry to the requested entry
$this->_currentObjectID = $pCoord;
$this->_currentObject =
unserialize(gzinflate($this->_cellCache[$pCoord]));
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -105,6 +105,20 @@
/**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
+ /**
* Clear the cell collection and disconnect from our parent
*
* @return void
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/MemorySerialized.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_MemorySerialized extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -40,9 +40,9 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
@@ -59,7 +59,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -78,7 +78,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -96,8 +96,8 @@
// Set current entry to the requested entry
$this->_currentObjectID = $pCoord;
$this->_currentObject = unserialize($this->_cellCache[$pCoord]);
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -105,6 +105,20 @@
/**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
+ /**
* Clear the cell collection and disconnect from our parent
*
* @return void
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/PHPTemp.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_PHPTemp extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -54,9 +54,9 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
@@ -78,7 +78,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -97,7 +97,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -116,8 +116,8 @@
$this->_currentObjectID = $pCoord;
fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
$this->_currentObject =
unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -125,6 +125,20 @@
/**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
+ /**
* Clone the cell collection
*
* @param PHPExcel_Worksheet $parent The new
worksheet
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_SQLite extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -54,14 +54,14 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
if (!$this->_DBHandle->queryExec("INSERT OR REPLACE
INTO kvp_".$this->_TableName."
VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
$this->_currentCellIsDirty = false;
}
$this->_currentObjectID = $this->_currentObject = null;
@@ -74,7 +74,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -93,7 +93,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -105,7 +105,7 @@
$query = "SELECT value FROM kvp_".$this->_TableName." WHERE
id='".$pCoord."'";
$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
if ($cellResultSet === false) {
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
} elseif ($cellResultSet->numRows() == 0) {
// Return null if requested entry doesn't exist in
cache
return null;
@@ -116,8 +116,8 @@
$cellResult = $cellResultSet->fetchSingle();
$this->_currentObject = unserialize($cellResult);
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -139,7 +139,7 @@
$query = "SELECT id FROM kvp_".$this->_TableName." WHERE
id='".$pCoord."'";
$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
if ($cellResultSet === false) {
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
} elseif ($cellResultSet->numRows() == 0) {
// Return null if requested entry doesn't exist in
cache
return false;
@@ -152,7 +152,7 @@
* Delete a cell in cache identified by coordinate address
*
* @param string $pCoord Coordinate address of
the cell to delete
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function deleteCacheData($pCoord) {
if ($pCoord === $this->_currentObjectID) {
@@ -163,22 +163,52 @@
// Check if the requested entry exists in the cache
$query = "DELETE FROM kvp_".$this->_TableName." WHERE
id='".$pCoord."'";
if (!$this->_DBHandle->queryExec($query))
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
$this->_currentCellIsDirty = false;
} // function deleteCacheData()
/**
+ * Move a cell object from one address to another
+ *
+ * @param string $fromAddress Current address of the
cell to move
+ * @param string $toAddress Destination
address of the cell to move
+ * @return boolean
+ */
+ public function moveCell($fromAddress, $toAddress) {
+ if ($fromAddress === $this->_currentObjectID) {
+ $this->_currentObjectID = $toAddress;
+ }
+
+ $query = "DELETE FROM kvp_".$this->_TableName." WHERE
id='".$toAddress."'";
+ $result = $this->_DBHandle->exec($query);
+ if ($result === false)
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+
+ $query = "UPDATE kvp_".$this->_TableName." SET
id='".$toAddress."' WHERE id='".$fromAddress."'";
+ $result = $this->_DBHandle->exec($query);
+ if ($result === false)
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+
+ return TRUE;
+ } // function moveCell()
+
+
+ /**
* Get a list of all cell addresses currently held in cache
*
* @return array of string
*/
public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
$query = "SELECT id FROM kvp_".$this->_TableName;
$cellIdsResult =
$this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
if ($cellIdsResult === false)
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
$cellKeys = array();
foreach($cellIdsResult as $row) {
@@ -196,11 +226,14 @@
* @return void
*/
public function copyCellCollection(PHPExcel_Worksheet $parent) {
+ $this->_currentCellIsDirty;
+ $this->_storeData();
+
// Get a new id for the new table name
$tableName = str_replace('.','_',$this->_getUniqueID());
if (!$this->_DBHandle->queryExec('CREATE TABLE
kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
AS SELECT * FROM kvp_'.$this->_TableName))
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
// Copy the existing cell cache file
$this->_TableName = $tableName;
@@ -238,9 +271,9 @@
$this->_DBHandle = new SQLiteDatabase($_DBName);
if ($this->_DBHandle === false)
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
if (!$this->_DBHandle->queryExec('CREATE TABLE
kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
- throw new
Exception(sqlite_error_string($this->_DBHandle->lastError()));
+ throw new
PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
}
} // function __construct()
@@ -249,6 +282,9 @@
* Destroy this cell collection
*/
public function __destruct() {
+ if (!is_null($this->_DBHandle)) {
+ $this->_DBHandle->queryExec('DROP TABLE
kvp_'.$this->_TableName);
+ }
$this->_DBHandle = null;
} // function __destruct()
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/SQLite3.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_SQLite3 extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -49,23 +49,50 @@
*/
private $_DBHandle = null;
+ /**
+ * Prepared statement for a SQLite3 select query
+ *
+ * @var SQLite3Stmt
+ */
+ private $_selectQuery;
+
+ /**
+ * Prepared statement for a SQLite3 insert query
+ *
+ * @var SQLite3Stmt
+ */
+ private $_insertQuery;
+
+ /**
+ * Prepared statement for a SQLite3 update query
+ *
+ * @var SQLite3Stmt
+ */
+ private $_updateQuery;
+
+ /**
+ * Prepared statement for a SQLite3 delete query
+ *
+ * @var SQLite3Stmt
+ */
+ private $_deleteQuery;
+
/**
* Store cell data in cache for the current cell object if it's "dirty",
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
- $query = $this->_DBHandle->prepare("INSERT OR REPLACE
INTO kvp_".$this->_TableName." VALUES(:id,:data)");
-
$query->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
-
$query->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
- $result = $query->execute();
+
$this->_insertQuery->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
+
$this->_insertQuery->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
+ $result = $this->_insertQuery->execute();
if ($result === false)
- throw new
Exception($this->_DBHandle->lastErrorMsg());
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
$this->_currentCellIsDirty = false;
}
$this->_currentObjectID = $this->_currentObject = null;
@@ -78,7 +105,7 @@
* @param string $pCoord Coordinate address of
the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -97,7 +124,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -106,21 +133,23 @@
}
$this->_storeData();
- $query = "SELECT value FROM kvp_".$this->_TableName." WHERE
id='".$pCoord."'";
- $cellResult = $this->_DBHandle->querySingle($query);
- if ($cellResult === false) {
- throw new Exception($this->_DBHandle->lastErrorMsg());
- } elseif (is_null($cellResult)) {
+ $this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
+ $cellResult = $this->_selectQuery->execute();
+ if ($cellResult === FALSE) {
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+ }
+ $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
+ if ($cellData === FALSE) {
// Return null if requested entry doesn't exist in
cache
- return null;
+ return NULL;
}
// Set current entry to the requested entry
$this->_currentObjectID = $pCoord;
- $this->_currentObject = unserialize($cellResult);
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ $this->_currentObject = unserialize($cellData['value']);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -135,19 +164,18 @@
*/
public function isDataSet($pCoord) {
if ($pCoord === $this->_currentObjectID) {
- return true;
+ return TRUE;
}
// Check if the requested entry exists in the cache
- $query = "SELECT id FROM kvp_".$this->_TableName." WHERE
id='".$pCoord."'";
- $cellResult = $this->_DBHandle->querySingle($query);
- if ($cellResult === false) {
- throw new Exception($this->_DBHandle->lastErrorMsg());
- } elseif (is_null($cellResult)) {
- // Return null if requested entry doesn't exist in
cache
- return false;
+ $this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
+ $cellResult = $this->_selectQuery->execute();
+ if ($cellResult === FALSE) {
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
}
- return true;
+ $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
+
+ return ($cellData === FALSE) ? FALSE : TRUE;
} // function isDataSet()
@@ -155,34 +183,65 @@
* Delete a cell in cache identified by coordinate address
*
* @param string $pCoord Coordinate address of
the cell to delete
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function deleteCacheData($pCoord) {
if ($pCoord === $this->_currentObjectID) {
$this->_currentObject->detach();
- $this->_currentObjectID = $this->_currentObject = null;
+ $this->_currentObjectID = $this->_currentObject = NULL;
}
// Check if the requested entry exists in the cache
- $query = "DELETE FROM kvp_".$this->_TableName." WHERE
id='".$pCoord."'";
- $result = $this->_DBHandle->exec($query);
- if ($result === false)
- throw new Exception($this->_DBHandle->lastErrorMsg());
+ $this->_deleteQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
+ $result = $this->_deleteQuery->execute();
+ if ($result === FALSE)
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
- $this->_currentCellIsDirty = false;
+ $this->_currentCellIsDirty = FALSE;
} // function deleteCacheData()
/**
+ * Move a cell object from one address to another
+ *
+ * @param string $fromAddress Current address of the
cell to move
+ * @param string $toAddress Destination
address of the cell to move
+ * @return boolean
+ */
+ public function moveCell($fromAddress, $toAddress) {
+ if ($fromAddress === $this->_currentObjectID) {
+ $this->_currentObjectID = $toAddress;
+ }
+
+ $this->_deleteQuery->bindValue('id',$toAddress,SQLITE3_TEXT);
+ $result = $this->_deleteQuery->execute();
+ if ($result === false)
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+
+ $this->_updateQuery->bindValue('toid',$toAddress,SQLITE3_TEXT);
+
$this->_updateQuery->bindValue('fromid',$fromAddress,SQLITE3_TEXT);
+ $result = $this->_updateQuery->execute();
+ if ($result === false)
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+
+ return TRUE;
+ } // function moveCell()
+
+
+ /**
* Get a list of all cell addresses currently held in cache
*
* @return array of string
*/
public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
$query = "SELECT id FROM kvp_".$this->_TableName;
$cellIdsResult = $this->_DBHandle->query($query);
if ($cellIdsResult === false)
- throw new Exception($this->_DBHandle->lastErrorMsg());
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
$cellKeys = array();
while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
@@ -200,11 +259,14 @@
* @return void
*/
public function copyCellCollection(PHPExcel_Worksheet $parent) {
+ $this->_currentCellIsDirty;
+ $this->_storeData();
+
// Get a new id for the new table name
$tableName = str_replace('.','_',$this->_getUniqueID());
if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.'
(id VARCHAR(12) PRIMARY KEY, value BLOB)
AS SELECT * FROM
kvp_'.$this->_TableName))
- throw new Exception($this->_DBHandle->lastErrorMsg());
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
// Copy the existing cell cache file
$this->_TableName = $tableName;
@@ -242,10 +304,15 @@
$this->_DBHandle = new SQLite3($_DBName);
if ($this->_DBHandle === false)
- throw new
Exception($this->_DBHandle->lastErrorMsg());
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
if (!$this->_DBHandle->exec('CREATE TABLE
kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
- throw new
Exception($this->_DBHandle->lastErrorMsg());
+ throw new
PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
}
+
+ $this->_selectQuery = $this->_DBHandle->prepare("SELECT value
FROM kvp_".$this->_TableName." WHERE id = :id");
+ $this->_insertQuery = $this->_DBHandle->prepare("INSERT OR
REPLACE INTO kvp_".$this->_TableName." VALUES(:id,:data)");
+ $this->_updateQuery = $this->_DBHandle->prepare("UPDATE
kvp_".$this->_TableName." SET id=:toId WHERE id=:fromId");
+ $this->_deleteQuery = $this->_DBHandle->prepare("DELETE FROM
kvp_".$this->_TableName." WHERE id = :id");
} // function __construct()
@@ -254,6 +321,7 @@
*/
public function __destruct() {
if (!is_null($this->_DBHandle)) {
+ $this->_DBHandle->exec('DROP TABLE
kvp_'.$this->_TableName);
$this->_DBHandle->close();
}
$this->_DBHandle = null;
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorage/Wincache.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_CachedObjectStorage_Wincache extends
PHPExcel_CachedObjectStorage_CacheBase implements
PHPExcel_CachedObjectStorage_ICache {
@@ -55,9 +55,9 @@
* and the 'nullify' the current cell object
*
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
- private function _storeData() {
+ protected function _storeData() {
if ($this->_currentCellIsDirty) {
$this->_currentObject->detach();
@@ -65,12 +65,12 @@
if
(wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
if
(!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache',
$obj, $this->_cacheTime)) {
$this->__destruct();
- throw new Exception('Failed to store
cell '.$this->_currentObjectID.' in WinCache');
+ throw new PHPExcel_Exception('Failed to
store cell '.$this->_currentObjectID.' in WinCache');
}
} else {
if
(!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache',
$obj, $this->_cacheTime)) {
$this->__destruct();
- throw new Exception('Failed to store
cell '.$this->_currentObjectID.' in WinCache');
+ throw new PHPExcel_Exception('Failed to
store cell '.$this->_currentObjectID.' in WinCache');
}
}
$this->_currentCellIsDirty = false;
@@ -86,7 +86,7 @@
* @param string $pCoord Coordinate
address of the cell to update
* @param PHPExcel_Cell $cell Cell to update
* @return void
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function addCacheData($pCoord, PHPExcel_Cell $cell) {
if (($pCoord !== $this->_currentObjectID) &&
($this->_currentObjectID !== null)) {
@@ -119,7 +119,7 @@
if ($success === false) {
// Entry no longer exists in Wincache, so
clear it from the cache array
parent::deleteCacheData($pCoord);
- throw new Exception('Cell entry '.$pCoord.' no
longer exists in WinCache');
+ throw new PHPExcel_Exception('Cell entry
'.$pCoord.' no longer exists in WinCache');
}
return true;
}
@@ -131,7 +131,7 @@
* Get cell at a specific coordinate
*
* @param string $pCoord Coordinate of
the cell
- * @throws Exception
+ * @throws PHPExcel_Exception
* @return PHPExcel_Cell Cell that was found, or null if not
found
*/
public function getCacheData($pCoord) {
@@ -148,7 +148,7 @@
if ($success === false) {
// Entry no longer exists in WinCache, so
clear it from the cache array
parent::deleteCacheData($pCoord);
- throw new Exception('Cell entry '.$pCoord.' no
longer exists in WinCache');
+ throw new PHPExcel_Exception('Cell entry
'.$pCoord.' no longer exists in WinCache');
}
} else {
// Return null if requested entry doesn't exist in
cache
@@ -158,8 +158,8 @@
// Set current entry to the requested entry
$this->_currentObjectID = $pCoord;
$this->_currentObject = unserialize($obj);
- // Re-attach the parent worksheet
- $this->_currentObject->attach($this->_parent);
+ // Re-attach this as the cell's parent
+ $this->_currentObject->attach($this);
// Return requested entry
return $this->_currentObject;
@@ -167,10 +167,24 @@
/**
+ * Get a list of all cell addresses currently held in cache
+ *
+ * @return array of string
+ */
+ public function getCellList() {
+ if ($this->_currentObjectID !== null) {
+ $this->_storeData();
+ }
+
+ return parent::getCellList();
+ }
+
+
+ /**
* Delete a cell in cache identified by coordinate address
*
* @param string $pCoord Coordinate
address of the cell to delete
- * @throws Exception
+ * @throws PHPExcel_Exception
*/
public function deleteCacheData($pCoord) {
// Delete the entry from Wincache
@@ -200,11 +214,11 @@
if ($success === false) {
// Entry no longer exists in
WinCache, so clear it from the cache array
parent::deleteCacheData($cellID);
- throw new Exception('Cell entry
'.$cellID.' no longer exists in Wincache');
+ throw new PHPExcel_Exception('Cell
entry '.$cellID.' no longer exists in Wincache');
}
if
(!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj,
$this->_cacheTime)) {
$this->__destruct();
- throw new Exception('Failed to store
cell '.$cellID.' in Wincache');
+ throw new PHPExcel_Exception('Failed to
store cell '.$cellID.' in Wincache');
}
}
}
Modified:
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/CachedObjectStorageFactory.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -1,239 +1,251 @@
-<?php
-
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2012 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @category PHPExcel
- * @package PHPExcel
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
- * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
- */
-
-
-/**
- * PHPExcel_CachedObjectStorageFactory
- *
- * @category PHPExcel
- * @package PHPExcel_CachedObjectStorage
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorageFactory
-{
- const cache_in_memory = 'Memory';
- const cache_in_memory_gzip = 'MemoryGZip';
- const cache_in_memory_serialized = 'MemorySerialized';
- const cache_igbinary = 'Igbinary';
- const cache_to_discISAM = 'DiscISAM';
- const cache_to_apc = 'APC';
- const cache_to_memcache = 'Memcache';
- const cache_to_phpTemp = 'PHPTemp';
- const cache_to_wincache = 'Wincache';
- const cache_to_sqlite = 'SQLite';
- const cache_to_sqlite3 = 'SQLite3';
-
-
- /**
- * Name of the method used for cell cacheing
- *
- * @var string
- */
- private static $_cacheStorageMethod = NULL;
-
- /**
- * Name of the class used for cell cacheing
- *
- * @var string
- */
- private static $_cacheStorageClass = NULL;
-
-
- /**
- * List of all possible cache storage methods
- *
- * @var string[]
- */
- private static $_storageMethods = array(
- self::cache_in_memory,
- self::cache_in_memory_gzip,
- self::cache_in_memory_serialized,
- self::cache_igbinary,
- self::cache_to_phpTemp,
- self::cache_to_discISAM,
- self::cache_to_apc,
- self::cache_to_memcache,
- self::cache_to_wincache,
- self::cache_to_sqlite,
- self::cache_to_sqlite3,
- );
-
-
- /**
- * Default arguments for each cache storage method
- *
- * @var array of mixed array
- */
- private static $_storageMethodDefaultParameters = array(
- self::cache_in_memory => array(
-
),
- self::cache_in_memory_gzip => array(
-
),
- self::cache_in_memory_serialized => array(
-
),
- self::cache_igbinary => array(
-
),
- self::cache_to_phpTemp => array(
'memoryCacheSize' => '1MB'
-
),
- self::cache_to_discISAM => array( 'dir'
=> NULL
-
),
- self::cache_to_apc =>
array( 'cacheTime' => 600
-
),
- self::cache_to_memcache => array(
'memcacheServer' => 'localhost',
-
'memcachePort' => 11211,
-
'cacheTime' => 600
-
),
- self::cache_to_wincache => array(
'cacheTime' => 600
-
),
- self::cache_to_sqlite => array(
-
),
- self::cache_to_sqlite3 => array(
-
),
- );
-
-
- /**
- * Arguments for the active cache storage method
- *
- * @var array of mixed array
- */
- private static $_storageMethodParameters = array();
-
-
- /**
- * Return the current cache storage method
- *
- * @return string|NULL
- **/
- public static function getCacheStorageMethod()
- {
- return self::$_cacheStorageMethod;
- } // function getCacheStorageMethod()
-
-
- /**
- * Return the current cache storage class
- *
- * @return PHPExcel_CachedObjectStorage_ICache|NULL
- **/
- public static function getCacheStorageClass()
- {
- return self::$_cacheStorageClass;
- } // function getCacheStorageClass()
-
-
- /**
- * Return the list of all possible cache storage methods
- *
- * @return string[]
- **/
- public static function getAllCacheStorageMethods()
- {
- return self::$_storageMethods;
- } // function getCacheStorageMethods()
-
-
- /**
- * Return the list of all available cache storage methods
- *
- * @return string[]
- **/
- public static function getCacheStorageMethods()
- {
- $activeMethods = array();
- foreach(self::$_storageMethods as $storageMethod) {
- $cacheStorageClass = 'PHPExcel_CachedObjectStorage_' .
$storageMethod;
- if (call_user_func(array($cacheStorageClass,
'cacheMethodIsAvailable'))) {
- $activeMethods[] = $storageMethod;
- }
- }
- return $activeMethods;
- } // function getCacheStorageMethods()
-
-
- /**
- * Identify the cache storage method to use
- *
- * @param string $method Name of the
method to use for cell cacheing
- * @param array of mixed $arguments Additional arguments to
pass to the cell caching class
- *
when instantiating
- * @return boolean
- **/
- public static function initialize($method = self::cache_in_memory,
$arguments = array())
- {
- if (!in_array($method,self::$_storageMethods)) {
- return FALSE;
- }
-
- $cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
- if (!call_user_func(array( $cacheStorageClass,
-
'cacheMethodIsAvailable'))) {
- return FALSE;
- }
-
- self::$_storageMethodParameters[$method] =
self::$_storageMethodDefaultParameters[$method];
- foreach($arguments as $k => $v) {
- if
(isset(self::$_storageMethodParameters[$method][$k])) {
- self::$_storageMethodParameters[$method][$k] =
$v;
- }
- }
-
- if (self::$_cacheStorageMethod === NULL) {
- self::$_cacheStorageClass =
'PHPExcel_CachedObjectStorage_' . $method;
- self::$_cacheStorageMethod = $method;
- }
- return TRUE;
- } // function initialize()
-
-
- /**
- * Initialise the cache storage
- *
- * @param PHPExcel_Worksheet $parent Enable cell
caching for this worksheet
- * @return PHPExcel_CachedObjectStorage_ICache
- **/
- public static function getInstance(PHPExcel_Worksheet $parent)
- {
- $cacheMethodIsAvailable = TRUE;
- if (self::$_cacheStorageMethod === NULL) {
- $cacheMethodIsAvailable = self::initialize();
- }
-
- if ($cacheMethodIsAvailable) {
- $instance = new self::$_cacheStorageClass( $parent,
-
self::$_storageMethodParameters[self::$_cacheStorageMethod]
-
);
- if ($instance !== NULL) {
- return $instance;
- }
- }
-
- return FALSE;
- } // function getInstance()
-
-}
\ No newline at end of file
+<?php
+
+/**
+ * PHPExcel
+ *
+ * Copyright (c) 2006 - 2013 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @category PHPExcel
+ * @package PHPExcel_CachedObjectStorage
+ * @copyright Copyright (c) 2006 - 2013 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
+ */
+
+
+/**
+ * PHPExcel_CachedObjectStorageFactory
+ *
+ * @category PHPExcel
+ * @package PHPExcel_CachedObjectStorage
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ */
+class PHPExcel_CachedObjectStorageFactory
+{
+ const cache_in_memory = 'Memory';
+ const cache_in_memory_gzip = 'MemoryGZip';
+ const cache_in_memory_serialized = 'MemorySerialized';
+ const cache_igbinary = 'Igbinary';
+ const cache_to_discISAM = 'DiscISAM';
+ const cache_to_apc = 'APC';
+ const cache_to_memcache = 'Memcache';
+ const cache_to_phpTemp = 'PHPTemp';
+ const cache_to_wincache = 'Wincache';
+ const cache_to_sqlite = 'SQLite';
+ const cache_to_sqlite3 = 'SQLite3';
+
+
+ /**
+ * Name of the method used for cell cacheing
+ *
+ * @var string
+ */
+ private static $_cacheStorageMethod = NULL;
+
+ /**
+ * Name of the class used for cell cacheing
+ *
+ * @var string
+ */
+ private static $_cacheStorageClass = NULL;
+
+
+ /**
+ * List of all possible cache storage methods
+ *
+ * @var string[]
+ */
+ private static $_storageMethods = array(
+ self::cache_in_memory,
+ self::cache_in_memory_gzip,
+ self::cache_in_memory_serialized,
+ self::cache_igbinary,
+ self::cache_to_phpTemp,
+ self::cache_to_discISAM,
+ self::cache_to_apc,
+ self::cache_to_memcache,
+ self::cache_to_wincache,
+ self::cache_to_sqlite,
+ self::cache_to_sqlite3,
+ );
+
+
+ /**
+ * Default arguments for each cache storage method
+ *
+ * @var array of mixed array
+ */
+ private static $_storageMethodDefaultParameters = array(
+ self::cache_in_memory => array(
+ ),
+ self::cache_in_memory_gzip => array(
+ ),
+ self::cache_in_memory_serialized => array(
+ ),
+ self::cache_igbinary => array(
+ ),
+ self::cache_to_phpTemp => array( 'memoryCacheSize' =>
'1MB'
+ ),
+ self::cache_to_discISAM => array( 'dir' => NULL
+ ),
+ self::cache_to_apc => array( 'cacheTime' => 600
+ ),
+ self::cache_to_memcache => array( 'memcacheServer' =>
'localhost',
+ 'memcachePort' =>
11211,
+ 'cacheTime' => 600
+ ),
+ self::cache_to_wincache => array( 'cacheTime' => 600
+ ),
+ self::cache_to_sqlite => array(
+ ),
+ self::cache_to_sqlite3 => array(
+ ),
+ );
+
+
+ /**
+ * Arguments for the active cache storage method
+ *
+ * @var array of mixed array
+ */
+ private static $_storageMethodParameters = array();
+
+
+ /**
+ * Return the current cache storage method
+ *
+ * @return string|NULL
+ **/
+ public static function getCacheStorageMethod()
+ {
+ return self::$_cacheStorageMethod;
+ } // function getCacheStorageMethod()
+
+
+ /**
+ * Return the current cache storage class
+ *
+ * @return PHPExcel_CachedObjectStorage_ICache|NULL
+ **/
+ public static function getCacheStorageClass()
+ {
+ return self::$_cacheStorageClass;
+ } // function getCacheStorageClass()
+
+
+ /**
+ * Return the list of all possible cache storage methods
+ *
+ * @return string[]
+ **/
+ public static function getAllCacheStorageMethods()
+ {
+ return self::$_storageMethods;
+ } // function getCacheStorageMethods()
+
+
+ /**
+ * Return the list of all available cache storage methods
+ *
+ * @return string[]
+ **/
+ public static function getCacheStorageMethods()
+ {
+ $activeMethods = array();
+ foreach(self::$_storageMethods as $storageMethod) {
+ $cacheStorageClass = 'PHPExcel_CachedObjectStorage_' .
$storageMethod;
+ if (call_user_func(array($cacheStorageClass,
'cacheMethodIsAvailable'))) {
+ $activeMethods[] = $storageMethod;
+ }
+ }
+ return $activeMethods;
+ } // function getCacheStorageMethods()
+
+
+ /**
+ * Identify the cache storage method to use
+ *
+ * @param string $method Name of the method to use
for cell cacheing
+ * @param array of mixed $arguments Additional arguments to pass
to the cell caching class
+ * when instantiating
+ * @return boolean
+ **/
+ public static function initialize($method = self::cache_in_memory,
$arguments = array())
+ {
+ if (!in_array($method,self::$_storageMethods)) {
+ return FALSE;
+ }
+
+ $cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
+ if (!call_user_func(array( $cacheStorageClass,
+ 'cacheMethodIsAvailable'))) {
+ return FALSE;
+ }
+
+ self::$_storageMethodParameters[$method] =
self::$_storageMethodDefaultParameters[$method];
+ foreach($arguments as $k => $v) {
+ if (array_key_exists($k,
self::$_storageMethodParameters[$method])) {
+ self::$_storageMethodParameters[$method][$k] = $v;
+ }
+ }
+
+ if (self::$_cacheStorageMethod === NULL) {
+ self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' .
$method;
+ self::$_cacheStorageMethod = $method;
+ }
+ return TRUE;
+ } // function initialize()
+
+
+ /**
+ * Initialise the cache storage
+ *
+ * @param PHPExcel_Worksheet $parent Enable cell caching for
this worksheet
+ * @return PHPExcel_CachedObjectStorage_ICache
+ **/
+ public static function getInstance(PHPExcel_Worksheet $parent)
+ {
+ $cacheMethodIsAvailable = TRUE;
+ if (self::$_cacheStorageMethod === NULL) {
+ $cacheMethodIsAvailable = self::initialize();
+ }
+
+ if ($cacheMethodIsAvailable) {
+ $instance = new self::$_cacheStorageClass( $parent,
+
self::$_storageMethodParameters[self::$_cacheStorageMethod]
+ );
+ if ($instance !== NULL) {
+ return $instance;
+ }
+ }
+
+ return FALSE;
+ } // function getInstance()
+
+
+ /**
+ * Clear the cache storage
+ *
+ **/
+ public static function finalize()
+ {
+ self::$_cacheStorageMethod = NULL;
+ self::$_cacheStorageClass = NULL;
+ self::$_storageMethodParameters = array();
+ }
+
+}
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Database.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/DateTime.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_DateTime {
@@ -56,6 +56,18 @@
} // function _isLeapYear()
+ /**
+ * Return the number of days between two dates based on a 360 day
calendar
+ *
+ * @param integer $startDay Day of month of the
start date
+ * @param integer $startMonth Month of the start date
+ * @param integer $startYear Year of the start date
+ * @param integer $endDay Day of month of the
start date
+ * @param integer $endMonth Month of the start date
+ * @param integer $endYear Year of the start date
+ * @param boolean $methodUS Whether to use the US
method or the European method of calculation
+ * @return integer Number of days between the start date and the
end date
+ */
private static function _dateDiff360($startDay, $startMonth,
$startYear, $endDay, $endMonth, $endYear, $methodUS) {
if ($startDay == 31) {
--$startDay;
@@ -92,7 +104,7 @@
(PHPExcel_Calculation_Functions::getCompatibilityMode() ==
PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
return PHPExcel_Calculation_Functions::VALUE();
}
- if ((is_object($dateValue)) && ($dateValue instanceof
PHPExcel_Shared_Date::$dateTimeObjectType)) {
+ if ((is_object($dateValue)) && ($dateValue instanceof
DateTime)) {
$dateValue =
PHPExcel_Shared_Date::PHPToExcel($dateValue);
} else {
$saveReturnDateType =
PHPExcel_Calculation_Functions::getReturnDateType();
@@ -238,6 +250,10 @@
* Excel Function:
* DATE(year,month,day)
*
+ * PHPExcel is a lot more forgiving than MS Excel when passing non
numeric values to this function.
+ * A Month name or abbreviation (English only at this point) such as
'January' or 'Jan' will still be accepted,
+ * as will a day value with a suffix (e.g. '21st' rather than
simply 21); again only English language.
+ *
* @access public
* @category Date/Time Functions
* @param integer $year The value of the year argument
can include one to four digits.
@@ -278,6 +294,14 @@
$month =
PHPExcel_Calculation_Functions::flattenSingleValue($month);
$day =
PHPExcel_Calculation_Functions::flattenSingleValue($day);
+ if (($month !== NULL) && (!is_numeric($month))) {
+ $month = PHPExcel_Shared_Date::monthStringToNumber($month);
+ }
+
+ if (($day !== NULL) && (!is_numeric($day))) {
+ $day = PHPExcel_Shared_Date::dayStringToNumber($day);
+ }
+
$year = ($year !== NULL) ?
PHPExcel_Shared_String::testStringAsNumeric($year) : 0;
$month = ($month !== NULL) ?
PHPExcel_Shared_String::testStringAsNumeric($month) : 0;
$day = ($day !== NULL) ?
PHPExcel_Shared_String::testStringAsNumeric($day) : 0;
@@ -720,6 +744,10 @@
return PHPExcel_Calculation_Functions::VALUE();
}
+ if (!is_bool($method)) {
+ return PHPExcel_Calculation_Functions::VALUE();
+ }
+
// Execute function
$PHPStartDateObject =
PHPExcel_Shared_Date::ExcelToPHPObject($startDate);
$startDay = $PHPStartDateObject->format('j');
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Engineering.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -45,7 +45,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Engineering {
@@ -741,8 +741,6 @@
/**
- * _cleanComplex
- *
* Cleans the leading characters in a complex number string
*
* @param string $complexNumber The complex number to
clean
@@ -756,20 +754,25 @@
return $complexNumber;
}
-
- private static function _nbrConversionFormat($xVal,$places) {
+ /**
+ * Formats a number base string value with leading zeroes
+ *
+ * @param string $xVal The "number" to pad
+ * @param integer $places The length that we want
to pad this value
+ * @return string The padded "number"
+ */
+ private static function _nbrConversionFormat($xVal, $places) {
if (!is_null($places)) {
if (strlen($xVal) <= $places) {
- return
substr(str_pad($xVal,$places,'0',STR_PAD_LEFT),-10);
+ return substr(str_pad($xVal, $places, '0',
STR_PAD_LEFT), -10);
} else {
return PHPExcel_Calculation_Functions::NaN();
}
}
- return substr($xVal,-10);
+ return substr($xVal, -10);
} // function _nbrConversionFormat()
-
/**
* BESSELI
*
@@ -1932,7 +1935,7 @@
/**
* IMLOG2
*
- * Returns the common logarithm (base 10) of a complex number in x + yi
or x + yj text format.
+ * Returns the base-2 logarithm of a complex number in x + yi or x + yj
text format.
*
* Excel Function:
* IMLOG2(complexNumber)
@@ -2356,7 +2359,6 @@
* Returns an array of units of measure, for a specified
conversion group, or for all groups
*
* @param string $group The group whose units of measure you
want to retrieve
- *
* @return array
*/
public static function getConversionGroupUnits($group = NULL) {
@@ -2373,6 +2375,7 @@
/**
* getConversionGroupUnitDetails
*
+ * @param string $group The group whose units of measure you
want to retrieve
* @return array
*/
public static function getConversionGroupUnitDetails($group = NULL) {
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Exception.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,9 +31,9 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
-class PHPExcel_Calculation_Exception extends Exception {
+class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
/**
* Error handler callback
*
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/ExceptionHandler.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
/**
@@ -30,7 +30,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Financial.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -48,7 +48,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Financial {
@@ -1206,13 +1206,22 @@
/**
* FVSCHEDULE
*
+ * Returns the future value of an initial principal after applying a
series of compound interest rates.
+ * Use FVSCHEDULE to calculate the future value of an investment with a
variable or adjustable rate.
+ *
+ * Excel Function:
+ * FVSCHEDULE(principal,schedule)
+ *
+ * @param float $principal The present value.
+ * @param float[] $schedule An array of interest rates to
apply.
+ * @return float
*/
public static function FVSCHEDULE($principal, $schedule) {
$principal =
PHPExcel_Calculation_Functions::flattenSingleValue($principal);
$schedule =
PHPExcel_Calculation_Functions::flattenArray($schedule);
- foreach($schedule as $n) {
- $principal *= 1 + $n;
+ foreach($schedule as $rate) {
+ $principal *= 1 + $rate;
}
return $principal;
@@ -1227,13 +1236,13 @@
* Excel Function:
*
INTRATE(settlement,maturity,investment,redemption[,basis])
*
- * @param mixed settlement The security's settlement date.
+ * @param mixed $settlement The security's settlement date.
* The
security settlement date is the date after the issue date when the security is
traded to the buyer.
- * @param mixed maturity The security's maturity date.
+ * @param mixed $maturity The security's maturity date.
* The
maturity date is the date when the security expires.
- * @param integer investment The amount invested in the
security.
- * @param integer redemption The amount to be received at
maturity.
- * @param integer basis The type of day count to use.
+ * @param integer $investment The amount invested in the
security.
+ * @param integer $redemption The amount to be received at
maturity.
+ * @param integer $basis The type of day count to use.
*
0 or omitted US (NASD) 30/360
*
1 Actual/actual
*
2 Actual/360
@@ -1273,6 +1282,9 @@
*
* Returns the interest payment for a given period for an investment
based on periodic, constant payments and a constant interest rate.
*
+ * Excel Function:
+ * IPMT(rate,per,nper,pv[,fv][,type])
+ *
* @param float $rate Interest rate per period
* @param int $per Period for which we want to
find the interest
* @param int $nper Number of periods
@@ -1302,7 +1314,25 @@
return $interestAndPrincipal[0];
} // function IPMT()
-
+ /**
+ * IRR
+ *
+ * Returns the internal rate of return for a series of cash flows
represented by the numbers in values.
+ * These cash flows do not have to be even, as they would be for an
annuity. However, the cash flows must occur
+ * at regular intervals, such as monthly or annually. The internal rate
of return is the interest rate received
+ * for an investment consisting of payments (negative values) and
income (positive values) that occur at regular
+ * periods.
+ *
+ * Excel Function:
+ * IRR(values[,guess])
+ *
+ * @param float[] $values An array or a reference to
cells that contain numbers for which you want
+ *
to calculate the internal rate of return.
+ * Values
must contain at least one positive value and one negative value to
+ *
calculate the internal rate of return.
+ * @param float $guess A number that you guess is
close to the result of IRR
+ * @return float
+ */
public static function IRR($values, $guess = 0.1) {
if (!is_array($values)) return
PHPExcel_Calculation_Functions::VALUE();
$values = PHPExcel_Calculation_Functions::flattenArray($values);
@@ -1336,28 +1366,30 @@
$dx *= 0.5;
$x_mid = $rtb + $dx;
$f_mid = self::NPV($x_mid, $values);
- if ($f_mid <= 0.0) $rtb = $x_mid;
- if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) <
FINANCIAL_PRECISION)) return $x_mid;
+ if ($f_mid <= 0.0)
+ $rtb = $x_mid;
+ if ((abs($f_mid) < FINANCIAL_PRECISION) || (abs($dx) <
FINANCIAL_PRECISION))
+ return $x_mid;
}
return PHPExcel_Calculation_Functions::VALUE();
} // function IRR()
/**
- * ISPMT
+ * ISPMT
*
- * Returns the interest payment for an investment based on an
interest rate and a constant payment schedule.
+ * Returns the interest payment for an investment based on an interest
rate and a constant payment schedule.
*
- * Excel Function:
- * =ISPMT(interest_rate, period, number_payments, PV)
+ * Excel Function:
+ * =ISPMT(interest_rate, period, number_payments, PV)
*
- * interest_rate is the interest rate for the investment
+ * interest_rate is the interest rate for the investment
*
- * period is the period to calculate the interest rate. It must
be betweeen 1 and number_payments.
+ * period is the period to calculate the interest rate. It must be
betweeen 1 and number_payments.
*
- * number_payments is the number of payments for the annuity
+ * number_payments is the number of payments for the annuity
*
- * PV is the loan amount or present value of the payments
+ * PV is the loan amount or present value of the payments
*/
public static function ISPMT() {
// Return value
@@ -1384,6 +1416,22 @@
} // function ISPMT()
+ /**
+ * MIRR
+ *
+ * Returns the modified internal rate of return for a series of
periodic cash flows. MIRR considers both
+ * the cost of the investment and the interest received on
reinvestment of cash.
+ *
+ * Excel Function:
+ * MIRR(values,finance_rate, reinvestment_rate)
+ *
+ * @param float[] $values An array or a
reference to cells that contain a series of payments and
+ *
income occurring at regular intervals.
+ *
Payments are negative value, income is positive values.
+ * @param float $finance_rate The interest rate you
pay on the money used in the cash flows
+ * @param float $reinvestment_rate The interest rate you
receive on the cash flows as you reinvest them
+ * @return float
+ */
public static function MIRR($values, $finance_rate, $reinvestment_rate)
{
if (!is_array($values)) return
PHPExcel_Calculation_Functions::VALUE();
$values =
PHPExcel_Calculation_Functions::flattenArray($values);
@@ -1475,14 +1523,11 @@
}
} // function NPER()
-
/**
* NPV
*
* Returns the Net Present Value of a cash flow series given a discount
rate.
*
- * @param float Discount interest rate
- * @param array Cash flow series
* @return float
*/
public static function NPV() {
@@ -1505,7 +1550,6 @@
return $returnValue;
} // function NPV()
-
/**
* PMT
*
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaParser.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -54,7 +54,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_FormulaParser {
/* Character constants */
@@ -93,13 +93,13 @@
* Create a new PHPExcel_Calculation_FormulaParser
*
* @param string $pFormula Formula to parse
- * @throws Exception
+ * @throws PHPExcel_Calculation_Exception
*/
public function __construct($pFormula = '')
{
// Check parameters
if (is_null($pFormula)) {
- throw new Exception("Invalid parameter passed: formula");
+ throw new PHPExcel_Calculation_Exception("Invalid parameter
passed: formula");
}
// Initialise values
@@ -122,13 +122,13 @@
*
* @param int $pId Token id
* @return string
- * @throws Exception
+ * @throws PHPExcel_Calculation_Exception
*/
public function getToken($pId = 0) {
if (isset($this->_tokens[$pId])) {
return $this->_tokens[$pId];
} else {
- throw new Exception("Token with id $pId does not exist.");
+ throw new PHPExcel_Calculation_Exception("Token with id $pId
does not exist.");
}
}
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/FormulaToken.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -55,7 +55,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Function.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -31,7 +31,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Function {
/* Function categories */
@@ -74,7 +74,7 @@
* @param string $pCategory Category (represented
by CATEGORY_*)
* @param string $pExcelName Excel function name
* @param string $pPHPExcelName PHPExcel function mapping
- * @throws Exception
+ * @throws PHPExcel_Calculation_Exception
*/
public function __construct($pCategory = NULL, $pExcelName = NULL,
$pPHPExcelName = NULL)
{
@@ -84,7 +84,7 @@
$this->_excelName = $pExcelName;
$this->_phpExcelName = $pPHPExcelName;
} else {
- throw new Exception("Invalid parameters passed.");
+ throw new PHPExcel_Calculation_Exception("Invalid parameters
passed.");
}
}
@@ -101,13 +101,13 @@
* Set Category (represented by CATEGORY_*)
*
* @param string $value
- * @throws Exception
+ * @throws PHPExcel_Calculation_Exception
*/
public function setCategory($value = null) {
if (!is_null($value)) {
$this->_category = $value;
} else {
- throw new Exception("Invalid parameter passed.");
+ throw new PHPExcel_Calculation_Exception("Invalid parameter
passed.");
}
}
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Functions.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -54,7 +54,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Functions {
@@ -308,6 +308,8 @@
public static function _ifCondition($condition) {
$condition =
PHPExcel_Calculation_Functions::flattenSingleValue($condition);
+ if (!isset($condition{0}))
+ $condition = '=""';
if (!in_array($condition{0},array('>', '<', '='))) {
if (!is_numeric($condition)) { $condition =
PHPExcel_Calculation::_wrapResult(strtoupper($condition)); }
return '='.$condition;
@@ -489,7 +491,7 @@
* @return string Version information
*/
public static function VERSION() {
- return 'PHPExcel 1.7.8, 2012-10-12';
+ return 'PHPExcel 1.7.9, 2013-06-02';
} // function VERSION()
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Logical.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/LookupRef.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_LookupRef {
@@ -251,8 +251,9 @@
*
* @access public
* @category Logical Functions
- * @param string $linkURL Value to check, is also
the value returned when no error
- * @param string $displayName Value to return when testValue
is an error condition
+ * @param string $linkURL Value
to check, is also the value returned when no error
+ * @param string $displayName Value to return
when testValue is an error condition
+ * @param PHPExcel_Cell $pCell The cell to set
the hyperlink in
* @return mixed The value of $displayName (or $linkURL if
$displayName was blank)
*/
public static function HYPERLINK($linkURL = '', $displayName = null,
PHPExcel_Cell $pCell = null) {
@@ -287,13 +288,14 @@
*
* NOTE - INDIRECT() does not yet support the optional a1 parameter
introduced in Excel 2010
*
- * @param cellAddress An array or array formula, or a
reference to a range of cells for which you want the number of rows
+ * @param cellAddress $cellAddress The cell
address of the current cell (containing this formula)
+ * @param PHPExcel_Cell $pCell The current
cell (containing this formula)
* @return mixed The cells referenced by
cellAddress
*
* @todo Support for the optional a1 parameter introduced in
Excel 2010
*
*/
- public static function INDIRECT($cellAddress=Null, PHPExcel_Cell $pCell
= null) {
+ public static function INDIRECT($cellAddress = NULL, PHPExcel_Cell
$pCell = NULL) {
$cellAddress =
PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
if (is_null($cellAddress) || $cellAddress === '') {
return PHPExcel_Calculation_Functions::REF();
@@ -307,29 +309,30 @@
if
((!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i',
$cellAddress1, $matches)) ||
((!is_null($cellAddress2)) &&
(!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_CELLREF.'$/i',
$cellAddress2, $matches)))) {
-
if
(!preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NAMEDRANGE.'$/i',
$cellAddress1, $matches)) {
return PHPExcel_Calculation_Functions::REF();
}
- if (strpos($cellAddress,'!') !== false) {
- list($sheetName,$cellAddress) =
explode('!',$cellAddress);
+ if (strpos($cellAddress,'!') !== FALSE) {
+ list($sheetName, $cellAddress) =
explode('!',$cellAddress);
+ $sheetName = trim($sheetName, "'");
$pSheet =
$pCell->getParent()->getParent()->getSheetByName($sheetName);
} else {
$pSheet = $pCell->getParent();
}
- return
PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet,
False);
+ return
PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet,
FALSE);
}
- if (strpos($cellAddress,'!') !== false) {
+ if (strpos($cellAddress,'!') !== FALSE) {
list($sheetName,$cellAddress) =
explode('!',$cellAddress);
+ $sheetName = trim($sheetName, "'");
$pSheet =
$pCell->getParent()->getParent()->getSheetByName($sheetName);
} else {
$pSheet = $pCell->getParent();
}
- return
PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet,
False);
+ return
PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet,
FALSE);
} // function INDIRECT()
@@ -373,9 +376,10 @@
return PHPExcel_Calculation_Functions::REF();
}
- $sheetName = null;
+ $sheetName = NULL;
if (strpos($cellAddress,"!")) {
list($sheetName,$cellAddress) =
explode("!",$cellAddress);
+ $sheetName = trim($sheetName, "'");
}
if (strpos($cellAddress,":")) {
list($startCell,$endCell) = explode(":",$cellAddress);
@@ -416,7 +420,7 @@
$cellAddress .= ':'.$endCellColumn.$endCellRow;
}
- if ($sheetName !== null) {
+ if ($sheetName !== NULL) {
$pSheet =
$pCell->getParent()->getParent()->getSheetByName($sheetName);
} else {
$pSheet = $pCell->getParent();
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/MathTrig.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_MathTrig {
@@ -79,7 +79,7 @@
* ATAN2
*
* This function calculates the arc tangent of the two variables x and
y. It is similar to
- * calculating the arc tangent of y \xF7 x, except that
the signs of both arguments are used
+ * calculating the arc tangent of y รท x, except that the
signs of both arguments are used
* to determine the quadrant of the result.
* The arctangent is the angle from the x-axis to a line containing the
origin (0, 0) and a
* point with coordinates (xCoordinate, yCoordinate). The
angle is given in radians between
@@ -495,13 +495,13 @@
*
* @access public
* @category Mathematical and Trigonometric Functions
- * @param float $value The positive real number for
which you want the logarithm
+ * @param float $number The positive real number for
which you want the logarithm
* @param float $base The base of the logarithm. If
base is omitted, it is assumed to be 10.
* @return float
*/
public static function LOG_BASE($number = NULL, $base = 10) {
$number =
PHPExcel_Calculation_Functions::flattenSingleValue($number);
- $base = (is_null($base)) ? 10 : (float)
PHPExcel_Calculation_Functions::flattenSingleValue($base);
+ $base = (is_null($base)) ? 10 : (float)
PHPExcel_Calculation_Functions::flattenSingleValue($base);
if ((!is_numeric($base)) || (!is_numeric($number)))
return PHPExcel_Calculation_Functions::VALUE();
@@ -547,7 +547,7 @@
try {
$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
return $matrix->det();
- } catch (Exception $ex) {
+ } catch (PHPExcel_Exception $ex) {
return PHPExcel_Calculation_Functions::VALUE();
}
} // function MDETERM()
@@ -589,7 +589,7 @@
try {
$matrix = new PHPExcel_Shared_JAMA_Matrix($matrixData);
return $matrix->inverse()->getArray();
- } catch (Exception $ex) {
+ } catch (PHPExcel_Exception $ex) {
return PHPExcel_Calculation_Functions::VALUE();
}
} // function MINVERSE()
@@ -642,7 +642,7 @@
}
return $matrixA->times($matrixB)->getArray();
- } catch (Exception $ex) {
+ } catch (PHPExcel_Exception $ex) {
return PHPExcel_Calculation_Functions::VALUE();
}
} // function MMULT()
@@ -1252,7 +1252,8 @@
/**
* SUMX2MY2
*
- * @param mixed $value Value to check
+ * @param mixed[] $matrixData1 Matrix #1
+ * @param mixed[] $matrixData2 Matrix #2
* @return float
*/
public static function SUMX2MY2($matrixData1,$matrixData2) {
@@ -1281,7 +1282,8 @@
/**
* SUMX2PY2
*
- * @param mixed $value Value to check
+ * @param mixed[] $matrixData1 Matrix #1
+ * @param mixed[] $matrixData2 Matrix #2
* @return float
*/
public static function SUMX2PY2($matrixData1,$matrixData2) {
@@ -1310,7 +1312,8 @@
/**
* SUMXMY2
*
- * @param mixed $value Value to check
+ * @param mixed[] $matrixData1 Matrix #1
+ * @param mixed[] $matrixData2 Matrix #2
* @return float
*/
public static function SUMXMY2($matrixData1,$matrixData2) {
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Statistical.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -57,7 +57,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_Statistical {
@@ -834,6 +834,7 @@
* @category Mathematical and Trigonometric Functions
* @param mixed $arg,... Data values
* @param string $condition The criteria
that defines which cells will be checked.
+ * @param mixed[] $averageArgs Data values
* @return float
*/
public static function AVERAGEIF($aArgs,$condition,$averageArgs =
array()) {
@@ -912,6 +913,8 @@
* @param float $probability Probability at which
you want to evaluate the distribution
* @param float $alpha Parameter to
the distribution
* @param float $beta Parameter to
the distribution
+ * @param float $rMin Minimum value
+ * @param float $rMax Maximum value
* @param boolean $cumulative
* @return float
*
@@ -1954,9 +1957,9 @@
* @param boolean A logical value
specifying whether to return additional regression statistics.
* @return array
*/
- public static function
LINEST($yValues,$xValues=null,$const=True,$stats=False) {
- $const = (is_null($const)) ? True : (boolean)
PHPExcel_Calculation_Functions::flattenSingleValue($const);
- $stats = (is_null($stats)) ? False : (boolean)
PHPExcel_Calculation_Functions::flattenSingleValue($stats);
+ public static function LINEST($yValues, $xValues = NULL, $const = TRUE,
$stats = FALSE) {
+ $const = (is_null($const)) ? TRUE : (boolean)
PHPExcel_Calculation_Functions::flattenSingleValue($const);
+ $stats = (is_null($stats)) ? FALSE : (boolean)
PHPExcel_Calculation_Functions::flattenSingleValue($stats);
if (is_null($xValues)) $xValues =
range(1,count(PHPExcel_Calculation_Functions::flattenArray($yValues)));
if (!self::_checkTrendArrays($yValues,$xValues)) {
@@ -2059,7 +2062,9 @@
*
* Returns the inverse of the normal cumulative distribution
*
- * @param float $value
+ * @param float $probability
+ * @param float $mean
+ * @param float $stdDev
* @return float
*
* @todo Try implementing P J Acklam's refinement algorithm for
greater
@@ -2088,6 +2093,8 @@
* with parameters mean and standard_dev.
*
* @param float $value
+ * @param float $mean
+ * @param float $stdDev
* @return float
*/
public static function LOGNORMDIST($value, $mean, $stdDev) {
@@ -3621,14 +3628,14 @@
* Returns the Weibull distribution. Use this distribution in
reliability
* analysis, such as calculating a device's mean time to failure.
*
- * @param float $value
- * @param float $alpha Alpha Parameter
- * @param float $beta Beta Parameter
+ * @param float $dataSet
+ * @param float $m0 Alpha Parameter
+ * @param float $sigma Beta Parameter
* @param boolean $cumulative
* @return float
*
*/
- public static function ZTEST($dataSet, $m0, $sigma=null) {
+ public static function ZTEST($dataSet, $m0, $sigma = NULL) {
$dataSet =
PHPExcel_Calculation_Functions::flattenArrayIndexed($dataSet);
$m0 =
PHPExcel_Calculation_Functions::flattenSingleValue($m0);
$sigma =
PHPExcel_Calculation_Functions::flattenSingleValue($sigma);
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/TextData.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 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 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
@@ -41,7 +41,7 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Calculation_TextData {
@@ -89,7 +89,7 @@
/**
* TRIMNONPRINTABLE
*
- * @param mixed $value Value to check
+ * @param mixed $stringValue Value to check
* @return string
*/
public static function TRIMNONPRINTABLE($stringValue = '') {
@@ -113,7 +113,7 @@
/**
* TRIMSPACES
*
- * @param mixed $value Value to check
+ * @param mixed $stringValue Value to check
* @return string
*/
public static function TRIMSPACES($stringValue = '') {
@@ -133,7 +133,7 @@
/**
* ASCIICODE
*
- * @param string $character Value
+ * @param string $characters Value
* @return int
*/
public static function ASCIICODE($characters) {
@@ -296,7 +296,9 @@
/**
* FIXEDFORMAT
*
- * @param mixed $value Value to check
+ * @param mixed $value Value to check
+ * @param integer $decimals
+ * @param boolean $no_commas
* @return boolean
*/
public static function FIXEDFORMAT($value, $decimals = 2, $no_commas =
FALSE) {
@@ -407,7 +409,6 @@
* STRINGLENGTH
*
* @param string $value Value
- * @param int $chars Number of characters
* @return string
*/
public static function STRINGLENGTH($value = '') {
@@ -440,11 +441,7 @@
$mixedCaseString = ($mixedCaseString) ?
PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
}
- if (function_exists('mb_convert_case')) {
- return mb_convert_case($mixedCaseString, MB_CASE_LOWER,
'UTF-8');
- } else {
- return strtoupper($mixedCaseString);
- }
+ return PHPExcel_Shared_String::StrToLower($mixedCaseString);
} // function LOWERCASE()
@@ -463,11 +460,7 @@
$mixedCaseString = ($mixedCaseString) ?
PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
}
- if (function_exists('mb_convert_case')) {
- return mb_convert_case($mixedCaseString, MB_CASE_UPPER,
'UTF-8');
- } else {
- return strtoupper($mixedCaseString);
- }
+ return PHPExcel_Shared_String::StrToUpper($mixedCaseString);
} // function UPPERCASE()
@@ -486,20 +479,17 @@
$mixedCaseString = ($mixedCaseString) ?
PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
}
- if (function_exists('mb_convert_case')) {
- return mb_convert_case($mixedCaseString, MB_CASE_TITLE,
'UTF-8');
- } else {
- return ucwords($mixedCaseString);
- }
+ return PHPExcel_Shared_String::StrToTitle($mixedCaseString);
} // function PROPERCASE()
/**
* REPLACE
*
- * @param string $value Value
- * @param int $start Start character
- * @param int $chars Number of characters
+ * @param string $oldText String to modify
+ * @param int $start Start character
+ * @param int $chars Number of characters
+ * @param string $newText String to replace in defined
position
* @return string
*/
public static function REPLACE($oldText = '', $start = 1, $chars =
null, $newText) {
@@ -565,7 +555,7 @@
/**
* RETURNSTRING
*
- * @param mixed $value Value to check
+ * @param mixed $testValue Value to check
* @return boolean
*/
public static function RETURNSTRING($testValue = '') {
@@ -582,6 +572,7 @@
* TEXTFORMAT
*
* @param mixed $value Value to check
+ * @param string $format Format mask to use
* @return boolean
*/
public static function TEXTFORMAT($value,$format) {
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
2013-10-07 13:37:40 UTC (rev 11354)
+++
branches/Version-1_0-branch/phpgwapi/inc/phpexcel/PHPExcel/Calculation/Token/Stack.php
2013-10-07 13:42:22 UTC (rev 11355)
@@ -2,7 +2,7 @@
/**
* PHPExcel
*
- * Copyright (c) 2006 - 2012 PHPExcel
+ * Copyright (c) 2006 - 2013 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,24 +20,53 @@
*
* @category PHPExcel
* @package PHPExcel_Calculation
- * @copyright Copyright (c) 2006 - 2012 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
- * @version 1.7.8, 2012-10-12
+ * @version 1.7.9, 2013-06-02
*/
+/**
+ * PHPExcel_Calculation_Token_Stack
+ *
+ * @category PHPExcel_Calculation_Token_Stack
+ * @package PHPExcel_Calculation
+ * @copyright Copyright (c) 2006 - 2013 PHPExcel
(http://www.codeplex.com/PHPExcel)
+ */
class PHPExcel_Calculation_Token_Stack {
+ /**
+ * The parser stack for formulae
+ *
+ * @var mixed[]
+ */
private $_stack = array();
+
+ /**
+ * Count of entries in the parser stack
+ *
+ * @var integer
+ */
private $_count = 0;
+ /**
+ * Return the number of entries on the stack
+ *
+ * @return integer
+ */
public function count() {
return $this->_count;
} // function count()
-
- public function push($type,$value,$reference=null) {
+ /**
+ * Push a new entry onto the stack
+ *
+ * @param mixed $type
+ * @param mixed $value
+ * @param mixed $reference
+ */
+ public function push($type, $value, $reference = NULL) {
$this->_stack[$this->_count++] = array('type' =>
$type,
'value' => $value,
'reference' => $reference
@@ -50,24 +79,37 @@
}
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11355] Merge 11347:11354 from trunk,
Sigurd Nes <=