Fix losmoketest UNO_TYPES

...and remove a bunch of unused Directories

Change-Id: Ibb20bf9f4049eee136132b4ebda86ec2a9613a29

scp2/source/smoketest/module_smoketest.scp

@@ -37,7 +37,6 @@ Module gid_Module_Optional_Smoketest
     Files = (gid_Test_File_Txt_License,
              gid_Test_File_Txt_Readme,
              gid_Test_File_Misc_Smoketestdoc,
-             gid_Test_File_Misc_TypesRdb,
              gid_Test_File_Bin_LOSmoketest,
              gid_Test_File_Exe_Cppunittester,
              gid_Test_File_Lib_Cppunit,

scp2/source/smoketest/smoketest.scp

@@ -95,31 +95,6 @@ Directory gid_Test_Brand_Dir_Share_Test
     DosName = "test";
 End
 
-Directory gid_Test_Dir_Common_Ure
-#if defined MACOSX
-    ParentID = gid_Test_Dir_Bundle_Contents;
-#else
-    ParentID = gid_Test_Dir_Brand_Root;
-#endif
-    HostName = "ure";
-    Styles = (UREDIRECTORY);
-End
-
-Directory gid_Test_Dir_Ure_Share
-    ParentID = gid_Test_Dir_Common_Ure;
-    DosName = "share";
-End
-
-Directory gid_Test_Dir_Ure_Misc
-    ParentID = gid_Test_Dir_Ure_Share;
-    DosName = "misc";
-End
-
-Directory gid_Test_Dir_Ure_Misc_Test
-    ParentID = gid_Test_Dir_Ure_Misc;
-    DosName = "test";
-End
-
 
 File gid_Test_File_Txt_License
     TXT_FILE_BODY;
@@ -152,14 +127,6 @@ File gid_Test_File_Misc_Smoketestdoc
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_Test_File_Misc_TypesRdb
-    TXT_FILE_BODY;
-    Dir = gid_Test_Dir_Ure_Misc_Test;
-    Name = "udkapi.rdb";
-    InstallName = "types.rdb";
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
-End
-
 File gid_Test_File_Bin_LOSmoketest
     BIN_FILE_BODY;
     Dir = gid_Test_Brand_Dir_Program;

smoketest/losmoketest

@@ -52,7 +52,7 @@ esac
 
 exec $sd_prog/cppunittester \
 	-env:UNO_SERVICES=file://$sd_prog/../ure/share/misc/services.rdb \
-	-env:UNO_TYPES=file://$sd_prog/../ure/share/misc/test/types.rdb \
+	-env:UNO_TYPES=file://$sd_prog/../ure/share/misc/types.rdb\ file://$sd_prog/types/offapi.rdb \
 	-env:arg-soffice=path:$sd_prog/soffice \
 	-env:arg-user=$user_conf_dir \
 	-env:arg-env=$LD_LIBRARY_PATH \