sw/source/core/crsr/swcrsr.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ce7ced5b7cbadb980adbb3998efa15a369d5a544
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Tue Jun 9 11:36:06 2020 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Jun 10 23:53:57 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.st...@cib.de>
(cherry picked from commit cb28054d831c38ef645f635ecd80475fb5735679)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95979
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
