diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-17 13:48:27 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:37 +0100 |
| commit | 052ac10a6f9b28b9b06884dd3ed41879722be6c9 (patch) | |
| tree | bc411acf431ce9971bf954ce6c26e9f837860d6c /sd/source/ui/view | |
| parent | a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd (diff) | |
tentatively restore more UNO / task-pane goo ...
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/ToolBarManager.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 13 | ||||
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index c5be674a8b3c..d0188211bc1d 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1199,6 +1199,7 @@ void ToolBarRules::MainViewShellChanged (ViewShell::ShellType nShellType) case ViewShell::ST_NONE: case ViewShell::ST_PRESENTATION: + case ViewShell::ST_TASK_PANE: case ViewShell::ST_SIDEBAR: default: break; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 3348c198ff76..91091c49bb1e 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -54,6 +54,7 @@ #include "PresentationViewShell.hxx" #include "FormShellManager.hxx" #include "ToolBarManager.hxx" +#include "taskpane/PanelId.hxx" #include "SidebarPanelId.hxx" #include "Window.hxx" #include "framework/ConfigurationController.hxx" @@ -697,6 +698,13 @@ void ViewShellBase::Execute (SfxRequest& rRequest) framework::FrameworkHelper::msSlideSorterURL); break; + case SID_TASKPANE: + mpImpl->SetPaneVisibility( + rRequest, + framework::FrameworkHelper::msRightPaneURL, + framework::FrameworkHelper::msTaskPaneURL); + break; + case SID_NORMAL_MULTI_PANE_GUI: case SID_SLIDE_SORTER_MULTI_PANE_GUI: case SID_DRAWINGMODE: @@ -1387,6 +1395,11 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet) xContext, FrameworkHelper::msLeftDrawPaneURL); break; + case SID_TASKPANE: + xResourceId = ResourceId::create( + xContext, FrameworkHelper::msRightPaneURL); + break; + case SID_NORMAL_MULTI_PANE_GUI: xResourceId = ResourceId::createWithAnchorURL( xContext, diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 84c31813b5d8..07048c05f2c3 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -40,6 +40,7 @@ #include "FrameView.hxx" #include "DrawViewShell.hxx" #include "ViewShellHint.hxx" +#include "taskpane/PanelId.hxx" #include "SidebarPanelId.hxx" #include "framework/FrameworkHelper.hxx" @@ -330,6 +331,7 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) // Since we have to return a view id for every possible shell type // and there is not (yet) a proper ViewShellBase sub class for the // remaining types we chose the Impress factory as a fall back. + case ViewShell::ST_TASK_PANE: case ViewShell::ST_SIDEBAR: case ViewShell::ST_NONE: default: |