sc/source/filter/excel/xestream.cxx | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 063997f8371f634e671947866b9e12e0a56c0f63
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Feb 10 14:59:51 2022 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Feb 10 21:54:31 2022 +0100
remove obsolete code (and last MAXCOL/MAXROW) from excel filter
Even if what the comment says were true, 6318254d63ef5c62bbd504
already broke it by possibly passing MAXROL/MAXROW. This originates
from 64274b38f6cc50a8bb49f114f1ac9e7c1c3 (the r263929 part),
but I've checked and at least Excel2013 reads its fine. I also
don't see anything in the OOXML spec that'd say what we do is wrong.
Change-Id: I0c48beae2b54213a8b3b5e2112076a88b11e6cb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129787
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index f8337b327930..a65cd90c20d4 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -742,16 +742,7 @@ OString XclXmlUtils::ToOString( const ScDocument& rDoc,
const ScRangeList& rRang
static ScAddress lcl_ToAddress( const XclAddress& rAddress )
{
- ScAddress aAddress;
-
- // For some reason, ScRange::Format() returns omits row numbers if
- // the row is >= MAXROW or the column is >= MAXCOL, and Excel doesn't
- // like "A:IV" (i.e. no row numbers). Prevent this.
- // KOHEI: Find out if the above comment is still true.
- aAddress.SetRow( std::min<sal_Int32>( rAddress.mnRow, MAXROW ) );
- aAddress.SetCol( static_cast<sal_Int16>(std::min<sal_Int32>(
rAddress.mnCol, MAXCOL )) );
-
- return aAddress;
+ return ScAddress( rAddress.mnCol, rAddress.mnRow, 0 );
}
OStringBuffer& XclXmlUtils::ToOString( OStringBuffer& s, const XclAddress&
rAddress )
