svx/source/svdraw/svdview.cxx | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit aed0110831b06105890c9972d3eee477f0c0bbc0
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Oct 14 16:04:10 2024 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Oct 14 21:17:52 2024 +0200
Reorder to avoid useless assignments immediately reassigned
Change-Id: Ia89e8d0ca5da12fdecc82f174d04f365ba682fea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174796
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 55e5bcc53d92..4e2ffd113bd0 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -514,7 +514,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos,
SdrViewEvent& rVEvt) co
// Around the TextEditArea there's a border to select without going
into text edit mode.
tools::Rectangle aBoundRect;
- if (pTextObj && !pTextObj->GetGeoStat().m_nRotationAngle
+ // Force to SnapRect when Fontwork
+ if (pTextObj && pTextObj->IsFontwork())
+ aBoundRect = pHitObj->GetSnapRect();
+ else if (pTextObj && !pTextObj->GetGeoStat().m_nRotationAngle
&& !pTextObj->GetGeoStat().m_nShearAngle)
{
pTextObj->TakeTextEditArea(nullptr, nullptr, &aBoundRect, nullptr);
@@ -522,10 +525,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos,
SdrViewEvent& rVEvt) co
else
aBoundRect = pHitObj->GetCurrentBoundRect();
- // Force to SnapRect when Fontwork
- if( pTextObj && pTextObj->IsFontwork() )
- aBoundRect = pHitObj->GetSnapRect();
-
sal_Int32 nTolerance(mnHitTolLog);
bool bBoundRectHit(false);
commit c5703bbeebc6b4976dbf7cafb2e0bfda6345f864
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Oct 14 15:51:31 2024 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Oct 14 21:17:44 2024 +0200
Dereference before nullptr check
After commit 2c8c436c4a8546276e285dd18f3f7ded091a2c4e (tdf#152992:
for Impress/Draw add horizontal hit tolerance for quick text edit,
2023-07-21).
Change-Id: Ia19bca115f95c53851dc63cdc7e4336f0289d731
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174793
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 479aead7b9d2..55e5bcc53d92 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -514,8 +514,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos,
SdrViewEvent& rVEvt) co
// Around the TextEditArea there's a border to select without going
into text edit mode.
tools::Rectangle aBoundRect;
- const GeoStat& rGeo = pTextObj->GetGeoStat();
- if (pTextObj && !rGeo.m_nRotationAngle && !rGeo.m_nShearAngle)
+ if (pTextObj && !pTextObj->GetGeoStat().m_nRotationAngle
+ && !pTextObj->GetGeoStat().m_nShearAngle)
{
pTextObj->TakeTextEditArea(nullptr, nullptr, &aBoundRect, nullptr);
}
