From 1ad7ff8affaba315c8f28a43a18d51c803eb78bc Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 15 Jun 2020 13:11:29 +0200 Subject: tdf#133957 sw: SelectAll should select fly in empty section Ctrl+A should select everything in the section; if the section is empty, there's no text to select, and then the shell will cancel the selection because SwCursorShell::HasSelection() returns false - so check if there are flys anchored there, which fixes the Copy. To fix Delete, a few more checks for empty selection need to be changed. Change-Id: If54160bdca976ad5f153b89cf8492f4da1e774b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96324 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 2d89b9929e85bede4c72684a12e7508751875f0e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96342 --- sw/inc/undobj.hxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sw/inc/undobj.hxx') diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 91394446ccf7..bd6748d656a0 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -152,6 +152,9 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos, bool IsSelectFrameAnchoredAtPara(SwPosition const & rAnchorPos, SwPosition const & rStart, SwPosition const & rEnd, DelContentType const nDelContentType = DelContentType::AllMask); +/// check at-char and at-para flys in rDoc +bool IsFlySelectedByCursor(SwDoc const & rDoc, + SwPosition const & rStart, SwPosition const & rEnd); // This class has to be inherited into an Undo-object if it saves content // for Redo/Undo... -- cgit