From b426d4671eb65d5fcef9b0abc6f8eacfc819cae0 Mon Sep 17 00:00:00 2001
From: Daniel Boelzle <dbo@openoffice.org>
Date: Fri, 25 Apr 2003 13:04:56 +0000
Subject: [PATCH] #107130# misc cleanup

---
 cli_ure/source/ure/makefile.mk              | 7 ++++---
 cli_ure/source/ure/uno/util/DisposeGuard.cs | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
index ae8c7fc7547f..1468547a612a 100644
--- a/cli_ure/source/ure/makefile.mk
+++ b/cli_ure/source/ure/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: dbo $ $Date: 2003-03-28 10:17:42 $
+#   last change: $Author: dbo $ $Date: 2003-04-25 14:04:53 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -82,7 +82,8 @@ ALLTAR : \
 CSFILES = \
     uno$/QueryInterface.cs						\
     uno$/Runtime.cs							\
-    uno$/util$/ServiceImplementationAttribute.cs			\
+    uno$/ServiceImplementationAttribute.cs				\
+    uno$/SingletonAttribute.cs					\
     uno$/util$/DisposeGuard.cs					\
     uno$/util$/WeakAdapter.cs					\
     uno$/util$/WeakBase.cs						\
diff --git a/cli_ure/source/ure/uno/util/DisposeGuard.cs b/cli_ure/source/ure/uno/util/DisposeGuard.cs
index 080446aaa5c9..6d37ea8ffcf9 100644
--- a/cli_ure/source/ure/uno/util/DisposeGuard.cs
+++ b/cli_ure/source/ure/uno/util/DisposeGuard.cs
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DisposeGuard.cs,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2003-04-07 09:40:44 $
+ *  last change: $Author: dbo $ $Date: 2003-04-25 14:04:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,8 +78,8 @@ public struct DisposeGuard : IDisposable
     */
     public DisposeGuard( Object obj )
     {
-        m_xComponent = (XComponent) uno.Runtime.queryInterface_throw(
-            typeof (XComponent), obj );
+        m_xComponent = (XComponent) uno.Runtime.queryInterface(
+            typeof (XComponent), obj, uno.Runtime.QueryOption.Throw );
     }
     /** ctor.