[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/crsr/swcrsr.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2684ce9dff3f122bc95481c420607c9f99dd22a0
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Jun 9 11:36:06 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Jun 15 03:51:00 2020 +0200

    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 at cib.de>
    (cherry picked from commit cb28054d831c38ef645f635ecd80475fb5735679)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95979
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit ce7ced5b7cbadb980adbb3998efa15a369d5a544)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96101
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

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