Commit Graph

535 Commits

Author SHA1 Message Date
Andrey Tyshev f9cab8d02c Fix name of style definitions 2017-02-21 21:42:56 +03:00
antoine d8c5703e06 Merge remote-tracking branch
'github_troosan/fix_for_different_even_odd_headers' into develop

Conflicts:
	tests/PhpWord/SettingsTest.php
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
2017-01-29 14:54:08 +01:00
antoine aef7a0ba76 add possibility to write w:evenAndOddHeaders in settings.xml 2017-01-29 14:34:19 +01:00
antoine 217fd6ecf1 fix image loading over https 2017-01-29 13:37:43 +01:00
antoine 517c432ee6 fix image loading over https 2017-01-29 13:16:54 +01:00
antoine 91f79d85cf Merge branch 'show_hide_spelling_grammatical_errors' into develop 2017-01-28 12:04:51 +01:00
antoine d23409f687 Add possibility to show/hide spelling and grammatical errors 2017-01-28 11:39:43 +01:00
antoine 8d7775552c Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-22 15:16:16 +01:00
antoine fc3bc29a02 fix default page size 2017-01-22 11:09:44 +01:00
antoine da60645be3 Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-21 19:29:14 +01:00
antoine b6a9f7c9b3 fix paper size and add tests for Paper class 2017-01-21 19:06:49 +01:00
Progi1984 6da9d8a0bf Merge pull request #928 from likeuntomurphy/develop
Fixes PHPOffice/PHPWord#927
2016-12-13 16:56:57 +01:00
antoine 51c6b5fc38 add support for Image creation from string image data 2016-11-08 23:40:10 +01:00
antoine a070628225 Merge remote-tracking branch 'origin/develop' into develop 2016-11-08 23:33:50 +01:00
antoine 46eebe2136 add support for Image creation from string image data 2016-11-08 23:22:22 +01:00
liangtaohy 3f9ab94812 Update MsDoc.php
fix style\font not found bug
2016-11-08 18:32:22 +08:00
Jonathan Cox 000e36acfe Fixes PHPOffice/PHPWord#927 2016-10-28 20:06:03 -04:00
antoine c50e3c581a replace tab with spaces 2016-10-28 23:28:05 +02:00
antoine 18474c56c4 replace tab with spaces 2016-10-28 23:27:24 +02:00
antoine 77ed1565c3 make FontStyle based on paragraph if it set 2016-10-28 22:40:44 +02:00
antoine e7229fc15c make FontStyle based on paragraph if it set 2016-10-28 22:27:05 +02:00
antoine d52d9b8985 Add support for XE and INDEX fields 2016-10-27 23:12:26 +02:00
Progi1984 c71069022e Merge pull request #821 from brutto/patch-1
Add info about Invalid image
2016-08-23 10:24:27 +02:00
Roman Syroeshko 2bcfacfbf9 Updated copyright. 2016-07-31 12:35:08 +04:00
Roman Syroeshko 1827eab20c Removed deprecated code. 2016-07-30 22:41:31 +04:00
Roman Syroeshko 54013a6164 https://github.com/PHPOffice/PHPWord/issues/399. 2016-07-30 22:32:32 +04:00
Roman Syroeshko fb863cdf21 https://github.com/PHPOffice/PHPWord/issues/335. 2016-07-30 16:02:23 +04:00
Roman Syroeshko 7deb010318 Fixed formatting. 2016-07-08 23:43:12 +04:00
Roman Syroeshko e2ea1eec7c Fixed tests. 2016-07-08 23:21:38 +04:00
Roman Syroeshko 3f1e0ac4a7 #483. Output escaping for RTF. 2016-07-08 22:56:59 +04:00
Roman Syroeshko 649da97a42 Fixed build. 2016-06-28 21:50:02 +04:00
Roman Syroeshko 4c7e1399fe #483. Output escaping for HTML. 2016-06-28 21:37:36 +04:00
Anton Karakulov 0652302423 add info about Invalid image
if there are many images in document are used and one of them throws `InvalidImageException` it is very difficult to detect which one without any message here...
2016-06-19 15:27:01 +03:00
Roman Syroeshko 508d6194fc Fixed build. 2016-06-13 20:31:33 +04:00
Roman Syroeshko ebbb3a525e #483. Output escaping for ODF. 2016-06-13 20:14:54 +04:00
Roman Syroeshko a07dc6cdf0 #483. Output escaping for OOXML. 2016-06-04 20:21:54 +04:00
Roman Syroeshko ec3c62b051 #483. Output escaping for OOXML. 2016-06-04 20:06:37 +04:00
Roman Syroeshko d57973693d #618. 2016-04-23 19:49:10 +04:00
Roman Syroeshko 1c5bb3a911 #548. 2016-04-09 22:03:21 +04:00
Roman Syroeshko 28f801b5d0 #704. 2016-02-23 19:02:35 +04:00
Roman Syroeshko 53a53695ff Reviewed and merged #612. 2016-02-06 22:14:29 +04:00
Roman Syroeshko 995dc68706 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 22:19:06 +04:00
Roman Syroeshko 8bc236460a Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 22:10:13 +04:00
Roman Syroeshko a621447993 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 21:35:04 +04:00
Roman Syroeshko ea4388def5 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 21:06:09 +04:00
Roman Syroeshko f359825cb7 Reviewed and merged #658. 2016-01-23 19:16:34 +04:00
Roman Syroeshko 529edcb68e Merge pull request #617 from kazitanvirahsan/develop
Template processor setValue() improvements #614
2015-12-12 21:01:31 +04:00
Roman Syroeshko 7bd6cbdb64 Copyright update. 2015-12-05 21:28:46 +04:00
Roman Syroeshko 43fb23d896 Copyright update. 2015-12-05 21:26:01 +04:00
Roman Syroeshko e6d73d8ff8 Removed custom autoloader. 2015-11-21 20:24:49 +04:00
Roman Syroeshko 95c097106f Reorganized unit tests. 2015-11-15 21:34:36 +04:00
Roman Syroeshko 3965f110ff Added backward compatibility for deprecated alignment options. 2015-11-14 15:57:15 +04:00
Roman Syroeshko d74c0bd878 Added backward compatibility for deprecated alignment options. 2015-11-14 15:31:50 +04:00
Roman Syroeshko 09e5e352a9 Changed init value of the NumberingLevel.alignment property. 2015-10-21 21:44:10 +04:00
Roman Syroeshko 12823a5fbf Fixed build. 2015-10-10 19:32:53 +04:00
Roman Syroeshko 505cc76406 Fixed build. 2015-10-10 19:22:19 +04:00
Roman Syroeshko 94c0d02330 Next round of refactoring of alignment-related functionality. 2015-10-10 19:06:23 +04:00
kazi Tanvir Ahsan b446a23b61 Update 2 Template processor setValue() improvements #614 2015-09-10 23:50:23 +10:00
kazi Tanvir Ahsan 873d41a872 Update Template processor setValue() improvements #614 2015-09-10 23:46:48 +10:00
kazi Tanvir Ahsan a123ce41e5 Template processor setValue() improvements #614 2015-09-10 23:33:02 +10:00
Roman Syroeshko adf20d318f #513. 2015-08-30 18:03:31 +04:00
Roman Syroeshko 90295fe09c #532. 2015-08-16 19:50:47 +04:00
Roman Syroeshko db8221d303 Fix for #532. 2015-07-02 21:46:29 +03:00
Roman Syroeshko 988eaca87e Fix for #532. 2015-07-02 21:39:54 +03:00
Roman Syroeshko 1cd4fbf5ae Performance improvement for #513. 2015-06-02 22:15:58 +03:00
Roman Syroeshko 9770f44877 Shortened names of ``TemplateProcessor`` properties. 2015-04-15 00:12:37 +03:00
Roman Syroeshko b7387be3fd Reimplemented #498. 2015-04-14 22:47:41 +03:00
Roman Syroeshko a5c3645717 Performance improvement for #513. 2015-04-11 21:41:58 +04:00
Roman Syroeshko f33abcdcc4 Performance improvement for #513. 2015-04-11 21:25:40 +04:00
Roman Syroeshko 4eefb60362 #51 (updated tests, refactored a little). 2015-02-21 18:30:00 +04:00
Roman Syroeshko cc305bcb11 Fixed broken paragraph alignment for OpenXml. 2015-02-21 17:43:46 +04:00
h6w 474f8ef2f7 Update AbstractStyle.php 2014-12-29 18:16:05 +11:00
Roman Syroeshko fbfde2e0ee #441 (added @since annotation). 2014-12-17 21:39:19 +04:00
Progi1984 2176232910 Merge PR #441 2014-12-10 19:55:07 +01:00
chc88 d330e57018 Update PageBreak.php
Update pdf-generation; check if we're generating a pdf
2014-12-10 15:49:40 +01:00
Roman Syroeshko 2cb124f5b1 https://github.com/PHPOffice/PHPWord/issues/51 2014-12-09 21:35:26 +04:00
Roman Syroeshko f8ee230495 [FIXED] Typo. 2014-12-04 22:12:16 +04:00
Franz Holzinger ca664a53d7 Update Table.php
You must not open a <th> and close it as a </td>.
read http://www.w3schools.com/tags/tag_th.asp
2014-12-03 17:01:27 +01:00
chc88 37ca009769 Extend HTML output for pagebreaks for PDF generation
Make HTML output of pagebreak compatible for the different PDF writers by combining:
http://mpdf1.com/manual/index.php?tid=110 (tested and working)
and
https://code.google.com/p/dompdf/wiki/FAQ (tested and working)
and
http://chandeshparekh.com/css-to-create-new-page-in-php-tcpdf-pdf/
2014-11-14 17:26:23 +01:00
Roman Syroeshko c0e04fac51 Reverted #51. 2014-11-07 20:54:24 +04:00
Roman Syroeshko b2286f8545 [FIXED] https://github.com/PHPOffice/PHPWord/issues/401 2014-10-22 19:53:50 +04:00
pjt33 b1acecb255 Correct spelling of fldCharType separate. See http://www.ecma-international.org/news/TC45_current_work/OfficeOpenXML-XMLSchema.zip , file wml.xsd, line 3977. 2014-10-20 11:27:57 +02:00
Roman Syroeshko fa575ef12c Minor refactoring. 2014-10-14 21:33:04 +04:00
Roman Syroeshko 2c81d5f38b Some phpdoc for https://github.com/PHPOffice/PHPWord/pull/390. 2014-10-10 21:20:52 +04:00
Roman Syroeshko 4445fd3258 Replaced `array_key_exists` with `isset` for better performance. 2014-10-10 21:10:29 +04:00
Spike Ilacqua 4e25283195 Add missing setters for pageSizeW and pageSizeH 2014-10-02 10:44:34 -06:00
Progi1984 8ebe3b3738 Revert "Add missing setters for pageSizeW and pageSizeH" 2014-10-02 17:21:17 +02:00
Spike Ilacqua 0a8635ece8 Add missing setters for pageSizeW and pageSizeH 2014-09-22 16:58:00 -06:00
Franz Holzinger 27b0c69fd4 Update Head.php
The generated HTML and PDF tables are missing the border lines. Sample_07_TemplateCloneRow.docx shows the lines around the table and the table cells. However the generated HTML and PDF file are missing those lines. This patch fixes this issue.
2014-09-22 15:46:55 +02:00
Roman Syroeshko fdbd983d14 Merge pull request #356 from GMTA/develop
Set the right method name for addShape() for AbstractContainer
2014-09-07 18:52:29 +04:00
Roman Syroeshko 5811aac272 Merge pull request #302 from basjan/absolute-positioning 2014-09-07 18:21:24 +04:00
Roman Syroeshko 42955f17dd Merge pull request #302 from basjan/absolute-positioning 2014-09-07 18:19:10 +04:00
Roman Syroeshko c4cbabeb36 Merge pull request #302 from basjan/absolute-positioning
For absolute positioning vPos and hPos need to be set to POS_ABSOLUTE
2014-09-07 18:01:53 +04:00
Jelle Raaijmakers 9b3b1aa7a0 Set the right method name for addShape() in PHPDoc @method for AbstractContainer. 2014-08-31 00:06:00 +02:00
Roman Syroeshko 9757fbb033 [FIXED] https://github.com/PHPOffice/PHPWord/issues/340 2014-08-23 20:19:48 +04:00
Roman Syroeshko bf0136c156 https://github.com/PHPOffice/PHPWord/issues/216 2014-08-16 15:46:38 +04:00
Roman Syroeshko 5a75d84f8f Merge remote-tracking branch 'origin/develop' into develop 2014-08-16 15:22:35 +04:00
Roman Syroeshko ec25dd338b https://github.com/PHPOffice/PHPWord/issues/216 2014-08-16 15:21:58 +04:00
Progi1984 90d64bd347 #23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes) 2014-08-16 12:44:12 +02:00
Progi1984 4ade9c3c6e #23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes) 2014-08-16 12:33:37 +02:00