Merge remote-tracking branch 'origin/master'

37 files changed, 373 insertions, 138 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index f6101b677464..38fbd9610934 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -326,24 +326,6 @@
         PACKED_LIB_FILE_BODY_PATCH; \
     End
 
-#define WINW4WFILTERFILENAME(name) STRING(CONCAT2(name,f32w.dll))
-
-#define STD_WIN_W4WFILTER_FILE(id,name) \
-    File id \
-        PACKED_FILTER_FILE_BODY; \
-        Name            = WINW4WFILTERFILENAME(name);  \
-    End
-
-#define SOLSW4WFILTERFILENAME(name) STRING(CONCAT2(w4w, name))
-
-#define STD_SOLS_W4WFILTER_FILE(id,name) \
-    File id \
-        BIN_FILE_BODY; \
-        Styles = (PACKED); \
-        Dir = gid_Dir_Filter; \
-        Name = SOLSW4WFILTERFILENAME(name); \
-    End
-
 #define SPECIAL_NO_WARNING_IF_NOT_EXISTS_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/prj/d.lst b/scp2/prj/d.lst
index 717c8c5b4f3e..37aaabbbae2a 100644
--- a/scp2/prj/d.lst
+++ b/scp2/prj/d.lst
@@ -1,27 +1,27 @@
-..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin%_EXT%\setup_osl.inf
-..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin%_EXT%\setup_osl.ins
-..\%__SRC%\bin\osl\ure.inf %_DEST%\bin%_EXT%\ure.inf
-..\%__SRC%\bin\osl\ure.ins %_DEST%\bin%_EXT%\ure.ins
-..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin%_EXT%\sdkoo.inf
-..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin%_EXT%\sdkoo.ins
-..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin%_EXT%\setup_osljre.inf
-..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin%_EXT%\setup_osljre.ins
+..\%__SRC%\bin\osl\setup_osl.inf %_DEST%\bin\setup_osl.inf
+..\%__SRC%\bin\osl\setup_osl.ins %_DEST%\bin\setup_osl.ins
+..\%__SRC%\bin\osl\ure.inf %_DEST%\bin\ure.inf
+..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
+..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
+..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
+..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
+..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
 
-mkdir: %_DEST%\par%_EXT%
+mkdir: %_DEST%\par
 
-mkdir: %_DEST%\par%_EXT%\osl
-mkdir: %_DEST%\par%_EXT%\fat
-mkdir: %_DEST%\par%_EXT%\fam
-mkdir: %_DEST%\par%_EXT%\ada
-mkdir: %_DEST%\par%_EXT%\adm
-mkdir: %_DEST%\par%_EXT%\omc
+mkdir: %_DEST%\par\osl
+mkdir: %_DEST%\par\fat
+mkdir: %_DEST%\par\fam
+mkdir: %_DEST%\par\ada
+mkdir: %_DEST%\par\adm
+mkdir: %_DEST%\par\omc
 
-..\%__SRC%\par\osl\*.par %_DEST%\par%_EXT%\osl\*.par
-..\%__SRC%\par\fat\*.par %_DEST%\par%_EXT%\fat\*.par
-..\%__SRC%\par\fam\*.par %_DEST%\par%_EXT%\fam\*.par
-..\%__SRC%\par\ada\*.par %_DEST%\par%_EXT%\ada\*.par
-..\%__SRC%\par\adm\*.par %_DEST%\par%_EXT%\adm\*.par
-..\%__SRC%\par\omc\*.par %_DEST%\par%_EXT%\omc\*.par
+..\%__SRC%\par\osl\*.par %_DEST%\par\osl\*.par
+..\%__SRC%\par\fat\*.par %_DEST%\par\fat\*.par
+..\%__SRC%\par\fam\*.par %_DEST%\par\fam\*.par
+..\%__SRC%\par\ada\*.par %_DEST%\par\ada\*.par
+..\%__SRC%\par\adm\*.par %_DEST%\par\adm\*.par
+..\%__SRC%\par\omc\*.par %_DEST%\par\omc\*.par
 
