[PATCH] A few more improvements to the About dialogue

Hi all,

I hope it's okay to send multiple related patches to the list like
this...

Some time ago, Jean-Baptiste Faure criticised my slightly nicer version
of About for it cutting of the button row when it got too long. This is
fixed by 0001-Fix-display... – the About box now resizes in that case.
(Screenshot with long text string attached.)

0002-Remove... removes the help menu entries for Credits and License
information, as these are duplicated inside the new About box. (Note
however that About for some reason uses the online versions, while the
menu entries opened the local versions of these files.)

Regards,

Astron.


From d0bd8c27543ce52ddd322dc3146ae0cc31fb63c4 Mon Sep 17 00:00:00 2001
From: "Stefan Knorr (astron)" <heinzlesspam@gmail.com>
Date: Thu, 7 Jun 2012 23:50:37 +0200
Subject: [PATCH 1/3] Fix display of About dialog when buttons contain long
 strings

Thanks to Jean-Baptiste Faure for spotting.

Change-Id: Ie05a15fca7f40c9a621a6aa758a19f7455d312a6
---
 cui/source/dialogs/about.cxx |  101 ++++++++++++++++++++++++++----------------
 cui/source/inc/about.hxx     |    8 ++--
 2 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c0df238..c8576ab 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -63,8 +63,8 @@ using namespace ::com::sun::star;
 enum AboutDialogButton
 {
     CREDITS_BUTTON,
-    WEBSITE_BUTTON,
-    LICENSE_BUTTON
+    LICENSE_BUTTON,
+    WEBSITE_BUTTON
 };
 
 AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
@@ -75,8 +75,8 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
     aCopyrightTextShadow ( this,     ResId( ABOUT_COPYRIGHT_TEXT, *rId.GetResMgr() ) ),
     aLogoImage           ( this,     ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr() ) ),
     aCreditsButton       ( this,     ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ),
-    aWebsiteButton       ( this,     ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ),
     aLicenseButton       ( this,     ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ),
+    aWebsiteButton       ( this,     ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ),
     aCancelButton        ( this,     ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ),
     m_aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr()).toString().trim()),
     m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
@@ -103,13 +103,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
 
     // Allow the button to be identifiable once they are clicked
     aCreditsButton.SetData( (void*)CREDITS_BUTTON );
-    aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
     aLicenseButton.SetData( (void*)LICENSE_BUTTON );
+    aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
 
     // Connect all handlers
     aCreditsButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
-    aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
     aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
+    aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 
     aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
 
@@ -127,10 +127,10 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
     AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData();
     if ( pDialogButton ==  (AboutDialogButton*)CREDITS_BUTTON )
         sURL = m_aCreditsLinkStr;
-    else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
-        sURL = m_aWebsiteLinkStr;
     else if ( pDialogButton == (AboutDialogButton*)LICENSE_BUTTON)
         sURL = m_aLicenseLinkStr;
+    else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
+        sURL = m_aWebsiteLinkStr;
 
     // If the URL is empty, don't do anything
     if ( sURL.isEmpty() )
@@ -195,26 +195,24 @@ void AboutDialog::LayoutControls()
     // Obtain an appropriate text width from the size of the screen
     sal_Int32 aIdealTextWidth = aScreenRect.GetWidth() / 2.4;
 
-    sal_Int32 aDialogBorder = 6;
-    sal_Int32 aContentWidth = aIdealTextWidth + aDialogBorder * 2;
-    sal_Int32 aShadowWidth = aContentWidth * 0.02;
-    sal_Int32 aDialogWidth = aContentWidth + aShadowWidth * 2;
+    sal_Int32 aDialogBorder = 12;
+    sal_Int32 aDialogWidth = aIdealTextWidth + aDialogBorder * 2;
 
     // Render and Position Logo
     vcl::RenderGraphicRasterizer aRasterizerLogo = Application::LoadBrandSVG("flat_logo");
     float aLogoWidthHeightRatio = (float)aRasterizerLogo.GetDefaultSizePixel().Width() /
                                (float)aRasterizerLogo.GetDefaultSizePixel().Height();
 
-    Size aLogoSize( aContentWidth * 0.6, (aContentWidth * 0.6) / aLogoWidthHeightRatio );
-    Point aLogoPos( aShadowWidth + ( aContentWidth - aLogoSize.Width() ) / 2,
-                    aShadowWidth + aDialogBorder );
+    Size aLogoSize( aDialogWidth * 0.6, (aDialogWidth * 0.6) / aLogoWidthHeightRatio );
+    Point aLogoPos( ( aDialogWidth - aLogoSize.Width() ) / 2,
+                    aDialogBorder );
     aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
     aLogoImage.SetImage( Image( aLogoBitmap ) );
     aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
 
     // Position version text
     sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
