qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java | 2 +-
sc/source/ui/view/drawview.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 50e2704c80b30934ba98001eb194eb5e6af56a65
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 16 12:50:08 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jul 16 20:33:33 2019 +0200
cid#1448279 Dereference before null check
Change-Id: I14e975f9bcb2b18a8dc12cef70478457391f72dc
Reviewed-on: https://gerrit.libreoffice.org/75721
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index b16ba1b75f5b..273431ef0bf5 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -899,7 +899,7 @@ SdrEndTextEditKind ScDrawView::ScEndTextEdit()
bool bIsTextEdit = IsTextEdit();
SdrEndTextEditKind eKind = SdrEndTextEdit();
- if ( bIsTextEdit && pViewData )
+ if (bIsTextEdit)
pViewData->GetViewShell()->SetDrawTextUndo(nullptr); // the "normal"
undo manager
return eKind;
commit 7d22ed676d251f7a6587fe278456ebfdc6edde3b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jul 16 11:23:00 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jul 16 20:33:19 2019 +0200
cid#1448531 RV: Bad use of return value
Change-Id: Ifbbf75985bcc3f8d1db9c979bd13a34dc93255a2
Reviewed-on: https://gerrit.libreoffice.org/75709
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
index c0059c718758..0fa919d944b1 100644
--- a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
+++ b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
@@ -123,7 +123,7 @@ public class _XSelectionSupplier extends MultiMethodTest {
if (locRes) {
if (ObjCompare != null) {
- ObjCompare.compare(selections[i], curSelection);
+ compRes = ObjCompare.compare(selections[i],
curSelection) == 0;
} else {
compRes = util.ValueComparer.equalValue(selections[i],
curSelection);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
