| commit | 7564f8651012ed0cbfbe6d37cd4effba308a2cd4 | [log] |
|---|---|---|
| author | Noel Grandin <noelgrandin@gmail.com> | Fri Feb 16 19:31:57 2024 +0200 |
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | Thu Feb 22 21:21:40 2024 +0100 |
| tree | ce3cfa7b8fe3fa43706ceee05c85b370a2bbcb9e | |
| parent | e0fd2489d5dd4b8b2bd41f6e42cfe64817a578da [diff] |
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 <noel@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.grandin@collabora.co.uk> (cherry picked from commit 4df426e429e1aed92f074d8acd3ba3a5ec335ba9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163532 (cherry picked from commit b5a5cae0e78e989c421a376bb55a724981c74d87) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163545 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index b2d2b8c..0617a86 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 )