-    Point aVersionPos( aShadowWidth + aDialogBorder,
+    Point aVersionPos( aDialogBorder,
                        aLogoPos.Y() + aLogoSize.Height() + aLogoVersionSpacing );
     Size aVersionSize = aVersionText.CalcMinimumSize();
     aVersionSize.Width() = aIdealTextWidth;
@@ -222,7 +220,7 @@ void AboutDialog::LayoutControls()
 
     // Position description text
     sal_Int32 aVersionDescriptionSpacing = aLogoSize.Height() * 0.45;
-    Point aDescriptionPos( aShadowWidth + aDialogBorder, aVersionPos.Y() + aVersionSize.Height() + 
aVersionDescriptionSpacing );
+    Point aDescriptionPos( aDialogBorder, aVersionPos.Y() + aVersionSize.Height() + 
aVersionDescriptionSpacing );
     Size aDescriptionSize = aDescriptionText.GetSizePixel();
     aDescriptionSize.Width() = aIdealTextWidth;
     aDescriptionText.SetPosSizePixel( aDescriptionPos, aDescriptionSize );
@@ -230,7 +228,7 @@ void AboutDialog::LayoutControls()
     aDescriptionText.SetSizePixel( aDescriptionSize );
 
     // Layout copyright text
-    Point aCopyrightPos( aShadowWidth + aDialogBorder, aDescriptionPos.Y() + 
aDescriptionText.GetSizePixel().Height() + aVersionDescriptionSpacing );
+    Point aCopyrightPos( aDialogBorder, aDescriptionPos.Y() + 
aDescriptionText.GetSizePixel().Height() + aVersionDescriptionSpacing );
     Size aCopyrightSize = aCopyrightText.GetSizePixel();
     aCopyrightSize.Width() = aIdealTextWidth;
     aCopyrightText.SetPosSizePixel( aCopyrightPos, aCopyrightSize );
@@ -246,9 +244,10 @@ void AboutDialog::LayoutControls()
     // Layout Buttons
     Size aButtonSize;
     Point aButtonPos;
-    LayoutButtons( aContentWidth, aDialogBorder, aShadowWidth, aCopyrightPos,
+    sal_Int32 aButtonsWidth = 0;
+    LayoutButtons( aDialogWidth, aDialogBorder, aCopyrightPos,
                    aCopyrightText.GetSizePixel().Height() + 1,
-                   aVersionDescriptionSpacing, aButtonPos, aButtonSize );
+                   aVersionDescriptionSpacing, aButtonPos, aButtonSize, aButtonsWidth );
 
 
 
@@ -259,36 +258,59 @@ void AboutDialog::LayoutControls()
     Size aBackgroundSize( aDialogWidth, aDialogWidth / aBackgroundWidthHeightRatio );
 
     // Make sure the dialog is tall enough
-    sal_Int32 aBottomY = aButtonPos.Y() + aButtonSize.Height() + aDialogBorder + aShadowWidth;
+    sal_Int32 aBottomY = aButtonPos.Y() + aButtonSize.Height() + aDialogBorder;
     // If not, make the dialog taller (and to maintain the aspect ratio of the background also 
wider)
+    if (aButtonsWidth > 0)
+    {
+        aBackgroundSize.Width() += aButtonsWidth;
+        aBackgroundSize.Height() = aBackgroundSize.Width() / aBackgroundWidthHeightRatio;
+    }
+
     if (aBottomY > aBackgroundSize.Height())
