diff options
23 files changed, 0 insertions, 44 deletions
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 0d7ecd71ba49..dee4234704d5 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/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/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 db5057f02961..daa662836ef9 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -61,7 +61,6 @@ using namespace ::com::sun::star; enum AboutDialogButton { CREDITS_BUTTON, - LICENSE_BUTTON, WEBSITE_BUTTON }; @@ -73,7 +72,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()), @@ -83,7 +81,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())) { @@ -101,12 +98,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 ) ); @@ -125,8 +120,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; @@ -269,15 +262,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 ) @@ -287,7 +277,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 ); @@ -304,9 +293,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 e2c8a64f36c0..7842dc9e0407 100644 --- a/cui/source/dialogs/about.hrc +++ b/cui/source/dialogs/about.hrc @@ -35,7 +35,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 0367d7e56dce..e6dd0d6d6c64 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -136,7 +136,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 e041079623dc..40485461777d 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/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/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index 7dc66d034c35..8b91fd77b4c4 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -60,7 +60,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 439a735b1d0b..1d48d0e1d430 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -61,7 +61,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 254f3b7901ce..e65dc77388bc 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -69,7 +69,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 100755 --- 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 1ac58e4cb549..3fba828036eb 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -416,7 +416,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 ab14b654d9f1..eb6443e5f90c 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/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/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 965d14c0601a..dea015799f60 100755 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -325,7 +325,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 7c757370abf0..39851e137bc6 100755 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -301,7 +301,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 4f1d159f03a3..5123215c72ec 100755 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -115,7 +115,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 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> |