Merge branch 'master' into feature/killsdf

Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx

10 files changed, 99 insertions, 234 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5c90285ecbe7..6617e4ad9570 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -84,7 +84,6 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,
-             gid_Brand_File_Share_Xdg_BinFilter,
              gid_Brand_File_Share_Xdg_Calc,
              gid_Brand_File_Share_Xdg_Draw,
              gid_Brand_File_Share_Xdg_Extension,
@@ -765,15 +764,6 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_BinFilter
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "binfilter.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_XsltFilter
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Xdg;
@@ -1257,9 +1247,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
 #ifdef SYSTEM_HSQLDB
     ValueList1 = HSQLDB_JAR;
 #endif
-#ifdef SYSTEM_SAXON
-    ValueList2 = SAXON_JAR;
-#endif
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index f5990938f1df..b766327ed7bf 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -109,6 +109,12 @@ Directory gid_Dir_Wizards_Fax
     DosName = "fax";
 End
 
+Directory gid_Dir_Wizards_Letter
+    Styles = (CREATE);
+    ParentID = gid_Dir_Wizards;
+    DosName = "letter";
+End
+
 Directory gid_Dir_Resource
     ParentID = gid_Brand_Dir_Program;
     DosName = "resource";
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 104f32ceb922..0781dfc046d3 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -143,6 +143,42 @@ STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinum_RB_G.ttf, Linux Bio
 STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinum_RI_G.ttf, Linux Biolinum G Italic)
 #endif
 
+// PT Serif fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_PtSerif_Regular, PT_Serif-Web-Regular.ttf, PT Serif Regular)
+STD_FONT_FILE( gid_File_Fnt_PtSerif_Bold, PT_Serif-Web-Bold.ttf, PT Serif Bold)
+STD_FONT_FILE( gid_File_Fnt_PtSerif_Italic, PT_Serif-Web-Italic.ttf, PT Serif Italic)
+STD_FONT_FILE( gid_File_Fnt_PtSerif_BoldItalic, PT_Serif-Web-BoldItalic.ttf, PT Serif Bold Italic)
+#endif
+
+// Open Sans fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_OpenSans_Regular, OpenSans-Regular.ttf, Open Sans Regular)
+STD_FONT_FILE( gid_File_Fnt_OpenSans_Bold, OpenSans-Bold.ttf, Open Sans Bold)
+STD_FONT_FILE( gid_File_Fnt_OpenSans_Italic, OpenSans-Italic.ttf, Open Sans Italic)
+STD_FONT_FILE( gid_File_Fnt_OpenSans_BoldItalic, OpenSans-BoldItalic.ttf, Open Sans Bold Italic)
+#endif
+
+
+// Source Sans Pro fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_SourceSans_Regular, SourceSansPro-Regular.ttf, Source Sans Pro Regular)
+STD_FONT_FILE( gid_File_Fnt_SourceSans_Bold, SourceSansPro-Bold.ttf, Source Sans Pro Bold)
+STD_FONT_FILE( gid_File_Fnt_SourceSans_Italic, SourceSansPro-Italic.ttf, Source Sans Pro Italic)
+STD_FONT_FILE( gid_File_Fnt_SourceSans_BoldItalic, SourceSansPro-BoldItalic.ttf, Source Sans Pro Bold Italic)
+#endif
+
+
+// Source Code Pro fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_SourceCode_Regular, SourceCodePro-Regular.ttf, Source Code Pro Regular)
+STD_FONT_FILE( gid_File_Fnt_SourceCode_Bold, SourceCodePro-Bold.ttf, Source Code Pro Bold)
+#endif
+
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 66f3a77e59f6..d3c08f3dc921 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -186,7 +186,7 @@ File gid_File_Lib_Curl
     #ifdef MACOSX
        Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
+       Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
     #endif
   #else
    #ifdef _gcc3
