diff options
| author | Sarper Akdemir <sarper.akdemir@collabora.com> | 2021-06-29 13:33:52 +0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2021-07-19 16:47:10 +0200 |
| commit | 7ec4a0872d16eb20d790eb8079ba538898fd2ff6 (patch) | |
| tree | bfc5a880f17e8daf2a0a95d5b47efaaf4cc84702 /oox | |
| parent | b1668edf7fa3ad8c32bcc4d73821770f2df011ca (diff) | |
tdf#59323 tdf#142221: fix pptx datetime import export format
fixed some problems from the original implementation of
pptx datetime field formatting
(2b0669eec0d86e973a7d8def8744c522bbf8af8b)
also the comments on tests seemed to be based on en-IN which
seems to differ a lot for SvxDateFormat::StdBig. So converted
them to en-US's StdBig.
expanded the tests, so it covers previously poorly imported
types. Also made them use the SvxDateFormat and SvxTimeFormat
Change-Id: I675c482d3095b5373975abb2e6e7eca2d353243d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118135
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textfield.cxx | 23 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 4 |
2 files changed, 15 insertions, 12 deletions
diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index e590c5c7a2cb..0d33da71266d 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -218,21 +218,22 @@ SvxDateFormat TextField::getLODateFormat(std::u16string_view rDateTimeType) switch( nDateTimeNum ) { case 1: // Date dd/mm/yyyy - case 2: // Date Day, Month dd, yyyy - case 5: // Date dd-Mon-yy - case 6: // Date Month yy - case 7: // Date Mon-yy case 8: // DateTime dd/mm/yyyy H:MM PM case 9: // DateTime dd/mm/yyyy H:MM:SS PM return SvxDateFormat::B; - case 3: // Date dd Month yyyy + case 2: // Date Day, Month dd, yyyy return SvxDateFormat::StdBig; - case 4: // Date Month dd, yyyy - return SvxDateFormat::StdSmall; - case 10: // Time H:MM - case 11: // Time H:MM:SS - case 12: // Time H:MM PM - case 13: // Time H:MM:SS PM + case 3: // Date dd Month yyyy + case 4: // Date Month dd, yyyy - no exact map + case 6: // Date Month yy - no exact map + return SvxDateFormat::D; + case 5: // Date dd-Mon-yy - no exact map + case 7: // Date Mon-yy - no exact map + return SvxDateFormat::C; + case 10: // Time H:MM - not a date format + case 11: // Time H:MM:SS - not a date format + case 12: // Time H:MM PM - not a date format + case 13: // Time H:MM:SS PM - not a date format default: return SvxDateFormat::AppDefault; } diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 7c6754a35f6d..e45c5c52e8c5 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2355,11 +2355,13 @@ OUString DrawingML::GetDatetimeTypeFromDateTime(SvxDateFormat eDate, SvxTimeForm case SvxDateFormat::B: aDateField = "datetime1"; // 13/02/1996 break; - case SvxDateFormat::StdBig: case SvxDateFormat::C: + aDateField = "datetime5"; + break; case SvxDateFormat::D: aDateField = "datetime3"; // 13 February 1996 break; + case SvxDateFormat::StdBig: case SvxDateFormat::E: case SvxDateFormat::F: aDateField = "datetime2"; |