resyncing to master

13 files changed, 71 insertions, 68 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 38fbd9610934..677bf2843386 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -186,6 +186,14 @@
         Styles  = (PACKED); \
     End
 
+#define BINFILTER_RES_FILE(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Name    = STRING(CONCAT3(name,en-US,.res)); \
+        Dir     = gid_Dir_Resource; \
+        Styles  = (PACKED); \
+    End
+
 #define BRAND_RES_FILE(id,name) \
     File id \
         TXT_FILE_BODY; \
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 580280561694..f225c3e3e849 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    TRANSLATIONS:translations i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    TRANSLATIONS:translations i18npool DESKTOP:setup_native DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index 951caadf69fb..140a430afd2e 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -58,17 +58,16 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
 STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
 STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
 STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
-
+STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
 STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
 STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
 
-STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
-STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
-STD_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
-STD_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
-STD_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
-STD_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
-STD_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
-STD_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
-STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
-STD_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
+BINFILTER_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index 4857ecf3804b..873652e6e16a 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -53,25 +53,15 @@ Module gid_Module_Optional_Binfilter
     gid_File_Lib_Bf_Wrapper,
     gid_File_Lib_Legacy_Binfilters,
     gid_File_Lib_Bf_Migratefilter,
-    gid_File_Lib_Bindet);
+    gid_File_Lib_Bindet,
+    gid_File_Res_Bf_Sch,
+    gid_File_Res_Bf_Svx,
+    gid_File_Res_Bf_Svt,
+    gid_File_Res_Bf_Frm,
+    gid_File_Res_Bf_Ofa,
+    gid_File_Res_Bf_Sc,
+    gid_File_Res_Bf_Sd,
+    gid_File_Res_Bf_Sm,
+    gid_File_Res_Bf_Sw,
+    gid_File_Res_Bf_Sfx);
 End
-
-Module gid_Module_Langpack_Binfilter_Template
-    ParentID = gid_Module_Optional_Binfilter;
-    Name = "gid_Module_Langpack_Binfilter_Template";
-    Description = "gid_Module_Langpack_Binfilter_Template";
-    Default = YES;
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Bf_Sch,
-             gid_File_Res_Bf_Svx,
-             gid_File_Res_Bf_Svt,
-             gid_File_Res_Bf_Frm,
-             gid_File_Res_Bf_Ofa,
-             gid_File_Res_Bf_Sc,
-             gid_File_Res_Bf_Sd,
-             gid_File_Res_Bf_Sm,
-             gid_File_Res_Bf_Sw,
-             gid_File_Res_Bf_Sfx);
-End
-
-#include "alllangmodules_binfilter.inc"
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index 4c38d168ac96..c5e1f133a9b1 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -42,9 +42,13 @@ SCP_PRODUCT_TYPE=osl
 PARFILES= canvascommons.par		\
           vclcanvas.par         \
 
-.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
 PARFILES+= cairocanvas.par
 .ENDIF
+.ENDIF
+
 .IF "$(ENABLE_DIRECTX)" != ""
 .IF "$(USE_DIRECTX5)" != ""
 SCPDEFS+=-DUSE_DIRECTX5
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8e08d6980bd6..6809f7422b7d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -54,6 +54,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Crashreport_Script,
              gid_Brand_File_Bin_Crashreport_Com,
              gid_Brand_File_Bin_Python,
+             gid_Brand_File_Gdb_Trace,
              gid_Brand_File_Bin_Soffice,
              gid_Brand_File_Bin_Soffice_Bin,
              gid_Brand_File_Bin_Soffice_Bin_Manifest,
@@ -483,6 +484,17 @@ File gid_Brand_File_Html_Thirdpartylicensereadme
     TXT_FILE_BODY;
 End
 
+#if defined UNX
+
+File gid_Brand_File_Gdb_Trace
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = gdbtrace;
+    Styles = (PACKED);
+End
+
+#endif
+
 File gid_Brand_File_Bin_Soffice
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -1084,7 +1096,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl
     Section = "Version";
     Order = 15;
     Key = "UpdateURL";
-  #if defined(BUILD_SPECIAL)
+  #if defined(ENABLE_ONLINE_UPDATE)
   #ifdef WNT
     Value = "${UPDATEURL}";
   #else  // defined WNT
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 9474eb4357e5..98d25ec51752 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -503,7 +503,7 @@ File gid_File_Lib_Desktopbe
     Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
 End
 
-#ifdef ENABLE_GTK
+#if defined(ENABLE_GTK) && !defined(ENABLE_GTK3)
 #ifdef GTK_TWO_FOUR
 File gid_File_Lib_Fps_Gnome
     TXT_FILE_BODY;
