The disposing happened to early. Move it a bit.

Submitted by:	Daniel Boelzle <dbo@openoffice.org>

17 files changed, 578 insertions, 0 deletions

diff --git a/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice-1.1/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice-1.1/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice-2.0-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice-2.0-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice-3-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice-3-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice-3/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice-3/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-1.1/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-1.1/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-2-RC/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-2-RC/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-2-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-2-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-2.0-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-2.0/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-2.0/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-2/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-2/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-3-RC/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-3-RC/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-3-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-3-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-3/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-3/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{
diff --git a/editors/openoffice.org-vcltesttool/files/patch-stoc+source+servicemanager+servicemanager.cxx b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+servicemanager+servicemanager.cxx
new file mode 100644
index 000000000000..4aef0d4ff05e
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-stoc+source+servicemanager+servicemanager.cxx
@@ -0,0 +1,34 @@
+--- ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 17:57:10 2003
++++ ../stoc/source/servicemanager/servicemanager.cxx	Wed Mar 12 18:51:36 2003
+@@ -2,9 +2,9 @@
+  *
+  *  $RCSfile: servicemanager.cxx,v $
+  *
+- *  $Revision: 1.19.2.1 $
++ *  $Revision: 1.19.2.1.16.1 $
+  *
+- *  last change: $Author: rt $ $Date: 2003/01/28 17:21:31 $
++ *  last change: $Author: dbo $ $Date: 2003/03/10 15:14:02 $
+  *
+  *  The Contents of this file are made available subject to the terms of
+  *  either of the following licenses
+@@ -686,6 +686,7 @@
+ 
+ protected:
+     inline void check_undisposed() const SAL_THROW( (lang::DisposedException) );
++    virtual void SAL_CALL disposing();
+     
+ 	sal_Bool haveFactoryWithThisImplementation(const OUString& aImplName);
+ 
+@@ -1081,7 +1082,10 @@
+     if (rBHelper.bDisposed || rBHelper.bInDispose)
+         return;
+ 	t_OServiceManager_impl::dispose();
+-    
++}
++
++void OServiceManager::disposing()
++{
+ 	// dispose all factories
+ 	HashSet_Ref aImpls;
+ 	{