-..\inc\macros.inc %_DEST%\inc%_EXT%\macros.inc
-..\%__SRC%\inc\langmacros.inc %_DEST%\inc%_EXT%\langmacros.inc
+..\inc\macros.inc %_DEST%\inc\macros.inc
+..\%__SRC%\inc\langmacros.inc %_DEST%\inc\langmacros.inc
diff --git a/scp2/source/accessories/module_samples_accessories.ulf b/scp2/source/accessories/module_samples_accessories.ulf
index 42166a600afb..b6a0f5229786 100644
--- a/scp2/source/accessories/module_samples_accessories.ulf
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -284,10 +284,16 @@ en-US = "Lao"
 [STR_DESC_MODULE_LANGPACK_LO]
 en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_NS]
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_LANGPACK_NS]
+[STR_DESC_MODULE_LANGPACK_NSO]
 en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_BN]
@@ -428,10 +434,10 @@ en-US = "Ukrainian"
 [STR_DESC_MODULE_LANGPACK_UK]
 en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_BE_BY]
+[STR_NAME_MODULE_LANGPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_LANGPACK_BE_BY]
+[STR_DESC_MODULE_LANGPACK_BE]
 en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_SL]
diff --git a/scp2/source/accessories/module_templates_accessories.ulf b/scp2/source/accessories/module_templates_accessories.ulf
index 31411cb4743b..da17fc11244f 100644
--- a/scp2/source/accessories/module_templates_accessories.ulf
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -279,10 +279,16 @@ en-US = "Lao"
 [STR_DESC_MODULE_LANGPACK_LO]
 en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_NS]
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_LANGPACK_NS]
+[STR_DESC_MODULE_LANGPACK_NSO]
 en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_BN]
@@ -423,10 +429,10 @@ en-US = "Ukrainian"
 [STR_DESC_MODULE_LANGPACK_UK]
 en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_BE_BY]
+[STR_NAME_MODULE_LANGPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_LANGPACK_BE_BY]
+[STR_DESC_MODULE_LANGPACK_BE]
 en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_SL]
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 833ed3905241..833ed3905241 100755..100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 8220610ec5c3..8220610ec5c3 100755..100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
index fa2a3f908a49..fa2a3f908a49 100755..100644
--- a/scp2/source/canvas/mtfrenderer.scp
+++ b/scp2/source/canvas/mtfrenderer.scp
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index d722319649cd..d722319649cd 100755..100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
diff --git a/scp2/source/extensions/module_extensions_lightproof.ulf b/scp2/source/extensions/module_extensions_lightproof.ulf
index 944f4e745f34..b78fe12a00d7 100644
--- a/scp2/source/extensions/module_extensions_lightproof.ulf
+++ b/scp2/source/extensions/module_extensions_lightproof.ulf
@@ -274,10 +274,16 @@ en-US = "Lao"
 [STR_DESC_MODULE_LANGPACK_LO]
 en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_NS]
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_LANGPACK_NS]
+[STR_DESC_MODULE_LANGPACK_NSO]
 en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_BN]
@@ -418,10 +424,10 @@ en-US = "Ukrainian"
 [STR_DESC_MODULE_LANGPACK_UK]
 en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_BE_BY]
+[STR_NAME_MODULE_LANGPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_LANGPACK_BE_BY]
+[STR_DESC_MODULE_LANGPACK_BE]
 en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_SL]
diff --git a/scp2/source/extensions/module_extensions_sun_templates.ulf b/scp2/source/extensions/module_extensions_sun_templates.ulf
index 944f4e745f34..b78fe12a00d7 100644
--- a/scp2/source/extensions/module_extensions_sun_templates.ulf
+++ b/scp2/source/extensions/module_extensions_sun_templates.ulf
@@ -274,10 +274,16 @@ en-US = "Lao"
 [STR_DESC_MODULE_LANGPACK_LO]
 en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_NS]
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_LANGPACK_NS]
+[STR_DESC_MODULE_LANGPACK_NSO]
 en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_BN]
@@ -418,10 +424,10 @@ en-US = "Ukrainian"
 [STR_DESC_MODULE_LANGPACK_UK]
 en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_BE_BY]
+[STR_NAME_MODULE_LANGPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_LANGPACK_BE_BY]
+[STR_DESC_MODULE_LANGPACK_BE]
 en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_LANGPACK_SL]
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 581aae447a55..43c2440695a9 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -61,6 +61,10 @@ SCPDEFS+=-DENABLE_GNOMEVFS
 SCPDEFS+=-DENABLE_GIO
 .ENDIF
 
