diff options
| author | Rob Snelders <programming@ertai.nl> | 2013-12-05 23:56:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-06 03:06:26 -0600 |
| commit | 7a92317c40a5aa5dcd78bc52d8c426b446626b0b (patch) | |
| tree | 5155c289255f164102487ea28aa1661fb2739f22 | |
| parent | ff927df4929022656668e4e98511c198134247cc (diff) | |
Partly revert "Resolves: #ii122335# Disabling the old task pane"
This partly reverts commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872.
SideBar is experimental, Impress still needs the TaskPane slot, otherwise once
disabled / clicked away the user won't get the TaskPane back.
Change-Id: I65b9e4a52ef2f3f1e7240fc01b828d2ff5d1589c
Reviewed-on: https://gerrit.libreoffice.org/6943
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit cb4225144f1fff44f9bb972fe06f51524da11b8b)
Reviewed-on: https://gerrit.libreoffice.org/6952
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sd/source/ui/view/drvwshrg.cxx | 1 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/menubar/menubar.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index bb2037008874..c71959c2f3ff 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -94,6 +94,7 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH { SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) ); SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR ); + SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE ); SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() ); SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() ); diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 9ad201952a09..9a5b87418c21 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -113,6 +113,7 @@ </menu:menupopup> </menu:menu> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:TaskPane"/> <menu:menuitem menu:id=".uno:Sidebar"/> <menu:menuitem menu:id=".uno:LeftPaneImpress"/> <menu:menuitem menu:id=".uno:AvailableToolbars"/> |