diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-09 11:36:06 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-06-10 23:53:57 +0200 |
| commit | ce7ced5b7cbadb980adbb3998efa15a369d5a544 (patch) | |
| tree | 1ea26e2a20c859d19803c1d1c3307e161eaf64fa | |
| parent | 5c2c03dde718b2bf627ef9ef8f985fc41454b1ab (diff) | |
tdf#133641 sw: fix crash double-clicking CH_TXT_ATR_FORMELEMENT
Only search for separator if there is one.
(regression from 1c94842e053a20a739a181d38a35c324df3e62a7)
Change-Id: I6697faa7cb83cab48084f9710f8c5018b9e738e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95905
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit cb28054d831c38ef645f635ecd80475fb5735679)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95979
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | sw/source/core/crsr/swcrsr.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 92b4e941876e..8cfa09e8c9ac 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1405,7 +1405,8 @@ bool SwCursor::SelectWordWT( SwViewShell const * pViewShell, sal_Int16 nWordType // Should we select the whole fieldmark? const IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( ); sw::mark::IFieldmark const*const pMark(pMarksAccess->getFieldmarkFor(*GetPoint())); - if ( pMark ) + if (pMark && (IDocumentMarkAccess::GetType(*pMark) == IDocumentMarkAccess::MarkType::TEXT_FIELDMARK + || IDocumentMarkAccess::GetType(*pMark) == IDocumentMarkAccess::MarkType::DATE_FIELDMARK)) { *GetPoint() = sw::mark::FindFieldSep(*pMark); ++GetPoint()->nContent; // Don't select the separator |