Merge branch 'DEV300_m106' into libreoffice-3-4

Conflicts:
Module_ooo.mk
Repository.mk
configure
configure.in
ooo.lst
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
solenv/config/sdev300.ini
solenv/config/ssolar.cmn
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/JunitTest.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/Module.mk
solenv/gbuild/Output.mk
solenv/gbuild/SdiTarget.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/inc/minor.mk

6 files changed, 220 insertions, 8 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 7321ca2a2d8c..95c7ea2c20a1 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1786,6 +1786,153 @@ STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
 STD_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
+// RSVG and dependencies
+#if ! defined (SYSTEM_GETTEXT)
+File gid_File_Lib_Intl
+    TXT_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_GLIB
+File gid_File_Lib_Glib
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+    Name = "libglib-2.0.0.dylib";
+    #elif defined WNT
+    Name = "libglib-2.0-0.dll";
+    #endif
+End
+File gid_File_Lib_Gthread
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+    Name = "libgthread-2.0.0.dylib";
+    #elif defined WNT
+    Name = "libgthread-2.0-0.dll";
+    #endif
+End
+File gid_File_Lib_Gobject
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+    Name = "libgobject-2.0.0.dylib";
+    #elif defined WNT
+    Name = "libgobject-2.0-0.dll";
+    #endif
+End
+File gid_File_Lib_Gio
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+    Name = "libgio-2.0.0.dylib";
+    #elif defined WNT
+    Name = "libgio-2.0-0.dll";
+    #endif
+End
+File gid_File_Lib_Gmodule
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+    Name = "libgmodule-2.0.0.dylib";
+    #elif defined WNT
+    Name = "libgmodule-2.0-0.dll";
+    #endif
+End
+#endif
+
+#if ! defined SYSTEM_GDKPIXBUF
+File gid_File_Lib_Gdkpixbuf
+    TXT_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
+    TXT_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 SYSTEM_PANGO
+File gid_File_Lib_Libpango
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+    Name = "libpango-1.0.0.dylib";
+    #elif defined WNT
+    Name = "libpango-1.0-0.dll";
+    #endif
+End
+File gid_File_Lib_Libpangocairo
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+    Name = "libpangocairo-1.0.0.dylib";
+    #elif defined WNT
+    Name = "libpangocairo-1.0-0.dll";
+    #endif
+End
+#if defined WNT
+File gid_File_Lib_Libpangowin32
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = "libpangowin32-1.0-0.dll";
+End
+#endif
+#endif
+
+#if ! defined SYSTEM_LIBGSF
+File gid_File_Lib_Libgsf
+    TXT_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
+    TXT_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
 
 #ifdef WNT
 File gid_File_Lib_sellangmsi
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 65769d268113..277308160d3f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2159,3 +2159,4 @@ End
 //    UnixRights = 444;
 // End
 // #endif
+
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 86ef48cc2667..db402e7278ce 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -250,6 +250,38 @@ SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\"
 SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\"
 .ENDIF
 
+.IF "$(SYSTEM_GDKPIXBUF)" == "YES"
+SCPDEFS+=-DSYSTEM_GDKPIXBUF
+.ENDIF
+
+.IF "$(SYSTEM_GETTEXT)" == "YES"
+SCPDEFS+=-DSYSTEM_GETTEXT
+.ENDIF
+
+.IF "$(SYSTEM_GLIB)" == "YES"
+SCPDEFS+=-DSYSTEM_GLIB
+.ENDIF
+
+.IF "$(SYSTEM_LIBCROCO)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBCROCO
+.ENDIF
+
+.IF "$(SYSTEM_LIBJPEG)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBJPEG
+.ENDIF
+
+.IF "$(SYSTEM_LIBRSVG)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBRSVG
+.ENDIF
+
+.IF "$(SYSTEM_PANGO)" == "YES"
+SCPDEFS+=-DSYSTEM_PANGO
+.ENDIF
+
+.IF "$(SYSTEM_LIBGSF)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBGSF
+.ENDIF
+
 .IF "$(ENABLE_LOMENUBAR)" == "TRUE"
 SCPDEFS+=-DENABLE_LOMENUBAR
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c27d21d2ea2d..3253f0099cc6 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -306,6 +306,32 @@ 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,
@@ -865,4 +891,3 @@ End
 //    Styles = (HIDDEN_ROOT);
 // End
 // #endif
-
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index cec7ed172b52..9f400afbbed0 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -87,6 +87,13 @@ Shortcut gid_Shortcut_Lib_Hsqldb_2
     Styles = (NETWORK, RELATIVE);
 End
 
+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/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 3426fc921e78..f35482e4dd39 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -210,12 +210,12 @@ End
 
 WindowsCustomAction gid_Customaction_Register_Extensions
 	Name = "RegisterExtensions";
-	Typ = "65";
+	Typ = "1025";
 	Source = "shlxtmsi.dll";
 	Target = "RegisterExtensions";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
+	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
 End
 
 WindowsCustomAction gid_Customaction_Remove_Extensions
@@ -273,8 +273,8 @@ WindowsCustomAction gid_Customaction_CopyExtensionData
     Source = "shlxtmsi.dll";
     Target = "copyExtensionData";
     Inbinarytable = 1;
-    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "RegisterExtensions");
-    Assignment2 = ("AdminExecuteSequence", "", "RegisterExtensions");
+    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+    Assignment2 = ("AdminExecuteSequence", "", "end");
 End
 
 WindowsCustomAction gid_Customaction_RegCleanOld
@@ -474,8 +474,8 @@ WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
 	Source = "rebase.dll";
 	Target = "RebaseLibrariesOnProperties";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+	Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
+	Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
 End
 
 WindowsCustomAction gid_Customaction_LookForRegisteredExtensions