[Libreoffice-commits] core.git: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/appl/sfxhelp.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 45660fb701334609da077a00222a57d2fc252eb4
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Aug 10 18:54:13 2018 +0200
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Tue Aug 14 20:19:51 2018 +0200

    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 at collabora.com>
    Tested-by: Andras Timar <andras.timar at 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 at libreoffice.org>

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");