diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-02 18:16:15 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-02 20:58:52 +0200 |
| commit | f68749054f36f070310e70e2dbf0a11c496539c0 (patch) | |
| tree | 12dffff67b41f4af9e3457532cdeb89cd5f122f0 /sw/source/core/text/porrst.cxx | |
| parent | 07c2bfc895c7a4074cb0cdcb12fead7624fc6336 (diff) | |
crashtesting: fix abi11870-2.odt assert in SwBookmarkPortion::Unchain()
This m_pPrevious pointer is a bad idea, should just use
FindPrevPortion() to find it, which shouldn't take that long to iterate
all the portions in the current line.
(regression from 4ce8120f1e53f7b81e653b01d141643013bc69ab)
Change-Id: Ibb5f2bb28d959958547ed27c51e5084cc746d642
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91622
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/text/porrst.cxx')
| -rw-r--r-- | sw/source/core/text/porrst.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 32b1e0b389c0..69183bc58557 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -630,13 +630,4 @@ sal_uInt16 SwControlCharPortion::GetViewWidth( const SwTextSizeInfo& rInf ) cons return mnViewWidth; } -SwLinePortion * SwBookmarkPortion::Unchain() -{ - assert(!m_pPrevious || m_pPrevious->GetNextPortion() == this); - m_pPrevious->SetNextPortion(nullptr); - auto const pTmp(m_pPrevious); - m_pPrevious = nullptr; - return pTmp; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |