Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for the new XLSX date type in cells, denoted with attribu…
…te 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 (cherry picked from commit 9621e55)
- Loading branch information
1 parent
a60f0fb
commit f42644c
Showing
6 changed files
with
104 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters