You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2023/01/08 08:30:34 UTC
[openoffice] branch trunk updated: Add support for the new XLSX date type in cells, denoted with attribute t="d", used by Excel 2010.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9621e552cd Add support for the new XLSX date type in cells, denoted with attribute t="d", used by Excel 2010.
9621e552cd is described below
commit 9621e552cdf723df9a998b3af4218407d6c66e37
Author: Damjan Jovanovic <da...@gmail.com>
AuthorDate: Sun Jan 8 10:24:33 2023 +0200
Add support for the new XLSX date type in cells, denoted with attribute t="d",
used by Excel 2010.
Also refactor the code so the datetime attribute in pivot tables is also parsed
by the same function, and increase the parsing accuracy to the maximum (HundredthSeconds,
instead of just Seconds).
Fixes: #127034 - xlsx file: imported DateTime cells are empty (Excel 2010 compatible)
Patch by: me
---
main/oox/Library_oox.mk | 1 +
main/oox/inc/oox/helper/datetimehelper.hxx | 34 +++++++++++++++++++
main/oox/source/helper/attributelist.cxx | 13 ++-----
main/oox/source/helper/datetimehelper.cxx | 54 ++++++++++++++++++++++++++++++
main/oox/source/xls/sheetdatacontext.cxx | 12 +++++++
main/oox/source/xls/unitconverter.cxx | 2 +-
6 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/main/oox/Library_oox.mk b/main/oox/Library_oox.mk
index 7bd2cf91f3..7ebe4358ca 100644
--- a/main/oox/Library_oox.mk
+++ b/main/oox/Library_oox.mk
@@ -183,6 +183,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/helper/binaryoutputstream \
oox/source/helper/binarystreambase \
oox/source/helper/containerhelper \
+ oox/source/helper/datetimehelper \
oox/source/helper/graphichelper \
oox/source/helper/modelobjecthelper \
oox/source/helper/progressbar \
diff --git a/main/oox/inc/oox/helper/datetimehelper.hxx b/main/oox/inc/oox/helper/datetimehelper.hxx
new file mode 100644
index 0000000000..dda5a1181d
--- /dev/null
+++ b/main/oox/inc/oox/helper/datetimehelper.hxx
@@ -0,0 +1,34 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef OOX_HELPER_DATETIMEHELPER_HXX
+#define OOX_HELPER_DATETIMEHELPER_HXX
+
+#include <com/sun/star/util/DateTime.hpp>
+#include "oox/helper/helper.hxx"
+
+namespace oox {
+
+bool parseISO8601DateTime( ::rtl::OUString &aValue, ::com::sun::star::util::DateTime &dateTime );
+
+} // namespace oox
+
+#endif /* OOX_HELPER_DATETIMEHELPER_HXX */
diff --git a/main/oox/source/helper/attributelist.cxx b/main/oox/source/helper/attributelist.cxx
index 30cf8babb1..686aeada05 100644
--- a/main/oox/source/helper/attributelist.cxx
+++ b/main/oox/source/helper/attributelist.cxx
@@ -22,6 +22,7 @@
#include "oox/helper/attributelist.hxx"
+#include "oox/helper/datetimehelper.hxx"
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
@@ -233,17 +234,7 @@ OptValue< DateTime > AttributeList::getDateTime( sal_Int32 nAttrToken ) const
{
OUString aValue = mxAttribs->getOptionalValue( nAttrToken );
DateTime aDateTime;
- bool bValid = (aValue.getLength() == 19) && (aValue[ 4 ] == '-') && (aValue[ 7 ] == '-') &&
- (aValue[ 10 ] == 'T') && (aValue[ 13 ] == ':') && (aValue[ 16 ] == ':');
- if( bValid )
- {
- aDateTime.Year = static_cast< sal_uInt16 >( aValue.copy( 0, 4 ).toInt32() );
- aDateTime.Month = static_cast< sal_uInt16 >( aValue.copy( 5, 2 ).toInt32() );
- aDateTime.Day = static_cast< sal_uInt16 >( aValue.copy( 8, 2 ).toInt32() );
- aDateTime.Hours = static_cast< sal_uInt16 >( aValue.copy( 11, 2 ).toInt32() );
- aDateTime.Minutes = static_cast< sal_uInt16 >( aValue.copy( 14, 2 ).toInt32() );
- aDateTime.Seconds = static_cast< sal_uInt16 >( aValue.copy( 17, 2 ).toInt32() );
- }
+ bool bValid = parseISO8601DateTime( aValue, aDateTime );
return OptValue< DateTime >( bValid, aDateTime );
}
diff --git a/main/oox/source/helper/datetimehelper.cxx b/main/oox/source/helper/datetimehelper.cxx
new file mode 100644
index 0000000000..cf44aaa24a
--- /dev/null
+++ b/main/oox/source/helper/datetimehelper.cxx
@@ -0,0 +1,54 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#include "oox/helper/datetimehelper.hxx"
+
+namespace oox {
+
+// ============================================================================
+
+using namespace ::com::sun::star::util;
+
+using ::rtl::OUString;
+
+// ============================================================================
+
+bool parseISO8601DateTime( OUString &aValue, DateTime &dateTime )
+{
+ bool bValid = (aValue.getLength() >= 19) && (aValue[ 4 ] == '-') && (aValue[ 7 ] == '-') &&
+ (aValue[ 10 ] == 'T') && (aValue[ 13 ] == ':') && (aValue[ 16 ] == ':');
+ if( bValid )
+ {
+ dateTime.Year = static_cast< sal_uInt16 >( aValue.copy( 0, 4 ).toInt32() );
+ dateTime.Month = static_cast< sal_uInt16 >( aValue.copy( 5, 2 ).toInt32() );
+ dateTime.Day = static_cast< sal_uInt16 >( aValue.copy( 8, 2 ).toInt32() );
+ dateTime.Hours = static_cast< sal_uInt16 >( aValue.copy( 11, 2 ).toInt32() );
+ dateTime.Minutes = static_cast< sal_uInt16 >( aValue.copy( 14, 2 ).toInt32() );
+ double seconds = aValue.copy( 17 ).toDouble();
+ dateTime.Seconds = static_cast< sal_uInt16 >( floor( seconds ) );
+ dateTime.HundredthSeconds = static_cast< sal_uInt16 >( round ( 100 * ( seconds - floor( seconds ) ) ) );
+ }
+ return bValid;
+}
+
+// ============================================================================
+
+} // namespace oox
diff --git a/main/oox/source/xls/sheetdatacontext.cxx b/main/oox/source/xls/sheetdatacontext.cxx
index f986992fd2..9882a65c06 100644
--- a/main/oox/source/xls/sheetdatacontext.cxx
+++ b/main/oox/source/xls/sheetdatacontext.cxx
@@ -27,7 +27,9 @@
#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/util/DateTime.hpp>
#include "oox/helper/attributelist.hxx"
+#include "oox/helper/datetimehelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/xls/addressconverter.hxx"
#include "oox/xls/biffinputstream.hxx"
@@ -44,6 +46,7 @@ using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::util;
using ::oox::core::ContextHandlerRef;
using ::rtl::OUString;
@@ -212,6 +215,15 @@ void SheetDataContext::onEndElement()
case XML_n:
mrSheetData.setValueCell( maCellData, maCellValue.toDouble() );
break;
+ case XML_d:
+ {
+ DateTime dateTime;
+ if ( parseISO8601DateTime( maCellValue, dateTime ) )
+ mrSheetData.setDateTimeCell( maCellData, dateTime );
+ else
+ mrSheetData.setErrorCell( maCellData, maCellValue );
+ }
+ break;
case XML_b:
mrSheetData.setBooleanCell( maCellData, maCellValue.toDouble() != 0.0 );
break;
diff --git a/main/oox/source/xls/unitconverter.cxx b/main/oox/source/xls/unitconverter.cxx
index c0d48d6bd3..93e62e4939 100644
--- a/main/oox/source/xls/unitconverter.cxx
+++ b/main/oox/source/xls/unitconverter.cxx
@@ -190,7 +190,7 @@ double UnitConverter::calcSerialFromDateTime( const DateTime& rDateTime ) const
sal_Int32 nDays = lclGetDays( Date( rDateTime.Day, rDateTime.Month, rDateTime.Year ) ) - mnNullDate;
OSL_ENSURE( nDays >= 0, "UnitConverter::calcDateTimeSerial - invalid date" );
OSL_ENSURE( (rDateTime.Hours <= 23) && (rDateTime.Minutes <= 59) && (rDateTime.Seconds <= 59), "UnitConverter::calcDateTimeSerial - invalid time" );
- return nDays + rDateTime.Hours / 24.0 + rDateTime.Minutes / 1440.0 + rDateTime.Seconds / 86400.0;
+ return nDays + rDateTime.Hours / 24.0 + rDateTime.Minutes / 1440.0 + rDateTime.Seconds / 86400.0 + rDateTime.HundredthSeconds / 8640000.0;
}
DateTime UnitConverter::calcDateTimeFromSerial( double fSerial ) const