Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi all,

I just fixed another blocker for 3.4. Can you please review and push it?

Thanks,

-- 
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr
From 6fa0f51c89a18317be5b7181f3c2c68d46784a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat.ooo@free.fr>
Date: Thu, 19 May 2011 17:00:35 +0200
Subject: [PATCH] fdo#36615: Fixed the prefix recognition in URLs... that list is sorted.

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

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;
-- 
1.7.3.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.