From 6f2f3e37ee7cd8b0fd8bdd463e6b6bbe27ead3eb Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Thu, 20 Apr 2006 14:02:57 +0000
Subject: [PATCH] Fix for NPE in CContentOutlinePage.createContentProvider(), 
 bugzilla 114054

---
 .../cdt/internal/ui/editor/CContentOutlinePage.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
index 90aebdc0039..dd1977eef18 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
@@ -224,8 +224,11 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS
 	}
 
 	protected CContentOutlinerProvider createContentProvider(TreeViewer viewer) {
-		IWorkbenchPartSite site= getSite().getPage().getActiveEditor().getSite();
-		return new CContentOutlinerProvider(viewer, site);
+		IWorkbenchPart part= getSite().getPage().getActivePart();
+		if (part == null) {
+			return new CContentOutlinerProvider(viewer);
+		}
+		return new CContentOutlinerProvider(viewer, part.getSite());
 	}
 
 	protected ProblemTreeViewer createTreeViewer(Composite parent) {