sc/source/filter/rtf/rtfparse.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 89cee35bac240a855a6f02a022e962bc0533554a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Feb 16 19:31:57 2024 +0200
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Sun Feb 18 14:03:41 2024 +0100
tdf#101313 Copy-paste table from writer to calc
With Merged Cells from Writer to Calc,
Cells Placed in Wrong Position (Wrong cell offsets).
regression from
commit ed24564ce11683731b820c29d5a46e073ab7a2a7
Author: Noel Grandin <n...@peralex.com>
Date: Thu Jul 19 15:22:31 2012 +0200
SV_DECL_VARARR_SORT(ScRTFColTwips) o3tl::sorted_vector
Change-Id: I8c90c19f6a27a368fd5807b3eaab84ce820e26e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163518
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
(cherry picked from commit 4df426e429e1aed92f074d8acd3ba3a5ec335ba9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163533
(cherry picked from commit 034f6c29c309561e75719142c305245ac19f7ba9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163537
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/sc/source/filter/rtf/rtfparse.cxx
b/sc/source/filter/rtf/rtfparse.cxx
index b2d2b8c2521f..0617a86c62b1 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -101,8 +101,8 @@ inline void ScRTFParser::NextRow()
bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol )
{
- ScRTFColTwips::const_iterator it = aColTwips.find( nTwips );
- bool bFound = it != aColTwips.end();
+ ScRTFColTwips::const_iterator it = aColTwips.lower_bound( nTwips );
+ bool bFound = it != aColTwips.end() && *it == nTwips;
sal_uInt16 nPos = it - aColTwips.begin();
*pCol = static_cast<SCCOL>(nPos);
if ( bFound )
