Tree - rpms/libreoffice - CentOS Git server

rpms / libreoffice

Files

Commit: f0633dd7d6b0029fb6a224ef7d14e9b88eb18692
Blob Blame History Raw
From 4c0ac90b4864d5eee401b54cdcd54e29ae4ddc53 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 11 Dec 2013 23:34:55 +0100
Subject: [PATCH 059/109] fdo#68160 Revert "Resolves: #ii122335# Disabling the
 old task pane"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 sc/source/ui/view/tabvwsh.cxx            | 1 +
 sc/uiconfig/scalc/menubar/menubar.xml    | 1 +
 sw/source/ui/uiview/view0.cxx            | 1 +
 sw/uiconfig/sglobal/menubar/menubar.xml  | 1 +
 sw/uiconfig/sweb/menubar/menubar.xml     | 1 +
 sw/uiconfig/swform/menubar/menubar.xml   | 1 +
 sw/uiconfig/swreport/menubar/menubar.xml | 1 +
 sw/uiconfig/swriter/menubar/menubar.xml  | 1 +
 sw/uiconfig/swxform/menubar/menubar.xml  | 1 +
 9 files changed, 9 insertions(+)

diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 7949e17..537499b 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 777c324..ca8d8ba 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"/>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 73555a8..e5f7b3b 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -90,6 +90,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
 SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
 {
     SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
+    SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
     SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
     SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
     SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 3c310f2..f79d0ec 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -137,6 +137,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"/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 30229a7..3cb3b76 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -108,6 +108,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"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 4f22cf1..806da2d 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -136,6 +136,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"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 39284e8..bc90989 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -137,6 +137,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"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 618e757..9506ab9 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -141,6 +141,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"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index e1d2c83..84b1fc3 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -138,6 +138,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"/>
-- 
1.8.4.2
rpms / libreoffice

Source Code

Files
