sc/source/ui/view/drawview.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a5d7b564b23e6802ea995aa444081782a9de6a4a
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Wed May 7 18:11:20 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 14 21:19:29 2025 +0200
tdf#166481 sc shapes edit view: fix wrong draw view shell
was created when an object was in rotation drag mode and we
enter into the shape to text edit mode.
We only need to switch to draw shell if we have not already
created a text shell for text edit mode.
TODO: unit/UI tests would be useful for the original enhancement.
(c628a26cd3f763b39a2e2441fc766dabf04ed492)
Follow-up commit of
c628a26cd3f763b39a2e2441fc766dabf04ed492
677e40c8b83b06ded8e06b6151f71686baf5f6b5
Regression from commit: c628a26cd3f763b39a2e2441fc766dabf04ed492
(tdf#90293 switch draw selection to rotate mode)
Change-Id: Ib857673b1f5469d6502736ecad84fe046f8c967e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185031
Tested-by: Jenkins
Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
(cherry picked from commit 7e15c704cedf1ca77b3ebe8b3b60f6a1ad57deb0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185052
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index b0c5e396322e..1b7499000ab6 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -421,8 +421,9 @@ void ScDrawView::MarkListHasChanged()
bSubShellSet = true;
}
else if (pObj->GetObjIdentifier() != SdrObjKind::Text // prevent
switching to the drawing shell
- || !pViewSh->IsDrawTextShell()) // when creating a
text object @#70206#
+ && !pViewSh->IsDrawTextShell()) // when creating a
text object @#70206#
{
+ // tdf#166481: we only need to switch to draw shell if we have not
already created a text shell for text edit mode
pViewSh->SetDrawShell(true);
}
}
