From ebed0cbef9b919d5362d90d99e133de9a7da2ad5 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 24 Jul 2009 16:56:06 +0200
Subject: [PATCH] #i101955# work in progress of a configmgr reimplementation,
 continued (for now in an extra module "configmgr2")

---
 scp2/source/ooo/file_library_ooo.scp  | 12 +-----------
 scp2/source/ooo/module_hidden_ooo.scp |  2 +-
 solenv/inc/libs.mk                    |  2 ++
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f9de70d434ac..d7493d4c5bc4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -85,17 +85,7 @@ File gid_File_Lib_Cached1
   #endif
 End
 
-File gid_File_Lib_Configmgr2
-    TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
-  #ifdef UNX
-    Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX));
-  #else
-    Name = "configmgr2.uno.dll";
-  #endif
-End
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr)
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 1e1037fa8c2e..991615d72d46 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -272,7 +272,7 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Index_Data,
     gid_File_Lib_Textconv_Dict,
 	gid_File_Lib_Basprov,
-	gid_File_Lib_Configmgr2,
+	gid_File_Lib_Configmgr,
 	gid_File_Lib_Crypto,
 	gid_File_Lib_Dlgprov,
 	gid_File_Lib_Stringresource,
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index b463b5db3db8..dc62a595df17 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -345,6 +345,7 @@ PYUNOLIB=-lpyuno
 LPSOLVELIB=-llpsolve55
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
+CONFIGMGRLIB=-lconfigmgr
 
 .ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 
@@ -523,5 +524,6 @@ PYUNOLIB=ipyuno.lib
 LPSOLVELIB=lpsolve55.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
+CONFIGMGRLIB=configmgr.lib
 
 .ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"