@@ -573,7 +573,6 @@ End
 
 #if !defined SYSTEM_CAIRO \
     && (defined ENABLE_CAIRO_CANVAS \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG) \
         || (defined WNT && !defined ENABLE_DIRECTX))
 
 File gid_File_Lib_Cairo
@@ -759,12 +758,16 @@ File gid_File_Lib_Langtag
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef MACOSX
-    Name = STRING(CONCAT4(liblangtag,.,0,UNXSUFFIX));
+    Name = STRING(CONCAT4(liblangtag,.,1,UNXSUFFIX));
   #elif defined WNT
-    // Nothing, statically linked to libi18nisolang1
+    #if defined _gcc3
+        Name = STRING(CONCAT4(liblangtag,-,1,.dll));
+    #else
+        // Nothing, statically linked to libi18nisolang1
+    #endif
   #else
     // FIXME: use version vars
-    Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,0));
+    Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,1));
   #endif
 End
 
@@ -902,6 +905,7 @@ End
 #else
 
 STD_LIB_FILE(gid_File_Lib_Mork,mork)
+SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
@@ -1442,7 +1446,6 @@ STD_LIB_FILE( gid_File_Lib_Textfd, textfd )
 STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml )
 
 #ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
 STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
 #endif
 
@@ -1721,161 +1724,6 @@ STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
 STD_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
-#if !defined SYSTEM_GLIB \
-    && ((defined ENABLE_LIBLANGTAG && !defined SYSTEM_LIBLANGTAG) \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG))
-File gid_File_Lib_Glib
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libglib-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gliblo.dll";
-    #endif
-End
-File gid_File_Lib_Gthread
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgthread-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gthreadlo.dll";
-    #endif
-End
-File gid_File_Lib_Gobject
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgobject-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gobjectlo.dll";
-    #endif
-End
-File gid_File_Lib_Gio
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgio-2.0.0.dylib";
-    #elif defined WNT
-    Name = "giolo.dll";
-    #endif
-End
-File gid_File_Lib_Gmodule
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgmodule-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gmodulelo.dll";
-    #endif
-End
-#endif
-
-// RSVG and dependencies
-#if ENABLE_LIBRSVG
-#if ! defined (SYSTEM_GETTEXT)
-File gid_File_Lib_Intl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libintl.8.dylib";
-    #elif defined WNT
-    Name = "intl.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_GDKPIXBUF
-File gid_File_Lib_Gdkpixbuf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgdk_pixbuf-2.0.0.dylib";
-    #elif defined WNT
-    Name = "libgdk_pixbuf-2.0-0.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBCROCO
-File gid_File_Lib_Libcroco
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libcroco-0.6.3.0.1.dylib";
-    #elif defined WNT
-    Name = "libcroco-0.6-3.dll";
-    #endif
-End
-#endif
-
-#if ! defined LIBO_HEADLESS
-#if ! defined SYSTEM_PANGO
-File gid_File_Lib_Libpango
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpango-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangolo.dll";
-    #endif
-End
-File gid_File_Lib_Libpangocairo
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpangocairo-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangocairolo.dll";
-    #endif
-End
-#if defined WNT
-File gid_File_Lib_Libpangowin32
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "pangowin32lo.dll";
-End
-#endif
-#endif
-#endif
-
-#if ! defined SYSTEM_LIBGSF
-File gid_File_Lib_Libgsf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-#ifdef WNT
-    Name = "gsf-1.dll";
-#endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBRSVG
-File gid_File_Lib_Librsvg
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "librsvg-2.2.dylib";
-    #elif defined WNT
-    Name = "librsvg-2-2.dll";
-    #endif
-End
-#endif
-
-#endif // #if ENABLE_LIBRSVG
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sellangmsi
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ea102c302fdb..eaf929478a1f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -430,9 +430,7 @@ End
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_Report, report )
 STD_JAR_FILE( gid_File_Jar_Table, table )
-STD_JAR_FILE( gid_File_Jar_Letter, letter )
 STD_JAR_FILE( gid_File_Jar_Form, form )
