Hello, I've removed a redundant pointer check in the file
core/sw/source/ui/uno/unomailmerge.cxx (in the line 630). The check can be
removed because the pointer is checked before in the line 622 (and if the
pointer is null throws a RuntimeException).
I can't build libreoffice with this patch, but i can't build it even without
the patch, it seems that when I made git pull the build was broken by
another commits.
From c122aad623759a3a92e6c3e6a8c981c348fe1655 Mon Sep 17 00:00:00 2001
From: Andreu Correa Casablanca <casta...@gmail.com>
Date: Sat, 17 Sep 2011 17:38:52 +0200
Subject: [PATCH] removed redundant null ptr check in sw/source/ui/uni/unomailmarge.cxx l. 630
---
sw/source/ui/uno/unomailmerge.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index e7fd532..1a1b5b0 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -627,7 +627,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
// and thus avoiding the SelectShell call in Writers GetState function
// while still in Update of Sfx.
// (GetSelection in Update is not allowed)
- if (pView && aCurDocumentURL.getLength())
+ if (aCurDocumentURL.getLength())
pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird.
SharedComponent aRowSetDisposeHelper;
--
1.7.4.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
