#88337# changed @deprecated

5 files changed, 39 insertions, 38 deletions

diff --git a/cppuhelper/inc/cppuhelper/compbase.hxx b/cppuhelper/inc/cppuhelper/compbase.hxx
index 1eb9e7e4c..460068507 100644
--- a/cppuhelper/inc/cppuhelper/compbase.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: compbase.hxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: dbo $ $Date: 2001-12-13 17:35:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,9 +68,9 @@
 #include <cppuhelper/implbase.hxx>
 #endif
 
-/* @deprecated
-   This header should not be used anymore.  compbase1-N.hxx use implbase_ex.hxx except
+/* This header should not be used anymore.  compbase1-N.hxx use implbase_ex.hxx except
    for MACOSX.
+   @deprecated
 */
 
 //==================================================================================================
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
index 47ac8e1c4..e935d91f6 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: component.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: dbo $ $Date: 2001-12-13 17:35:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,14 +82,14 @@
 namespace cppu
 {    
 
-/** @deprecated
-    Helper for implementing ::com::sun::star::lang::XComponent.
+/** Deprecated.  Helper for implementing ::com::sun::star::lang::XComponent.
     Upon disposing objects of this class, sub-classes receive a disposing() call.  Objects of
     this class can be held weakly, i.e. by a ::com::sun::star::uno::WeakReference.  Object of
     this class can be aggregated, i.e. incoming queryInterface() calls are delegated.
     
     @attention
     The life-cycle of the passed mutex reference has to be longer than objects of this class.
+    @deprecated
 */
 class OComponentHelper
     : public ::cppu::OWeakAggObject
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 467d1a576..b617ee484 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: factory.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: dbo $ $Date: 2001-12-13 17:35:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,17 +144,16 @@ typedef void * (SAL_CALL * component_getFactoryFunc)(
 #define WRITE_COMPONENT_INFO_FUNCTION 		"writeComponentInfo"
 #define CREATE_COMPONENT_FACTORY_FUNCTION	"createComponentFactory"
 
-/** @deprecated
-    Function pointer declaration.
+/** Deprecated.  Function pointer declaration.
     Function writes component registry info, at least writing the supported service names.
     
     @param pXKey a registry key
     @return true if everything went fine
+    @deprecated
 */
 typedef sal_Bool (SAL_CALL * WriteComponentInfoFunc)( uno_Interface * pXKey );
 
-/** @deprecated
-    Function pointer declaration.
+/** Deprecated.  Function pointer declaration.
     Retrieves a factory to create component instances.
     
     @param pImplName
@@ -162,6 +161,7 @@ typedef sal_Bool (SAL_CALL * WriteComponentInfoFunc)( uno_Interface * pXKey );
     @param pXSMgr a service manager
     @param pXKey a registry key
     @return acquired component factory
+    @deprecated
 */
 typedef uno_Interface* (SAL_CALL * CreateComponentFactoryFunc)(
     const sal_Unicode * pImplName, uno_Interface * pXSMgr, uno_Interface * pXKey );
@@ -196,17 +196,16 @@ SAL_CALL createSingleComponentFactory(
     rtl_ModuleCount * pModCount = 0 )
     SAL_THROW( () );
 
-/** @deprecated
-    The type of the instanciate function used as argument of the create*Fcatory functions.
+/** Deprecated.  The type of the instanciate function used as argument of the create*Fcatory functions.
     
     @see createSingleFactory
     @see createOneInstanceFactory
+    @deprecated
 */
 typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SAL_CALL * ComponentInstantiation)(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager );
 
-/** @deprecated
-    Create a single service factory.
+/** Deprecated.  Creates a single service factory.
     
     @param rServiceManager		the service manager used by the implementation.
     @param rImplementationName	the implementation name. An empty string is possible.
@@ -217,6 +216,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(SA
     XSingleServiceFactory and XComponent.
     
     @see createOneInstanceFactory
+    @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
 createSingleFactory(
@@ -227,8 +227,7 @@ createSingleFactory(
     rtl_ModuleCount * pModCount = 0  )
     SAL_THROW( () );
 
-/** @deprecated
-    Creates a factory wrapping another one.
+/** Deprecated.  Creates a factory wrapping another one.
     This means the methods of the interfaces XServiceProvider, XServiceInfo and
     XSingleServiceFactory are forwarded.
     @attention
@@ -240,6 +239,7 @@ createSingleFactory(
     XSingleServiceFactory.
     
     @see createSingleFactory
+    @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
 createFactoryProxy(
@@ -247,8 +247,7 @@ createFactoryProxy(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > & rFactory )
     SAL_THROW( () );
 
-/** @deprecated
-    Creates a single service factory which hold the instance created.
+/** Deprecated.  Creates a single service factory which holds the instance created only once.
     
     @param rServiceManager		the service manager used by the implementation.
     @param rImplementationName	the implementation name. An empty string is possible.
@@ -259,6 +258,7 @@ createFactoryProxy(
     XSingleServiceFactory and XComponent.
     
     @see createSingleFactory
+    @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL
 createOneInstanceFactory(
@@ -269,14 +269,14 @@ createOneInstanceFactory(
     rtl_ModuleCount * pModCount = 0  )
     SAL_THROW( () );
 
-/** @deprecated
-    Creates a single service factory.
+/** Deprecated.  Creates a single service factory based on a registry.
     
     @param rServiceManager		the service manager used by the implementation.
     @param rImplementationName	the implementation name. An empty string is possible.
     @param rImplementationKey	the registry key of the implementation section.
     @return a factory that support the interfaces XServiceProvider, XServiceInfo
     XSingleServiceFactory and XComponent.
+    @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createSingleRegistryFactory(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
@@ -284,8 +284,8 @@ createOneInstanceFactory(
     const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > & rImplementationKey )
     SAL_THROW( () );
 
-/** @deprecated
-    Creates a single service factory which holds the instance created.
+/** Deprecated.  Creates a single service factory which holds the instance created only once
+    based on a registry.
     
     @param rServiceManager		the service manager used by the implementation.
     @param rImplementationName	the implementation name. An empty string is possible.
@@ -294,6 +294,7 @@ createOneInstanceFactory(
     XSingleServiceFactory and XComponent.
     
     @see createSingleRegistryFactory
+    @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL createOneInstanceRegistryFactory(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rServiceManager,
diff --git a/cppuhelper/inc/cppuhelper/implbase.hxx b/cppuhelper/inc/cppuhelper/implbase.hxx
index 56e032566..394768d80 100644
--- a/cppuhelper/inc/cppuhelper/implbase.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbase.hxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: dbo $ $Date: 2001-12-13 17:35:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,9 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-/* @deprecated
-   This header should not be used anymore.  implbase1-N.hxx use implbase_ex.hxx except
+/* This header should not be used anymore.  implbase1-N.hxx use implbase_ex.hxx except
    for MACOSX.
+   @deprecated
 */
 
 namespace cppu
diff --git a/cppuhelper/inc/cppuhelper/servicefactory.hxx b/cppuhelper/inc/cppuhelper/servicefactory.hxx
index d4438723f..a88a52200 100644
--- a/cppuhelper/inc/cppuhelper/servicefactory.hxx
+++ b/cppuhelper/inc/cppuhelper/servicefactory.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: servicefactory.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: dbo $ $Date: 2001-12-13 17:35:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,8 +72,7 @@
 namespace cppu
 {
 
-/** @deprecated
-    Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
+/** Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
     
     This bootstraps an initial service factory working on a registry. If the first or both 
     parameters contain a value then the service factory is initialized with a simple registry
@@ -95,6 +94,7 @@ namespace cppu
     specifies a path where the bootstrap components could be find. If this
     parameter is an empty string the compoents will be searched in the system
     path.
+    @deprecated
 */
 ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL
 createRegistryServiceFactory(
@@ -105,8 +105,7 @@ createRegistryServiceFactory(
     SAL_THROW( (::com::sun::star::uno::Exception) );
 
 
-/** @deprecated
-    Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
+/** Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
     
     This bootstraps an initial service factory working on a registry file.
     
@@ -121,6 +120,7 @@ createRegistryServiceFactory(
     specifies a path where the bootstrap components could be find. If this
     parameter is an empty string the compoents will be searched in the system
     path.
+    @deprecated
 */
 inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL
 createRegistryServiceFactory(
@@ -133,8 +133,7 @@ createRegistryServiceFactory(
         rRegistryFile, ::rtl::OUString(), bReadOnly, rBootstrapPath );
 }
 
-/** @deprecated
-    Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
+/** Deprecated.  Use cppuhelper/bootstrap.hxx functions instead.
     
     This bootstraps a service factory without initialize a registry.
 
@@ -142,6 +141,7 @@ createRegistryServiceFactory(
     specifies a path where the bootstrap components could be find. If this
     parameter is an empty string the compoents will be searched in the system
     path.
+    @deprecated
 */
 inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL
 createServiceFactory(