#104432# Changed to proxyconfig helper class

1 files changed, 6 insertions, 97 deletions

diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 207a60226bb0..0e6cd12bc985 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftpcontentprovider.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: abi $ $Date: 2002-10-23 08:00:07 $
+ *  last change: $Author: abi $ $Date: 2002-10-29 12:43:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,7 @@
 #include <vector>
 #include <osl/mutex.hxx>
 #include <ucbhelper/macros.hxx>
+#include <ucbhelper/proxydecider.hxx>
 #include <ucbhelper/providerhelper.hxx>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -100,8 +101,7 @@ namespace ftp {
 
     class FTPContentProvider:
         public ::ucb::ContentProviderImplHelper,
-        public ::com::sun::star::container::XContainerListener,
-        public ::com::sun::star::lang::XComponent,
+        // public ::com::sun::star::lang::XComponent,
         public FTPHandleProvider
     {
     public:
@@ -125,62 +125,7 @@ namespace ftp {
             throw( com::sun::star::ucb::IllegalIdentifierException,
                    com::sun::star::uno::RuntimeException );
 
-        // XComponent
-
-        virtual void SAL_CALL
-        dispose(  )
-            throw (::com::sun::star::uno::RuntimeException)
-        {
-            if(m_xContainer.is())
-            {
-                m_xContainer->removeContainerListener(this);
-                m_xContainer =
-                    com::sun::star::uno::Reference<
-                    com::sun::star::container::XContainer>(0);
-            }
-        }
-
-        virtual void SAL_CALL
-        addEventListener(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::lang::XEventListener >& xListener )
-            throw (::com::sun::star::uno::RuntimeException) { }
-
-        virtual void SAL_CALL
-        removeEventListener(
-            const ::com::sun::star::uno::Reference<
-            ::com::sun::star::lang::XEventListener >& aListener )
-            throw (::com::sun::star::uno::RuntimeException) { }
-
-        // XConainerListener ( deriver from XEventListener )
-
-        virtual void SAL_CALL
-        disposing( const ::com::sun::star::lang::EventObject& Source )
-            throw (::com::sun::star::uno::RuntimeException)
-        {
-            m_xContainer =
-                com::sun::star::uno::Reference<
-                com::sun::star::container::XContainer>(0);
-        }
-
-        virtual void SAL_CALL
-        elementInserted(
-            const ::com::sun::star::container::ContainerEvent& Event )
-            throw (::com::sun::star::uno::RuntimeException) { }
-
-        virtual void SAL_CALL
-        elementRemoved(
-            const ::com::sun::star::container::ContainerEvent& Event )
-            throw (::com::sun::star::uno::RuntimeException)  { }
-
-        virtual void SAL_CALL
-        elementReplaced(
-            const ::com::sun::star::container::ContainerEvent& Event )
-            throw (::com::sun::star::uno::RuntimeException);
-
-
-        /** FTPHandleProvider.
-         */
+        // FTPHandleProvider.
 
         virtual CURL* handle();
 
@@ -209,51 +154,15 @@ namespace ftp {
 
         osl::Mutex m_aMutex;
         FTPLoaderThread *m_ftpLoaderThread;
-
-        sal_Int32     m_eType;
-        rtl::OUString m_aFtpProxy;
-        rtl::OUString m_aNoProxyList;
-
-        // used for access to ftp-proxy
-        com::sun::star::uno::Reference<
-        com::sun::star::ucb::XContentProviderManager > m_xManager;
-
-        com::sun::star::uno::Reference<
-        com::sun::star::container::XContainer> m_xContainer;
-
+        ucbhelper::InternetProxyDecider *m_pProxyDecider;
         std::vector<ServerInfo> m_ServerInfo;
 
         void init();
 
-        com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory >
-        getConfiguration() const;
-
-        com::sun::star::uno::Reference<
-        com::sun::star::container::XHierarchicalNameAccess >
-        getHierAccess(
-            const com::sun::star::uno::Reference<
-            com::sun::star::lang::XMultiServiceFactory >& sProvider,
-            const char* file ) const;
-
-        rtl::OUString
-        getKey(
-            const com::sun::star::uno::Reference<
-            com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
-            const char* key) const;
-
-        sal_Int32
-        getIntKey(
-            const com::sun::star::uno::Reference<
-            com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
-            const char* key) const;
-
         com::sun::star::uno::Reference<com::sun::star::ucb::XContentProvider>
         getHttpProvider()
             throw(com::sun::star::uno::RuntimeException);
 
-        bool ShouldUseFtpProxy(const FTPURL& aURL) const;
-
     };  // end class FTPContentProvider
 
 }       // end namespace ftp