INTEGRATION: CWS xmlsec06 (1.3.96); FILE MERGED

2004/11/10 13:11:11 tra 1.3.96.1: #i36532#all interfaces and service descriptions concerning proxy settings have been marked as deprecated

3 files changed, 12 insertions, 6 deletions

diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl
index ca758d64e261..23926df53135 100644
--- a/offapi/com/sun/star/system/ProxySettings.idl
+++ b/offapi/com/sun/star/system/ProxySettings.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ProxySettings.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 23:33:14 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 14:42:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,8 @@ module com { module sun { module star { module system {
     installation or a central system database.
 
     @see com::sun::star::system::XProxySettings
+
+    @deprecated
 */
 
 published service ProxySettings
diff --git a/offapi/com/sun/star/system/SOffice52ProxySettings.idl b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
index a649fde0c6ab..f91c8da7436c 100644
--- a/offapi/com/sun/star/system/SOffice52ProxySettings.idl
+++ b/offapi/com/sun/star/system/SOffice52ProxySettings.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SOffice52ProxySettings.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 23:33:29 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 14:43:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,8 @@ module com { module sun { module star { module system {
     StarOffice 5.2 installation.
 
     @see com::sun::star::system::ProxySettings
+
+    @deprecated
 */
 
 published service SOffice52ProxySettings
diff --git a/offapi/com/sun/star/system/SystemProxySettings.idl b/offapi/com/sun/star/system/SystemProxySettings.idl
index 05c54f822f71..012fbd92632c 100644
--- a/offapi/com/sun/star/system/SystemProxySettings.idl
+++ b/offapi/com/sun/star/system/SystemProxySettings.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SystemProxySettings.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 23:34:23 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 14:43:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,6 +81,8 @@ module com { module sun { module star { module system {
 //=============================================================================
 /** Specifies a service for reading the system proxy settings. Some  systems
     store this information in a central configuration database.
+
+    @deprecated
 */
 
 published service SystemProxySettings