Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop
This commit is contained in:
commit
b726b23411
@ -1371,7 +1371,9 @@ class PHPExcel_Reader_Excel2007 extends PHPExcel_Reader_Abstract implements PHPE
|
|||||||
$hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
|
$hfImages[ (string)$shape['id'] ]->setResizeProportional(false);
|
||||||
$hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
|
$hfImages[ (string)$shape['id'] ]->setWidth($style['width']);
|
||||||
$hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
|
$hfImages[ (string)$shape['id'] ]->setHeight($style['height']);
|
||||||
|
if (isset($style['margin-left'])) {
|
||||||
$hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
|
$hfImages[ (string)$shape['id'] ]->setOffsetX($style['margin-left']);
|
||||||
|
}
|
||||||
$hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
|
$hfImages[ (string)$shape['id'] ]->setOffsetY($style['margin-top']);
|
||||||
$hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
|
$hfImages[ (string)$shape['id'] ]->setResizeProportional(true);
|
||||||
}
|
}
|
||||||
|
49
Classes/PHPExcel/locale/bg/config
Normal file
49
Classes/PHPExcel/locale/bg/config
Normal file
@ -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 = #Н/Д
|
@ -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:
|
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
|
#### Creating PHPExcel_Reader_IReader using PHPExcel_IOFactory
|
||||||
|
|
||||||
|
@ -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 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.
|
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.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user