diff options
23 files changed, 0 insertions, 45 deletions
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index e326a254df72..aa5530f156da 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -103,7 +103,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/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 353a8ad76647..61832fba9945 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -151,7 +151,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/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; diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc index ee52aaeb8283..6ad08e7fdfda 100644 --- a/cui/source/dialogs/about.hrc +++ b/cui/source/dialogs/about.hrc @@ -26,7 +26,6 @@ #define ABOUT_STR_BASED_DERIVED 6 #define ABOUT_STR_LINK_WEBSITE 7 #define ABOUT_STR_LINK_CREDITS 8 -#define ABOUT_STR_LINK_LICENSE 9 #define ABOUT_BTN_CREDITS 10 #define ABOUT_DESCRIPTION_TEXT 11 #define ABOUT_COPYRIGHT_TEXT 12 diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src index 3a38862889c1..63c5f2c0e930 100644 --- a/cui/source/dialogs/about.src +++ b/cui/source/dialogs/about.src @@ -105,18 +105,10 @@ ModalDialog RID_DEFAULTABOUT { Text[ en-US ] = "http://www.libreoffice.org/about-us/credits/"; }; - String ABOUT_STR_LINK_LICENSE - { - Text[ en-US ] = "http://www.libreoffice.org/download/license/"; - }; PushButton ABOUT_BTN_CREDITS { Text [ en-US ] = "Credits"; }; - PushButton ABOUT_BTN_LICENSE - { - Text [ en-US ] = "License"; - }; PushButton ABOUT_BTN_WEBSITE { Text [ en-US ] = "Website"; diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 5d1af3d7bf90..639490878f26 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -52,7 +52,6 @@ private: MultiLineEdit aCopyrightTextShadow; FixedImage aLogoImage; PushButton aCreditsButton; - PushButton aLicenseButton; PushButton aWebsiteButton; CancelButton aCancelButton; @@ -64,7 +63,6 @@ private: String m_aBasedDerivedTextStr; String m_aWebsiteLinkStr; String m_aCreditsLinkStr; - String m_aLicenseLinkStr; rtl::OUString m_sBuildStr; String m_aDescriptionTextStr; diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index e15bfe412cdc..84e999a0d073 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -153,7 +153,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/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index 09ab390dd88e..4e980800dd19 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -94,7 +94,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/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index 7587caa2e9cf..688ecf2b68d0 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -77,7 +77,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/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index 213afbc42049..5fa12003a709 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -78,7 +78,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/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index f1fe8575fcf5..5f35b46de3e3 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -86,7 +86,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/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 055810bb8d0c..0a6c5cff86e7 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -77,7 +77,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/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index fd5b0d2b97c9..21bfb56ea042 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -426,7 +426,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/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 0c366539b266..ff7b3270c006 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -469,7 +469,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/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index dade19bcf33e..a6cbd3323f10 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -338,7 +338,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/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index b4ca6bf5e766..6d5e36222cec 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -314,7 +314,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/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 9716fc260dc1..084f1da36cfc 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -125,7 +125,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/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 693048d0d96b..19da430f94d9 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -463,7 +463,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 648d396cd688..453ba89f610a 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -393,7 +393,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 192894d61063..8dcb2c9196bd 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -458,7 +458,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 192894d61063..8dcb2c9196bd 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -458,7 +458,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 03b0ee9fab3b..ea0d2f1431fb 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -470,7 +470,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 afa86d7bf0b7..b1ece9d3a56f 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -459,7 +459,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> |