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 --- filter/source/config/fragments/filters/BroadBand_eBook.xcu | 2 +- filter/source/config/fragments/filters/ClarisWorks.xcu | 2 +- filter/source/config/fragments/filters/ClarisWorks_Calc.xcu | 2 +- filter/source/config/fragments/filters/ClarisWorks_Draw.xcu | 2 +- filter/source/config/fragments/filters/ClarisWorks_Impress.xcu | 2 +- filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu | 2 +- filter/source/config/fragments/filters/CorelDrawDocument.xcu | 2 +- filter/source/config/fragments/filters/CorelPresentationExchange.xcu | 2 +- filter/source/config/fragments/filters/DIF.xcu | 2 +- filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu | 2 +- filter/source/config/fragments/filters/DocBook_File.xcu | 2 +- filter/source/config/fragments/filters/DosWord.xcu | 2 +- filter/source/config/fragments/filters/FictionBook_2.xcu | 2 +- filter/source/config/fragments/filters/FreehandDocument.xcu | 2 +- filter/source/config/fragments/filters/Lotus.xcu | 2 +- filter/source/config/fragments/filters/LotusWordPro.xcu | 2 +- filter/source/config/fragments/filters/MacWrite.xcu | 2 +- filter/source/config/fragments/filters/Mac_Word.xcu | 2 +- filter/source/config/fragments/filters/Mac_Works.xcu | 2 +- filter/source/config/fragments/filters/Mac_Works_Calc.xcu | 2 +- filter/source/config/fragments/filters/Mariner_Write.xcu | 2 +- filter/source/config/fragments/filters/PageMakerDocument.xcu | 2 +- filter/source/config/fragments/filters/PalmDoc.xcu | 2 +- filter/source/config/fragments/filters/Palm_Text_Document.xcu | 2 +- filter/source/config/fragments/filters/Plucker_eBook.xcu | 2 +- filter/source/config/fragments/filters/QPro.xcu | 2 +- filter/source/config/fragments/filters/QXPDocument.xcu | 2 +- filter/source/config/fragments/filters/StarOffice_Drawing.xcu | 2 +- filter/source/config/fragments/filters/StarOffice_Presentation.xcu | 2 +- filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu | 2 +- filter/source/config/fragments/filters/StarOffice_Writer.xcu | 2 +- filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu | 2 +- filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu | 2 +- filter/source/config/fragments/filters/UOF_presentation.xcu | 2 +- filter/source/config/fragments/filters/UOF_spreadsheet.xcu | 2 +- filter/source/config/fragments/filters/UOF_text.xcu | 2 +- filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu | 2 +- filter/source/config/fragments/filters/WPS_QPro_Calc.xcu | 2 +- filter/source/config/fragments/filters/WordPerfect.xcu | 2 +- filter/source/config/fragments/filters/WordPerfectGraphics.xcu | 2 +- filter/source/config/fragments/filters/WriteNow.xcu | 2 +- filter/source/config/fragments/filters/ZMFDocument.xcu | 2 +- framework/uiconfig/startmodule/menubar/menubar.xml | 3 --- officecfg/registry/data/org/openoffice/Office/Common.xcu | 2 +- officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 +- reportdesign/uiconfig/dbreport/menubar/menubar.xml | 3 --- sc/uiconfig/scalc/menubar/menubar.xml | 3 --- scp2/source/python/module_python_librelogo.scp | 2 +- sd/uiconfig/sdraw/menubar/menubar.xml | 3 --- sd/uiconfig/simpress/menubar/menubar.xml | 3 --- setup_native/source/packinfo/packinfo_brand.txt | 7 +++++++ setup_native/source/packinfo/packinfo_office.txt | 2 ++ setup_native/source/packinfo/spellchecker_selection.txt | 2 +- sfx2/source/appl/appserv.cxx | 6 ++---- sfx2/source/dialog/backingwindow.cxx | 4 ++-- sfx2/source/view/viewfrm.cxx | 3 --- 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 --- writerperfect/qa/unit/EPUBExportTest.cxx | 3 +++ 72 files changed, 62 insertions(+), 115 deletions(-)
New commits: commit 27fa1e7a76f29b12fff91fff5497f99adf6a283e Author: Andras Timar <[email protected]> AuthorDate: Mon May 14 16:02:08 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:02:14 2025 +0100 [cp] MSI: do not install LibreLogo by default Change-Id: Ibde24b2045497aca4ea37845fc42c327d22d3d42 diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp index a056d49acc3e..021425f06dd5 100644 --- a/scp2/source/python/module_python_librelogo.scp +++ b/scp2/source/python/module_python_librelogo.scp @@ -18,7 +18,7 @@ Module gid_Module_Optional_Pyuno_LibreLogo Sortkey = "810"; Files = (auto_python_librelogo_ALL, gid_File_Share_Registry_LibreLogo_Xcd); - Default = YES; + Default = NO; Styles = ( ); End #endif commit cf5d1e3c70f5307ffafc3e22b4f17f4c038406a4 Author: Andras Timar <[email protected]> AuthorDate: Sun Jul 14 20:28:13 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:02:12 2025 +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 6c7f41239cf8..f86e2ac29f2b 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1518,8 +1518,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) rBind.Invalidate( SID_RELOAD ); rBind.Invalidate( SID_EDITDOC ); - bool bIsInfobarShown(false); - if (officecfg::Office::Common::Passwords::HasMaster::get() && officecfg::Office::Common::Passwords::StorageVersion::get() == 0) { @@ -1542,7 +1540,6 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } } - const bool bEmbedded = m_xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED; // read-only infobar if necessary commit 7acf619509d13e43b08e4674872ed1c859ff5e6b Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 13:28:26 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:32 2025 +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 bf41ce562bec..63582f50b553 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -170,9 +170,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 53e300045e44..adb1967f8eba 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -170,9 +170,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 924db564a2f6..3b45787ecfe1 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -155,9 +155,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 5eb22274306d..22bd82a18505 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -110,9 +110,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 a88bb7abf0c7..5dd94e182574 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -94,9 +94,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 5ccbf5d5f84a..cb059d1318cb 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -94,9 +94,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 6313b55fc5f7..ac4a8766c791 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -119,9 +119,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 3851ceb21aa4..3cff73d32d77 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/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/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 097154cc3483..a4bceb0eb925 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -70,9 +70,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 fa2fcf02ba40..50bb6182a7f6 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -285,9 +285,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 6563defbafd7..6a726f1f4e71 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -758,9 +758,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 183c595917c0..1196e27d5b9e 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -644,9 +644,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 07f0456335aa..8b9686a05dfe 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -676,9 +676,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 2c5aca7361bf..b0db58261ba1 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -165,9 +165,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 04ea613b39fd..47cbf1439f58 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/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/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index d8379e4db851..e59cc3cd5a9e 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -661,9 +661,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 c64bf29ce9c0..0c91327bd91b 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -741,9 +741,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 7fb861d383ae..a66c125b711c 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -694,9 +694,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 7bd02bc1bc5f..55084344f59e 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -848,9 +848,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 0ee99fadebbc..58d2dad7bdcb 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 6527a53e35c9259fc98243343e31fa7d896ab613 Author: Miklos Vajna <[email protected]> AuthorDate: Thu May 14 10:19:21 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:32 2025 +0100 [cp] CppunitTest_writerperfect_epubexport: don't try to load flagged abw format master opens this as-is, this branch would first show you a dialog, we cancel that in headless mode, and then loading fails, but that's not an interesting failure. Change-Id: I6ff83e320738fb33ee88d10f9b2cfabff91de8ed diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index a9e08bdbed9a..13c5145dccc6 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -853,9 +853,12 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSimpleRuby) CPPUNIT_TEST_FIXTURE(EPUBExportTest, testAbi11105) { +// Disable the test on this branch, .abw is flagged as EXOTIC, so loading would fail. +#if 0 // This crashed because the paragraph style "P5" which had a master-page-name // appeared in a table cell messed up page spans. createDoc(u"abi11105.abw", {}); +#endif } } commit b61ea41402def8877e9251edeedff68696362851 Author: Andras Timar <[email protected]> AuthorDate: Wed Apr 25 15:30:38 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:32 2025 +0100 [cp] StarOffice XML is not exotic, old binary format is exotic Change-Id: Ie435dda390e434e34ef753b5cb2715ac2252e82e Reviewed-on: https://gerrit.libreoffice.org/53450 Reviewed-by: Aron Budea <[email protected]> Tested-by: Aron Budea <[email protected]> diff --git a/filter/source/config/fragments/filters/StarOffice_Drawing.xcu b/filter/source/config/fragments/filters/StarOffice_Drawing.xcu index f820fe0965a3..a367a5bd909a 100644 --- a/filter/source/config/fragments/filters/StarOffice_Drawing.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Drawing.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Drawing" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Draw.StarOfficeDrawImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_Presentation.xcu b/filter/source/config/fragments/filters/StarOffice_Presentation.xcu index 7179379d74d6..ce591c60e126 100644 --- a/filter/source/config/fragments/filters/StarOffice_Presentation.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Presentation.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Presentation" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Impress.StarOfficePresentationImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu b/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu index d6ac85576aca..dda317a24083 100644 --- a/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Spreadsheet.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Spreadsheet" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Calc.StarOfficeCalcImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_Writer.xcu b/filter/source/config/fragments/filters/StarOffice_Writer.xcu index 9522d73b0374..f27ee757ecd4 100644 --- a/filter/source/config/fragments/filters/StarOffice_Writer.xcu +++ b/filter/source/config/fragments/filters/StarOffice_Writer.xcu @@ -9,7 +9,7 @@ <node oor:name="StarOffice_Writer" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.StarOfficeWriterImportFilter</value> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu index 344843043b7c..4c33a806fd9d 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="StarOffice XML (Base)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION EXOTIC</value></prop> + <prop oor:name="Flags"><value>IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu index ba7db694d6ca..ee3638bc0cc8 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="StarOffice XML (Writer)" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION EXOTIC</value></prop> + <prop oor:name="Flags"><value>IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value>CXML</value></prop> commit 1cb1c70572beffb56b680ba6b0b6ae6991a4b62e Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 13:14:47 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:32 2025 +0100 [cp] Display warning at attempted loading of exotic file format Change-Id: I5dbf0545230795806aa3eb28e0a9e6170d916de2 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index d94c0aeacf00..a1b1adf8db35 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2316,7 +2316,7 @@ </info> </enumeration> </constraints> - <value>2</value> + <value>1</value> </prop> <prop oor:name="EnableExpertConfiguration" oor:type="xs:boolean" oor:nillable="false"> <info> commit f019970b65b08e785233024a575a65f90bc150b4 Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 13:12:32 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:31 2025 +0100 [cp] Flag a few more import filters as EXOTIC Change-Id: I171efc7e533039ab61d7ae607673aaf81d88c73d diff --git a/filter/source/config/fragments/filters/BroadBand_eBook.xcu b/filter/source/config/fragments/filters/BroadBand_eBook.xcu index 3a54aed07d92..cb53d790c5dc 100644 --- a/filter/source/config/fragments/filters/BroadBand_eBook.xcu +++ b/filter/source/config/fragments/filters/BroadBand_eBook.xcu @@ -9,7 +9,7 @@ <node oor:name="BroadBand eBook" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/ClarisWorks.xcu b/filter/source/config/fragments/filters/ClarisWorks.xcu index 8288c34ff66f..788bd9bd2f32 100644 --- a/filter/source/config/fragments/filters/ClarisWorks.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu index a6f817dc26ae..4fa8d5e1b8f2 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu index e69354c3ffc2..5fa846dfa188 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu b/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu index 9318c5d95376..9e220ba6d815 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Impress.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="ClarisWorks_Impress" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.MWAWPresentationImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu b/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu index 17b80242229b..b0ffab33d1d8 100644 --- a/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu +++ b/filter/source/config/fragments/filters/Claris_Resolve_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Claris_Resolve_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/CorelDrawDocument.xcu b/filter/source/config/fragments/filters/CorelDrawDocument.xcu index 14b6e2806ca3..8ee043694f84 100644 --- a/filter/source/config/fragments/filters/CorelDrawDocument.xcu +++ b/filter/source/config/fragments/filters/CorelDrawDocument.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Corel Draw Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.CDRImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu index 0a402d2ea633..47fdabc06c81 100644 --- a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu +++ b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Corel Presentation Exchange" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.CMXImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DIF.xcu b/filter/source/config/fragments/filters/DIF.xcu index c075ff97797c..ba1a84850889 100644 --- a/filter/source/config/fragments/filters/DIF.xcu +++ b/filter/source/config/fragments/filters/DIF.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="DIF" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN EXOTIC</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu b/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu index 652ee10e2c58..0059a539f4b0 100644 --- a/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu +++ b/filter/source/config/fragments/filters/DXF___AutoCAD_Interchange.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="DXF - AutoCAD Interchange" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu index 6f7a4a66fa3f..1ff47f065e0a 100644 --- a/filter/source/config/fragments/filters/DocBook_File.xcu +++ b/filter/source/config/fragments/filters/DocBook_File.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">DocBook</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/DosWord.xcu b/filter/source/config/fragments/filters/DosWord.xcu index 697032c91e4e..d94cb04a9dc8 100644 --- a/filter/source/config/fragments/filters/DosWord.xcu +++ b/filter/source/config/fragments/filters/DosWord.xcu @@ -8,7 +8,7 @@ <node oor:name="DosWord" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER</value> + <value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>com.sun.star.comp.Writer.MSWorksImportFilter</value> diff --git a/filter/source/config/fragments/filters/FictionBook_2.xcu b/filter/source/config/fragments/filters/FictionBook_2.xcu index 68e4c1c34841..bef1d1a0d68c 100644 --- a/filter/source/config/fragments/filters/FictionBook_2.xcu +++ b/filter/source/config/fragments/filters/FictionBook_2.xcu @@ -9,7 +9,7 @@ <node oor:name="FictionBook 2" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/FreehandDocument.xcu b/filter/source/config/fragments/filters/FreehandDocument.xcu index 4502ac0ce697..656b443c0391 100644 --- a/filter/source/config/fragments/filters/FreehandDocument.xcu +++ b/filter/source/config/fragments/filters/FreehandDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="Freehand Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.FreehandImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Lotus.xcu b/filter/source/config/fragments/filters/Lotus.xcu index 44bf3a89c548..c3c9370953ba 100644 --- a/filter/source/config/fragments/filters/Lotus.xcu +++ b/filter/source/config/fragments/filters/Lotus.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Lotus" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"><value>com.sun.star.comp.Calc.FilterOptionsDialog</value></prop> <prop oor:name="FilterService"/> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/LotusWordPro.xcu b/filter/source/config/fragments/filters/LotusWordPro.xcu index 8b065b0c2fd2..074b6cd88a4b 100644 --- a/filter/source/config/fragments/filters/LotusWordPro.xcu +++ b/filter/source/config/fragments/filters/LotusWordPro.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="LotusWordPro" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.LotusWordProImportFilter</value></prop> <prop oor:name="UserData"><value>WPD</value></prop> diff --git a/filter/source/config/fragments/filters/MacWrite.xcu b/filter/source/config/fragments/filters/MacWrite.xcu index 79a297f336b2..cfe91f5a3cea 100644 --- a/filter/source/config/fragments/filters/MacWrite.xcu +++ b/filter/source/config/fragments/filters/MacWrite.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MacWrite" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Word.xcu b/filter/source/config/fragments/filters/Mac_Word.xcu index 64d2edb2b7ae..f23ad5382311 100644 --- a/filter/source/config/fragments/filters/Mac_Word.xcu +++ b/filter/source/config/fragments/filters/Mac_Word.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Word" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Works.xcu b/filter/source/config/fragments/filters/Mac_Works.xcu index beb2eadea3cb..b74b50934b90 100644 --- a/filter/source/config/fragments/filters/Mac_Works.xcu +++ b/filter/source/config/fragments/filters/Mac_Works.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Works" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu index ec3b959d227d..a18a7431b41d 100644 --- a/filter/source/config/fragments/filters/Mac_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/Mac_Works_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mac_Works_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MWAWCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/Mariner_Write.xcu b/filter/source/config/fragments/filters/Mariner_Write.xcu index df6689ccca4a..5344c28036f2 100644 --- a/filter/source/config/fragments/filters/Mariner_Write.xcu +++ b/filter/source/config/fragments/filters/Mariner_Write.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Mariner_Write" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/PageMakerDocument.xcu b/filter/source/config/fragments/filters/PageMakerDocument.xcu index ad45de75b559..afcbce65870e 100644 --- a/filter/source/config/fragments/filters/PageMakerDocument.xcu +++ b/filter/source/config/fragments/filters/PageMakerDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="PageMaker Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>org.libreoffice.comp.Draw.PageMakerImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/PalmDoc.xcu b/filter/source/config/fragments/filters/PalmDoc.xcu index 8e612f693f01..6466a595fcc7 100644 --- a/filter/source/config/fragments/filters/PalmDoc.xcu +++ b/filter/source/config/fragments/filters/PalmDoc.xcu @@ -9,7 +9,7 @@ <node oor:name="PalmDoc" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/Palm_Text_Document.xcu b/filter/source/config/fragments/filters/Palm_Text_Document.xcu index 4747d3588490..5979b131989d 100644 --- a/filter/source/config/fragments/filters/Palm_Text_Document.xcu +++ b/filter/source/config/fragments/filters/Palm_Text_Document.xcu @@ -9,7 +9,7 @@ <node oor:name="Palm_Text_Document" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/Plucker_eBook.xcu b/filter/source/config/fragments/filters/Plucker_eBook.xcu index b5942780db75..e3ac69ce82b4 100644 --- a/filter/source/config/fragments/filters/Plucker_eBook.xcu +++ b/filter/source/config/fragments/filters/Plucker_eBook.xcu @@ -9,7 +9,7 @@ <node oor:name="Plucker eBook" oor:op="replace"> <prop oor:name="Flags"> - <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> + <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value> </prop> <prop oor:name="FilterService"> <value>org.libreoffice.comp.Writer.EBookImportFilter</value> diff --git a/filter/source/config/fragments/filters/QPro.xcu b/filter/source/config/fragments/filters/QPro.xcu index e3242644b84e..b9b000c0550b 100644 --- a/filter/source/config/fragments/filters/QPro.xcu +++ b/filter/source/config/fragments/filters/QPro.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="Quattro Pro 6.0" oor:op="replace" oor:finalized="true" oor:mandatory="true"> - <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"/> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/QXPDocument.xcu b/filter/source/config/fragments/filters/QXPDocument.xcu index b0e6450001c5..cd3acfc399de 100644 --- a/filter/source/config/fragments/filters/QXPDocument.xcu +++ b/filter/source/config/fragments/filters/QXPDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="QXP Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>org.libreoffice.comp.Draw.QXPImportFilter</value></prop> <prop oor:name="UserData"/> diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu index 1f8be437ba6d..6a90a00e099c 100644 --- a/filter/source/config/fragments/filters/UOF_presentation.xcu +++ b/filter/source/config/fragments/filters/UOF_presentation.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">Unified Office Format presentation</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu index 91f564307b9c..50ffb3f6ec98 100644 --- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu +++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">Unified Office Format spreadsheet</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu index e4241f1753f3..39cb3e2c7e9a 100644 --- a/filter/source/config/fragments/filters/UOF_text.xcu +++ b/filter/source/config/fragments/filters/UOF_text.xcu @@ -26,5 +26,5 @@ <prop oor:name="UIName"> <value xml:lang="en-US">Unified Office Format text</value> </prop> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> </node> diff --git a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu index 1d141826c229..a982c3acd80b 100644 --- a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu +++ b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WPS_Lotus_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu index f32b11820d82..f307ea3db1ef 100644 --- a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu +++ b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WPS_QPro_Calc" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WordPerfect.xcu b/filter/source/config/fragments/filters/WordPerfect.xcu index d26c30369df2..35ed5cb850cf 100644 --- a/filter/source/config/fragments/filters/WordPerfect.xcu +++ b/filter/source/config/fragments/filters/WordPerfect.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WordPerfect" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WordPerfectImportFilter</value></prop> <prop oor:name="UserData"><value>WPD</value></prop> diff --git a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu index 54f4f43db7d1..d98fb20114e7 100644 --- a/filter/source/config/fragments/filters/WordPerfectGraphics.xcu +++ b/filter/source/config/fragments/filters/WordPerfectGraphics.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WordPerfect Graphics" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.WPGImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/WriteNow.xcu b/filter/source/config/fragments/filters/WriteNow.xcu index 600e5d61713c..c649b51a9e1e 100644 --- a/filter/source/config/fragments/filters/WriteNow.xcu +++ b/filter/source/config/fragments/filters/WriteNow.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="WriteNow" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop> <prop oor:name="UserData"><value></value></prop> diff --git a/filter/source/config/fragments/filters/ZMFDocument.xcu b/filter/source/config/fragments/filters/ZMFDocument.xcu index b72449df3e1d..f444d54b3770 100644 --- a/filter/source/config/fragments/filters/ZMFDocument.xcu +++ b/filter/source/config/fragments/filters/ZMFDocument.xcu @@ -1,5 +1,5 @@ <node oor:name="ZMF Document" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> + <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED EXOTIC</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>org.libreoffice.comp.Draw.ZMFImportFilter</value></prop> <prop oor:name="UserData"/> commit a1454e46858ff3e49501ca87dec28ecc98af4e07 Author: Andras Timar <[email protected]> AuthorDate: Tue Apr 17 14:06:38 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:31 2025 +0100 [cp] Send feedback to [email protected] Change-Id: Ic734235426001e4aa7119476c1e6884b7c39776d diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d826cc6c42ee..eebb3cc1c66b 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -600,10 +600,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.subView(module.lastIndexOf('.') + 1 ) ); + OUString sURL("mailto:[email protected]?Subject=Version:%20"; + utl::ConfigManager::getAboutBoxProductVersion() + + ",%20Locale:%20" + utl::ConfigManager::getUILocale() + ",%20Module:%20" + module.subView(module.lastIndexOf('.') + 1 ) ); sfx2::openUriExternally(sURL, false, rReq.GetFrameWeld()); break; } commit 35eec4e8d860431a77e534ebae72ea7c64e2e270 Author: Andras Timar <[email protected]> AuthorDate: Mon Sep 12 08:19:08 2022 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:31 2025 +0100 [cp] Add Persian dictionary to install set this way Change-Id: I86e0eeb68120b311759a6cef0b13740bb1529999 diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 602bf0b51603..6fccc46e43a3 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -27,7 +27,7 @@ # be used as first entry. af = "af" -ar = "ar" +ar = "ar,fa" be = "be" bg = "bg" bn = "bn" commit 87d6e61c18bfded62a7ccb0f101ab131e02e42eb Author: Andras Timar <[email protected]> AuthorDate: Fri Oct 2 14:18:26 2015 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:31 2025 +0100 [cp] provide libreoffice-writer, libreoffice-calc etc. metapackages (cherry picked from commit d151f43cdb0e7735d267115868a9dac9f45bb6b2) (cherry picked from commit ddb987c79a3852cfb552f10b1beca03f419879c2) Change-Id: Ibadbcb45eb0cacd8f26e7bfed3cff794a7ce88f1 diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt index ee641ee0eea3..5b436c89a89a 100644 --- a/setup_native/source/packinfo/packinfo_brand.txt +++ b/setup_native/source/packinfo/packinfo_brand.txt @@ -28,6 +28,7 @@ vendor = "The Document Foundation" description = "Brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice" End Start @@ -42,6 +43,7 @@ vendor = "The Document Foundation" description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-writer" End Start @@ -56,6 +58,7 @@ vendor = "The Document Foundation" description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-calc" End Start @@ -70,6 +73,7 @@ vendor = "The Document Foundation" description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-impress" End Start @@ -84,6 +88,7 @@ vendor = "The Document Foundation" description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-draw" End Start @@ -98,6 +103,7 @@ vendor = "The Document Foundation" description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-math" End Start @@ -112,6 +118,7 @@ vendor = "The Document Foundation" description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-base" End Start diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index a581dd8bc343..6a3f2a27144c 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -53,6 +53,7 @@ vendor = "The Document Foundation" description = "GNOME integration module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-evolution libreoffice-gnome" End Start @@ -101,6 +102,7 @@ vendor = "The Document Foundation" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" destpath = "/opt" packageversion = "%PACKAGEVERSION" +provides = "libreoffice-common" End Start commit ae86a40f2734010b7b78dfdadc8ead43254f8228 Author: Andras Timar <[email protected]> AuthorDate: Mon Jun 5 14:02:50 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:31 2025 +0100 [cp] Let's use our ReleaseNotesURL here, too Change-Id: Iad11921bc11d59a9f47122a3deb75cebe3aa90b6 diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 41783bea9950..06f6385b8e70 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -129,8 +129,8 @@ public: { if (rMEvt.IsLeft()) { - OUString sURL = officecfg::Office::Common::Menus::VolunteerURL::get(); - localizeWebserviceURI(sURL); + OUString sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get(); + // localizeWebserviceURI(sURL); Reference<css::system::XSystemShellExecute> const xSystemShellExecute( css::system::SystemShellExecute::create( commit 141ab584b5e9cec50c0d398fe0f12b273a0903da Author: Andras Timar <[email protected]> AuthorDate: Thu Jun 18 12:03:22 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 8 16:00:31 2025 +0100 [cp] ReleaseNotesURL Change-Id: Iff5941ffc49be5fe583ee8966d18b5e7277648ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96594 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 48faa40b5549..0f6a84d6666b 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -349,7 +349,7 @@ <value>https://hub.libreoffice.org/donation/</value> </prop> <prop oor:name="ReleaseNotesURL" oor:type="xs:string"> - <value>https://hub.libreoffice.org/ReleaseNotes/</value> + <value>https://www.collaboraoffice.com/collabora-office-24.04-release-notes/</value> </prop> <prop oor:name="CreditsURL" oor:type="xs:string"> <value>https://hub.libreoffice.org/credits/</value>
