diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-04-04 06:47:28 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-04 06:47:28 +0000 |
commit | 9661c81173eb4118fe4599f4a02d2ff946f9d167 (patch) | |
tree | b3ceb0111da1f6abb2016a3567e141a2dba8e091 /shell | |
parent | 8daa5623478e68c6ace489ad8ebbef4bbcde6220 (diff) |
INTEGRATION: CWS updchk05 (1.4.38); FILE MERGED
2007/01/29 12:27:16 dv 1.4.38.1: #i63398# removed proxy server from exclude list, reversed exclude list
Diffstat (limited to 'shell')
-rw-r--r-- | shell/source/backends/wininetbe/wininetlayer.cxx | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/shell/source/backends/wininetbe/wininetlayer.cxx b/shell/source/backends/wininetbe/wininetlayer.cxx index 5580ec6083eb..e8857194fbd6 100644 --- a/shell/source/backends/wininetbe/wininetlayer.cxx +++ b/shell/source/backends/wininetbe/wininetlayer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wininetlayer.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:40:19 $ + * last change: $Author: rt $ $Date: 2007-04-04 07:47:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,8 @@ #include <malloc.h> +#include <rtl/ustrbuf.hxx> + #define EQUAL_SIGN '=' #define COLON ':' #define SPACE ' ' @@ -181,6 +183,26 @@ void SAL_CALL WinInetLayer::readData( // fill proxy bypass list if( aProxyBypassList.getLength() > 0 ) { + rtl::OUStringBuffer aReverseList; + sal_Int32 nIndex = 0; + do + { + rtl::OUString aToken = aProxyBypassList.getToken( 0, SPACE, nIndex ); + if ( aProxyList.indexOf( aToken ) == -1 ) + { + if ( aReverseList.getLength() ) + { + aReverseList.insert( 0, sal_Unicode( SEMI_COLON ) ); + aReverseList.insert( 0, aToken ); + } + else + aReverseList = aToken; + } + } + while ( nIndex >= 0 ); + + aProxyBypassList = aReverseList.makeStringAndClear(); + aPropInfoList[nProperties].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Inet/Settings/ooInetNoProxy") ); aPropInfoList[nProperties].Type = rtl::OUString( |