Use instsetoo_native-generated uno ini-file for both instdir and instsets

Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656

1 files changed, 0 insertions, 81 deletions

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index bb60cc36d919..18a15d7a7a06 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -146,87 +146,6 @@ End
 
 // Private Dynamic Libraries:
 
-// We set up the URE unorc/uno.ini in scp2 because then it is easy to
-// get the platform differences into it compared to constructing it in
-// Makefiles etc. On OS X it goes into .app/Contents/Resources/ure/etc/unorc,
-// on other Unix into .../ure/lib/unorc and on Windows into
-// .../ure/bin/unorc. The latter two locations are factored out as
-// SCP2_URE_DL_DIR.
-
-// FIXME: remove this completely?
-// currently getting 'destination' at file not unique error on WNT
-// but needs handling of MACOSX then...
-#ifndef WNT
-Profile gid_Profile_Dl_Uno_Ini
-    ModuleID = gid_Module_Root_Ure_Hidden;
-#if defined MACOSX
-    Dir = gid_Brand_Dir_Share_Ure_Etc;
-#else
-    Dir = SCP2_URE_DL_DIR;
-#endif
-    Name = PROFILENAME(uno);
-End
-
-ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    ProfileID = gid_Profile_Dl_Uno_Ini;
-    Section = "Bootstrap";
-    Key = "URE_INTERNAL_LIB_DIR";
-#if defined MACOSX
-    Value = "${ORIGIN}/../../../Frameworks";
-#else
-    Value = "${ORIGIN}";
-#endif
-End
-
-ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    ProfileID = gid_Profile_Dl_Uno_Ini;
-    Section = "Bootstrap";
-    Key = "URE_INTERNAL_JAVA_DIR";
-#if defined MACOSX
-    Value = "${ORIGIN}/../../java";
-#elif defined WNT
-    Value = "${ORIGIN}/../java";
-#else
-    Value = "${ORIGIN}/../share/java";
-#endif
-End
-
-ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Classpath
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    ProfileID = gid_Profile_Dl_Uno_Ini;
-    Section = "Bootstrap";
-    Key = "URE_INTERNAL_JAVA_CLASSPATH";
-    Value = "${URE_MORE_JAVA_TYPES}";
-End
-
-ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    ProfileID = gid_Profile_Dl_Uno_Ini;
-    Section = "Bootstrap";
-    Key = "UNO_TYPES";
-#if defined WNT
-    Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}";
-#else
-    Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";
-#endif
-End
-
-ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
-    ModuleID = gid_Module_Root_Ure_Hidden;
-    ProfileID = gid_Profile_Dl_Uno_Ini;
-    Section = "Bootstrap";
-    Key = "UNO_SERVICES";
-#if defined WNT
-    Value = "${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}";
-#else
-    Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}";
-#endif
-End
-#endif
-
-
 #if defined _MSC_VER
 File gid_File_Dl_Cli_Ure_Assembly
     TXT_FILE_BODY;