From f342094d35c85a882db7b6ffe3f69ea9b3f8cc74 Mon Sep 17 00:00:00 2001
From: "Stefan Knorr (astron)" <heinzlesspam@gmail.com>
Date: Thu, 28 Jun 2012 16:45:08 +0200
Subject: Remove duplication of License/Credits information

A bit differently this time around:
+ remove Credits menu item from menu
+ remove License button from the About dialog

Conflicts:

	cui/source/dialogs/about.cxx

Change-Id: I07c1e115aa209ef1d69458f5b188d73caaae4294
---
 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 -
 6 files changed, 6 deletions(-)

(limited to 'sw')

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 25e1f8f3e737..e74e9c79800b 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -453,7 +453,6 @@
       <menu:menuitem menu:id=".uno:SendFeedback"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 902e8909ef6f..4bb0b54878a0 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -383,7 +383,6 @@
       <menu:menuitem menu:id=".uno:SendFeedback"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index e69afcd21f4d..5362ff174446 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -448,7 +448,6 @@
       <menu:menuitem menu:id=".uno:SendFeedback"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index e69afcd21f4d..5362ff174446 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -448,7 +448,6 @@
       <menu:menuitem menu:id=".uno:SendFeedback"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index b0f707646712..0a1a025a6d0d 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -457,7 +457,6 @@
       <menu:menuitem menu:id=".uno:SendFeedback"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 077a3f97a30a..36b0ce49e531 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -449,7 +449,6 @@
       <menu:menuitem menu:id=".uno:SendFeedback"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowLicense"/>
-      <menu:menuitem menu:id=".uno:ShowCredits"/>
       <menu:menuitem menu:id=".uno:About"/>
     </menu:menupopup>
   </menu:menu>
-- 
cgit v1.2.3