API CHANGE: remove com.sun.star.system.XProxySettings

... and related services:

com.sun.star.system.SOffice52ProxySettings
com.sun.star.system.ProxySettings
com.sun.star.system.SystemProxySettings

The implementation for these has apparently been removed in
OpenOffice.org 2.0 or thereabouts.

EXISTENCE: published key
"/UCR/com/sun/star/system/SOffice52ProxySettings" exists only in
registry 1
EXISTENCE: published key "/UCR/com/sun/star/system/ProxySettings" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/system/XProxySettings"
exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/system/SystemProxySettings"
exists only in registry 1

Change-Id: If00c332edf08619fcad12ed07d0d8a13a714045e

2 files changed, 0 insertions, 196 deletions

diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
deleted file mode 100644
index 8d472c0c8e5c..000000000000
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ /dev/null
@@ -1,183 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/system/XProxySettings.hpp>
-#include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/servicefactory.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-#include <osl/diagnose.h>
-
-#ifdef WNT
-
-#include <stdio.h>
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-
-#endif
-
-//--------------------------------------------------------------
-//  namesapces
-//--------------------------------------------------------------
-
-using namespace ::rtl                   ;
-using namespace ::cppu                  ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::lang  ;
-using namespace std                     ;
-using namespace com::sun::star::system;
-
-#ifdef WNT
-
-#define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb"
-
-#endif
-
-//--------------------------------------------------------------
-//  global variables
-//--------------------------------------------------------------
-
-Reference< XMultiServiceFactory >   g_xFactory;
-
-//--------------------------------------------------------------
-//  main
-//--------------------------------------------------------------
-
-
-// int SAL_CALL main(int nArgc, char* Argv[], char* Env[]   )
-int SAL_CALL main(int, char*, char* )
-{
-    //-------------------------------------------------
-    // get the global service-manager
-    //-------------------------------------------------
-
-    // Get global factory for uno services.
-    OUString rdbName = OUString( RDB_SYSPATH  );
-    Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
-
-    // Print a message if an error occurred.
-    if ( g_xFactory.is() == sal_False )
-    {
-        OSL_FAIL("Can't create RegistryServiceFactory");
-        return(-1);
-    }
-
-    printf("Creating RegistryServiceFactory successful\n");
-
-    //-------------------------------------------------
-    // try to get an Interface to a XFilePicker Service
-    //-------------------------------------------------
-
-    try
-    {
-        Reference< XProxySettings > xProxySettings(
-            g_xFactory->createInstance( OUString("com.sun.star.system.SystemProxySettings") ), UNO_QUERY );
-
-        if ( !xProxySettings.is() )
-        {
-            OSL_FAIL( "Error creating SystemProxySettings Service" );
-            return(-1);
-        }
-
-        printf( "Creating instance of SystemProxySettings successful\n" );
-
-        OUString ftpProxy    = xProxySettings->getFtpProxyAddress( );
-        OUString httpProxy   = xProxySettings->getHttpProxyAddress( );
-        OUString httpsProxy  = xProxySettings->getHttpsProxyAddress( );
-        OUString socksProxy  = xProxySettings->getSocksProxyAddress( );
-        OUString gopherProxy = xProxySettings->getGopherProxyAddress( );
-
-        OUString ftpProxyPort    = xProxySettings->getFtpProxyPort( );
-        OUString httpProxyPort   = xProxySettings->getHttpProxyPort( );
-        OUString httpsProxyPort  = xProxySettings->getHttpsProxyPort( );
-        OUString socksProxyPort  = xProxySettings->getSocksProxyPort( );
-        OUString gopherProxyPort = xProxySettings->getGopherProxyPort( );
-
-        OUString proxyBypass = xProxySettings->getProxyBypassAddress( );
-
-        printf( "Test of SystemProxySettings successful\n" );
-
-        xProxySettings = Reference< XProxySettings >(
-            g_xFactory->createInstance( OUString("com.sun.star.system.SOProxySettings") ), UNO_QUERY );
-
-        if ( !xProxySettings.is() )
-        {
-            OSL_FAIL( "Error creating SystemProxySettings Service" );
-            return(-1);
-        }
-
-        printf( "Creating instance of SOProxySettings successful\n" );
-
-        ftpProxy    = xProxySettings->getFtpProxyAddress( );
-        httpProxy   = xProxySettings->getHttpProxyAddress( );
-        httpsProxy  = xProxySettings->getHttpsProxyAddress( );
-        socksProxy  = xProxySettings->getSocksProxyAddress( );
-        gopherProxy = xProxySettings->getGopherProxyAddress( );
-
-        ftpProxyPort    = xProxySettings->getFtpProxyPort( );
-        httpProxyPort   = xProxySettings->getHttpProxyPort( );
-        httpsProxyPort  = xProxySettings->getHttpsProxyPort( );
-        socksProxyPort  = xProxySettings->getSocksProxyPort( );
-        gopherProxyPort = xProxySettings->getGopherProxyPort( );
-
-        proxyBypass = xProxySettings->getProxyBypassAddress( );
-
-        sal_Bool bProxyEnabled = xProxySettings->isProxyEnabled( );
-        if (bProxyEnabled)
-        {
-            printf("Test ProxyEnabled true\n");
-        }
-
-        printf( "Test of SOProxySettings successful\n" );
-    }
-    catch( Exception& )
-    {
-    }
-
-    //--------------------------------------------------
-    // shutdown
-    //--------------------------------------------------
-
-    // Cast factory to XComponent
-    Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
-
-    // Print a message if an error occurred.
-    if ( xComponent.is() == sal_False )
-    {
-        OSL_FAIL("Error shuting down");
-    }
-
-    // Dispose and clear factory
-    xComponent->dispose();
-    g_xFactory.clear();
-    g_xFactory = Reference< XMultiServiceFactory >();
-
-    printf("Test successful\n");
-
-    return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/workbench/makefile.mk b/shell/source/win32/workbench/makefile.mk
index 277ec062bf69..d55a7999d70e 100644
--- a/shell/source/win32/workbench/makefile.mk
+++ b/shell/source/win32/workbench/makefile.mk
@@ -21,7 +21,6 @@ PRJ=..$/..$/..
 PRJNAME=shell
 TARGET=testsyssh
 TARGET1=testsmplmail
-TARGET2=testprx
 TARGET4=testfopen
 LIBTARGET=NO
 TARGETTYPE=CUI
@@ -36,7 +35,6 @@ CFLAGS+=/GX
 
 OBJFILES1=$(OBJ)$/TestSysShExec.obj
 OBJFILES2=$(OBJ)$/TestSmplMail.obj
-OBJFILES3=$(OBJ)$/TestProxySet.obj
 OBJFILES4=$(OBJ)$/Testfopen.obj
 
 OBJFILES=$(OBJFILES1)\
@@ -65,17 +63,6 @@ APP2STDLIBS+=	$(CPPULIB)			\
 
 APP2DEF=		$(MISC)$/$(APP2TARGET).def
 
-# --- TestProxy ---
-
-APP3TARGET=$(TARGET2)
-APP3OBJS=$(OBJFILES3)
-
-APP3STDLIBS+=	$(CPPULIB)			\
-                $(CPPUHELPERLIB)	\
-                $(SALLIB)
-
-APP3DEF=		$(MISC)$/$(APP3TARGET).def
-
 # --- Testfopen ---
 
 APP4TARGET=$(TARGET4)