summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga.extern@allotropia.de>2025-05-07 18:11:20 +0200
committerBalazs Varga <balazs.varga.extern@allotropia.de>2025-05-08 14:01:26 +0200
commit7e15c704cedf1ca77b3ebe8b3b60f6a1ad57deb0 (patch)
treea9031d1622a6ca8ea108311dbcce8949c9692052
parent94aa3c3123fe0ff004097c5b05c2fb498d5a45e6 (diff)
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.extern@allotropia.de> Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
-rw-r--r--sc/source/ui/view/drawview.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 462f71f820a3..69f65dd095d7 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -401,8 +401,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);
}
}