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 instsetoo_native/util/openoffice.lst.in | 8 +- 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/appl/appserv.cxx | 6 - sfx2/source/view/viewfrm.cxx | 56 ------------------ solenv/bin/modules/installer/windows/admin.pm | 3 solenv/bin/modules/installer/windows/msp.pm | 2 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 25 files changed, 10 insertions(+), 125 deletions(-)
New commits: commit c2afd8c3e49e0181e2b62bc4781ff40da90cddaa Author: Andras Timar <[email protected]> AuthorDate: Sun Jul 14 20:28:13 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 15:24:11 2020 +0200 [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 5a64599e5894..b64f68fe5a3c 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1334,62 +1334,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } //bShowTipOfTheDay - // 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>(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); - - 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("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO); - - VclPtrInstance<PushButton> xDonateButton(&GetWindow()); - xDonateButton->SetText(SfxResId(STR_DONATE_BUTTON)); - xDonateButton->SetSizePixel(xDonateButton->GetOptimalSize()); - xDonateButton->SetClickHdl(LINK(this, SfxViewFrame, DonationHandler)); - pInfoBar->addButton(xDonateButton); - } - - 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; commit afa569101329e4cc12fcdf0dfd003ac646988bdc Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 13:28:26 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 15:24:11 2020 +0200 [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 ac59065c9daf..68f7cbab6742 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -166,9 +166,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 354ebbc1903a..dca2eaff7efe 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 7038a63608a7..34d8b8f5dc0e 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -154,9 +154,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 8227446b4b89..e896abfa00da 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -109,9 +109,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 6e3df781eca9..fbeda4a1e9c2 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -93,9 +93,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 bbd4a7428f74..4ef7c80a26a2 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -93,9 +93,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 bbf379953e85..c858d89878e4 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -118,9 +118,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 3604c1b760a1..65f55fff0012 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -67,9 +67,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 eb0532080155..1c4c5cf4202b 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 cf9bb4543450..e31c19bffcc3 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -284,9 +284,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 d1d8069b50e2..ac0092ad062b 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -781,9 +781,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 004219a49e78..87d81f5446be 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -638,9 +638,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 ddaf30f94e52..cec28407957b 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -678,9 +678,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 04ca77df844b..f1dbdf8745a9 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -160,9 +160,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 7c5df550f5bf..9fc2e154628a 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -788,9 +788,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 9c0ac3e88a3a..2c61bd98711d 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 973cfd9ade65..ab27ec3cc546 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 a81e5dd14d42..045696fa6cbe 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -699,9 +699,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 bdfd44675517..f84f9c18de07 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -799,9 +799,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 1a03f6786465..84a0a247722a 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -787,9 +787,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> commit c5c84a9662d17d82d60b55758acc19ce4e7365a1 Author: Andras Timar <[email protected]> AuthorDate: Wed Apr 3 11:40:10 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 15:24:11 2020 +0200 [cp] license file locations for install sets License files can be in SRCDIR ({licensepath}). In fact we set {licensepath} in solenv/bin/modules/installer/environment.pm: my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license"; For example EULA_en-US.rtf is taken from here in Collabora Office. Generated license files, such as LICENSE in text format for Linux packaging are located in {customtargetpath}/readlicense_oo/license Change-Id: Ieb1f3f4f1673ed8a2b2e975bbce928a8005182e1 diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 305310a3e769..988218ff6992 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -80,7 +80,7 @@ CollaboraOffice downloadname CollaboraOffice_{productversion}_{os}_install_{languages} langpackdownloadname CollaboraOffice_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname CollaboraOffice_{productversion}_helppack_{os}_install_{languages} - include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} + include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath} } } @@ -132,7 +132,7 @@ LibreOfficeDev downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} - include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{packinfopath} + include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists,{extensionsdir},{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath} } } @@ -170,7 +170,7 @@ LibreOffice_SDK active 1 compression 5 script sdkoo - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} + include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath} } } @@ -215,6 +215,6 @@ LibreOfficeDev_SDK active 1 compression 5 script sdkoo - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} + include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{customtargetpath}/readlicense_oo/license,{packinfopath} } } commit 747ce14e1bf5687b951d684af51cb7084627695a Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 14:06:38 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 15:24:11 2020 +0200 [cp] Send feedback to [email protected] Change-Id: Ic734235426001e4aa7119476c1e6884b7c39776d diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 06828d918fdc..0633c12df3e7 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -562,10 +562,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_SEND_FEEDBACK: { OUString module = SfxHelp::GetCurrentModuleIdentifier(); - OUString sURL(officecfg::Office::Common::Menus::SendFeedbackURL::get() + //officecfg/registry/data/org/openoffice/Office/Common.xcu => https://hub.libreoffice.org/send-feedback/ - "?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + - "&LOlocale=" + utl::ConfigManager::getUILocale() + - "&LOmodule=" + module.copy(module.lastIndexOf('.') + 1 ) ); + OUString sURL("mailto:[email protected]?Subject=Version:%20"; + utl::ConfigManager::getAboutBoxProductVersion() + + ",%20Locale:%20" + utl::ConfigManager::getUILocale() + ",%20Module:%20" + module.copy(module.lastIndexOf('.') + 1 ) ); sfx2::openUriExternally(sURL, false); break; } commit ff6418804840d4b31f80d8387a4f894e32400d20 Author: Andras Timar <[email protected]> AuthorDate: Thu Jul 5 23:27:53 2018 -0700 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 15:24:11 2020 +0200 [cp] Take MsiMsp.Exe from Windows SDK 7.1A Change-Id: I68914ca86fa9cabaac3ce28d9aa870a522cdb2da Reviewed-on: https://gerrit.libreoffice.org/78988 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 1bbeea8d20cb..1e76947df7b0 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -198,7 +198,7 @@ sub execute_msimsp { my ($fullpcpfilename, $mspfilename, $localmspdir) = @_; - my $msimsp = "msimsp.exe"; # Has to be in the path + my $msimsp = "/cygdrive/c/PROGRA~2/MICROS~1/Windows/v7.1A/Bin/MsiMsp.Exe"; # FIXME Higher versions of Windows SDK do not have mspatchc.dll :( my $infoline = ""; my $systemcall = ""; my $returnvalue = ""; commit b098c2919c211841fddcf852438e67f2ccf0d38f Author: Andras Timar <[email protected]> AuthorDate: Sun Jun 3 12:34:00 2018 -0700 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 15:13:44 2020 +0200 [cp] MSP: add System64 folder path Change-Id: I5dba3dfb3a68d33608f2c2a7db026063063982ec diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index 54396ac27835..f822afe7eaec 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -289,6 +289,7 @@ sub create_directory_structure } # FIXME why is this hack needed? ERROR: Did not find full directory path for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA" $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"} = $targetdir . $installer::globals::separator . "System"; + $fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} = $targetdir . $installer::globals::separator . "System64"; return \%fullpathhash; } commit 47978e694ed5524636297b15eeb2715a05634cd6 Author: Andras Timar <[email protected]> AuthorDate: Sun Sep 6 01:31:01 2015 -0700 Commit: Andras Timar <[email protected]> CommitDate: Wed May 13 15:13:16 2020 +0200 [cp] hack to fix an MSP creation error (cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff) (cherry picked from commit 07d93f57b99c077d6b3062ddafea56e021122111) Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm index 27e4ba7c3232..54396ac27835 100644 --- a/solenv/bin/modules/installer/windows/admin.pm +++ b/solenv/bin/modules/installer/windows/admin.pm @@ -287,6 +287,8 @@ sub create_directory_structure { if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; } } + # FIXME why is this hack needed? ERROR: Did not find full directory path for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA" + $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"} = $targetdir . $installer::globals::separator . "System"; return \%fullpathhash; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