-STD_JAR_FILE( gid_File_Jar_Fax, fax )
 STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
 STD_JAR_FILE( gid_File_Jar_Query, query )
 STD_JAR_FILE( gid_File_Jar_Web, web )
@@ -474,12 +472,6 @@ End
 
 #endif
 
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_SAXON
-STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
-#endif
-#endif
-
 #ifndef AIX
 #ifndef DISABLE_PYUNO
 
@@ -492,7 +484,13 @@ End
 File gid_File_Wizards_Fax
     Dir = gid_Dir_Wizards_Fax;
     ARCHIVE_TXT_FILE_BODY;
-    Name = "pyfax.zip";
+    Name = "fax.zip";
+End
+
+File gid_File_Wizards_Letter
+    Dir = gid_Dir_Wizards_Letter;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "letter.zip";
 End
 
 #endif
@@ -740,7 +738,7 @@ End
 #endif
 #endif
 
-// new user interface configuration files
+// user interface configuration files
 File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
     TXT_FILE_BODY;
     Styles = (ARCHIVE);
@@ -749,6 +747,14 @@ File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
     Patchfiles = ();
 End
 
+// user interface configuration file translations
+File gid_File_Share_Config_Sofficecfg_uiconfig_Zip_Lang
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE);
+    Dir = gid_Dir_Share_Config_Sofficecfg;
+    EXTRA_ALL_LANG_BUT_EN_US(uiconfig,zip);
+End
+
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 7124530a3ddd..17d1139cb003 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -73,13 +73,7 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, MINGW_DB_DLL )
 #endif
 #endif
 
-#ifdef SYSTEM_CURL
-#ifdef NEEDS_MINGW_INTL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl,     MINGW_INTL_DLL )
-#endif
-#ifdef NEEDS_MINGW_IDN_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn,       MINGW_IDN_DLL )
-#endif
+#if defined SYSTEM_CURL || defined SYSTEM_NSS
 #ifdef NEEDS_MINGW_NSPR4_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr,     MINGW_NSPR4_DLL )
 #endif
@@ -98,12 +92,24 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_nss,         MINGW_NSS3_DLL )
 #ifdef NEEDS_MINGW_SSL3_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl,         MINGW_SSL3_DLL )
 #endif
+#ifdef NEEDS_MINGW_SMIME3_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_smime,         MINGW_SMIME3_DLL )
+#endif
+#endif
+
+#ifdef SYSTEM_CURL
 #ifdef NEEDS_MINGW_GPG_ERROR_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, MINGW_GPG_ERROR_DLL )
 #endif
 #ifdef NEEDS_MINGW_GCRYPT_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt,   MINGW_GCRYPT_DLL )
 #endif
+#ifdef NEEDS_MINGW_INTL_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl,     MINGW_INTL_DLL )
+#endif
+#ifdef NEEDS_MINGW_IDN_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn,       MINGW_IDN_DLL )
+#endif
 #ifdef NEEDS_MINGW_SSH2_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh,      MINGW_SSH2_DLL )
 #endif
@@ -136,12 +142,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL )
 #endif
 #endif
 
-#ifdef SYSTEM_MINIZIP
-#ifdef NEEDS_MINGW_MINIZP_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libminizip, MINGW_MINIZIP_DLL )
-#endif
-#endif
-
 #ifdef SYSTEM_NEON
 #ifdef NEEDS_MINGW_TASN1_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn,   MINGW_TASN1_DLL )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4085de195d89..671264880469 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -137,7 +137,6 @@ Module gid_Module_Root_Files_3
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root3,
-	gid_File_Jar_Saxon,
 	gid_File_Jar_Unoil,
 	gid_File_Jar_Hsqldb,
 	gid_File_Jar_Hsqldb_Sdbc,
