summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-07-01 12:38:02 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-07-01 12:38:02 +0000
commit09896044e5eac867e002a9d4338da878446c73e4 (patch)
tree546132bbe6afa7e60510dcfa3e9534b1f75ed8b7 /sd/source/ui/view
parent28167b4e618fa7aa3a9207c0aba7c124a6eabe30 (diff)
INTEGRATION: CWS impress144 (1.42.40); FILE MERGED
2008/05/29 09:58:22 af 1.42.40.1: #i78201# Fixed activation of layout menu in tool panel.
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 911a93372f67..96cec808127a 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ViewShellBase.cxx,v $
- * $Revision: 1.42 $
+ * $Revision: 1.43 $
*
* This file is part of OpenOffice.org.
*
@@ -1613,15 +1613,8 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
&& mrBase.GetMainViewShell()!=NULL
&& mrBase.GetMainViewShell()->GetShellType()==ViewShell::ST_OUTLINE))
{
- // Set the visibility of the right pane.
- framework::FrameworkHelper::Instance(mrBase)->RequestView(
- framework::FrameworkHelper::msTaskPaneURL,
- framework::FrameworkHelper::msRightPaneURL);
-
- if (bShowToolPanel && bPanelIdGiven)
- framework::FrameworkHelper::Instance(mrBase)->RunOnConfigurationEvent(
- framework::FrameworkHelper::msConfigurationUpdateEndEvent,
- toolpanel::PanelActivation(mrBase,nPanelId));
+ framework::FrameworkHelper::Instance(mrBase)->RequestTaskPanel(
+ framework::FrameworkHelper::msLayoutTaskPanelURL);
}
}