@@ -572,7 +572,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 
 
-#if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO))
+#ifndef SYSTEM_CAIRO
 
 File gid_File_Lib_Cairo
     TXT_FILE_BODY;
@@ -593,6 +593,8 @@ File gid_File_Lib_Cairo
   #endif
 End
 
+#ifndef WNT
+
 File gid_File_Lib_Pixman
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -603,13 +605,13 @@ File gid_File_Lib_Pixman
     #else
        Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
     #endif
-  #elif defined(WNT)
-    Name = "libpixman-1-0.dll";
   #endif
 End
 
 #endif
 
+#endif
+
 STD_LIB_FILE( gid_File_Lib_Frm , frm)
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
@@ -898,6 +900,8 @@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
 
 STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 
+STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
+
 #ifdef WNT
 #if defined(_gcc3)
 
@@ -1006,8 +1010,6 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Preload, preload)
-
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
 
 #if defined(UNX) && ! defined(QUARTZ)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 28891ed60f1d..fb85ddf0f8ba 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1746,15 +1746,6 @@ File gid_File_Config_Javasettingsunopkginstall
   #endif
 End
 
-#ifdef ENABLE_SVCTAGS
-File gid_File_Jar_Productregistration
-    TXT_FILE_BODY;
-    Name = "productregistration.jar";
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED);
-End
-#endif
-
 #ifdef THEME_DEFAULT
 File gid_File_Images_Zip
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index cbd8ff609721..7cfbb4fc2df5 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -66,8 +66,6 @@ STD_RES_FILE( gid_File_Res_Pcr, pcr)
 
 STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
 
-STD_RES_FILE( gid_File_Res_Preload, preload)
-
 STD_RES_FILE( gid_File_Res_Productregistration, productregistration)
 
 #ifdef UNX
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index f27828489d64..8fc9ad5a924b 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC
 SCPDEFS+=-DBUILD_SPECIAL
 .ENDIF
 
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
+SCPDEFS+=-DENABLE_ONLINE_UPDATE
+.ENDIF
+
 .IF "$(BUILD_X64)"!=""
 SCPDEFS+=-DBUILD_X64
 .ENDIF
@@ -91,18 +95,17 @@ SCPDEFS+=-DENABLE_EVOAB2
 SCPDEFS+=-DENABLE_DIRECTX
 .ENDIF
 
-.IF "$(SYSTEM_FREETYPE)" == "YES"
-SCPDEFS+=-DSYSTEM_FREETYPE
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
+SCPDEFS+=-DENABLE_CAIROCANVAS
+.ENDIF
 .ENDIF
 
 .IF "$(SYSTEM_CAIRO)" == "YES"
 SCPDEFS+=-DSYSTEM_CAIRO
 .ENDIF
 
-.IF "$(ENABLE_CAIRO)" == "YES"
-SCPDEFS+=-DENABLE_CAIRO
-.ENDIF
-
 .IF "$(SYSTEM_LIBXML)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBXML
 .ENDIF
@@ -180,11 +183,6 @@ SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
 SCPDEFS+=-DGCJ
 .ENDIF
 
-
-.IF "$(ENABLE_CAIRO)" == "TRUE"
-SCPDEFS+=-DENABLE_CAIRO
-.ENDIF
-
 .IF "$(SYSTEM_LUCENE)" == "YES"
 SCPDEFS+=-DSYSTEM_LUCENE
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4cf3c5825b59..f9f29be41a28 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -234,7 +234,6 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Pdffilter,
 	gid_File_Lib_Pk,
 	gid_File_Lib_Pl,
-	gid_File_Lib_Preload,
 	gid_File_Lib_Sf_Prothdlr,
 	gid_File_Lib_Psp,
 	gid_File_Lib_Res,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 60ee02b8b760..efc2d98db0e7 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -74,7 +74,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Ofa,
              gid_File_Res_Pcr,
              gid_File_Res_Pdffilter,
-             gid_File_Res_Preload,
              gid_File_Res_San,
              gid_File_Res_Productregistration,
              gid_File_Res_Sb,
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index af4861d10e1d..ff2037fa59ec 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -206,15 +206,18 @@ SCP1FILES += \
 SCP1FILES += \
              vclcanvas.par \
 
-.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
 SCP1FILES += cairocanvas.par
 .ENDIF
+.ENDIF
 
 .IF "$(ENABLE_LAYOUT)" == "TRUE"
 SCP1FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP1FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par
@@ -391,7 +394,7 @@ SCP2FILES += \
 SCP2FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP2FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par