From 08d90bddc85cc4abb8d76305cfd644ab2d9fb9a5 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Thu, 3 Mar 2005 02:59:38 +0000
Subject: [PATCH] 2005-03-02 Alain Magloire 	Fix for PR 87027: Thanks to
 Jonathan Emmett, for noticing. 	*
 src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java

---
 core/org.eclipse.cdt.ui/ChangeLog                          | 4 ++++
 .../cdt/internal/ui/editor/CContentOutlinePage.java        | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index ed2f60108b6..4a73389cbe6 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-02 Alain Magloire
+	Fix for PR 87027: Thanks to Jonathan Emmett, for noticing.
+	* src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
+
 2005-02-25 Alain Magloire
 	Fix PR 82292: Code template variable not working.
 	* src/org/eclipse/cdt/internal/corext/template/c/CContext.java
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 af447942974..935456c1c3e 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
@@ -54,9 +54,9 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionContext;
 import org.eclipse.ui.actions.ActionGroup;
-import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.part.IPageSite;
 import org.eclipse.ui.part.Page;
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
@@ -93,7 +93,7 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS
 			setDescription(ActionMessages.getString("IncludesGroupingAction.description")); //$NON-NLS-1$
 			setToolTipText(ActionMessages.getString("IncludeGroupingAction.tooltip")); //$NON-NLS-1$
 			CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, "synced.gif"); //$NON-NLS-1$		
-			WorkbenchHelp.setHelp(this, ICHelpContextIds.LINK_EDITOR_ACTION);
+			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.LINK_EDITOR_ACTION);
 
 			boolean enabled= isIncludesGroupingEnabled();
 			setChecked(enabled);
@@ -244,6 +244,7 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS
 		treeViewer.setContentProvider(new CContentOutlinerProvider(treeViewer));
 		treeViewer.setLabelProvider(new DecoratingCLabelProvider(new StandardCElementLabelProvider(), true));
 		treeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS);
+		treeViewer.setUseHashlookup(true);
 		treeViewer.addSelectionChangedListener(this);
 
 		initDragAndDrop();
@@ -284,7 +285,7 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS
 		fCustomFiltersActionGroup= new CustomFiltersActionGroup("org.eclipse.cdt.ui.COutlinePage", getTreeViewer()); //$NON-NLS-1$
 
 		treeViewer.setInput(fInput);
-		WorkbenchHelp.setHelp(control, ICHelpContextIds.COUTLINE_VIEW);	
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, ICHelpContextIds.COUTLINE_VIEW);
 	}
 	
 	public void dispose() {