+    {
         aBackgroundSize.Width() = aBottomY * aBackgroundWidthHeightRatio;
         aBackgroundSize.Height() = aBottomY;
+    }
+
+    // Not pretty, but better than having the buttons in the center of the dialog.
+    if (aBottomY < aBackgroundSize.Height())
+    {
+        sal_Int32 aHeightDifference = aBackgroundSize.Height() - aBottomY;
+
+        MoveControl(aVersionText, 0, aHeightDifference * 0.25);
+        MoveControl(aDescriptionText, 0, aHeightDifference * 0.5 );
+        MoveControl(aCopyrightText, 0, aHeightDifference * 0.75 );
+        MoveControl(aCopyrightTextShadow, 0, aHeightDifference * 0.75 );
+        MoveControl(aCreditsButton, 0, aHeightDifference);
+        MoveControl(aLicenseButton, 0, aHeightDifference);
+        MoveControl(aWebsiteButton, 0, aHeightDifference);
+        MoveControl(aCancelButton, 0, aHeightDifference);
+    }
 
     // If needed, adjust all control position to the new width
     if (aBackgroundSize.Width() != aDialogWidth)
     {
         sal_Int32 aWidthDifference = aBackgroundSize.Width() - aDialogWidth;
 
-        MoveControl(aLogoImage, aWidthDifference / 2);
-        MoveControl(aVersionText, aWidthDifference / 2);
-        MoveControl(aDescriptionText, aWidthDifference / 2);
-        MoveControl(aCreditsButton, aWidthDifference / 2);
-        MoveControl(aWebsiteButton, aWidthDifference / 2);
-        MoveControl(aLicenseButton, aWidthDifference / 2);
-        MoveControl(aCopyrightText, aWidthDifference / 2);
-        MoveControl(aCopyrightTextShadow, aWidthDifference / 2);
+        MoveControl(aLogoImage, aWidthDifference / 2, 0);
+        MoveControl(aVersionText, aWidthDifference / 2, 0);
+        MoveControl(aDescriptionText, aWidthDifference / 2, 0);
+        MoveControl(aCopyrightText, aWidthDifference / 2, 0);
+        MoveControl(aCopyrightTextShadow, aWidthDifference / 2, 0);
+        if (aButtonsWidth <= 0)
+            MoveControl(aCancelButton, aWidthDifference, 0);
     }
 
+
     // Render Background and set final dialog size
     aBackgroundBitmap = aRasterizerBackground.Rasterize( aBackgroundSize );
     SetOutputSizePixel( aBackgroundSize );
 }
 
-void AboutDialog::LayoutButtons(sal_Int32 aContentWidth, sal_Int32 aDialogBorder,
-                                 sal_Int32 aShadowWidth, Point aCopyrightPos,
-                                 sal_Int32 aCopyrightTextHeight, sal_Int32 
aVersionDescriptionSpacing,
-                                 Point& aButtonPos, Size& aButtonSize)
+void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
+                                Point aCopyrightPos, sal_Int32 aCopyrightTextHeight,
+                                sal_Int32 aVersionDescriptionSpacing, Point& aButtonPos,
+                                Size& aButtonSize, sal_Int32& aButtonsWidth )
 {
     // Position credits button
     sal_Int32 aButtonVPadding = 5;
@@ -317,10 +339,14 @@ void AboutDialog::LayoutButtons(sal_Int32 aContentWidth, sal_Int32 
aDialogBorder
     aWebsiteButton.SetSizePixel( aButtonSize );
     aCancelButton.SetSizePixel( aButtonSize );
 
-    sal_Int32 aButtonSpacing = (aContentWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 4 
) - ( aAdjacentButtonSpacing * 2) );
-    if (aButtonSpacing < 1)
-        aButtonSpacing = 6;
-    aButtonPos.X() = aShadowWidth + aDialogBorder;
+    sal_Int32 aButtonSpacing = aDialogWidth - ( aDialogBorder * 2 ) - ( aButtonSize.Width() * 4 ) 
- ( aAdjacentButtonSpacing * 2);
+    if (aButtonSpacing < aAdjacentButtonSpacing)
+    {
+        aButtonsWidth = aAdjacentButtonSpacing - aButtonSpacing;
+        aButtonSpacing = aAdjacentButtonSpacing;
+    }
+
+    aButtonPos.X() = aDialogBorder;
     aButtonPos.Y() = aCopyrightPos.Y() + aCopyrightTextHeight + aVersionDescriptionSpacing;
 
     aCreditsButton.SetPosPixel( aButtonPos );
@@ -337,10 +363,11 @@ void AboutDialog::LayoutButtons(sal_Int32 aContentWidth, sal_Int32 
aDialogBorder
 
 }
 
-void AboutDialog::MoveControl(Control& rControl, sal_Int32 X)
+void AboutDialog::MoveControl(Control& rControl, sal_Int32 X, sal_Int32 Y)
 {
     Point aControlPos = rControl.GetPosPixel();
     aControlPos.X() += X;
+    aControlPos.Y() += Y;
     rControl.SetPosPixel(aControlPos);
 }
 
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index fb876a5..5d1af3d 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -52,8 +52,8 @@ private:
     MultiLineEdit       aCopyrightTextShadow;
     FixedImage          aLogoImage;
     PushButton          aCreditsButton;
-    PushButton          aWebsiteButton;
     PushButton          aLicenseButton;
+    PushButton          aWebsiteButton;
     CancelButton        aCancelButton;
 
     String aVersionData;
@@ -71,11 +71,11 @@ private:
     void StyleControls();
     void LayoutControls();
     void LayoutButtons(sal_Int32 aContentWidth, sal_Int32 aDialogBorder,
-                       sal_Int32 aShadowWidth, Point aDescriptionPos,
+                       Point aDescriptionPos,
                        sal_Int32 aDescriptionTextHeight,
                        sal_Int32 aVersionDescriptionSpacing, Point& aButtonPos,
-                       Size& aButtonSize);
-    void MoveControl(Control& rControl, sal_Int32 X);
+                       Size& aButtonSize, sal_Int32& aButtonsWidth );
+    void MoveControl(Control& rControl, sal_Int32 X, sal_Int32 Y);
     rtl::OUString GetBuildId();
     rtl::OUString GetVersionString();
     rtl::OUString GetCopyrightString();
