[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

Andras Timar atimar at suse.com
Wed May 8 00:22:08 PDT 2013


 sfx2/source/appl/sfxhelp.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b8dd48c73c0d6978913e93af8ea8e0fae0b2c190
Author: Andras Timar <atimar at suse.com>
Date:   Tue May 7 21:01:30 2013 +0200

    fdo#64211 replace "%2F" to "/" in online (wiki) help URLs
    
    It is not possible to create wiki pages with URLs that have %2F in
    them. Help URLs contain %2F, when invoked from dialogs that are
    based on .ui files, it seems this is the new HID syntax.
    
    For example for Zoom dialog LibreOffice used to call
    http://help.libreoffice.org/simpress/cui%2Fui%2Fzoomdialog%2Fzoomsb
    and it did not work. Now it calls
    http://help.libreoffice.org/simpress/cui/ui/zoomdialog/zoomsb
    and it works.
    
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>
    
    Conflicts:
    
    	sfx2/source/appl/sfxhelp.cxx
    
    Change-Id: I163cf8ec3b69f31eadbbd9085d2180839fe91e07

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index b2be3e3..4e7837c 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -660,6 +660,7 @@ static bool impl_showOnlineHelp( const String& rURL )
 
     OUString aHelpLink( "http://help.libreoffice.org/"  );
     aHelpLink += rURL.Copy( aInternal.Len() );
+    aHelpLink = aHelpLink.replaceAll("%2F","/");
     try
     {
         Reference< XSystemShellExecute > xSystemShell(


More information about the Libreoffice-commits mailing list