7244 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Burch	a51afa06f4	Nice and small change here... Update the formula parser code to use usermodel.HSSFWorkbook instead of model.Workbook. This should keep things a bit cleaner, and make it much easier for the formula code to work with XSSF ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648303 13f79535-47bb-0310-9956-ffa450edef68	2008-04-15 16:00:50 +00:00
Yegor Kozlov	437dc3b77d	Improved factoring of ppt objects. For ppt tabels Slide.getShapes() returns the Table object (was ShapeGroup) ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648276 13f79535-47bb-0310-9956-ffa450edef68	2008-04-15 15:12:58 +00:00
Yegor Kozlov	e643ec7129	TextSpecInfoAtom is present in PPT 2003+. When the text is changed we must update this record, otherwise the ppt becomes corrupted ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648274 13f79535-47bb-0310-9956-ffa450edef68	2008-04-15 15:11:13 +00:00
Yegor Kozlov	0d790c922c	start improving handling of resources in HSLF. PPFont object represents a font in a presenatation. ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648203 13f79535-47bb-0310-9956-ffa450edef68	2008-04-15 10:05:22 +00:00
Yegor Kozlov	149e87cda0	TextShape is a common superclass of all shapes that can hold text. The subclasses are TextBox and AutoShape. ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648156 13f79535-47bb-0310-9956-ffa450edef68	2008-04-15 07:54:20 +00:00
Nick Burch	a7a2f8917c	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647832 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r647824 | yegor | 2008-04-14 15:58:18 +0100 (Mon, 14 Apr 2008) | 1 line make sure all hslf classes use POI loggers ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647834 13f79535-47bb-0310-9956-ffa450edef68	2008-04-14 15:11:54 +00:00
Yegor Kozlov	82bb0bc7ef	make sure all hslf classes use POI loggers ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647824 13f79535-47bb-0310-9956-ffa450edef68	2008-04-14 14:58:18 +00:00
Nick Burch	6317266dc9	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647740 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r647712 | yegor | 2008-04-14 10:20:20 +0100 (Mon, 14 Apr 2008) | 1 line use commons logging throughout the code ........ r647713 | yegor | 2008-04-14 10:21:57 +0100 (Mon, 14 Apr 2008) | 1 line misc usermodel improvements. Also added the source code for the ApacheconEU08 FFT presentation ........ r647738 | nick | 2008-04-14 12:47:47 +0100 (Mon, 14 Apr 2008) | 1 line Switch to using our own logger, rather than the commons one ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647743 13f79535-47bb-0310-9956-ffa450edef68	2008-04-14 11:54:34 +00:00
Nick Burch	4e3d83a556	Add missing sysproperty ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647740 13f79535-47bb-0310-9956-ffa450edef68	2008-04-14 11:50:22 +00:00
Nick Burch	a23a1f11fc	Switch to using our own logger, rather than the commons one ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647738 13f79535-47bb-0310-9956-ffa450edef68	2008-04-14 11:47:47 +00:00
Yegor Kozlov	7bf8c0afbe	misc usermodel improvements. Also added the source code for the ApacheconEU08 FFT presentation ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647713 13f79535-47bb-0310-9956-ffa450edef68	2008-04-14 09:21:57 +00:00
Yegor Kozlov	874b349c58	use commons logging throughout the code ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647712 13f79535-47bb-0310-9956-ffa450edef68	2008-04-14 09:20:20 +00:00
Nick Burch	3e71a7fdc3	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647579 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r647278 | josh | 2008-04-11 20:36:37 +0100 (Fri, 11 Apr 2008) | 1 line fixed typo and formatting in class javadoc ........ r647567 | nick | 2008-04-13 14:16:36 +0100 (Sun, 13 Apr 2008) | 1 line Various new bits of documentation on embeded files and text extraction ........ r647574 | nick | 2008-04-13 15:58:27 +0100 (Sun, 13 Apr 2008) | 1 line Start on a eventusermodel based excel text extractor ........ r647576 | nick | 2008-04-13 16:09:42 +0100 (Sun, 13 Apr 2008) | 1 line Finish off eventusermodel based Excel Extractor, and update the xls to csv converter (moved to correct place) based on discoveries for the text extractor ........ r647577 | nick | 2008-04-13 16:13:17 +0100 (Sun, 13 Apr 2008) | 1 line Add information of EventBasedExcelExtractor to the documentation ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647580 13f79535-47bb-0310-9956-ffa450edef68	2008-04-13 15:25:33 +00:00
Nick Burch	6051677d7b	Start documenting changes on the branch in the status file ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647579 13f79535-47bb-0310-9956-ffa450edef68	2008-04-13 15:18:29 +00:00
Nick Burch	0d7b9ae941	Add information of EventBasedExcelExtractor to the documentation ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647577 13f79535-47bb-0310-9956-ffa450edef68	2008-04-13 15:13:17 +00:00
Nick Burch	5a36ce6ec3	Finish off eventusermodel based Excel Extractor, and update the xls to csv converter (moved to correct place) based on discoveries for the text extractor ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647576 13f79535-47bb-0310-9956-ffa450edef68	2008-04-13 15:09:42 +00:00
Nick Burch	497c9eb3c6	Start on a eventusermodel based excel text extractor ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647574 13f79535-47bb-0310-9956-ffa450edef68	2008-04-13 14:58:27 +00:00
Nick Burch	205b021a27	Various new bits of documentation on embeded files and text extraction ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647567 13f79535-47bb-0310-9956-ffa450edef68	2008-04-13 13:16:36 +00:00
Josh Micich	6f04c746ac	fixed typo and formatting in class javadoc ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647278 13f79535-47bb-0310-9956-ffa450edef68	2008-04-11 19:36:37 +00:00
Nick Burch	e828cee4c3	Start on interfaces for powerpoint ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647229 13f79535-47bb-0310-9956-ffa450edef68	2008-04-11 17:22:40 +00:00
Nick Burch	58889f782a	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-647199 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r646854 | nick | 2008-04-10 16:54:02 +0100 (Thu, 10 Apr 2008) | 1 line Initial support for getting and changing chart titles and series titles ........ r646870 | nick | 2008-04-10 17:59:10 +0100 (Thu, 10 Apr 2008) | 1 line Improve how POIFS works with directory entries, and update HWPFDocument to support reading an embeded word document ........ r647152 | nick | 2008-04-11 14:04:11 +0100 (Fri, 11 Apr 2008) | 1 line Update the sample embeded documents to be from know sources, so we can test better ........ r647186 | nick | 2008-04-11 15:43:05 +0100 (Fri, 11 Apr 2008) | 1 line Update HSLFSlideShow and HSSFWorkbook to take advantage of POIFS updates, and allow reading embeded documents ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647203 13f79535-47bb-0310-9956-ffa450edef68	2008-04-11 15:52:17 +00:00
Nick Burch	3e3895049c	Update HSLFSlideShow and HSSFWorkbook to take advantage of POIFS updates, and allow reading embeded documents ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647186 13f79535-47bb-0310-9956-ffa450edef68	2008-04-11 14:43:05 +00:00
Nick Burch	425305fd67	Update the sample embeded documents to be from know sources, so we can test better ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@647152 13f79535-47bb-0310-9956-ffa450edef68	2008-04-11 13:04:11 +00:00
Nick Burch	beed69a11e	Improve how POIFS works with directory entries, and update HWPFDocument to support reading an embeded word document ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@646870 13f79535-47bb-0310-9956-ffa450edef68	2008-04-10 16:59:10 +00:00
Nick Burch	f8c6a52a2c	Initial support for getting and changing chart titles and series titles ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@646854 13f79535-47bb-0310-9956-ffa450edef68	2008-04-10 15:54:02 +00:00
Nick Burch	077fb6c6f9	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646820 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r646405 | nick | 2008-04-09 16:36:39 +0100 (Wed, 09 Apr 2008) | 1 line Implement a proxy HSSFListener which tracks the format records, and lets you lookup the format string for a given cell. Convert the xls to csv example to use it ........ r646666 | josh | 2008-04-10 08:06:55 +0100 (Thu, 10 Apr 2008) | 1 line bugzilla 44792 - fixed encode/decode problems in ExternalNameRecord and CRNRecord. ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646826 13f79535-47bb-0310-9956-ffa450edef68	2008-04-10 14:43:24 +00:00
Nick Burch	958e1ffb71	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646313 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r646312 | nick | 2008-04-09 13:46:42 +0100 (Wed, 09 Apr 2008) | 1 line Provide a common ole2 implementation of POITextExtractor, which gives access to the document metadata ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646818 13f79535-47bb-0310-9956-ffa450edef68	2008-04-10 14:26:36 +00:00
Paolo Mottadelli	32401dd168	ColumnHelper get/setColDefaultStyle; XSSFSheet setDefaultColumnStyle; XSSFCellStyle constructor refactored abd getIndex method implemented; StyesTable get/setCellXf and get/setCellStyleXf. + tests ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646668 13f79535-47bb-0310-9956-ffa450edef68	2008-04-10 07:35:47 +00:00
Josh Micich	7024f8896e	bugzilla 44792 - fixed encode/decode problems in ExternalNameRecord and CRNRecord. ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@646666 13f79535-47bb-0310-9956-ffa450edef68	2008-04-10 07:06:55 +00:00
Paolo Mottadelli	e545961728	build.xml indentation ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646532 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 21:04:41 +00:00
Paolo Mottadelli	3c92cf0fd9	build.xml reverted to revision 646405 (not to be committed in 646527) ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646530 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 20:58:33 +00:00
Paolo Mottadelli	3c1c5bac83	XSSFSheet removeMergedRegion + tests ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646527 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 20:50:55 +00:00
Nick Burch	63409a6647	Implement a proxy HSSFListener which tracks the format records, and lets you lookup the format string for a given cell. Convert the xls to csv example to use it ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@646405 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 15:36:39 +00:00
Nick Burch	3a7871a2dd	Provide a common ole2 implementation of POITextExtractor, which gives access to the document metadata ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@646312 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 12:46:42 +00:00
Nick Burch	e047e25094	Tweak how we do ooxml properties, and handle hyperlinks for word documents when extracting ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646298 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 12:22:23 +00:00
Nick Burch	7aa73d82dc	Shuffle the common text extractor stuff from scratchpad to ooxml, to match the compile paths ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646239 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 09:20:20 +00:00
Nick Burch	033bb682a2	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-646236 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r645952 | yegor | 2008-04-08 15:49:59 +0100 (Tue, 08 Apr 2008) | 1 line fix bug #44770: RuntimeException: Couldn't instantiate the class for type with id 1036 on class class org.apache.poi.hslf.record.PPDrawing ........ r646194 | josh | 2008-04-09 06:56:50 +0100 (Wed, 09 Apr 2008) | 1 line some more tweaks for bug 30311. Set some (unused) bits in FontFormatting to match Excel. ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@646237 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 09:17:58 +00:00
Josh Micich	08802e667e	some more tweaks for bug 30311. Set some (unused) bits in FontFormatting to match Excel. ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@646194 13f79535-47bb-0310-9956-ffa450edef68	2008-04-09 05:56:50 +00:00
Yegor Kozlov	e534579881	fix bug #44770: RuntimeException: Couldn't instantiate the class for type with id 1036 on class class org.apache.poi.hslf.record.PPDrawing ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@645952 13f79535-47bb-0310-9956-ffa450edef68	2008-04-08 14:49:59 +00:00
Nick Burch	13bbdb732e	Finish off ExtractorFactory tests ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645879 13f79535-47bb-0310-9956-ffa450edef68	2008-04-08 12:39:39 +00:00
Nick Burch	8c4372edce	More ExtractorFactory support and tests ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645872 13f79535-47bb-0310-9956-ffa450edef68	2008-04-08 12:17:18 +00:00
Nick Burch	fdc07f33f8	More ExtractorFactory support and tests ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645870 13f79535-47bb-0310-9956-ffa450edef68	2008-04-08 12:03:05 +00:00
Nick Burch	dfad3bbafb	Start on a factory for text extractors ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645861 13f79535-47bb-0310-9956-ffa450edef68	2008-04-08 11:43:37 +00:00
Nick Burch	59a9bd6448	Example of using xssf usermodel to create a new file ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645832 13f79535-47bb-0310-9956-ffa450edef68	2008-04-08 10:34:43 +00:00
Nick Burch	1b687abb8d	Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645821 via svnmerge from ... https://svn.apache.org:443/repos/asf/poi/trunk ........ r645560 | nick | 2008-04-07 16:20:57 +0100 (Mon, 07 Apr 2008) | 1 line Fix 43670, 44501 - Fix how HDGF deals with trailing data in the list of chunk headers ........ r645566 | yegor | 2008-04-07 16:34:53 +0100 (Mon, 07 Apr 2008) | 1 line empty.ppt with the master styles compatible with PPT 2003 ........ r645567 | yegor | 2008-04-07 16:35:49 +0100 (Mon, 07 Apr 2008) | 1 line misc usermodel improvements in HSLF ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645823 13f79535-47bb-0310-9956-ffa450edef68	2008-04-08 10:07:36 +00:00
Paolo Mottadelli	6e35b1d786	XSSFSheet getNumMergedRegions, getMergedRegionAt methods + tests ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645666 13f79535-47bb-0310-9956-ffa450edef68	2008-04-07 20:31:43 +00:00
Paolo Mottadelli	b80094b1a2	XSSFSheet freeze/splitPane support + tests ... git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@645662 13f79535-47bb-0310-9956-ffa450edef68	2008-04-07 19:54:43 +00:00
Yegor Kozlov	3174b1bf34	misc usermodel improvements in HSLF ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@645567 13f79535-47bb-0310-9956-ffa450edef68	2008-04-07 15:35:49 +00:00
Yegor Kozlov	4e58d9cff9	empty.ppt with the master styles compatible with PPT 2003 ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@645566 13f79535-47bb-0310-9956-ffa450edef68	2008-04-07 15:34:53 +00:00
Nick Burch	0d6a3d651d	Fix 43670, 44501 - Fix how HDGF deals with trailing data in the list of chunk headers ... git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@645560 13f79535-47bb-0310-9956-ffa450edef68	2008-04-07 15:20:57 +00:00