-- 
1.7.9.5

From 8bc3211f3b43467c364eb1ad2beb2cd59e3e5f44 Mon Sep 17 00:00:00 2001
From: "Stefan Knorr (astron)" <heinzlesspam@gmail.com>
Date: Mon, 18 Jun 2012 15:25:10 +0200
Subject: [PATCH 2/3] Remove License/Credits menu items

The About dialog now houses these functions.

Change-Id: I7f751027564897a063d2910644c69680d471b6d9
---
 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 --
 .../uiconfig/sbibliography/menubar/menubar.xml     |    1 -
 framework/uiconfig/startmodule/menubar/menubar.xml |    2 --
 reportdesign/uiconfig/dbreport/menubar/menubar.xml |    2 --
 sc/uiconfig/scalc/menubar/menubar.xml              |    2 --
 sd/uiconfig/sdraw/menubar/menubar.xml              |    2 --
 sd/uiconfig/simpress/menubar/menubar.xml           |    2 --
 starmath/uiconfig/smath/menubar/menubar.xml        |    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 --
 20 files changed, 39 deletions(-)

diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml 
b/basctl/uiconfig/basicide/menubar/menubar.xml
index e326a25..a3cca1e 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -102,8 +102,6 @@
             <menu:menuseparator/>
             <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/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index 353a8ad..8a17aec 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -150,8 +150,6 @@
             <menu:menuseparator/>
             <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/dbaccess/uiconfig/dbapp/menubar/menubar.xml 
b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index 0367d7e..a687710 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -135,8 +135,6 @@
             <menu:menuseparator/>
             <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/dbaccess/uiconfig/dbquery/menubar/menubar.xml 
b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index e041079..4217df1 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -76,8 +76,6 @@
             <menu:menuseparator/>
             <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/dbaccess/uiconfig/dbrelation/menubar/menubar.xml 
b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 7dc66d0..6587403 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -59,8 +59,6 @@
             <menu:menuseparator/>
             <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/dbaccess/uiconfig/dbtable/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index 439a735..9a6bb0e 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -60,8 +60,6 @@
             <menu:menuseparator/>
             <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/dbaccess/uiconfig/dbtdata/menubar/menubar.xml 
b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index 254f3b7..c44d9d5 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -68,8 +68,6 @@
             <menu:menuseparator/>
             <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/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml 
b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
index f66c285..c2416e6 100644
--- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
@@ -86,7 +86,6 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:SendFeedback"/>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml 
b/framework/uiconfig/startmodule/menubar/menubar.xml
index 055810b..367d7d2 100755
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -76,8 +76,6 @@
             <menu:menuseparator/>
             <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/reportdesign/uiconfig/dbreport/menubar/menubar.xml 
b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index 1ac58e4..755808c 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -415,8 +415,6 @@
             <menu:menuseparator/>
             <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/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index af9f7014..ddbf2ee 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -455,8 +455,6 @@
             <menu:menuseparator/>
             <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/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 965d14c..2c72839 100755
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -324,8 +324,6 @@
       <menu:menuseparator/>
       <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/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 7c75737..d399e0c 100755
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -300,8 +300,6 @@
             <menu:menuseparator/>
             <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/starmath/uiconfig/smath/menubar/menubar.xml 
b/starmath/uiconfig/smath/menubar/menubar.xml
index 4f1d159..db4407e 100755
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -114,8 +114,6 @@
       <menu:menuseparator/>
       <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/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 25e1f8f..bd96dea 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -452,8 +452,6 @@
       <menu:menuseparator/>
       <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 902e890..8a8d6e0 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -382,8 +382,6 @@
       <menu:menuseparator/>
       <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 e69afcd..3021151 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -447,8 +447,6 @@
       <menu:menuseparator/>
       <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 e69afcd..3021151 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -447,8 +447,6 @@
       <menu:menuseparator/>
       <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 b0f7076..e8bc75a 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -456,8 +456,6 @@
       <menu:menuseparator/>
       <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 077a3f9..c56ab37 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -448,8 +448,6 @@
       <menu:menuseparator/>
       <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>
-- 
1.7.9.5

Attachment: aboutlongtext.png
Description: PNG image