basctl/uiconfig/basicide/menubar/menubar.xml | 3 chart2/uiconfig/menubar/menubar.xml | 3 dbaccess/uiconfig/dbapp/menubar/menubar.xml | 3 dbaccess/uiconfig/dbquery/menubar/menubar.xml | 3 dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 3 dbaccess/uiconfig/dbtable/menubar/menubar.xml | 3 dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 3 extensions/uiconfig/sbibliography/menubar/menubar.xml | 3 framework/uiconfig/startmodule/menubar/menubar.xml | 3 reportdesign/uiconfig/dbreport/menubar/menubar.xml | 3 sc/uiconfig/scalc/menubar/menubar.xml | 3 sd/uiconfig/sdraw/menubar/menubar.xml | 3 sd/uiconfig/simpress/menubar/menubar.xml | 3 sfx2/source/view/viewfrm.cxx | 58 ------------------ starmath/uiconfig/smath/menubar/menubar.xml | 3 sw/uiconfig/sglobal/menubar/menubar.xml | 3 sw/uiconfig/sweb/menubar/menubar.xml | 3 sw/uiconfig/swform/menubar/menubar.xml | 3 sw/uiconfig/swreport/menubar/menubar.xml | 3 sw/uiconfig/swriter/menubar/menubar.xml | 3 sw/uiconfig/swxform/menubar/menubar.xml | 3 21 files changed, 118 deletions(-)
New commits: commit 7160baa8883410fe63ab3f7e8885763617034b05 Author: Andras Timar <[email protected]> AuthorDate: Sun Jul 14 20:28:13 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 13 21:15:04 2024 +0100 [cp] remove donate and community involvement infobars Change-Id: I37c9c76eb88dea4effa786b62755ea8738efc3e0 Reviewed-on: https://gerrit.libreoffice.org/75600 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index fe0dc0adc7fc..abb616ce5505 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1520,63 +1520,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) GetDispatcher()->ExecuteList(SID_TIPOFTHEDAY, SfxCallMode::SLOT, {}, { &aDocFrame }); } - // inform about the community involvement - const auto t0 = std::chrono::system_clock::now().time_since_epoch(); - const sal_Int64 nLastGetInvolvedShown = officecfg::Setup::Product::LastTimeGetInvolvedShown::get(); - const sal_Int64 nNow = std::chrono::duration_cast<std::chrono::seconds>(t0).count(); - const sal_Int64 nPeriodSec(60 * 60 * 24 * 180); // 180 days in seconds - bool bUpdateLastTimeGetInvolvedShown = false; - - if (nLastGetInvolvedShown == 0) - bUpdateLastTimeGetInvolvedShown = true; - else if (nPeriodSec < nNow && nLastGetInvolvedShown < (nNow + nPeriodSec/2) - nPeriodSec) // 90d alternating with donation - { - bUpdateLastTimeGetInvolvedShown = true; - - VclPtr<SfxInfoBarWindow> pInfoBar = AppendInfoBar("getinvolved", "", SfxResId(STR_GET_INVOLVED_TEXT), InfobarType::INFO); - - if (pInfoBar) - { - weld::Button& rGetInvolvedButton = pInfoBar->addButton(); - rGetInvolvedButton.set_label(SfxResId(STR_GET_INVOLVED_BUTTON)); - rGetInvolvedButton.connect_clicked(LINK(this, SfxViewFrame, GetInvolvedHandler)); - } - } - - if (bUpdateLastTimeGetInvolvedShown - && !officecfg::Setup::Product::LastTimeGetInvolvedShown::isReadOnly()) - { - std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); - officecfg::Setup::Product::LastTimeGetInvolvedShown::set(nNow, batch); - batch->commit(); - } - - // inform about donations - const sal_Int64 nLastDonateShown = officecfg::Setup::Product::LastTimeDonateShown::get(); - bool bUpdateLastTimeDonateShown = false; - - if (nLastDonateShown == 0) - bUpdateLastTimeDonateShown = true; - else if (nPeriodSec < nNow && nLastDonateShown < nNow - nPeriodSec) // 90d alternating with getinvolved - { - bUpdateLastTimeDonateShown = true; - - VclPtr<SfxInfoBarWindow> pInfoBar = AppendInfoBar("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO); - if (pInfoBar) - { - weld::Button& rDonateButton = pInfoBar->addButton(); - rDonateButton.set_label(SfxResId(STR_DONATE_BUTTON)); - rDonateButton.connect_clicked(LINK(this, SfxViewFrame, DonationHandler)); - } - } - - if (bUpdateLastTimeDonateShown - && !officecfg::Setup::Product::LastTimeDonateShown::isReadOnly()) - { - std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); - officecfg::Setup::Product::LastTimeDonateShown::set(nNow, batch); - batch->commit(); - } #endif if (officecfg::Office::Common::Passwords::HasMaster::get() && officecfg::Office::Common::Passwords::StorageVersion::get() == 0) @@ -1599,7 +1542,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } } - const bool bEmbedded = m_xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED; // read-only infobar if necessary commit d2b0499d4d95df77396ea6abcfd65ddee7708371 Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 13:28:26 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 13 21:14:32 2024 +0100 [cp] Remove Help - Donate to LibreOffice menu item ... and remove Help - Get Involved menu item, too Change-Id: I7a701173f596306ee628ae4a12ad81d2d756caca diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index fc510571e2fe..3cd60edffee1 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -168,9 +168,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 58c84d6cbc33..bfdf1f77384f 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -167,9 +167,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index 29e65762524c..d424dc3d3be8 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -153,9 +153,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index 762a5533de74..5a404026788b 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -108,9 +108,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index 0c2a73ec31d5..f9fa2b80f436 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -92,9 +92,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index 80511e8ea4d6..5d34f377e22e 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -92,9 +92,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index e787d60d7355..4783fcf6a342 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -117,9 +117,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml index 9b449072ac32..66b245f7b43e 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -66,9 +66,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 72f0354a79df..c5bea72f2e7e 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -68,9 +68,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index e95054ed7889..1d26cebe00d5 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -283,9 +283,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index dad1d6844f4e..f0b1c3c7f08d 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -755,9 +755,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index a905b056929f..115fe2dca29d 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -640,9 +640,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 6cc13819bde1..c4a9193f81b1 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -671,9 +671,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index 903ba7189664..02a0f2241b90 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -162,9 +162,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index f1caab1bc1b4..d0b9a1c4c1b0 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -797,9 +797,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index dc0715beeb81..8bde4e44ca62 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -659,9 +659,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 5eebcc9a96a1..e81736dd0f7a 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -740,9 +740,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 59f630afc70e..8720d57ecb6b 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -693,9 +693,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 5e8fe23f7107..281b77afe16e 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -840,9 +840,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 70e0c4a10b84..886126bab61a 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -786,9 +786,6 @@ <menu:menuseparator/> <menu:menuitem menu:id=".uno:SafeMode"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:GetInvolved"/> - <menu:menuitem menu:id=".uno:Donation"/> - <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup>