+.IF "$(ENABLE_GTK3)" != ""
+SCPDEFS+=-DENABLE_GTK3
+.ENDIF
+
 PARFILES =                   \
         module_gnome.par     \
         file_gnome.par
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 5572a26a64ef..8b84916172ac 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -44,6 +44,9 @@ Module gid_Module_Optional_Gnome
       gid_File_Lib_Evoab_2,
       gid_File_Lib_Fps_Gnome,
       gid_File_Lib_Vclplug_Gtk,
+#ifdef ENABLE_GTK3
+      gid_File_Lib_Vclplug_Gtk3,
+#endif
       gid_File_Bin_Gnome_Open_Url,
       gid_File_Bin_Gnome_Open_Url_Bin,
 #ifdef ENABLE_SYSTRAY_GTK
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index 35895bdd8254..15a18d297421 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -39,3 +39,5 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
 STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
 
 STD_FILTER_FILE( gid_File_Lib_WPGImport, wpgimport )
+
+STD_FILTER_FILE( gid_File_Lib_VisioImport, visioimport )
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index abfdb1537041..e3313c821db4 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -44,10 +44,7 @@ Module gid_Module_Prg_Impress_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
     gid_File_Share_Registry_Impress_Xcd,
-	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
- #if defined ENABLE_OPENGL
-     gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml,
- #endif
+    gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 063bcf91f4eb..063bcf91f4eb 100755..100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 3a72af6a4b77..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;
@@ -896,7 +908,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
   #elif defined MACOSX
     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #else
-    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #endif
 End
 
@@ -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/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 7860835c21a9..0393302ce14b 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -970,11 +970,6 @@ Directory gid_Dir_Share_Template_Wizard
     DosName = "wizard";
 End
 
-Directory gid_Dir_Share_Template_Layout
-    ParentID = gid_Dir_Template;
-    DosName = "layout";
-End
-
 Directory gid_Dir_Share_Template_Wizard_Bitmap
     ParentID = gid_Dir_Share_Template_Wizard;
     DosName = "bitmap";
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index ee4ad7522938..ab1138d70c44 100755..100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -34,9 +34,7 @@ Directory gid_Dir_Bundle
     LangPackHostName = "%PRODUCTNAME Language Pack.app";
     PatchHostName = "%PRODUCTNAME Patch.app";
 End
-#endif
 
-#ifdef MACOSX
 Directory gid_Dir_Bundle_Contents
     ParentID = gid_Dir_Bundle;
     HostName = "Contents";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 1beec8aad249..993161786c26 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -351,7 +351,7 @@ File gid_File_Extra_Tplpresntimpr_Lang
 End
 
 File gid_File_Extra_Tpllayoutimpr
-    Dir = gid_Dir_Share_Template_Layout;
+    Dir = gid_Dir_Template_Common_Layout;
     ARCHIVE_TXT_FILE_BODY;
     Name = "tpllayoutimpr.zip";
 End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b8bd6f7ef3c5..7965e1d75337 100755..100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -34,9 +34,6 @@ File gid_File_Lib_Accessbridge
     Name = "java_uno_accessbridge.dll";
 End
 #endif
-#if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
-STD_LIB_FILE( gid_File_Lib_Adabas, adabas)
-#endif
 
 #if defined(WNT)
 STD_LIB_FILE( gid_File_Lib_Ado, ado)
@@ -602,7 +599,7 @@ File gid_File_Lib_Pixman
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT3(libpixman-1,.0,UNXSUFFIX));
+       Name = "libpixman-1.a";
     #else
        Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
     #endif
@@ -803,17 +800,6 @@ End
 
 #ifdef WNT
 
-File gid_File_Lib_relnotes
-    BIN_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "relnotes.dll";
-End
-
-#endif
-
-#ifdef WNT
-
 File gid_File_Lib_Patchmsi
     TXT_FILE_BODY;
     Name = "patchmsi.dll";
@@ -1065,6 +1051,14 @@ File gid_File_Lib_Vclplug_Gtk
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
+#ifdef ENABLE_GTK3
+File gid_File_Lib_Vclplug_Gtk3
+    Name = LIBNAME(vclplug_gtk3);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
 #ifdef ENABLE_KDE
 #ifndef MACOSX
 File gid_File_Lib_Vclplug_Kde
