|
 |
f0633d |
From 4c0ac90b4864d5eee401b54cdcd54e29ae4ddc53 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Date: Wed, 11 Dec 2013 23:34:55 +0100
|
|
|
f0633d |
Subject: [PATCH 059/109] fdo#68160 Revert "Resolves: #ii122335# Disabling the
|
|
|
f0633d |
old task pane"
|
|
|
f0633d |
MIME-Version: 1.0
|
|
|
f0633d |
Content-Type: text/plain; charset=UTF-8
|
|
|
f0633d |
Content-Transfer-Encoding: 8bit
|
|
|
f0633d |
|
|
|
f0633d |
fdo#68160 Revert "Partly revert "Resolves: #ii122335# Disabling the old task pane""
|
|
|
f0633d |
|
|
|
f0633d |
This reverts commit cb4225144f1fff44f9bb972fe06f51524da11b8b.
|
|
|
f0633d |
|
|
|
f0633d |
To be able to revert 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872 entirely.
|
|
|
f0633d |
|
|
|
f0633d |
fdo#68160 Revert "Resolves: #ii122335# Disabling the old task pane"
|
|
|
f0633d |
|
|
|
f0633d |
This reverts commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872.
|
|
|
f0633d |
|
|
|
f0633d |
We need a TaskPane even in Writer and Calc to be used by extensions.
|
|
|
f0633d |
Sidebar is experimental so TaskPane is needed anyway for Impress (see
|
|
|
f0633d |
fdo#72371).
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: Ia94ab377a59996ba434b56e3823117183674afb7
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7042
|
|
|
f0633d |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
sc/source/ui/view/tabvwsh.cxx | 1 +
|
|
|
f0633d |
sc/uiconfig/scalc/menubar/menubar.xml | 1 +
|
|
|
f0633d |
sw/source/ui/uiview/view0.cxx | 1 +
|
|
|
f0633d |
sw/uiconfig/sglobal/menubar/menubar.xml | 1 +
|
|
|
f0633d |
sw/uiconfig/sweb/menubar/menubar.xml | 1 +
|
|
|
f0633d |
sw/uiconfig/swform/menubar/menubar.xml | 1 +
|
|
|
f0633d |
sw/uiconfig/swreport/menubar/menubar.xml | 1 +
|
|
|
f0633d |
sw/uiconfig/swriter/menubar/menubar.xml | 1 +
|
|
|
f0633d |
sw/uiconfig/swxform/menubar/menubar.xml | 1 +
|
|
|
f0633d |
9 files changed, 9 insertions(+)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
|
|
|
f0633d |
index 7949e17..537499b 100644
|
|
|
f0633d |
--- a/sc/source/ui/view/tabvwsh.cxx
|
|
|
f0633d |
+++ b/sc/source/ui/view/tabvwsh.cxx
|
|
|
f0633d |
@@ -54,6 +54,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
|
|
|
f0633d |
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
|
|
|
f0633d |
+ SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId());
|
|
|
f0633d |
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
|
|
|
f0633d |
index 777c324..ca8d8ba 100644
|
|
|
f0633d |
--- a/sc/uiconfig/scalc/menubar/menubar.xml
|
|
|
f0633d |
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
|
|
|
f0633d |
@@ -139,6 +139,7 @@
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Navigator"/>
|
|
|
f0633d |
+ <menu:menuitem menu:id=".uno:TaskPane"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Sidebar"/>
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:FullScreen"/>
|
|
|
f0633d |
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
|
|
|
f0633d |
index 73555a8..e5f7b3b 100644
|
|
|
f0633d |
--- a/sw/source/ui/uiview/view0.cxx
|
|
|
f0633d |
+++ b/sw/source/ui/uiview/view0.cxx
|
|
|
f0633d |
@@ -90,6 +90,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
|
|
|
f0633d |
SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
|
|
|
f0633d |
{
|
|
|
f0633d |
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
|
|
|
f0633d |
+ SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
|
|
|
f0633d |
SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
|
|
|
f0633d |
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
|
|
|
f0633d |
index 3c310f2..f79d0ec 100644
|
|
|
f0633d |
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
|
|
|
f0633d |
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
|
|
|
f0633d |
@@ -137,6 +137,7 @@
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Navigator"/>
|
|
|
f0633d |
+ <menu:menuitem menu:id=".uno:TaskPane"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Sidebar"/>
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:FullScreen"/>
|
|
|
f0633d |
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
|
|
|
f0633d |
index 30229a7..3cb3b76 100644
|
|
|
f0633d |
--- a/sw/uiconfig/sweb/menubar/menubar.xml
|
|
|
f0633d |
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
|
|
|
f0633d |
@@ -108,6 +108,7 @@
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Navigator"/>
|
|
|
f0633d |
+ <menu:menuitem menu:id=".uno:TaskPane"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Sidebar"/>
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:FullScreen"/>
|
|
|
f0633d |
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
|
|
|
f0633d |
index 4f22cf1..806da2d 100644
|
|
|
f0633d |
--- a/sw/uiconfig/swform/menubar/menubar.xml
|
|
|
f0633d |
+++ b/sw/uiconfig/swform/menubar/menubar.xml
|
|
|
f0633d |
@@ -136,6 +136,7 @@
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Navigator"/>
|
|
|
f0633d |
+ <menu:menuitem menu:id=".uno:TaskPane"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Sidebar"/>
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:FullScreen"/>
|
|
|
f0633d |
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
|
|
|
f0633d |
index 39284e8..bc90989 100644
|
|
|
f0633d |
--- a/sw/uiconfig/swreport/menubar/menubar.xml
|
|
|
f0633d |
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
|
|
|
f0633d |
@@ -137,6 +137,7 @@
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Navigator"/>
|
|
|
f0633d |
+ <menu:menuitem menu:id=".uno:TaskPane"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Sidebar"/>
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:FullScreen"/>
|
|
|
f0633d |
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
|
|
|
f0633d |
index 618e757..9506ab9 100644
|
|
|
f0633d |
--- a/sw/uiconfig/swriter/menubar/menubar.xml
|
|
|
f0633d |
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
|
|
|
f0633d |
@@ -141,6 +141,7 @@
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Navigator"/>
|
|
|
f0633d |
+ <menu:menuitem menu:id=".uno:TaskPane"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Sidebar"/>
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:FullScreen"/>
|
|
|
f0633d |
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
|
|
|
f0633d |
index e1d2c83..84b1fc3 100644
|
|
|
f0633d |
--- a/sw/uiconfig/swxform/menubar/menubar.xml
|
|
|
f0633d |
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
|
|
|
f0633d |
@@ -138,6 +138,7 @@
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Navigator"/>
|
|
|
f0633d |
+ <menu:menuitem menu:id=".uno:TaskPane"/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:Sidebar"/>
|
|
|
f0633d |
<menu:menuseparator/>
|
|
|
f0633d |
<menu:menuitem menu:id=".uno:FullScreen"/>
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|