Yegor Kozlov
ae00a22c6a
should have been included in r705638
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@705662 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 16:21:05 +00:00
Yegor Kozlov
59b02716ac
more progress on SpreadsheetML drawing layer;finished XSSFPicture, auto-sizing is supported; implemented initial support for shape groups. Common HSSF-XSSF drawing interfaces are still TODO.
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@705638 13f79535-47bb-0310-9956-ffa450edef68
2008-10-17 15:14:00 +00:00
Yegor Kozlov
9c094be425
refactored POIXMLFactory and related classes; simplified XSSFRelation - now it's just a set of definitions of XSSF relations, all read/load stuff is not used anymore and was removed. Also, removed Workbook.getCustomPallete() - it's OLE-specific
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703814 13f79535-47bb-0310-9956-ffa450edef68
2008-10-12 13:10:30 +00:00
Yegor Kozlov
1a700918d8
applied patch #45967 by Gisella Bronzetti: support for XSSFPrintSetup object
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703778 13f79535-47bb-0310-9956-ffa450edef68
2008-10-12 10:25:58 +00:00
Yegor Kozlov
6153569465
Initial support for SpreadsheetML drawings,implemented XSSFPicture, added ability to add pictures to workbook, refactored XSSFPictureData to be a subclass of POIXMLDocumentPart. Also refactored misc odds and ends in order to produce xml better compatible with what MS Office produces
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703490 13f79535-47bb-0310-9956-ffa450edef68
2008-10-10 14:54:32 +00:00
Josh Micich
78504dfa20
Merged revisions 703092 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r703092 | josh | 2008-10-09 00:44:37 -0700 (Thu, 09 Oct 2008) | 1 line
converted short HSSFCell.getCellNum to int getColumnIndex
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703096 13f79535-47bb-0310-9956-ffa450edef68
2008-10-09 08:03:43 +00:00
Josh Micich
f7acb6bb7c
Merged revisions 703063 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r703063 | josh | 2008-10-08 23:07:36 -0700 (Wed, 08 Oct 2008) | 1 line
Performance optimisation for EvaluationCache. Changed to use HSSFCell as key into cache entry map. Reduced dependency information storage for blank cells. Introduced EvaluationSheet and EvaluationCell interfaces. Modified HSSFFormulaEvaluator API to have simpler notify~ methods
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703083 13f79535-47bb-0310-9956-ffa450edef68
2008-10-09 07:20:46 +00:00
Josh Micich
52c6f5aa0c
Merged revisions 701756,702231 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r701756 | josh | 2008-10-05 00:22:12 -0700 (Sun, 05 Oct 2008) | 1 line
Fixing comments and formatting inside Record subclasses
........
r702231 | josh | 2008-10-06 12:13:41 -0700 (Mon, 06 Oct 2008) | 1 line
Fix for 43354 - made the formula evaluator capable of handling missing function arguments
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703070 13f79535-47bb-0310-9956-ffa450edef68
2008-10-09 06:46:17 +00:00
Josh Micich
7e158d23a5
Merged revisions 700479,700493,700916,701302,701569,701598,701747 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r700479 | yegor | 2008-09-30 07:32:37 -0700 (Tue, 30 Sep 2008) | 1 line
reverted the change made in r693085 , see bug #45859
........
r700493 | yegor | 2008-09-30 08:11:26 -0700 (Tue, 30 Sep 2008) | 1 line
initial support for creating hyperlinks in HSLF, units test are still to do
........
r700916 | josh | 2008-10-01 13:56:21 -0700 (Wed, 01 Oct 2008) | 1 line
Fixed bug in CellCacheEntry (support for caching blank evaluation results)
........
r701302 | yegor | 2008-10-02 22:27:06 -0700 (Thu, 02 Oct 2008) | 1 line
fixed bug #45889:rrayIndexOutOfBoundsException when constructing HSLF Table with a single row
........
r701569 | josh | 2008-10-03 16:50:22 -0700 (Fri, 03 Oct 2008) | 1 line
Fix for bug 45912 - ArrayIndexOutOfBoundsException in EmbeddedObjectRefSubRecord
........
r701598 | josh | 2008-10-03 21:59:26 -0700 (Fri, 03 Oct 2008) | 1 line
changed workbook reference to index in CellLocation
........
r701747 | josh | 2008-10-04 21:43:48 -0700 (Sat, 04 Oct 2008) | 1 line
Better bounds checking in RecordInputStream. Removed rarely used methods readShortArray and putShortArray
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@703069 13f79535-47bb-0310-9956-ffa450edef68
2008-10-09 06:38:50 +00:00
Yegor Kozlov
cdfa36cada
applied patch #45492 submitted by Gisella Bronzetti,also performed major cleanup of StylesTable and its components, the goal was to ensure that StylesTable works as a cache of styling components, not just a regular store of fill patterns and cell styles.
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@701797 13f79535-47bb-0310-9956-ffa450edef68
2008-10-05 13:56:28 +00:00
Yegor Kozlov
0d051eb3c2
applied patches provided by Gisella Bronzetti in bugs #45918 , #45917 and #45920
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700844 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 17:15:02 +00:00
Yegor Kozlov
0afe659835
iterator over sheet data in XSSFReader returns sheets in logical order, i.e. as they are defined in workbook.xml (was in physical order, as they were stored in the relationship table)
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700821 13f79535-47bb-0310-9956-ffa450edef68
2008-10-01 16:14:39 +00:00
Yegor Kozlov
baa56c4fc8
refactored POIXMLDocument to be a composite of POIXMLDocumentPart, this way XSSFWorkbook is a root of a tree: XSSFSheets are children, XSSFDrawings are children of worksheets, etc,
...
Also, performed major cleanup of core XSSF classes and test cases
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700472 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 13:57:36 +00:00
Josh Micich
57e7f5f10f
Merged revisions 700280,700304,700327,700356 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r700280 | josh | 2008-09-29 15:04:20 -0700 (Mon, 29 Sep 2008) | 1 line
Fix for bug 45876 - allowed BoundSheetRecord to take sheet names longer than 31 chars
........
r700304 | josh | 2008-09-29 16:12:53 -0700 (Mon, 29 Sep 2008) | 1 line
Updated formula evaluator documentation due to bugzilla 45768
........
r700327 | josh | 2008-09-29 19:30:53 -0700 (Mon, 29 Sep 2008) | 1 line
Removed validateSid method from Record classes
........
r700356 | josh | 2008-09-29 23:18:44 -0700 (Mon, 29 Sep 2008) | 1 line
Refactored fillFields() method into constructor in Record class hierarchy
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700359 13f79535-47bb-0310-9956-ffa450edef68
2008-09-30 06:42:27 +00:00
Josh Micich
fad1570e1f
Merged revisions 700005,700203-700204 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r700005 | josh | 2008-09-29 00:27:14 -0700 (Mon, 29 Sep 2008) | 1 line
Fix for bug 45890 - made HSSFSheet.shiftRows also update conditional formats
........
r700203 | josh | 2008-09-29 11:43:53 -0700 (Mon, 29 Sep 2008) | 1 line
Refactoring row-blocks record reading logic in Sheet
........
r700204 | josh | 2008-09-29 11:48:43 -0700 (Mon, 29 Sep 2008) | 1 line
Should have been submitted with c700203 (Refactoring row-blocks record reading logic in Sheet)
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700243 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 20:38:55 +00:00
Josh Micich
96cb7321ba
Merged revisions 699178,699487,699489,699761 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r699178 | josh | 2008-09-25 21:49:20 -0700 (Thu, 25 Sep 2008) | 1 line
Changed HSSFEvaluationWorkbook to avoid re-parsing cell formulas during execution. (working towards fix for bug 45865)
........
r699487 | josh | 2008-09-26 13:25:45 -0700 (Fri, 26 Sep 2008) | 1 line
Fix formula parser to properly support the range operator. Small fixes to parsing of sheet names and full column references.
........
r699489 | josh | 2008-09-26 13:32:06 -0700 (Fri, 26 Sep 2008) | 1 line
Code cleanup in junit
........
r699761 | josh | 2008-09-27 19:04:31 -0700 (Sat, 27 Sep 2008) | 1 line
Bug 45865 - modified Formula Parser/Evaluator to handle cross-worksheet formulas
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@700234 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 20:09:09 +00:00
Josh Micich
0d50343293
Cleaned up test code
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699991 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 05:46:06 +00:00
Josh Micich
0c602f354f
Clean-up of generics in XSSFRelation
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699990 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 05:40:48 +00:00
Josh Micich
29e0439f39
Applied patch 45899 - XSSFWorkbook getActiveSheetIndex / setActiveSheet
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699989 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 04:50:20 +00:00
Josh Micich
72d626f2b2
Applied patch 45898 - fixed XSSFCellFill getFillBackgroundColor and getFillForegroundColor to not throw NPE if fill has not been set. Some other code clean up.
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699984 13f79535-47bb-0310-9956-ffa450edef68
2008-09-29 04:28:55 +00:00
Yegor Kozlov
84e3bbd179
applied patches #45894 and #45892 , also major cleanup of XSSFSheet and related classes
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@699185 13f79535-47bb-0310-9956-ffa450edef68
2008-09-26 06:02:38 +00:00
Yegor Kozlov
36e20d8073
misc ooxml improvements:"
...
1. preserve themes across read-write
2. properly set default properties of a new worksheet
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698838 13f79535-47bb-0310-9956-ffa450edef68
2008-09-25 06:51:18 +00:00
Yegor Kozlov
dca93e084f
patch #45881 from Sourcesense: implemented cell fills and borders, added examples
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698674 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 17:53:29 +00:00
Yegor Kozlov
6130d5cb83
XSSFFont improvements from patch #45874
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698651 13f79535-47bb-0310-9956-ffa450edef68
2008-09-24 16:56:12 +00:00
Josh Micich
6beba5ccc0
Merged revisions 698047 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r698047 | josh | 2008-09-22 17:40:22 -0700 (Mon, 22 Sep 2008) | 1 line
Optimised the FormulaEvaluator to take cell dependencies into account
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698370 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 21:52:49 +00:00
Josh Micich
8433f6f7b3
Merged revisions 698039 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r698039 | josh | 2008-09-22 16:43:50 -0700 (Mon, 22 Sep 2008) | 1 line
Some clean-up in BoundSheetRecord
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698282 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 18:52:14 +00:00
Nick Burch
9ce7ae4a9f
Merged revisions 697562,697580,697584,697589,697595,697599 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r697562 | nick | 2008-09-21 18:49:20 +0100 (Sun, 21 Sep 2008) | 1 line
Fix bug #45784 - Support long chart titles in SeriesTextRecords
........
r697580 | nick | 2008-09-21 19:43:49 +0100 (Sun, 21 Sep 2008) | 1 line
Include the sheet name in the output of examples.XLS2CSVmra
........
r697584 | nick | 2008-09-21 19:56:32 +0100 (Sun, 21 Sep 2008) | 1 line
Test to show that bug #45492 is invalid
........
r697589 | nick | 2008-09-21 20:17:41 +0100 (Sun, 21 Sep 2008) | 1 line
Update hssf.extractor.ExcelExtractor to optionally output blank cells too
........
r697595 | nick | 2008-09-21 20:31:34 +0100 (Sun, 21 Sep 2008) | 1 line
Improved tests to show that bugs #45062 and #44292 are fixed
........
r697599 | nick | 2008-09-21 20:50:21 +0100 (Sun, 21 Sep 2008) | 1 line
Apply part of patch from bug #16936 , with the rest made more HSSFCell like - Initial support for whole-row cell styling
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698257 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 17:35:31 +00:00
Nick Burch
62fefc61ac
Merged revisions 697559 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r697559 | nick | 2008-09-21 18:38:39 +0100 (Sun, 21 Sep 2008) | 1 line
Fix bug #45777 - Throw an exception if HSSF Footer or Header is attemped to be set too long, rather than having it break during writing out
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698250 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 17:18:57 +00:00
Josh Micich
b4d8dee65f
removing svn:mergeinfo property on SharedStringSource which was set during r697548
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@698067 13f79535-47bb-0310-9956-ffa450edef68
2008-09-23 02:23:05 +00:00
Nick Burch
7a8a9bf9e1
Merged revisions 697520 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r697520 | yegor | 2008-09-21 15:14:34 +0100 (Sun, 21 Sep 2008) | 1 line
patch from bug #45844 : Addtional diagnostics for SlideShowRecordDumper
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@697548 13f79535-47bb-0310-9956-ffa450edef68
2008-09-21 16:56:04 +00:00
Nick Burch
df7a2992fa
Get version numbering consistent
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@697539 13f79535-47bb-0310-9956-ffa450edef68
2008-09-21 16:36:42 +00:00
Nick Burch
ee20756d07
Update for 3.5 beta 4 being the next version
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@697538 13f79535-47bb-0310-9956-ffa450edef68
2008-09-21 16:35:14 +00:00
Josh Micich
d78acff2de
Merged revisions 697145 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r697145 | josh | 2008-09-19 09:34:21 -0700 (Fri, 19 Sep 2008) | 1 line
Some clean-up after r696898 (partitioning common formula logic). Fixed compiler error in example XLS2CSVmra
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@697148 13f79535-47bb-0310-9956-ffa450edef68
2008-09-19 16:47:18 +00:00
Yegor Kozlov
140348ae0c
formula improvements from josh
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696969 13f79535-47bb-0310-9956-ffa450edef68
2008-09-19 07:59:40 +00:00
Josh Micich
e188e7737d
Merged revisions 696860,696898 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
Quite a lot of manual fixing required. Also moved CellValue to top level class.
........
r696860 | josh | 2008-09-18 17:02:21 -0700 (Thu, 18 Sep 2008) | 1 line
code clean-up (removed compiler warnings/unused methods)
........
r696898 | josh | 2008-09-18 19:19:58 -0700 (Thu, 18 Sep 2008) | 1 line
Partitioning common formula logic. Introduced FormulaParsingWorkbook and EvaluationWorkbook interfaces to make merge with ooxml branch easier
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696961 13f79535-47bb-0310-9956-ffa450edef68
2008-09-19 07:32:34 +00:00
Josh Micich
f9517a6d15
Merged revisions 696813 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r696813 | josh | 2008-09-18 14:22:23 -0700 (Thu, 18 Sep 2008) | 1 line
Partitioning common formula logic. Introduced FormulaRenderingWorkbook interface to make merge with ooxml branch easier
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696847 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 23:14:48 +00:00
Josh Micich
ee1e7e7f72
Merged revisions 696622-696623,696627 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r696622 | yegor | 2008-09-18 03:28:24 -0700 (Thu, 18 Sep 2008) | 1 line
fixed bug #45829 : HSSFPicture.getImageDimension() fails when DPI of image is zero
........
r696623 | yegor | 2008-09-18 03:45:00 -0700 (Thu, 18 Sep 2008) | 1 line
fixed bug 45815: bit mask values inStyleTextPropAtom are not preserved across read-write
........
r696627 | yegor | 2008-09-18 03:58:39 -0700 (Thu, 18 Sep 2008) | 1 line
patch from bug #45814 : Specify RecordType for slide show Handout
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696839 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 22:40:03 +00:00
Josh Micich
7849dbc534
Merged revisions 696501 via svnmerge from
...
https://svn.apache.org/repos/asf/poi/trunk
........
r696501 | josh | 2008-09-17 15:35:09 -0700 (Wed, 17 Sep 2008) | 1 line
Small tweak to NamePtg and Ref3DPtg
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696831 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 22:13:01 +00:00
Yegor Kozlov
a6af3789b7
removed extra line that caused compilation error
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696762 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 18:49:08 +00:00
Yegor Kozlov
40f525ecbd
1. initial support for rich text in xssf"
...
2. cleaned common ooxml-ole2 interfaces, removed ole2-specific stuff
3. added new examples from the quick guide
4. misc xssf refactoring, tending to use enums intstead of final static constants
5. refactored XSSFFont
6. included test-ooxml and jar-ooxml in the dist target, they are part of release and should be there
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696584 13f79535-47bb-0310-9956-ffa450edef68
2008-09-18 07:42:40 +00:00
Josh Micich
35962f976b
merged 696109,696111 from trunk - (Added junit for bug 45732)
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696492 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 22:08:15 +00:00
Josh Micich
914d4706e6
should have been submitted with 696475 - merged 696075,696084 from trunk - (Fix for bug 45805 - 16-bit signed/unsigned problems in HSSFSheet.getColWidth() etc)
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696488 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 22:05:20 +00:00
Nick Burch
3aa8aaa5c0
Fix jdk14 compile issue
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696482 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 22:00:09 +00:00
Josh Micich
500a5d918d
merged 696075,696084 from trunk - (Fix for bug 45805 - 16-bit signed/unsigned problems in HSSFSheet.getColWidth() etc)
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696475 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 21:54:32 +00:00
Josh Micich
d074c7a1eb
merged 696038 from trunk - (Fix for bug 45780 - update area refs during HSSFSheet.shiftRows())
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696453 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 21:23:58 +00:00
Josh Micich
bb3bf964bd
Minor fixes to get junits working after r695832. Updates to align with new sample.xlsx, and moved SharedStringSource out of usermodel API.
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696415 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 19:52:55 +00:00
Josh Micich
e2c8b4f4d4
minor improvements to junits
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696401 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 19:05:39 +00:00
Yegor Kozlov
bb1235e2e5
include rich text in the unit test
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696377 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 17:39:33 +00:00
Yegor Kozlov
9a49637d5f
unit tests for SharedStringsTable
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695833 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 12:27:05 +00:00
Yegor Kozlov
6a3bc9352b
Preserve rich text across read-write of SharedStringsTable, also improved performance and removed obsolete ole2-specific stuff
...
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@695832 13f79535-47bb-0310-9956-ffa450edef68
2008-09-16 12:25:54 +00:00