@@ -1731,6 +1725,157 @@ 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 = "gliblo.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 = "gthreadlo.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 = "gobjectlo.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 = "giolo.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 = "gmodulelo.dll";
+    #endif
+End
+#endif
+
+#if ENABLE_LIBRSVG
+
+#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 = "pangolo.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 = "pangocairolo.dll";
+    #endif
+End
+#if defined WNT
+File gid_File_Lib_Libpangowin32
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = "pangowin32lo.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
+
+#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 0c618093bc85..28891ed60f1d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1173,21 +1173,29 @@ File gid_File_Share_Registry_Ctl_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
     Dir = gid_Dir_Share_Registry;
-    Name (th) = "ctl.xcd";
-    Name (hi-IN) = "ctl.xcd";
-    Name (pa-IN) = "ctl.xcd";
-    Name (ta-IN) = "ctl.xcd";
-    Name (gu-IN) = "ctl.xcd";
     Name (ar) = "ctl.xcd";
-    Name (he) = "ctl.xcd";
-    Name (lo) = "ctl.xcd";
     Name (dz) = "ctl.xcd";
-    Name (km) = "ctl.xcd";
-    Name (gu-IN) = "ctl.xcd";
-    Name (or) = "ctl.xcd";
-    Name (ne) = "ctl.xcd";
     Name (fa) = "ctl.xcd";
+    Name (gu) = "ctl.xcd";
+    Name (he) = "ctl.xcd";
+    Name (hi) = "ctl.xcd";
+    Name (km) = "ctl.xcd";
+    Name (lo) = "ctl.xcd";
     Name (my) = "ctl.xcd";
+    Name (ne) = "ctl.xcd";
+    Name (or) = "ctl.xcd";
+    Name (pa-IN) = "ctl.xcd";
+    Name (ta) = "ctl.xcd";
+    Name (th) = "ctl.xcd";
+End
+
+File gid_File_Share_Registry_Ctlseqcheck_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED,MAKE_LANG_SPECIFIC);
+    Dir = gid_Dir_Share_Registry;
+    Name (km) = "ctlseqcheck.xcd";
+    Name (lo) = "ctlseqcheck.xcd";
+    Name (th) = "ctlseqcheck.xcd";
 End
 
 File gid_File_Scripts_Beanshell
@@ -2133,3 +2141,4 @@ End
 //    UnixRights = 444;
 // End
 // #endif
+
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 1df99f36fb3e..1504a2ac14f0 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
@@ -66,6 +70,9 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
 SCPDEFS+=-DGTK_TWO_FOUR
 .ENDIF
 .ENDIF
+.IF "$(ENABLE_GTK3)" != ""
+SCPDEFS+=-DENABLE_GTK3
+.ENDIF
 .ENDIF			# "$(GUI)"=="UNX"
 
 .IF "$(ENABLE_KDE)" != ""
@@ -246,6 +253,42 @@ 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 "$(ENABLE_LIBRSVG)" == "INTERNAL"
+SCPDEFS+=-DENABLE_LIBRSVG
+.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_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
index 64604c3cf424..b9bb3616fabd 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -271,10 +271,10 @@ en-US = "Lao"
 [STR_DESC_MODULE_HELPPACK_LO]
 en-US = "Installs Lao help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_NS]
+[STR_NAME_MODULE_HELPPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_HELPPACK_NS]
+[STR_DESC_MODULE_HELPPACK_NSO]
 en-US = "Installs Northern Sotho help in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_HELPPACK_BN]
@@ -421,10 +421,10 @@ en-US = "Ukrainian"
 [STR_DESC_MODULE_HELPPACK_UK]
 en-US = "Installs Ukrainian help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_BE_BY]
+[STR_NAME_MODULE_HELPPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_HELPPACK_BE_BY]
+[STR_DESC_MODULE_HELPPACK_BE]
 en-US = "Installs Belarusian help in %PRODUCTNAME %PRODUCTVERSION"
 
 [STR_NAME_MODULE_HELPPACK_SL]
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4e4fbb9fe678..d2d46cd9f1e0 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -303,6 +303,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,
@@ -430,7 +456,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Lomenubar,
 #endif
     gid_File_Lib_sn_tools,
