sd/source/ui/func/fudraw.cxx | 2 +- sd/source/ui/unoidl/unomodel.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 11d1031c279393e9092a1ae7fff269d77569dea8 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Thu Aug 14 12:16:53 2025 +0500 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Aug 18 09:17:31 2025 +0200 Revert unrelated changes From commit fdd24dabb6f8c520e8307bacab2bd8b09ebc763d (tdf#145967: Initial support for docs with restricted embedded fonts, 2025-08-12). These were from an unrelated experiment. Change-Id: Ifadbcc4fbd967810e753a5a9bbae4f13cd67c908 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189564 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> (cherry picked from commit 6e79ce684280d8954215a6941fcd290271114c34) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189594 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 0df63c9d5e7d..28e1bf7e96f3 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -245,7 +245,7 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt) bOrtho = rMEvt.IsShift() != pFrameView->IsOrtho(); } - bool bSnapModPressed = mpView->IsDragObj() ? rMEvt.IsMod2() : rMEvt.IsMod1(); + bool bSnapModPressed = rMEvt.IsMod2(); mpView->SetDragWithCopy(rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (mpView->IsOrtho() != bOrtho) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index d6b0a6c1f706..d89f6b39797c 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2893,7 +2893,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property uno::Any aAny; if( nullptr == mpDoc ) - throw lang::DisposedException({}, getXWeak()); + throw lang::DisposedException(); const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName);