Commit Graph

3824 Commits

Author SHA1 Message Date
Yegor Kozlov
c5ce487ede correctly process PICT blips (see bug #44886)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@652288 13f79535-47bb-0310-9956-ffa450edef68
2008-04-30 06:19:38 +00:00
Yegor Kozlov
25a1ddde16 start a new section for 3.1-beta2
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@652285 13f79535-47bb-0310-9956-ffa450edef68
2008-04-30 06:18:05 +00:00
Nick Burch
64775cfe62 Fix from Trejkaz from bug #44857 - Avoid OOM on unknown escher records when EscherMetafileBlip is incorrect
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@651992 13f79535-47bb-0310-9956-ffa450edef68
2008-04-27 18:02:13 +00:00
Nick Burch
10c9ab866b Improved hyperlink and comment fetching for xwpf text extraction, based on the patch from bug #44821
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@651979 13f79535-47bb-0310-9956-ffa450edef68
2008-04-27 16:36:51 +00:00
Nick Burch
c6a1c586b5 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-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-650914,650916-650920 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk

........
  r648589 | yegor | 2008-04-16 08:47:16 +0100 (Wed, 16 Apr 2008) | 1 line
  
  bug #41071 is fixed in trunk. Added a unit test and resolved.
........
  r648623 | yegor | 2008-04-16 09:43:08 +0100 (Wed, 16 Apr 2008) | 1 line
  
  Rich text in HSSFTextbox must have at least one format run. Make sure it is so and apply th default fopnt if no formats were applied.
........
  r648624 | yegor | 2008-04-16 09:44:07 +0100 (Wed, 16 Apr 2008) | 1 line
  
  Misc improvements in Freeform shape
........
  r648674 | yegor | 2008-04-16 12:57:15 +0100 (Wed, 16 Apr 2008) | 1 line
  
  Support for getting OLE object data from slide show
........
  r649142 | yegor | 2008-04-17 16:06:01 +0100 (Thu, 17 Apr 2008) | 1 line
  
  added a unit test and closed bug #28774
........
  r649143 | yegor | 2008-04-17 16:08:03 +0100 (Thu, 17 Apr 2008) | 1 line
  
  initial support for rendering powerpoint slides into images
........
  r649145 | yegor | 2008-04-17 16:09:37 +0100 (Thu, 17 Apr 2008) | 1 line
  
  updated the list of changes
........
  r649557 | yegor | 2008-04-18 15:57:07 +0100 (Fri, 18 Apr 2008) | 1 line
  
  improved rendering of text
........
  r649796 | yegor | 2008-04-19 12:09:59 +0100 (Sat, 19 Apr 2008) | 1 line
  
  Support for getting embedded sounds from slide show
........
  r649797 | yegor | 2008-04-19 12:16:53 +0100 (Sat, 19 Apr 2008) | 1 line
  
  properly set shapeId for new shapes
........
  r649798 | yegor | 2008-04-19 12:17:37 +0100 (Sat, 19 Apr 2008) | 1 line
  
  misc improvements in slide rendering
........
  r649800 | yegor | 2008-04-19 12:52:36 +0100 (Sat, 19 Apr 2008) | 1 line
  
  updated the docs
........
  r649911 | yegor | 2008-04-20 12:17:48 +0100 (Sun, 20 Apr 2008) | 1 line
  
  more improvements in slide rendering
........
  r649914 | yegor | 2008-04-20 12:58:08 +0100 (Sun, 20 Apr 2008) | 1 line
  
  set version.id=3.0.3-beta1
........
  r650129 | yegor | 2008-04-21 13:51:47 +0100 (Mon, 21 Apr 2008) | 1 line
  
  more improvements in slide rendering
........
  r650130 | yegor | 2008-04-21 13:52:23 +0100 (Mon, 21 Apr 2008) | 1 line
  
  a couple of HSLF examples
........
  r650133 | yegor | 2008-04-21 14:10:33 +0100 (Mon, 21 Apr 2008) | 1 line
  
  update current version to 3.1-beta1
........
  r650138 | yegor | 2008-04-21 14:29:59 +0100 (Mon, 21 Apr 2008) | 1 line
  
  unfinished release guide. It would be nice to have a html version.
........
  r650139 | yegor | 2008-04-21 14:31:53 +0100 (Mon, 21 Apr 2008) | 1 line
  
  unfinished release guide. It would be nice to have a html version.
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@650938 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 16:49:18 +00:00
Nick Burch
eebb380b95 Include the jdk14 jar, and the libs when building the ooxml dist
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@650920 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 15:54:50 +00:00
Nick Burch
8e27843dcd Fix up interfaces to compile cleanly all on jdk14s
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@650919 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 15:53:12 +00:00
Nick Burch
71413188e1 As mentioned on dev@ - zap the old, initial OOXML code out of trunk. It isn't compatible with the new code in the ooxml branch, which may catch users out, and anyone wanting OOXML support should be using the code in the branch to get updates and lots more features
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@650915 13f79535-47bb-0310-9956-ffa450edef68
2008-04-23 15:45:42 +00:00
Yegor Kozlov
5e615eeeba unfinished release guide. It would be nice to have a html version.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@650139 13f79535-47bb-0310-9956-ffa450edef68
2008-04-21 13:31:53 +00:00
Yegor Kozlov
7ef12296b5 unfinished release guide. It would be nice to have a html version.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@650138 13f79535-47bb-0310-9956-ffa450edef68
2008-04-21 13:29:59 +00:00
Yegor Kozlov
dc47a4bf65 update current version to 3.1-beta1
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@650133 13f79535-47bb-0310-9956-ffa450edef68
2008-04-21 13:10:33 +00:00
Yegor Kozlov
182344b2bb a couple of HSLF examples
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@650130 13f79535-47bb-0310-9956-ffa450edef68
2008-04-21 12:52:23 +00:00
Yegor Kozlov
f5d6d1d2db more improvements in slide rendering
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@650129 13f79535-47bb-0310-9956-ffa450edef68
2008-04-21 12:51:47 +00:00
Yegor Kozlov
7d67735404 set version.id=3.0.3-beta1
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649914 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:58:08 +00:00
Yegor Kozlov
40c49400e7 more improvements in slide rendering
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649911 13f79535-47bb-0310-9956-ffa450edef68
2008-04-20 11:17:48 +00:00
Yegor Kozlov
383ac9d4d8 updated the docs
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649800 13f79535-47bb-0310-9956-ffa450edef68
2008-04-19 11:52:36 +00:00
Yegor Kozlov
6e96462b0e misc improvements in slide rendering
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649798 13f79535-47bb-0310-9956-ffa450edef68
2008-04-19 11:17:37 +00:00
Yegor Kozlov
4ff1e84247 properly set shapeId for new shapes
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649797 13f79535-47bb-0310-9956-ffa450edef68
2008-04-19 11:16:53 +00:00
Yegor Kozlov
76a479f668 Support for getting embedded sounds from slide show
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649796 13f79535-47bb-0310-9956-ffa450edef68
2008-04-19 11:09:59 +00:00
Yegor Kozlov
15b47da3fb improved rendering of text
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649557 13f79535-47bb-0310-9956-ffa450edef68
2008-04-18 14:57:07 +00:00
Yegor Kozlov
4f43a000ee updated the list of changes
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649145 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 15:09:37 +00:00
Yegor Kozlov
f5c9d3023f initial support for rendering powerpoint slides into images
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649143 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 15:08:03 +00:00
Yegor Kozlov
577b3e084f added a unit test and closed bug #28774
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@649142 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 15:06:01 +00:00
Yegor Kozlov
1cd1e8546f Support for getting OLE object data from slide show
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648674 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 11:57:15 +00:00
Yegor Kozlov
e52de74f2d Misc improvements in Freeform shape
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648624 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 08:44:07 +00:00
Yegor Kozlov
c52a8b10af Rich text in HSSFTextbox must have at least one format run. Make sure it is so and apply th default fopnt if no formats were applied.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648623 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 08:43:08 +00:00
Yegor Kozlov
9b786497f8 bug #41071 is fixed in trunk. Added a unit test and resolved.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648589 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 07:47:16 +00:00
Nick Burch
d578c64812 In the ooxml branch, convert the formula stuff from using hssf.HSSFWorkbook to ss.Workbook, so that everything now works for XSSF too
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@648454 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 23:18:25 +00:00
Nick Burch
101e30ed37 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-647823,647825-648417 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk

........
  r648156 | yegor | 2008-04-15 08:54:20 +0100 (Tue, 15 Apr 2008) | 1 line
  
  TextShape is a common superclass of all shapes that can hold text. The subclasses are TextBox and AutoShape.
........
  r648203 | yegor | 2008-04-15 11:05:22 +0100 (Tue, 15 Apr 2008) | 1 line
  
  start improving handling of resources in HSLF. PPFont object represents a font in a presenatation.
........
  r648274 | yegor | 2008-04-15 16:11:13 +0100 (Tue, 15 Apr 2008) | 1 line
  
  TextSpecInfoAtom is present in PPT 2003+. When the text is changed we must update this record, otherwise the ppt becomes corrupted
........
  r648276 | yegor | 2008-04-15 16:12:58 +0100 (Tue, 15 Apr 2008) | 1 line
  
  Improved factoring of ppt objects. For ppt tabels Slide.getShapes() returns the Table object (was ShapeGroup) 
........
  r648303 | nick | 2008-04-15 17:00:50 +0100 (Tue, 15 Apr 2008) | 1 line
  
  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
........
  r648334 | josh | 2008-04-15 18:07:06 +0100 (Tue, 15 Apr 2008) | 1 line
  
  Conditional Formatting (30311) - API improvements, added HSSFSheetConditionalFormatting
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@648444 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 22:47:30 +00:00
Josh Micich
35d89933c9 Conditional Formatting (30311) - API improvements, added HSSFSheetConditionalFormatting
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@648334 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 17:07:06 +00:00
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