summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-12-11 23:34:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-12-12 14:33:48 +0000
commit4c0ac90b4864d5eee401b54cdcd54e29ae4ddc53 (patch)
tree37edc961649d7a3bba7c9a2bf119c49429e7b905 /sc
parentb8339a06050fcbff25e3c990e1ff8ca02dc7bad5 (diff)
fdo#68160 Revert "Resolves: #ii122335# Disabling the old task pane"
fdo#68160 Revert "Partly revert "Resolves: #ii122335# Disabling the old task pane"" This reverts commit cb4225144f1fff44f9bb972fe06f51524da11b8b. To be able to revert 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872 entirely. fdo#68160 Revert "Resolves: #ii122335# Disabling the old task pane" This reverts commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872. We need a TaskPane even in Writer and Calc to be used by extensions. Sidebar is experimental so TaskPane is needed anyway for Impress (see fdo#72371). Change-Id: Ia94ab377a59996ba434b56e3823117183674afb7 Reviewed-on: https://gerrit.libreoffice.org/7042 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/tabvwsh.cxx1
-rw-r--r--sc/uiconfig/scalc/menubar/menubar.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 7949e1776b78..537499b528ee 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,6 +54,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
+ SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 777c3249f9cf..ca8d8ba943c5 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -139,6 +139,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
+ <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>