@@ -306,32 +305,6 @@ Module gid_Module_Root_Files_5
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root5,
-#if ! defined SYSTEM_GETTEXT
-    gid_File_Lib_Intl,
-#endif
-#if ! defined SYSTEM_GLIB
-    gid_File_Lib_Glib,
-    gid_File_Lib_Gobject,
-    gid_File_Lib_Gthread,
-    gid_File_Lib_Gmodule,
-    gid_File_Lib_Gio,
-#endif
-#if ! defined SYSTEM_GDKPIXBUF
-    gid_File_Lib_Gdkpixbuf,
-#endif
-#if ! defined SYSTEM_LIBCROCO
-    gid_File_Lib_Libcroco,
-#endif
-#if ! defined SYSTEM_PANGO
-    gid_File_Lib_Libpango,
-    gid_File_Lib_Libpangocairo,
-#ifdef WNT
-    gid_File_Lib_Libpangowin32,
-#endif
-#endif
-#if ! defined SYSTEM_LIBGSF
-    gid_File_Lib_Libgsf,
-#endif
 	gid_File_Lib_Dict_Ja,
 	gid_File_Lib_Dict_Zh,
     gid_File_Lib_Collator_Data,
@@ -339,6 +312,7 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Textconv_Dict,
 	gid_File_Lib_Basprov,
 	gid_File_Lib_Configmgr,
+	gid_File_Lib_Losessioninstall,
 	gid_File_Lib_Crypto,
 	gid_File_Lib_Dlgprov,
 	gid_File_Lib_Stringresource,
@@ -792,7 +766,21 @@ Module gid_Module_Root_Fonts_OOo_Hidden
 	gid_File_Fnt_LiberationSerif_Bold,
 	gid_File_Fnt_LiberationSerif_BoldItalic,
 	gid_File_Fnt_LiberationSerif_Italic,
-	gid_File_Fnt_LiberationSerif_Regular);
+	gid_File_Fnt_LiberationSerif_Regular
+	gid_File_Fnt_PtSerif_Regular
+	gid_File_Fnt_PtSerif_Bold
+	gid_File_Fnt_PtSerif_Italic
+	gid_File_Fnt_PtSerif_BoldItalic
+	gid_File_Fnt_OpenSans_Regular
+	gid_File_Fnt_OpenSans_Bold
+	gid_File_Fnt_OpenSans_Italic
+	gid_File_Fnt_OpenSans_BoldItalic
+	gid_File_Fnt_SourceSans_Regular
+	gid_File_Fnt_SourceSans_Bold
+	gid_File_Fnt_SourceSans_Italic
+	gid_File_Fnt_SourceSans_BoldItalic
+	gid_File_Fnt_SourceCode_Regular
+	gid_File_Fnt_SourceCode_Bold);
 End
 #endif
 
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 213b00ec69a8..9a85f8884988 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -30,7 +30,8 @@ Module gid_Module_Langpack_Basis_Template
     Name = "gid_Module_Langpack_Root_Template";
     Description = "gid_Module_Langpack_Root_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Extra_Autotextshare_Lang,
+    Files = (gid_File_Share_Config_Sofficecfg_uiconfig_Zip_Lang,
+             gid_File_Extra_Autotextshare_Lang,
              gid_File_Registry_Filter_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 0df44d301f75..c6f7c29052cc 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -91,13 +91,6 @@ End
 
 #endif
 
-Shortcut gid_Shortcut_Lib_Libcroco
-    FileID = gid_File_Lib_Libcroco;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "libcroco-0.6.3.dylib";
-    Styles = (NETWORK, RELATIVE);
-End
-
 #endif
 
 //i44154 -end-
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index be2c52f4d78f..a53ddcb6abb6 100644..100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -592,7 +592,7 @@ End
 File gid_File_Lib_Cli_Cppuhelper_Assembly
     TXT_FILE_BODY;
     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_cppuhelper.dll";
+    Name = "assembly/cli_cppuhelper.dll";
     Dir = SCP2_URE_DL_DIR;
     Assemblyname = "cli_cppuhelper";
     PublicKeyToken = "ce2cb7e279207b9e";