sc/uiconfig/scalc/ui/notebookbar.ui | 8 ---- sc/uiconfig/scalc/ui/notebookbar_compact.ui | 16 --------- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 8 ---- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 24 -------------- sd/uiconfig/sdraw/ui/notebookbar.ui | 8 ---- sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui | 8 ---- sd/uiconfig/simpress/ui/notebookbar.ui | 8 ---- sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 8 ---- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 24 -------------- sw/uiconfig/swriter/ui/notebookbar.ui | 8 ---- sw/uiconfig/swriter/ui/notebookbar_compact.ui | 8 ---- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 8 ---- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 16 --------- 13 files changed, 152 deletions(-)
New commits: commit 4b46adb58e843dacc0e5448fb1e598ed97c89e93 Author: Thorsten Behrens <thorsten.behr...@cib.de> AuthorDate: Tue Mar 26 11:56:40 2019 +0100 Commit: Katarina Behrens <katarina.behr...@cib.de> CommitDate: Tue Mar 26 20:06:01 2019 +0100 tdf#122989 remove update check from notebookbar for the moment Temp fix, since update check is an extension, and extensions can't currently modify notebookbars. This needs implementation of something like https://wiki.openoffice.org/wiki/Framework/Article/Addon_Menu_Toolbar_Merging for notebookbar popup menus. Such that Addons.xcs provide some merge points with notebookbar menu IDs, we can then plug into existing popup menus. Change-Id: If30525fec1e7be0429e351588614618c5f56cdd4 Reviewed-on: https://gerrit.libreoffice.org/69735 Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> Tested-by: Thorsten Behrens <thorsten.behr...@cib.de> (cherry picked from commit 98174e163348ab44461f114142bc546e97720eec) Reviewed-on: https://gerrit.libreoffice.org/69741 Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> Tested-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index adeb29754cde..4d33af24f753 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -779,14 +779,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuHelp-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="CalcNotebookbar|Menu">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index ac6e9c0f97d9..1301829c7932 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -850,14 +850,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_compact|Menu">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="separator34"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -1671,14 +1663,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_compact|Tools">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="OptionsTreeDialogD"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 836a1486898d..de5f1aff5f16 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -2493,14 +2493,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSettings-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuAction">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSettings-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 2711a049b315..6f8d64726a1c 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -1748,14 +1748,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Help">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="separator43"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2455,14 +2447,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSettings-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Menu">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSettings-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2880,14 +2864,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuTools-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|Tools">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuTools-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 95ac1e833e58..f3d9aff2aaf1 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -764,14 +764,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuHelp-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="DrawNotebookbar|Help">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 9eb7f06c8f94..c9434a7a001f 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -2237,14 +2237,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSettings-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="draw_notebookbar_groupedbar_compact|Menu">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSettings-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index fa1a55711ed5..8d3bebf48b62 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -764,14 +764,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuHelp-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="ImpressNotebookbar|Help">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 8d985a9dc092..b5a5445e35b9 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -2243,14 +2243,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSettings-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Menu">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSettings-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index 98c3ee22fb36..8806c8e9c8e8 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -1414,14 +1414,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" context="notebookbar_groupedbar_full|Help" translatable="yes">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="separator113"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2108,14 +2100,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" context="notebookbar_groupedbar_full|Menu" translatable="yes">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="separator58"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2592,14 +2576,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" context="notebookbar_groupedbar_full|Tools" translatable="yes">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="OptionsTreeDialogD2"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index f2d5ae0626ea..e2b1e54691bf 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -493,14 +493,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuHelp-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="WriterNotebookbar|Help">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_compact.ui index 631bedd28544..9bfe89ce398e 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui @@ -1891,14 +1891,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="UpdateMenuD2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_compact|Update">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="OptionsTreeDialogD"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui index 6ca64df7744f..a310513d9730 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui @@ -2531,14 +2531,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSettings-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|MenuAction">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSettings-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index b82b824e23bb..dde4c70452a5 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -1498,14 +1498,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuHelp-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|HelpButton">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -2688,14 +2680,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="MenuSettings-UpdateMenu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_full|MenuButton">_Check for Updates...</property> - </object> - </child> - <child> <object class="GtkSeparatorMenuItem" id="MenuSettings-separator3"> <property name="visible">True</property> <property name="can_focus">False</property> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits