[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/source
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Fri Sep 10 08:34:00 UTC 2021
sw/source/uibase/shells/drwbassh.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit c7df28f23d7a6717b525dd2fdd87e3381107e2f1
Author: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Wed Aug 25 14:14:51 2021 +0200
Commit: Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Fri Sep 10 10:33:23 2021 +0200
Fix crash when drawing shape
Fallout from 75cd2b0fa71c73ae815b80d8e42328024ea63555
Change-Id: I455519126d11bee1b809f9fd9476b2fdd0f1a524
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121034
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
(cherry picked from commit 2694a666b62701a8c0e546151c41f9c30aba00da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121053
Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
Tested-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 924877a876a5..6f73e76ec91c 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -798,7 +798,10 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet)
case SID_COPY_HYPERLINK_LOCATION:
{
if (pSdrView->GetMarkedObjectCount() != 1)
+ {
rSet.DisableItem(nWhich);
+ break;
+ }
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
More information about the Libreoffice-commits
mailing list