Rebased ref, commits from common ancestor:
commit c786ad6c9921980b7bf5f590abf4d6534fa85f01
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed Apr 21 14:15:07 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Apr 25 22:09:27 2021 +0200
Related tdf#139804 Allow activating btn on first click
Change-Id: I3bcdf8bdd6f25fd30106214f40e72bf1506f6bbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114398
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114437
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 17139528c909..d360c4847481 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -534,6 +534,7 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt,
vcl::Window* pWin)
if (rI18nHelper.MatchMnemonic(pWindow->GetText(),
rKEvt.GetCharCode()))
{
pWindow->GrabFocus();
+ pWindow->KeyInput(rKEvt);
bDone = true;
break;
}
commit e13c6ca3b356c119c042ba85640d9719e0c92f82
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Tue Mar 16 16:27:44 2021 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Apr 25 22:09:27 2021 +0200
Add mechanism to selectively enable macros for document events
Change-Id: I56703b2c0ee009a645458c78c026c546b2e7e321
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112584
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
(cherry picked from commit 0a893a15b02a3662e3c68776be09534c9f955e4f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114436
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ffa8f99b0814..b39c29fe2214 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2708,6 +2708,28 @@
</info>
<value>false</value>
</prop>
+ <prop oor:name="CheckDocumentEvents" oor:type="xs:boolean"
oor:nillable="false">
+ <info>
+ <desc>Warn on load when a document binds an event to a macro</desc>
+ </info>
+ <value>true</value>
+ </prop>
+ <prop oor:name="AllowedDocumentEventURLs" oor:type="oor:string-list">
+ <info>
+ <desc>List of script URLS which are allowed to be called by
document events.
+ Look into content.xml of the odf file to find the URL.
+ You can either write the full URL, a part of it (starting from the
beginning),
+ or use regular expressions.
+ Examples:
+ *
vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=user
+ * vnd.sun.star.script:Standard.Module1
+ * vnd.sun.star.script:YourScript.*location=share
+ * .*location=application.*
+
+ When this list is empty, all document event URLs are allowed.
+ </desc>
+ </info>
+ </prop>
<set oor:name="TrustedAuthors" oor:node-type="TrustedAuthor">
<info>
<desc>List with trusted authors.</desc>
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 8f386caaa283..bf1dbea7b3c3 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -69,6 +69,9 @@ $(eval $(call gb_Library_use_libraries,sfx,\
$(eval $(call gb_Library_use_externals,sfx,\
boost_headers \
+ icu_headers \
+ icui18n \
+ icuuc \
libxml2 \
orcus \
orcus-parser\
diff --git a/sfx2/source/inc/eventsupplier.hxx
b/sfx2/source/inc/eventsupplier.hxx
index be6421416939..4624ed8b4907 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -86,6 +86,10 @@ public:
::comphelper::NamedValueCollection&
o_normalizedDescriptor,
SfxObjectShell* i_document );
static void Execute( css::uno::Any const & aEventData, const
css::document::DocumentEvent& aTrigger, SfxObjectShell* pDoc );
+
+private:
+ /// Check if script URL whitelist exists, and if so, if current script url
is part of it
+ static bool isScriptURLAllowed(const OUString& aScriptURL);
};
#endif
diff --git a/sfx2/source/notify/eventsupplier.cxx
b/sfx2/source/notify/eventsupplier.cxx
index e21130d6022c..12bf1ce828e5 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/uno/XInterface.hpp>
@@ -39,6 +40,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/sequence.hxx>
+#include <officecfg/Office/Common.hxx>
#include <eventsupplier.hxx>
#include <sfx2/app.hxx>
@@ -49,6 +51,10 @@
#include <sfx2/frame.hxx>
#include <macroloader.hxx>
+#include <unicode/errorcode.h>
+#include <unicode/regex.h>
+#include <unicode/unistr.h>
+
using namespace css;
using namespace ::com::sun::star;
@@ -178,6 +184,31 @@ namespace
}
}
+bool SfxEvents_Impl::isScriptURLAllowed(const OUString& aScriptURL)
+{
+ boost::optional<css::uno::Sequence<OUString>> allowedEvents(
+
officecfg::Office::Common::Security::Scripting::AllowedDocumentEventURLs::get());
+ // When AllowedDocumentEventURLs is empty, all event URLs are allowed
+ if (!allowedEvents)
+ return true;
+
+ icu::ErrorCode status;
+ const uint32_t rMatcherFlags = UREGEX_CASE_INSENSITIVE;
+ icu::UnicodeString usInput(aScriptURL.getStr());
+ const css::uno::Sequence<OUString>& rAllowedEvents = *allowedEvents;
+ for (auto const& allowedEvent : rAllowedEvents)
+ {
+ icu::UnicodeString usRegex(allowedEvent.getStr());
+ icu::RegexMatcher rmatch1(usRegex, usInput, rMatcherFlags, status);
+ if (aScriptURL.startsWith(allowedEvent) || rmatch1.matches(status))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
void SfxEvents_Impl::Execute( uno::Any const & aEventData, const
document::DocumentEvent& aTrigger, SfxObjectShell* pDoc )
{
uno::Sequence < beans::PropertyValue > aProperties;
@@ -216,6 +247,9 @@ void SfxEvents_Impl::Execute( uno::Any const & aEventData,
const document::Docum
if (aScript.isEmpty())
return;
+ if (!isScriptURLAllowed(aScript))
+ return;
+
if (!pDoc)
pDoc = SfxObjectShell::Current();
commit f4efef35a85d7ab0d31491f4e0dc11c31e047204
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 19 15:32:53 2021 +0000
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Apr 25 22:09:27 2021 +0200
cid#1474166 Deference null return value
Change-Id: I725eff105f963b139ae8646cd1cb193ce737d313
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112760
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 229558c0bf257e4e559cc1b84bd2918b04c68305)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114367
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index e090d7c73640..17139528c909 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -517,24 +517,26 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt,
vcl::Window* pWin)
// tdf#139804 Allow selecting form controls with Alt-<Mnemonic>
if (rKeyCode.IsMod2() && rKeyCode.GetCode())
{
- FmFormPage* pCurPage = GetCurPage();
- for (size_t a = 0; a < pCurPage->GetObjCount(); ++a)
+ if (FmFormPage* pCurPage = GetCurPage())
{
- SdrObject* pObj = pCurPage->GetObj(a);
- FmFormObj* pFormObject = FmFormObj::GetFormObject(pObj);
- if (!pFormObject)
- continue;
-
- Reference<awt::XControl> xControl =
pFormObject->GetUnoControl(*this, *pWin);
- if (!xControl.is())
- continue;
- const vcl::I18nHelper& rI18nHelper =
Application::GetSettings().GetUILocaleI18nHelper();
- VclPtr<vcl::Window> pWindow =
VCLUnoHelper::GetWindow(xControl->getPeer());
- if (rI18nHelper.MatchMnemonic(pWindow->GetText(),
rKEvt.GetCharCode()))
+ for (size_t a = 0; a < pCurPage->GetObjCount(); ++a)
{
- pWindow->GrabFocus();
- bDone = true;
- break;
+ SdrObject* pObj = pCurPage->GetObj(a);
+ FmFormObj* pFormObject = FmFormObj::GetFormObject(pObj);
+ if (!pFormObject)
+ continue;
+
+ Reference<awt::XControl> xControl =
pFormObject->GetUnoControl(*this, *pWin);
+ if (!xControl.is())
+ continue;
+ const vcl::I18nHelper& rI18nHelper =
Application::GetSettings().GetUILocaleI18nHelper();
+ VclPtr<vcl::Window> pWindow =
VCLUnoHelper::GetWindow(xControl->getPeer());
+ if (rI18nHelper.MatchMnemonic(pWindow->GetText(),
rKEvt.GetCharCode()))
+ {
+ pWindow->GrabFocus();
+ bDone = true;
+ break;
+ }
}
}
}
commit ec64ba1cc90729f04f60e54cd8ad4546e8a1a669
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed Apr 21 10:57:16 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Apr 25 22:09:27 2021 +0200
tdf#141703 Restore tab function in sd tables
Regression from 67ad205404211a2ae17c430a17ede6e9d04d0b7e
Change-Id: Iadbdaf1b59d2481264e45b85aed248c84404c26b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114383
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
(cherry picked from commit 75f5fdbbe48a847874397d9d126f832dbdfada5a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114370
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 4f9162f84069..e16e8a67dc53 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -130,9 +130,9 @@ void DrawViewShell::DeleteActualLayer()
bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
{
- bool bRet = GetView()->KeyInput(rKEvt, pWin);
+ bool bRet = false;
- if (!bRet && (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() ==
KEY_ESCAPE)))
+ if (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE))
{
if(KEY_RETURN == rKEvt.GetKeyCode().GetCode()
&& rKEvt.GetKeyCode().IsMod1()
@@ -209,6 +209,9 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt,
::sd::Window* pWin)
}
}
+ if (!bRet)
+ bRet = GetView()->KeyInput(rKEvt, pWin);
+
return bRet;
}
commit e002f82ccfcb8d8b7abad07a62d36a9ac686455f
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Fri Apr 16 00:27:57 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sun Apr 25 22:09:27 2021 +0200
Remove .uno:QuestionAnswers, direct safeMode help to landing page
Change-Id: I41a456b838508a7904a81ff858de6dada0ed6824
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="MenuHelp-SendFeedback">
<property name="visible">True</property>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="QuestionAnswersD1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="SendFeedbackD1">
<property name="visible">True</property>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="QuestionAnswersD1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="SendFeedbackD1">
<property name="visible">True</property>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="MenuHelp-SendFeedback">
<property name="visible">True</property>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="MenuHelp-SendFeedback">
<property name="visible">True</property>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="MenuHelp-SendFeedback">
<property name="visible">True</property>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="MenuHelp-SendFeedback">
<property name="visible">True</property>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="QuestionAnswersD1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="SendFeedbackD1">
<property name="visible">True</property>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 <sfx2/safemode.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
+#include <vcl/settings.hxx>
+#include <i18nlangtag/languagetag.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/ZipPackageHelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
@@ -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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="MenuHelp-SendFeedback">
<property name="visible">True</property>
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 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:QuestionAnswers</property>
- </object>
- </child>
<child>
<object class="GtkMenuItem" id="MenuHelp-SendFeedback">
<property name="visible">True</property>
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 @@
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
