diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-08-10 18:54:13 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-08-14 20:19:51 +0200 |
| commit | 45660fb701334609da077a00222a57d2fc252eb4 (patch) | |
| tree | 06ebdf0a9a83a3a6fa99c91f0638c86666d576ab /sfx2 | |
| parent | daa131c420c640a66c36e69da58f7e6a9d9bd8f0 (diff) | |
help: Let's make the help urls more standard, and use ?Target=...&... form.
Reviewed-on: https://gerrit.libreoffice.org/58863
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit a7485a5db36dc8a8e61285384eed06c46e6a5b53)
Change-Id: If9b7f6e50e8e668b7349dae1935ce16965ef19b0
Reviewed-on: https://gerrit.libreoffice.org/58868
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index c418887f95d5..14d9fb4e10d3 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -658,9 +658,9 @@ static bool impl_showOnlineHelp( const OUString& rURL ) OUString aHelpLink( "https://help.libreoffice.org/help.html?" ); - aHelpLink += rURL.copy( aInternal.getLength() ); - aHelpLink = aHelpLink.replaceAll("%2F","/"); - + OUString aTarget = "Target=" + rURL.copy(aInternal.getLength()); + aTarget = aTarget.replaceAll("%2F", "/").replaceAll("?", "&"); + aHelpLink += aTarget; if (comphelper::LibreOfficeKit::isActive()) { @@ -695,8 +695,9 @@ static bool impl_showOfflineHelp( const OUString& rURL ) OUString const aInternal( "vnd.sun.star.help://" ); OUString aHelpLink( aBaseInstallPath + "/index.html?" ); - aHelpLink += rURL.copy( aInternal.getLength() ); - aHelpLink = aHelpLink.replaceAll("%2F","/").replaceAll("%3A",":"); + OUString aTarget = "Target=" + rURL.copy(aInternal.getLength()); + aTarget = aTarget.replaceAll("%2F","/").replaceAll("?","&"); + aHelpLink += aTarget; // get a html tempfile OUString const aExtension(".html"); |