summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2021-04-09 09:59:39 +0200
committerLászló Németh <nemeth@numbertext.org>2021-04-16 15:46:54 +0200
commit7de3a25bc19c85995cffbe0e0823bf57473f7a19 (patch)
tree9d4bc96f0fbd8a99f12799ba21b327f7731f63a5
parenttdf#141525 Fix "Line with Arrow/Circle" insertion error. (diff)
downloadcore-7de3a25bc19c85995cffbe0e0823bf57473f7a19.tar.gz
core-7de3a25bc19c85995cffbe0e0823bf57473f7a19.zip
related tdf#137626: rewrite XML_min to XML_minute
Followed up of 26032e63abd01c3d5941a2728ef024da290d6b0a (tdf#137626 XLSX import: fix missing datetime filters) Change-Id: I9f72749198d410ce40a6d14c5d3a6e9f4ae7b4bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113832 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
-rw-r--r--sc/source/filter/oox/autofilterbuffer.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 464c7e4a51dd..b75c05f65f19 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -241,19 +241,19 @@ void DiscreteFilter::importAttribs( sal_Int32 nElement, const AttributeList& rAt
// because if the dateGroupItem exists also XML_dateTimeGrouping exists!
sal_uInt16 nToken = rAttribs.getToken(XML_dateTimeGrouping, XML_day);
if( nToken == XML_year || nToken == XML_month || nToken == XML_day ||
- nToken == XML_hour || nToken == XML_min || nToken == XML_second )
+ nToken == XML_hour || nToken == XML_minute || nToken == XML_second )
{
aDateValue = rAttribs.getString(XML_year, OUString());
if( nToken == XML_month || nToken == XML_day || nToken == XML_hour ||
- nToken == XML_min || nToken == XML_second )
+ nToken == XML_minute || nToken == XML_second )
{
OUString aMonthName = rAttribs.getString(XML_month, OUString());
if( aMonthName.getLength() == 1 )
aMonthName = "0" + aMonthName;
aDateValue += "-" + aMonthName;
- if( nToken == XML_day || nToken == XML_hour || nToken == XML_min ||
+ if( nToken == XML_day || nToken == XML_hour || nToken == XML_minute ||
nToken == XML_second )
{
OUString aDayName = rAttribs.getString(XML_day, OUString());
@@ -261,16 +261,16 @@ void DiscreteFilter::importAttribs( sal_Int32 nElement, const AttributeList& rAt
aDayName = "0" + aDayName;
aDateValue += "-" + aDayName;
- if( nToken == XML_hour || nToken == XML_min || nToken == XML_second )
+ if( nToken == XML_hour || nToken == XML_minute || nToken == XML_second )
{
OUString aHourName = rAttribs.getString(XML_hour, OUString());
if( aHourName.getLength() == 1 )
aHourName = "0" + aHourName;
aDateValue += " " + aHourName;
- if( nToken == XML_min || nToken == XML_second )
+ if( nToken == XML_minute || nToken == XML_second )
{
- OUString aMinName = rAttribs.getString(XML_min, OUString());
+ OUString aMinName = rAttribs.getString(XML_minute, OUString());
if( aMinName.getLength() == 1 )
aMinName = "0" + aMinName;
aDateValue += ":" + aMinName;