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

Change-Id: I07c1e115aa209ef1d69458f5b188d73caaae4294

1 files changed, 0 insertions, 15 deletions

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c8576abd31ee..5b3da4b3839e 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -63,7 +63,6 @@ using namespace ::com::sun::star;
 enum AboutDialogButton
 {
     CREDITS_BUTTON,
-    LICENSE_BUTTON,
     WEBSITE_BUTTON
 };
 
@@ -75,7 +74,6 @@ 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() ) ),
-    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()),
@@ -85,7 +83,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
     m_aBasedDerivedTextStr(ResId(ABOUT_STR_BASED_DERIVED, *rId.GetResMgr())),
     m_aWebsiteLinkStr(ResId( ABOUT_STR_LINK_WEBSITE, *rId.GetResMgr())),
     m_aCreditsLinkStr(ResId( ABOUT_STR_LINK_CREDITS, *rId.GetResMgr())),
-    m_aLicenseLinkStr(ResId( ABOUT_STR_LINK_LICENSE, *rId.GetResMgr())),
     m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr())),
     m_aDescriptionTextStr(ResId(ABOUT_STR_DESCRIPTION, *rId.GetResMgr()))
 {
@@ -103,12 +100,10 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
 
     // Allow the button to be identifiable once they are clicked
     aCreditsButton.SetData( (void*)CREDITS_BUTTON );
-    aLicenseButton.SetData( (void*)LICENSE_BUTTON );
     aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
 
     // Connect all handlers
     aCreditsButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
-    aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
     aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 
     aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
@@ -127,8 +122,6 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
     AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton->GetData();
     if ( pDialogButton ==  (AboutDialogButton*)CREDITS_BUTTON )
         sURL = m_aCreditsLinkStr;
-    else if ( pDialogButton == (AboutDialogButton*)LICENSE_BUTTON)
-        sURL = m_aLicenseLinkStr;
     else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
         sURL = m_aWebsiteLinkStr;
 
@@ -282,7 +275,6 @@ void AboutDialog::LayoutControls()
         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);
     }
@@ -317,15 +309,12 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
     sal_Int32 aButtonHPadding = 4;
     sal_Int32 aAdjacentButtonSpacing = 15;
     sal_Int32 aCreditsButtonWidth = aCreditsButton.CalcMinimumSize().Width();
-    sal_Int32 aLicenseButtonWidth = aLicenseButton.CalcMinimumSize().Width();
     sal_Int32 aWebsiteButtonWidth = aWebsiteButton.CalcMinimumSize().Width();
     sal_Int32 aCancelButtonWidth = aCancelButton.CalcMinimumSize().Width();
     sal_Int32 aLargestButtonWidth = 70;
 
     if ( aLargestButtonWidth < aCreditsButtonWidth )
         aLargestButtonWidth = aCreditsButtonWidth;
-    if ( aLargestButtonWidth < aLicenseButtonWidth )
-        aLargestButtonWidth = aLicenseButtonWidth;
     if ( aLargestButtonWidth < aWebsiteButtonWidth )
         aLargestButtonWidth = aWebsiteButtonWidth;
     if ( aLargestButtonWidth < aCancelButtonWidth )
@@ -335,7 +324,6 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
     aButtonSize.Height() = aWebsiteButton.CalcMinimumSize().Height() + ( 2 * aButtonVPadding );
 
     aCreditsButton.SetSizePixel( aButtonSize );
-    aLicenseButton.SetSizePixel( aButtonSize );
     aWebsiteButton.SetSizePixel( aButtonSize );
     aCancelButton.SetSizePixel( aButtonSize );
 
@@ -352,9 +340,6 @@ void AboutDialog::LayoutButtons(sal_Int32 aDialogWidth, sal_Int32 aDialogBorder,
     aCreditsButton.SetPosPixel( aButtonPos );
 
     aButtonPos.X() += aButtonSize.Width() + aAdjacentButtonSpacing;
-    aLicenseButton.SetPosPixel( aButtonPos );
-
-    aButtonPos.X() += aButtonSize.Width() + aAdjacentButtonSpacing;
     aWebsiteButton.SetPosPixel( aButtonPos );
 
     aButtonPos.X() += aButtonSize.Width() + aButtonSpacing;