From e002f82ccfcb8d8b7abad07a62d36a9ac686455f Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Fri, 16 Apr 2021 00:27:57 +0200 Subject: Remove .uno:QuestionAnswers, direct safeMode help to landing page Change-Id: I41a456b838508a7904a81ff858de6dada0ed6824 --- basctl/uiconfig/basicide/menubar/menubar.xml | 1 - chart2/uiconfig/menubar/menubar.xml | 1 - cui/inc/strings.hrc | 2 +- dbaccess/uiconfig/dbapp/menubar/menubar.xml | 1 - dbaccess/uiconfig/dbquery/menubar/menubar.xml | 1 - dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 1 - dbaccess/uiconfig/dbtable/menubar/menubar.xml | 1 - dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 - extensions/uiconfig/sbibliography/menubar/menubar.xml | 1 - framework/uiconfig/startmodule/menubar/menubar.xml | 1 - reportdesign/uiconfig/dbreport/menubar/menubar.xml | 1 - sc/uiconfig/scalc/menubar/menubar.xml | 1 - sc/uiconfig/scalc/ui/notebookbar.ui | 7 ------- sc/uiconfig/scalc/ui/notebookbar_compact.ui | 7 ------- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 7 ------- sd/uiconfig/sdraw/menubar/menubar.xml | 1 - sd/uiconfig/sdraw/ui/notebookbar.ui | 7 ------- sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 7 ------- sd/uiconfig/simpress/menubar/menubar.xml | 1 - sd/uiconfig/simpress/ui/notebookbar.ui | 7 ------- sd/uiconfig/simpress/ui/notebookbar_compact.ui | 7 ------- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui | 7 ------- sfx2/sdi/appslots.sdi | 4 ---- sfx2/sdi/sfx.sdi | 15 --------------- sfx2/source/appl/appserv.cxx | 11 ----------- starmath/uiconfig/smath/menubar/menubar.xml | 1 - svx/source/dialog/SafeModeDialog.cxx | 7 +++++-- sw/uiconfig/sglobal/menubar/menubar.xml | 1 - sw/uiconfig/sweb/menubar/menubar.xml | 1 - sw/uiconfig/swform/menubar/menubar.xml | 1 - sw/uiconfig/swreport/menubar/menubar.xml | 1 - sw/uiconfig/swriter/menubar/menubar.xml | 1 - sw/uiconfig/swriter/ui/notebookbar.ui | 7 ------- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 7 ------- sw/uiconfig/swxform/menubar/menubar.xml | 1 - 35 files changed, 6 insertions(+), 123 deletions(-) diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 68f7cbab6742..85d8505718a3 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -161,7 +161,6 @@ - diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index dca2eaff7efe..a0e848f5cd92 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -162,7 +162,6 @@ - diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index c9d1acec41af..4051cbb4e444 100644 --- a/cui/inc/strings.hrc +++ b/cui/inc/strings.hrc @@ -382,7 +382,7 @@ #define RID_SVXSTR_CANNOTCONVERTURL_ERR NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a filesystem path.") #define RID_SVXSTR_ABOUT_VERSION NC_("aboutdialog|textbuffer1", "Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX") -#define RID_SVXSTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 2000–2020 LibreOffice contributors.") +#define RID_SVXSTR_ABOUT_COPYRIGHT NC_("aboutdialog|copyright", "Copyright © 2000–2021 LibreOffice contributors.") #define RID_SVXSTR_ABOUT_CREDITS_URL NC_("aboutdialog|link", "https://www.libreoffice.org/about-us/credits/") #define RID_SVXSTR_ABOUT_BUILDID NC_("aboutdialog|buildid", "Build ID: $BUILDID") #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", "This release was supplied by %OOOVENDOR.") diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index 34d8b8f5dc0e..214747123b2e 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -149,7 +149,6 @@ - diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index e896abfa00da..46c31e3f6613 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -104,7 +104,6 @@ - diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index fbeda4a1e9c2..8d13f0fc557e 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -88,7 +88,6 @@ - diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index 4ef7c80a26a2..bba876604886 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -88,7 +88,6 @@ - diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index c858d89878e4..4c5553aef0ed 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -113,7 +113,6 @@ - diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml index 65f55fff0012..c29111670ab7 100644 --- a/extensions/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml @@ -62,7 +62,6 @@ - diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 1c4c5cf4202b..c69e9b44455a 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -63,7 +63,6 @@ - diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml index e31c19bffcc3..465d7819b17b 100644 --- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml +++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml @@ -279,7 +279,6 @@ - diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index ac0092ad062b..ca7136343d7e 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -776,7 +776,6 @@ - diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 4f888da7004a..ce08a6b7293a 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -749,13 +749,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index d1708782da28..e43fea595e10 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -996,13 +996,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 015387b3a435..584fa6d7ab75 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -1824,13 +1824,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 87d81f5446be..208aa633dc11 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -633,7 +633,6 @@ - diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui index 2a541d470184..8317bf4ead8c 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar.ui @@ -805,13 +805,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index 53e3d6da180c..871d1b0343ab 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -847,13 +847,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index cec28407957b..d93cb7fe360b 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -673,7 +673,6 @@ - diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index fce116aec371..950fd54b4d46 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -727,13 +727,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui index 67c811e31958..e1f45979a1de 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui @@ -846,13 +846,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index dca3ad7922e6..c6e2dcfe5573 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -1494,13 +1494,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi index c12eb098b37e..3b3ff6a77fcc 100644 --- a/sfx2/sdi/appslots.sdi +++ b/sfx2/sdi/appslots.sdi @@ -119,10 +119,6 @@ interface Application [ ExecMethod = MiscExec_Impl ; ] - SID_Q_AND_A - [ - ExecMethod = MiscExec_Impl ; - ] SID_DOCUMENTATION [ ExecMethod = MiscExec_Impl ; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 2cd73b915bf7..06e3eea22f3d 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4900,21 +4900,6 @@ SfxVoidItem SendFeedback SID_SEND_FEEDBACK ToolBoxConfig = TRUE, GroupId = SfxGroupId::Application; ] -SfxVoidItem QuestionAnswers SID_Q_AND_A -() -[ - AutoUpdate = FALSE, - FastCall = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = TRUE, - MenuConfig = TRUE, - GroupId = SfxGroupId::Application; -] SfxVoidItem Documentation SID_DOCUMENTATION () [ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 9295718c37ab..31f090bc3ee6 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -546,17 +546,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) sfx2::openUriExternally(sURL, false); break; } - - case SID_Q_AND_A: - { - // Askbot has URL's normalized to languages, not locales - // Get language from locale: ll or lll or ll-CC or lll-CC - - OUString sURL(officecfg::Office::Common::Menus::QA_URL::get() + //https://hub.libreoffice.org/forum/ - "?LOlocale=" + utl::ConfigManager::getUILocale()); - sfx2::openUriExternally(sURL, false); - break; - } case SID_DOCUMENTATION: { // Open documentation page based on locales diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml index f1dbdf8745a9..e2484f3c8f59 100644 --- a/starmath/uiconfig/smath/menubar/menubar.xml +++ b/starmath/uiconfig/smath/menubar/menubar.xml @@ -155,7 +155,6 @@ - diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index a9054153da31..da8dbd94fa59 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include #include @@ -89,8 +91,9 @@ SafeModeDialog::SafeModeDialog(weld::Window* pParent) RadioBtnHdl(*mxRadioRestore); // Set URL for help button (module=safemode) - OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + - "&LOlocale=" + utl::ConfigManager::getUILocale() + "&LOmodule=safemode"); + OUString lang = Application::GetSettings().GetUILanguageTag().getLanguage(); + OUString sURL("https://libreoffice.cib.de/support_%1.html&LOmodule=safemode"); + sURL = sURL.replaceFirst("%1", lang); mxBugLink->set_uri(sURL); mxUserProfileLink->set_uri(comphelper::BackupFileHelper::getUserProfileURL()); diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 9fc2e154628a..5956ec71410c 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -783,7 +783,6 @@ - diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index 2c61bd98711d..ce2b5d0b1f27 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -654,7 +654,6 @@ - diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index ab27ec3cc546..e0ea58674a1e 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -735,7 +735,6 @@ - diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 045696fa6cbe..d991f0c69b7a 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -694,7 +694,6 @@ - diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index f84f9c18de07..29cca3cefdaa 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -794,7 +794,6 @@ - diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui index e19282968a57..fd817b04b510 100644 --- a/sw/uiconfig/swriter/ui/notebookbar.ui +++ b/sw/uiconfig/swriter/ui/notebookbar.ui @@ -503,13 +503,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 3d34fe1e43a4..4a9a66854bc2 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -1768,13 +1768,6 @@ False - - - True - False - .uno:QuestionAnswers - - True diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 84a0a247722a..6213464f0def 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -782,7 +782,6 @@ - -- cgit