[Libreoffice-commits] core.git: basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/uiconfig framework/uiconfig include/sfx2 officecfg/registry reportdesign/uiconfig sc/uiconfig sd/uiconfig sfx2/sdi sfx2/source starmath/uiconfig sw/uiconfig
Olivier Hallot
ohallot at collabora.co.uk
Wed Oct 19 16:07:56 UTC 2016
basctl/uiconfig/basicide/menubar/menubar.xml | 1
chart2/uiconfig/menubar/menubar.xml | 1
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
include/sfx2/sfxsids.hrc | 1
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 +
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 1
sc/uiconfig/scalc/menubar/menubar.xml | 1
sd/uiconfig/sdraw/menubar/menubar.xml | 1
sd/uiconfig/simpress/menubar/menubar.xml | 1
sfx2/sdi/appslots.sdi | 4 +
sfx2/sdi/sfx.sdi | 14 ++++
sfx2/source/appl/appserv.cxx | 32 +++-------
starmath/uiconfig/smath/menubar/menubar.xml | 1
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/swxform/menubar/menubar.xml | 1
25 files changed, 56 insertions(+), 20 deletions(-)
New commits:
commit e91a1abe4c53ea3a1ac59e3c1d5dddf98141a4ee
Author: Olivier Hallot <ohallot at collabora.co.uk>
Date: Sat Sep 10 13:38:52 2016 -0300
tdf#96015 (part) link to Doc'tation in Help menu
Add the entry "Documentation" to the modules Help menu.
on click, the system browser opens
http://hub.libreoffice.org/documentation/?&LOlang=<locale>
<locale> is obtained from .getLocale()
Patch2: create a member with try/catch for external URLs
Patch3
Use sfx2::openUriExternally
Revert to User Guides.. in UI.
Change-Id: I8332253c31bd3be330cdd794f9e056b632b38037
Patch4: remove 1st '&' in URLs
Reviewed-on: https://gerrit.libreoffice.org/28817
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index 62c7ded..2a177f6 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -96,6 +96,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index ddf7af1..032e758 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -167,6 +167,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index 97cad1c..ecffe81 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -152,6 +152,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index 14d1acf..bd46041 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -93,6 +93,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 3df7607..7f88113 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -76,6 +76,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index fa4aefc..ca66a41 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -77,6 +77,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index 9624cc5..17678fe 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -85,6 +85,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml
index f111b1a..361fb47 100644
--- a/extensions/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml
@@ -78,6 +78,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index 2cdff80..f66bbe8 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -51,6 +51,7 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index c24096a..8520a25 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -88,6 +88,7 @@
#define SID_HELPMENU (SID_SFX_START + 410)
#define SID_SEND_FEEDBACK (SID_SFX_START + 421)
#define SID_Q_AND_A (SID_SFX_START + 422)
+#define SID_DOCUMENTATION (SID_SFX_START + 423)
#define SID_SHOW_LICENSE (SID_SFX_START + 1683)
#define SID_SHOW_CREDITS (SID_SFX_START + 1711)
#define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a9bef87..e8cd5d4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4909,6 +4909,11 @@
<value xml:lang="en-US">~Get help online...</value>
</prop>
</node>
+ <node oor:name=".uno:Documentation" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">User Guides...</value>
+ </prop>
+ </node>
<node oor:name=".uno:ShowLicense" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">License Information...</value>
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index ad19bbd..c9f65ae 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -282,6 +282,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 216b3c7..7156cf3 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -705,6 +705,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 18138a5..a7d01bb 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -369,6 +369,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index d8e911f..6db6157 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -607,6 +607,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 5df800d..bd03c12 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -155,6 +155,10 @@ interface Application
[
ExecMethod = MiscExec_Impl ;
]
+ SID_DOCUMENTATION
+ [
+ ExecMethod = MiscExec_Impl ;
+ ]
SID_SHOW_LICENSE
[
ExecMethod = MiscExec_Impl ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index edf0ea2..e45cf6d 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -5096,7 +5096,21 @@ SfxVoidItem QuestionAnswers SID_Q_AND_A
MenuConfig = TRUE,
GroupId = GID_APPLICATION;
]
+SfxVoidItem Documentation SID_DOCUMENTATION
+()
+[
+ AutoUpdate = FALSE,
+ FastCall = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ GroupId = GID_APPLICATION;
+]
SfxVoidItem ShowLicense SID_SHOW_LICENSE
()
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index defd3b6..6717966 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -136,6 +136,8 @@
#include <officecfg/Setup.hxx>
#include <memory>
+#include "openuriexternally.hxx"
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
@@ -497,15 +499,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
OUString module = SfxHelp::GetCurrentModuleIdentifier();
OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() +
"&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" + module.copy(module.lastIndexOf('.') + 1 ) );
- try
- {
- uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
- css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
- xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
- }
- catch ( uno::Exception& )
- {
- }
+ sfx2::openUriExternally(sURL, false);
break;
}
@@ -520,16 +514,15 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
else
aLang = utl::ConfigManager::getLocale().copy(0,ix);
- OUString sURL("http://hub.libreoffice.org/forum/?&LOlang=" + aLang);
- try
- {
- uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
- css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
- xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
- }
- catch ( uno::Exception& )
- {
- }
+ OUString sURL("http://hub.libreoffice.org/forum/?LOlang=" + aLang);
+ sfx2::openUriExternally(sURL, false);
+ break;
+ }
+ case SID_DOCUMENTATION:
+ {
+ // Open documentation page based on locales
+ OUString sURL("http://hub.libreoffice.org/documentation/?LOlocale=" + utl::ConfigManager::getLocale());
+ sfx2::openUriExternally(sURL, false);
break;
}
case SID_SHOW_LICENSE:
@@ -1016,7 +1009,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
rReq.Done();
}
-
void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
{
const sal_uInt16 *pRanges = rSet.GetRanges();
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index 9f273f8..a43305f 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -142,6 +142,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 6d2c050..e6dbe3d 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -485,6 +485,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index cd61f44..c3638db 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -415,6 +415,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index ae961e7..cefc7be 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -479,6 +479,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 0050629..4b71934 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -481,6 +481,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index ee638a0..78bdf78 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -742,6 +742,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index c2eb910..31bdeb7 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -481,6 +481,7 @@
<menu:menupopup>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
+ <menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
More information about the Libreoffice-commits
mailing list