basctl/uiconfig/basicide/menubar/menubar.xml | 2 -
chart2/uiconfig/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbapp/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbquery/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbtable/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 2 -
extensions/uiconfig/sbibliography/menubar/menubar.xml | 2 -
framework/uiconfig/startmodule/menubar/menubar.xml | 2 -
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 2 -
sc/uiconfig/scalc/menubar/menubar.xml | 2 -
scp2/source/ooo/folderitem_ooo.scp | 23 ------------------
sd/uiconfig/sdraw/menubar/menubar.xml | 2 -
sd/uiconfig/simpress/menubar/menubar.xml | 2 -
starmath/uiconfig/smath/menubar/menubar.xml | 2 -
svx/uiconfig/ui/crashreportdlg.ui | 2 -
sw/uiconfig/sglobal/menubar/menubar.xml | 2 -
sw/uiconfig/sweb/menubar/menubar.xml | 2 -
sw/uiconfig/swform/menubar/menubar.xml | 2 -
sw/uiconfig/swreport/menubar/menubar.xml | 2 -
sw/uiconfig/swriter/menubar/menubar.xml | 2 -
sw/uiconfig/swxform/menubar/menubar.xml | 2 -
22 files changed, 1 insertion(+), 64 deletions(-)
New commits:
commit 6c56f2928120373457a41d45d6d22845329928f7
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun May 7 22:45:52 2017 +0200
Collabora Office: remove Safe Mode from menus and Windows start menu
Change-Id: I9eaf6ef76597be6bc35462308f1cee61cb9bae5a
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml
b/basctl/uiconfig/basicide/menubar/menubar.xml
index 2a177f62961d..fbde6a4e2cc5 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -101,8 +101,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/chart2/uiconfig/menubar/menubar.xml
b/chart2/uiconfig/menubar/menubar.xml
index 032e75894d7f..944924b677dc 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -172,8 +172,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index ecffe81468d0..2a02bc6b0d04 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -157,8 +157,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index bd460419e416..6e92d745c7f7 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -98,8 +98,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 7f88113ab303..e66e76c613e8 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -81,8 +81,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index ca66a41dde2e..08953683a6df 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -82,8 +82,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index 17678fec9918..5048718b33c3 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -90,8 +90,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml
b/extensions/uiconfig/sbibliography/menubar/menubar.xml
index 361fb47ac07b..d582390f0152 100644
--- a/extensions/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml
@@ -83,8 +83,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml
b/framework/uiconfig/startmodule/menubar/menubar.xml
index 3718ee3bb6fa..adcdd1a93ad2 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -55,8 +55,6 @@
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index c9f65aedef6c..b74d01de5f62 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -287,8 +287,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 0bcdf66e822e..93110d624328 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -715,8 +715,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/scp2/source/ooo/folderitem_ooo.scp
b/scp2/source/ooo/folderitem_ooo.scp
index 3c0423bbb54f..ff8a371354da 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -65,26 +65,3 @@ FolderItemProperty gid_Fip_Soffice_Desktop_AppID
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Startcenter";
End
-
-FolderItem gid_Folderitem_LibreOffice_SafeMode
- Name = "%PRODUCTNAME (Safe Mode)";
- ModuleID = gid_Module_Root;
-#ifdef ENABLE_SILENT_MSI
- FolderID = PREDEFINED_STARTMENU;
-#else
- FolderID = gid_Folder_Staroffice51;
-#endif
- FileID = auto_brand_exe_soffice;
- IconFile = auto_brand_exe_soffice;
- IconID = 0;
- WkDir = gid_Brand_Dir_Program;
- Parameter = "--safe-mode";
- Styles = (NON_ADVERTISED);
- ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
-End
-
-FolderItemProperty gid_Fip_LibreOffice_SafeMode
- ShortcutID = gid_Folderitem_LibreOffice_SafeMode;
- Key = "System.AppUserModel.ID";
- Value = "TheDocumentFoundation.LibreOffice.SafeMode";
-End
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 8394479f9284..dda1edb79938 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -379,8 +379,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index a996a54c403a..25e39bf453de 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -617,8 +617,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml
b/starmath/uiconfig/smath/menubar/menubar.xml
index a43305f5944d..97a01fd55f6c 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -147,8 +147,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index f0919aa534eb..97f19e27d1af 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -115,7 +115,7 @@ Thank you for your help in improving
%PRODUCTNAME.</property>
<child>
<object class="GtkCheckButton" id="check_safemode">
<property name="label" translatable="yes">Restart %PRODUCTNAME to
enter safe mode</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
index e6dbe3d53275..7328a82ef34e 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -490,8 +490,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml
b/sw/uiconfig/sweb/menubar/menubar.xml
index c3638db27f4c..ba529fd65f41 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -420,8 +420,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml
b/sw/uiconfig/swform/menubar/menubar.xml
index cefc7be45f5d..bd2684f47601 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -484,8 +484,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml
b/sw/uiconfig/swreport/menubar/menubar.xml
index 4b71934b2284..095071ee950a 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -486,8 +486,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index 2d39cd0fdd50..b91238f96df0 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -752,8 +752,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml
b/sw/uiconfig/swxform/menubar/menubar.xml
index 31bdeb7cad64..3966e006a48b 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -486,8 +486,6 @@
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:SafeMode"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
