[Libreoffice-commits] .: Branch 'libreoffice-3-4' - tools/source

[Cédric Bosdonnat]

 tools/source/fsys/urlobj.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 30428e1b7088df9b61a18c9b47557669cb542622
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Thu May 19 17:00:35 2011 +0200

    fdo#36615: Fixed the prefix recognition in URLs... that list is sorted.

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 40c2a5f..f3a4a37 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2165,6 +2165,7 @@ INetURLObject::getPrefix(sal_Unicode const *& rBegin,
               INET_PROT_PRIV_SOFFICE, PrefixInfo::INTERNAL },
             { "private:trashcan:", "staroffice.trashcan:",
               INET_PROT_PRIV_SOFFICE, PrefixInfo::INTERNAL },
+            { "sftp:", 0, INET_PROT_SFTP, PrefixInfo::OFFICIAL },
             { "slot:", "staroffice.slot:", INET_PROT_SLOT,
               PrefixInfo::INTERNAL },
             { "smb:", 0, INET_PROT_SMB, PrefixInfo::OFFICIAL },
@@ -2217,8 +2218,7 @@ INetURLObject::getPrefix(sal_Unicode const *& rBegin,
             { "vnd.sun.star.tdoc:", 0, INET_PROT_VND_SUN_STAR_TDOC,
               PrefixInfo::OFFICIAL },
             { "vnd.sun.star.webdav:", 0, INET_PROT_VND_SUN_STAR_WEBDAV,
-              PrefixInfo::OFFICIAL },
-            { "sftp:", 0, INET_PROT_SFTP, PrefixInfo::OFFICIAL } };
+              PrefixInfo::OFFICIAL } };
 
     PrefixInfo const * pFirst = aMap + 1;
     PrefixInfo const * pLast = aMap + sizeof aMap / sizeof (PrefixInfo) - 1;