From 4b6269c99066393645e615f81c7003c784056983 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Mon, 15 Oct 2007 11:03:03 +0000
Subject: INTEGRATION: CWS sb71 (1.14.34); FILE MERGED 2007/10/01 17:29:12 sb
 1.14.34.2: RESYNC: (1.14-1.15); FILE MERGED 2007/06/22 09:36:19 sb 1.14.34.1:
 #i75466# Support for dynamic loading of the reg shared library has been
 dropped.

---
 stoc/source/simpleregistry/simpleregistry.cxx | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'stoc')

diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 2b7d29967676..a554fc4ef170 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: simpleregistry.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: hr $ $Date: 2007-09-27 13:03:17 $
+ *  last change: $Author: vg $ $Date: 2007-10-15 12:03:03 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1319,18 +1319,14 @@ namespace stoc_bootstrap
 Reference<XInterface> SAL_CALL SimpleRegistry_CreateInstance( const Reference<XComponentContext>& )
 {
     Reference<XInterface>   xRet;
-    RegistryLoader          aLoader;
 
-    if ( aLoader.isLoaded() )
-    {
-        Registry reg(aLoader);
+    Registry reg;
 
-        XSimpleRegistry *pRegistry = (XSimpleRegistry*) new stoc_simreg::SimpleRegistryImpl(reg);
+    XSimpleRegistry *pRegistry = (XSimpleRegistry*) new stoc_simreg::SimpleRegistryImpl(reg);
 
-        if (pRegistry)
-        {
-            xRet = Reference<XInterface>::query(pRegistry);
-        }
+    if (pRegistry)
+    {
+        xRet = Reference<XInterface>::query(pRegistry);
     }
 
     return xRet;
-- 
cgit