[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jul 30 15:46:06 UTC 2019
sfx2/source/view/viewfrm.cxx | 56 -------------------------------------------
1 file changed, 56 deletions(-)
New commits:
commit 4236bb79017795bb743035d7d34690ed0df627fd
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Jul 14 20:28:13 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jul 30 17:44:57 2019 +0200
[cp] remove donate and community involvement infobars
Change-Id: I37c9c76eb88dea4effa786b62755ea8738efc3e0
Reviewed-on: https://gerrit.libreoffice.org/75600
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index ee298b2bc55c..e623ce9a6304 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1271,62 +1271,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
- // inform about the community involvement
- const sal_Int64 nLastGetInvolvedShown = officecfg::Setup::Product::LastTimeGetInvolvedShown::get();
- const sal_Int64 nNow = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).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);
-
- VclPtrInstance<PushButton> xGetInvolvedButton(&GetWindow());
- xGetInvolvedButton->SetText(SfxResId(STR_GET_INVOLVED_BUTTON));
- xGetInvolvedButton->SetSizePixel(xGetInvolvedButton->GetOptimalSize());
- xGetInvolvedButton->SetClickHdl(LINK(this, SfxViewFrame, GetInvolvedHandler));
- pInfoBar->addButton(xGetInvolvedButton);
- }
-
- 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("getdonate", SfxResId(STR_GET_DONATE_TEXT), InfoBarType::Info);
-
- VclPtrInstance<PushButton> xGetDonateButton(&GetWindow());
- xGetDonateButton->SetText(SfxResId(STR_GET_DONATE_BUTTON));
- xGetDonateButton->SetSizePixel(xGetDonateButton->GetOptimalSize());
- xGetDonateButton->SetClickHdl(LINK(this, SfxViewFrame, GetDonateHandler));
- pInfoBar->addButton(xGetDonateButton);
- }
-
- 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();
- }
-
// read-only infobar if necessary
const SfxViewShell *pVSh;
const SfxShell *pFSh;
More information about the Libreoffice-commits
mailing list