sw/source/uibase/shells/annotsh.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8729c9751253f955840cffd24e2e31b1535a095a
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat May 2 00:24:31 2020 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat May 2 07:35:33 2020 +0200
tdf#132603: fix crash when selecting part of a comment
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=160206
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=65404e2c72ea2d5d3f6c074121005b8b9369e7fb
author Samuel Mehrbrodt <samuel.mehrbr...@cib.de> 2020-04-08 08:54:21
+0200
committer Samuel Mehrbrodt <samuel.mehrbr...@cib.de> 2020-04-09
11:14:15 +0200
commit 65404e2c72ea2d5d3f6c074121005b8b9369e7fb (patch)
tree 15eeeb5b634c461611893dbe3b49d689ef71f5c4
parent 40d83914d43f60a196dfabddea0b52e2046b333a (diff)
Move is*Locked methods to object shell
They depend on the model, not the view.
Follow-up to 523922ee9d033fd304d2b50a72b76853ddcfbcdf
Change-Id: I9267e856a0f0fb22778dcd95974bb4217fd3712f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93308
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/source/uibase/shells/annotsh.cxx
b/sw/source/uibase/shells/annotsh.cxx
index df50cb78163d..0c81d1d00009 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -963,7 +963,8 @@ void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet)
}
case SID_COPY:
{
- if (!pOLV->HasSelection() ||
GetObjectShell()->isContentExtractionLocked())
+ SfxObjectShell* pObjectShell = GetObjectShell();
+ if (!pOLV->HasSelection() || (pObjectShell &&
pObjectShell->isContentExtractionLocked()) )
rSet.DisableItem( nWhich );
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
