coverity#982764 Dereference null return value

Change-Id: Ib0f01bf529a739e5f92cd41979c18d76d7b545d1

coverity#982764 Dereference null return value
Change-Id: Ib0f01bf529a739e5f92cd41979c18d76d7b545d1
2e827334 · Caolán McNamara · a69209a4 · 2e827334
Kaydet (Commit) 2e827334 authored Mar 28, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx +3 -1

No files found.
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -395,10 +395,10 @@ void ScPivotLayoutDlg::AddField( size_t nFromIndex, ScPivotFieldType eToType, co
    if (!bAllowed)
        return;

+    size_t nAt = 0;
    ScDPFieldControlBase* toWnd = GetFieldWindow(eToType);
    if (!toWnd)
        return;
-    size_t nAt = 0;
    ScDPFieldControlBase* rmWnd1 = NULL;
    ScDPFieldControlBase* rmWnd2 = NULL;
    GetOtherFieldWindows(eToType, rmWnd1, rmWnd2);
@@ -454,6 +454,8 @@ void ScPivotLayoutDlg::AppendField(size_t nFromIndex, ScPivotFieldType eToType)

    size_t nAt = 0;
    ScDPFieldControlBase* toWnd = GetFieldWindow(eToType);
+    if (!toWnd)
+        return;
    ScDPFieldControlBase* rmWnd1 = NULL;
    ScDPFieldControlBase* rmWnd2 = NULL;
    GetOtherFieldWindows(eToType, rmWnd1, rmWnd2);