-    gid_File_Lib_relnotes,
     GID_FILE_LIB_WPD,
     gid_File_Lib_Mingw_GccS,
     gid_File_Lib_Mingw_Stdcpp,
@@ -862,4 +887,3 @@ End
 //    Styles = (HIDDEN_ROOT);
 // End
 // #endif
-
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index f801a6201dc6..60ee02b8b760 100755..100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -41,6 +41,7 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
              gid_File_Share_Registry_Ctl_Xcd,
+             gid_File_Share_Registry_Ctlseqcheck_Xcd,
              gid_File_InfoPlist_Lang);
     Dirs = (gid_Dir_Samples_Language);
 End
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3f9e27bf1784..7e1f9e6e8d3e 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -271,10 +271,16 @@ en-US = "Lao"
 [STR_DESC_MODULE_LANGPACK_LO]
 en-US = "Installs the Lao user interface"
 
-[STR_NAME_MODULE_LANGPACK_NS]
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs the Burmese (Myanmar) user interface"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_LANGPACK_NS]
+[STR_DESC_MODULE_LANGPACK_NSO]
 en-US = "Installs the Northern Sotho user interface"
 
 [STR_NAME_MODULE_LANGPACK_BN]
@@ -421,10 +427,10 @@ en-US = "Ukrainian"
 [STR_DESC_MODULE_LANGPACK_UK]
 en-US = "Installs the Ukrainian user interface"
 
-[STR_NAME_MODULE_LANGPACK_BE_BY]
+[STR_NAME_MODULE_LANGPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_LANGPACK_BE_BY]
+[STR_DESC_MODULE_LANGPACK_BE]
 en-US = "Installs the Belarusian user interface"
 
 [STR_NAME_MODULE_LANGPACK_SL]
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 3142ac6e0e20..293878bc9e71 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -149,7 +149,7 @@ Module gid_Module_Root_Extension_Dictionary_En
     Files = (gid_File_Extension_Dictionary_En);
     InstallOrder = "2000";
     Sortkey = "550";
-    Spellcheckerlanguage = "en-US";
+    Spellcheckerlanguage = "en";
     PackageInfo = "packinfo_office.txt";
     ParentID = gid_Module_Dictionaries;
     Styles = ();
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/ure.scp b/scp2/source/ooo/ure.scp
index 6d61daff3df0..6d61daff3df0 100755..100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 397d8fd8f2da..397d8fd8f2da 100755..100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index 8579139f95e3..8579139f95e3 100755..100644
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index dd0874492ec9..f35482e4dd39 100755..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
@@ -459,24 +459,6 @@ WindowsCustomAction gid_Customaction_CheckVersions
 	Assignment2 = ("InstallUISequence", "NOT Installed", "NewProductFound");
 End
 
-WindowsCustomAction gid_Customaction_ShowReleaseNotes1
-	Name = "ShowReleaseNotesBefore";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowReleaseNotesBefore";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "behind_InstallValidate");
-End
-
-WindowsCustomAction gid_Customaction_ShowReleaseNotes2
-	Name = "ShowReleaseNotesAfter";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowReleaseNotesAfter";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
-End
-
 WindowsCustomAction gid_Customaction_SelectLanguage
     Name = "SelectLanguage";
     Typ = "321";
@@ -492,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
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 32b151633f67..ea6502445a66 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,9 +27,9 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE( gid_File_Lib_Swd , swd)
+STD_LIB_FILE(gid_File_Lib_Swd, swd)
 
-SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
+STD_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
 
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 3071059f282b..e66214bbc71c 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -51,6 +51,7 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Lib_Wpft,
     gid_File_Lib_Msworks,
     gid_File_Lib_T602Filter,
+    gid_File_Lib_Writerfilter,
     gid_File_Lib_Wlwp,
     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
     gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 6e3d9741430b..6e3d9741430b 100755..100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index a7873d180bbf..90306993b11f 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -215,7 +215,7 @@ SCP1FILES += cairocanvas.par
 SCP1FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP1FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par
@@ -392,7 +392,7 @@ SCP2FILES += \
 SCP2FILES += layout.par
 .ENDIF # ENABLE_LAYOUT == TRUE
 
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCP2FILES += \
              module_onlineupdate.par   \
              file_onlineupdate.par