From d4277abd853a4045cddc7a24afdfca91d324a156 Mon Sep 17 00:00:00 2001 From: Nikolay Ninkov Date: Mon, 15 Jul 2013 09:28:47 +0300 Subject: [PATCH 1/4] Bulgarian localisation Start translation to Bulgarian language. --- Classes/PHPExcel/locale/bg/config | 49 +++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Classes/PHPExcel/locale/bg/config diff --git a/Classes/PHPExcel/locale/bg/config b/Classes/PHPExcel/locale/bg/config new file mode 100644 index 0000000..4cecddb --- /dev/null +++ b/Classes/PHPExcel/locale/bg/config @@ -0,0 +1,49 @@ +## +## 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_Settings +## @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 ##VERSION##, ##DATE## +## +## + + +ArgumentSeparator = ; + + +## +## (For future use) +## +currencySymbol = лв + + +## +## Excel Error Codes (For future use) + +## +NULL = #ПРАЗНО! +DIV0 = #ДЕЛ/0! +VALUE = #СТОЙНОСТ! +REF = #РЕФ! +NAME = #ИМЕ? +NUM = #ЧИСЛО! +NA = #Н/Д From 963931a7e31e37d323824dd94f09934826c85bb2 Mon Sep 17 00:00:00 2001 From: Jack Stone Date: Thu, 18 Jul 2013 10:34:27 -0400 Subject: [PATCH 2/4] Update 02-Loading-a-Spreadsheet.md --- .../ReadingSpreadsheetFiles/02-Loading-a-Spreadsheet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/markdown/ReadingSpreadsheetFiles/02-Loading-a-Spreadsheet.md b/Documentation/markdown/ReadingSpreadsheetFiles/02-Loading-a-Spreadsheet.md index 986360f..afa674d 100644 --- a/Documentation/markdown/ReadingSpreadsheetFiles/02-Loading-a-Spreadsheet.md +++ b/Documentation/markdown/ReadingSpreadsheetFiles/02-Loading-a-Spreadsheet.md @@ -15,7 +15,7 @@ $objPHPExcel = PHPExcel_IOFactory::load($inputFileName); The load() method will attempt to identify the file type, and instantiate a loader for that file type; using it to load the file and store the data and any formatting in a PHPExcel object. -The method makes an initial guess at the loader to instantiate based on the file extension; but will test the file before actually executing the load: so if (for example) the file is actually a CSV file or conatins HTML markup, but that has been given a .xls extension (quite a common practise), it will reject the Excel5 loader that it would normally use for a .xls file; and test the file using the other loaders until it finds the appropriate loader, and then use that to read the file. +The method makes an initial guess at the loader to instantiate based on the file extension; but will test the file before actually executing the load: so if (for example) the file is actually a CSV file or contains HTML markup, but that has been given a .xls extension (quite a common practise), it will reject the Excel5 loader that it would normally use for a .xls file; and test the file using the other loaders until it finds the appropriate loader, and then use that to read the file. While easy to implement in your code, and you don't need to worry about the file type; this isn't the most efficient method to load a file; and it lacks the flexibility to configure the loader in any way before actually reading the file into a PHPExcel object. From 67ed42d0cdf2501a4e0d9f8bd97d2892152d9a21 Mon Sep 17 00:00:00 2001 From: Jack Stone Date: Thu, 18 Jul 2013 10:42:58 -0400 Subject: [PATCH 3/4] Update 10-Reading-and-Writing.md --- Documentation/markdown/Overview/10-Reading-and-Writing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/markdown/Overview/10-Reading-and-Writing.md b/Documentation/markdown/Overview/10-Reading-and-Writing.md index e582352..1468abc 100644 --- a/Documentation/markdown/Overview/10-Reading-and-Writing.md +++ b/Documentation/markdown/Overview/10-Reading-and-Writing.md @@ -8,7 +8,7 @@ As you already know from part REF _Ref191885438 \w \h 3.3 REF _Ref191885438 \h The PHPExcel API offers multiple methods to create a PHPExcel_Writer_IReader or PHPExcel_Writer_IWriter instance: -Direct creationVia PHPExcel_IOFactoryAll examples underneath demonstrate the direct creation method. Note that you can also use the PHPExcel_IOFactory class to do this. +Direct creation via PHPExcel_IOFactory. All examples underneath demonstrate the direct creation method. Note that you can also use the PHPExcel_IOFactory class to do this. #### Creating PHPExcel_Reader_IReader using PHPExcel_IOFactory From 2d39be32cb4321bd43b7aa790949df6a9a7d248b Mon Sep 17 00:00:00 2001 From: Andreas Scheibleger Date: Tue, 23 Jul 2013 14:16:40 +0200 Subject: [PATCH 4/4] Check whether margin-left is set in excel file when reading --- Classes/PHPExcel/Reader/Excel2007.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Reader/Excel2007.php b/Classes/PHPExcel/Reader/Excel2007.php index 678d837..412cc71 100644 --- a/Classes/PHPExcel/Reader/Excel2007.php +++ b/Classes/PHPExcel/Reader/Excel2007.php @@ -1371,7 +1371,9 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE $hfImages[ (string)$shape['id'] ]->setResizeProportional(false); $hfImages[ (string)$shape['id'] ]->setWidth($style['width']); $hfImages[ (string)$shape['id'] ]->setHeight($style['height']); - $hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']); + if (isset($style['margin-left'])) { + $hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']); + } $hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']); $hfImages[ (string)$shape['id'] ]->setResizeProportional(true); }