diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-19 20:40:14 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-19 20:53:19 +0200 |
| commit | 17c626e347377c586eccb8b007a1edc35b5a7824 (patch) | |
| tree | d8559a4d8dcf9e4dcb48d776ec155b8a9d5c8b4b | |
| parent | a77cbb3148d2f16b765108e2d8ff5cf20e1aee58 (diff) | |
Fix updating WhichRangesContainer using MergeRange
I forgot that MergeRange is not modifying its object, but returns
a modified copy. Added SAL_WARN_UNUSED_RESULT to it (but it seems
to not have effect on Windows).
Change-Id: I919146fc25a0992d543890464ccac75737647ee5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119230
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 4 | ||||
| -rw-r--r-- | include/svl/whichranges.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index ac1e91e2cdde..7bbf46a6026c 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -922,7 +922,7 @@ void SvxRTFParser::BuildWhichTable() { sal_uInt16 nTrueWid = pAttrPool->GetTrueWhich(nWid, false); aPardMap[nWid] = nTrueWid; - aWhichMap.MergeRange(nTrueWid, nTrueWid); + aWhichMap = aWhichMap.MergeRange(nTrueWid, nTrueWid); } // Here are the IDs for all character attributes, which can be detected by @@ -944,7 +944,7 @@ void SvxRTFParser::BuildWhichTable() { sal_uInt16 nTrueWid = pAttrPool->GetTrueWhich(nWid, false); aPlainMap[nWid] = nTrueWid; - aWhichMap.MergeRange(nTrueWid, nTrueWid); + aWhichMap = aWhichMap.MergeRange(nTrueWid, nTrueWid); } } diff --git a/include/svl/whichranges.hxx b/include/svl/whichranges.hxx index 76403968d2d7..744a0f2edaf5 100644 --- a/include/svl/whichranges.hxx +++ b/include/svl/whichranges.hxx @@ -122,7 +122,7 @@ struct SVL_DLLPUBLIC WhichRangesContainer void reset(); // Adds a range to which ranges, keeping the ranges in valid state (sorted, non-overlapping) - WhichRangesContainer MergeRange(sal_uInt16 nFrom, sal_uInt16 nTo) const; + SAL_WARN_UNUSED_RESULT WhichRangesContainer MergeRange(sal_uInt16 nFrom, sal_uInt16 nTo) const; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |