aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice.org-1.1-devel
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2003-03-24 01:14:16 +0800
committermbr <mbr@FreeBSD.org>2003-03-24 01:14:16 +0800
commita6cb7d7ed3257f880d74df169584abe9dcc090d6 (patch)
tree00500044700ac5384702cbd65ba9f2ff5cae76cd /editors/openoffice.org-1.1-devel
parent2710c3def4579b798e7c323aee11400cc89d9fa3 (diff)
downloadfreebsd-ports-graphics-a6cb7d7ed3257f880d74df169584abe9dcc090d6.tar.gz
freebsd-ports-graphics-a6cb7d7ed3257f880d74df169584abe9dcc090d6.tar.zst
freebsd-ports-graphics-a6cb7d7ed3257f880d74df169584abe9dcc090d6.zip
The disposing happened to early. Move it a bit.
Submitted by: Daniel Boelzle <dbo@openoffice.org>
Diffstat (limited to 'editors/openoffice.org-1.1-devel')
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-stoc+source+servicemanager+servicemanager.cxx34
1 files changed, 34 insertions, 0 deletions
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 00000000000..4aef0d4ff05
--- /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;
+ {