Attachment 57588 Details for Bug 46506 – scp2 module tarball diff

scp2 module tarball diff

scp2-tarball.diff (text/plain), 443.49 KB, created by Tomáš Chvátal on 2012-02-24 04:59:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomáš Chvátal

Created: 2012-02-24 04:59:47 UTC

Size: 443.49 KB

patch

obsolete

>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//inc/macros.inc scp2//inc/macros.inc
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//inc/macros.inc	2012-02-24 13:17:24.280783969 +0100
>+++ scp2//inc/macros.inc	2012-02-24 13:39:12.640661266 +0100
>@@ -85,15 +85,14 @@
> #define EXTRAFILENAME(name,lang)              STRING(CONCAT3(name,lang,.zip))
> #define CONFIGLANGFILENAME(name,lang,ext)     STRING(CONCAT4(name,lang,.,ext))
> 
>-#if defined WNT
> #define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
>-#else
>-#define SCP2_OOO_BIN_DIR gid_Dir_Program
>-#endif
> 
> #define BIN_FILE_BODY \
>         UnixRights   = 755
> 
>+#define LIB_FILE_BODY \
>+        UnixRights   = 755
>+
> #define TXT_FILE_BODY \
>         UnixRights   = 644
> 
>@@ -135,12 +134,12 @@
>         Styles = (ARCHIVE,SUBSTITUTE,PATCH)
> 
> #define PACKED_LIB_FILE_BODY \
>-        TXT_FILE_BODY; \
>+        LIB_FILE_BODY; \
>         Styles = (PACKED); \
>         Dir    = SCP2_OOO_BIN_DIR
> 
> #define PACKED_LIB_FILE_BODY_PATCH \
>-        TXT_FILE_BODY; \
>+        LIB_FILE_BODY; \
>         Styles = (PACKED,PATCH); \
>         Dir    = SCP2_OOO_BIN_DIR
> 
>@@ -186,11 +185,11 @@
>         Styles  = (PACKED); \
>     End
> 
>-#define BRAND_RES_FILE(id,name) \
>+#define BINFILTER_RES_FILE(id,name) \
>     File id \
>         TXT_FILE_BODY; \
>-        RESFILE_ALL_LANG(name); \
>-        Dir     = gid_Brand_Dir_Program_Resource; \
>+        Name    = STRING(CONCAT3(name,en-US,.res)); \
>+        Dir     = gid_Dir_Resource; \
>         Styles  = (PACKED); \
>     End
> 
>@@ -284,6 +283,14 @@
>     End
> #endif
> 
>+#define STD_PY_FILE(id,name,dir) \
>+    File id \
>+        TXT_FILE_BODY; \
>+        Name     = STRING(CONCAT2(name,.py)); \
>+        Dir      = dir; \
>+        Styles   = (PACKED,DONT_OVERWRITE); \
>+    End
>+
> #define STD_JAR_FILE(id,name) \
>     File id \
>         TXT_FILE_BODY; \
>@@ -326,24 +333,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; \
>@@ -402,7 +391,7 @@
>         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
>         ModuleID = modid; \
>         Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
>-        Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
>+        Value = "<progpath>\program\soffice.bin," STRING(icon_id); \
>     End
> 
> #define REGISTRY_ENTRY_SHELL(name,default,modid) \
>@@ -499,6 +488,8 @@
> 
> // ---------------------------------------
> 
>+#ifdef _MSC_VER
>+
> #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
>     RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
>         ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
>@@ -510,12 +501,17 @@
>         Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
>     End
> 
>+#else
>+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty
>+#endif
>+
> // ---------------------------------------
> 
> #if defined WNT
> #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
> #define SCP2_URE_DL_NORMAL(n) n ".dll"
> #define SCP2_URE_DL_BARE(n) n ".dll"
>+#if defined _MSC_VER
> #define SCP2_URE_DL_VER(n, v) n v ".dll"
> #define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
> #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
>@@ -527,6 +523,16 @@
> #else
> #define SCP2_STDLP_DEBUG ""
> #endif
>+#else // GCC
>+#define SCP2_URE_DL_VER(n, v) n v ".dll"
>+#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
>+#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
>+#define SCP2_URE_DL_UNO_VER(n, v) "uno_" n v ".dll"
>+#define SCP2_URE_DL_UNO_COMID_VER(n, v)	\
>+    "uno_" n STRING(COMID) v ".dll"
>+#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
>+#define SCP2_STDLP_DEBUG ""
>+#endif
> #else
> #define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
> #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//macros/macro.pl scp2//macros/macro.pl
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//macros/macro.pl	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//macros/macro.pl	2011-09-13 16:39:36.063306253 +0200
>@@ -1,7 +1,7 @@
> #*************************************************************************
> #
> # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>-# 
>+#
> # Copyright 2000, 2010 Oracle and/or its affiliates.
> #
> # OpenOffice.org - a multi-platform office productivity suite
>@@ -286,7 +286,7 @@
>                 $lastcompletelangiso_var =~ s/^\/\/.*completelangiso:\s*//;
>                 last;
>             }
>-                
>+
>         }
>         close OLDFILE;
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//prj/build.lst scp2//prj/build.lst
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//prj/build.lst	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//prj/build.lst	2012-02-24 13:39:12.640661266 +0100
>@@ -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
>@@ -14,17 +14,17 @@
> cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros cp_langtemplates NULL
> cp    scp2\source\javafilter      nmake    -    all    cp_javafilter cp_langmacros cp_langtemplates NULL
> cp    scp2\source\kde             nmake    -    all    cp_kde cp_langmacros cp_langtemplates NULL
>-cp    scp2\source\layout          nmake    -    all    cp_layout cp_langmacros NULL
> cp    scp2\source\math            nmake    -    all    cp_math cp_langmacros cp_langtemplates NULL
> cp    scp2\source\ooo             nmake    -    all    cp_ooo cp_langmacros cp_langtemplates NULL
> cp    scp2\source\python          nmake    -    all    cp_python cp_langmacros cp_langtemplates NULL
> cp    scp2\source\quickstart      nmake    -    all    cp_quickstart cp_langmacros cp_langtemplates NULL
> cp    scp2\source\sdkoo           nmake    -    all    cp_sdkoo cp_langmacros cp_langtemplates NULL
>-cp    scp2\source\testtool        nmake    -    all    cp_testtool cp_langmacros cp_langtemplates NULL
>+cp    scp2\source\smoketest       nmake    -    all    cp_smoketest cp_langmacros cp_langtemplates NULL
>+cp    scp2\source\stdlibs         nmake    -    all    cp_stdlibs cp_langmacros cp_langtemplates NULL
> cp    scp2\source\writer          nmake    -    all    cp_writer cp_langmacros cp_langtemplates NULL
> cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_langtemplates NULL
> cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
> cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
> cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
> cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
>-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
>+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_smoketest cp_stdlibs cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//prj/d.lst scp2//prj/d.lst
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//prj/d.lst	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//prj/d.lst	2011-12-05 16:23:33.965716511 +0100
>@@ -1,27 +1,29 @@
>-..\%__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\test.inf %_DEST%\bin\test.inf
>+..\%__SRC%\bin\osl\test.ins %_DEST%\bin\test.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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/accessories/makefile.mk scp2//source/accessories/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/accessories/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/accessories/makefile.mk	2011-11-29 09:56:02.924323818 +0100
>@@ -28,8 +28,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=accessories
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/accessories/module_accessories.scp scp2//source/accessories/module_accessories.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/accessories/module_accessories.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/accessories/module_accessories.scp	2011-11-15 12:07:35.878246095 +0100
>@@ -28,6 +28,8 @@
> 
> #include "macros.inc"
> 
>+#if defined(WITH_EXTRA_FONT) || defined(WITH_EXTRA_GALLERY) || defined(WITH_EXTRA_SAMPLE) || defined(WITH_EXTRA_TEMPLATE)
>+
> Module gid_Module_Optional_Accessories
>     ParentID = gid_Module_Optional;
>     Files = (
>@@ -38,3 +40,4 @@
>     MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
> End
> 
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/activex/file_activex.scp scp2//source/activex/file_activex.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/activex/file_activex.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/activex/file_activex.scp	2011-12-05 16:23:33.965716511 +0100
>@@ -30,7 +30,7 @@
> #ifdef WITH_ACTIVEX_COMPONENT
> 
> File gid_File_Lib_Soactivex
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "so_activex.dll";
>@@ -38,7 +38,7 @@
> 
> #ifdef BUILD_X64
> 	File gid_File_Lib_Soactivex64
>-		TXT_FILE_BODY;
>+		LIB_FILE_BODY;
> 		Styles = (PACKED);
> 		Dir = SCP2_OOO_BIN_DIR;
> 		Name = "so_activex_x64.dll";
>@@ -47,14 +47,14 @@
> #endif
> 
> File gid_File_Lib_Regactivex_Msi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "regactivex.dll";
> End
> 
> File gid_File_Lib_Regpatchactivex_Msi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "regpatchactivex.dll";
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/activex/makefile.mk scp2//source/activex/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/activex/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/activex/makefile.mk	2011-11-29 09:56:02.924323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=activex
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/file_base.scp scp2//source/base/file_base.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/file_base.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/base/file_base.scp	2012-02-24 13:38:59.905662460 +0100
>@@ -42,7 +42,7 @@
> #if defined WNT
> File gid_File_Exe_Odbcconfig
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = EXENAME(odbcconfig);
>     Styles = (PACKED);
> End
>@@ -72,16 +72,18 @@
> 
> STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
> 
>+#if defined WITH_HELP
> File gid_File_Help_Sdatabase_Zip
>     Dir = gid_Dir_Help_Isolanguage;
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
>     Patchfiles = (); 
> End
>+#endif
> 
> File gid_File_Share_Registry_Base_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "base.xcd";
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/folderitem_base.scp scp2//source/base/folderitem_base.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/folderitem_base.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/base/folderitem_base.scp	2011-11-23 11:35:42.325833796 +0100
>@@ -27,16 +27,17 @@
> 
> #include "macros.inc"
> 
>+#ifndef ENABLE_SILENT_MSI
> FolderItem gid_Folderitem_Sbase
>     Name = "%PRODUCTNAME Base";
>-    Name (pt-BR) = "%PRODUCTNAME_BR Base";
>     ModuleID = gid_Module_Prg_Base_Bin;
>     FolderID = gid_Folder_Staroffice51;
>     FileID = gid_File_Exe_Sbase;
>     IconFile = gid_File_Exe_Sbase;
>     IconID = 0;
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>     Styles = (NOWEB, NON_ADVERTISED);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
> End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/makefile.mk scp2//source/base/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/base/makefile.mk	2012-02-24 13:39:12.640661266 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=base
> TARGETTYPE=CUI
>@@ -45,7 +43,8 @@
> 
> PARFILES= \
>         module_base.par             \
>-        file_base.par
>+        file_base.par               \
>+        postgresqlsdbc.par
> 
> .IF "$(GUI)"=="WNT"
> PARFILES += \
>@@ -56,7 +55,8 @@
> ULFFILES= \
>         module_base.ulf              \
>         registryitem_base.ulf        \
>-        folderitem_base.ulf
>+        folderitem_base.ulf          \
>+        postgresqlsdbc.ulf
> 
> # --- File ---------------------------------------------------------
> .INCLUDE :  target.mk
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/postgresqlsdbc.scp scp2//source/base/postgresqlsdbc.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/postgresqlsdbc.scp	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/base/postgresqlsdbc.scp	2012-02-24 13:39:12.640661266 +0100
>@@ -0,0 +1,75 @@
>+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * [ Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
>+ *   (initial developer) ]
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+#include "macros.inc"
>+
>+#if defined WITH_POSTGRESQL_SDBC
>+
>+Module gid_Module_Optional_PostgresqlSdbc
>+    PackageInfo = "packinfo_office.txt";
>+    MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
>+    ParentID = gid_Module_Prg_Base_Bin;
>+    Files = (gid_File_Lib_PostgresqlSdbc,
>+             gid_File_Lib_PostgresqlSdbcImpl,
>+             gid_File_PostgresqlSdbc_Ini,
>+             gid_File_PostgresqlSdbc_Rdb,
>+             gid_File_PostgresqlSdbc_Xcd);
>+    Minimal = NO;
>+    Default = YES;
>+    Styles = ();
>+End
>+
>+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno)
>+
>+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl.uno)
>+
>+File gid_File_PostgresqlSdbc_Ini
>+    TXT_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program;
>+    Name = "postgresql-sdbc.ini";
>+    Styles = (PACKED);
>+End
>+
>+File gid_File_PostgresqlSdbc_Rdb
>+    TXT_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program_Services;
>+    Name = "postgresql-sdbc.rdb";
>+    Styles = (PACKED);
>+End
>+
>+File gid_File_PostgresqlSdbc_Xcd
>+    TXT_FILE_BODY;
>+    Dir = gid_Brand_Dir_Share_Registry;
>+    Name = "postgresqlsdbc.xcd";
>+    Styles = (PACKED);
>+End
>+
>+#endif
>+
>+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/postgresqlsdbc.ulf scp2//source/base/postgresqlsdbc.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/postgresqlsdbc.ulf	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/base/postgresqlsdbc.ulf	2012-02-24 13:39:12.640661266 +0100
>@@ -0,0 +1,36 @@
>+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * [ Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
>+ *   (initial developer) ]
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQLSDBC]
>+en-US = "PostgreSQL Connector"
>+
>+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQLSDBC]
>+en-US = "PostgreSQL Connector"
>+
>+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/registryitem_base.scp scp2//source/base/registryitem_base.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/base/registryitem_base.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/base/registryitem_base.scp	2012-02-24 13:39:12.640661266 +0100
>@@ -91,9 +91,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "opendocument.DatabaseDocument.1\DefaultIcon";
>     ModuleID = gid_Module_Prg_Base_Bin;
>-    Value = "<progpath>\program\soffice.exe,13";
>+    Value = "<progpath>\program\soffice.bin,11";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_odb_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -101,6 +102,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/file_binfilter.scp scp2//source/binfilter/file_binfilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/file_binfilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/binfilter/file_binfilter.scp	2011-10-23 14:07:24.861868974 +0200
>@@ -31,14 +31,14 @@
> File gid_File_Share_Registry_Binfilter_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "binfilter.xcd";
> End
> 
> File gid_Starregistry_Legacy_Binfilters_Rdb
>     TXT_FILE_BODY;
>     Name = "legacy_binfilters.rdb";
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
> End
> 
>@@ -58,17 +58,16 @@
> 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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/makefile.mk scp2//source/binfilter/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/binfilter/makefile.mk	2011-11-29 09:56:02.924323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=binfilter
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/module_binfilter.scp scp2//source/binfilter/module_binfilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/module_binfilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/binfilter/module_binfilter.scp	2011-09-13 16:39:36.063306253 +0200
>@@ -53,25 +53,15 @@
>     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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/registryitem_binfilter.scp scp2//source/binfilter/registryitem_binfilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/binfilter/registryitem_binfilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/binfilter/registryitem_binfilter.scp	2012-02-24 13:39:12.642661265 +0100
>@@ -110,7 +110,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Binfilter;
>     Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,27";
>+    Value = "<progpath>\program\soffice.bin,1";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
>@@ -166,7 +166,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
>     ModuleID = gid_Module_Optional_Binfilter;
>-    Value = "<progpath>\program\soffice.exe,35";
>+    Value = "<progpath>\program\soffice.bin,9";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
>@@ -248,7 +248,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Binfilter;
>     Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,29";
>+    Value = "<progpath>\program\soffice.bin,3";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
>@@ -361,7 +361,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Binfilter;
>     Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,33";
>+    Value = "<progpath>\program\soffice.bin,7";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
>@@ -476,7 +476,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Binfilter;
>     Subkey = "soffice.StarDrawDocument.5\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,31";
>+    Value = "<progpath>\program\soffice.bin,5";
> End
> 
> RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell
>@@ -573,7 +573,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarChartDocument.5\DefaultIcon";
>     ModuleID = gid_Module_Optional_Binfilter;
>-    Value = "<progpath>\program\soffice.exe,36";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell
>@@ -636,7 +636,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon";
>     ModuleID = gid_Module_Optional_Binfilter;
>-    Value = "<progpath>\program\soffice.exe,15";
>+    Value = "<progpath>\program\soffice.bin,10";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell
>@@ -749,7 +749,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Binfilter;
>     Subkey = "soffice.StarMathDocument.5\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,38";
>+    Value = "<progpath>\program\soffice.bin,12";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/file_calc.scp scp2//source/calc/file_calc.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/file_calc.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/calc/file_calc.scp	2011-10-17 18:59:33.603146577 +0200
>@@ -41,7 +41,7 @@
> File gid_File_Share_Registry_Calc_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "calc.xcd";
> End
> 
>@@ -65,12 +65,14 @@
> 
> STD_RES_FILE( gid_File_Res_Sc, sc )
> 
>+#if defined WITH_HELP
> File gid_File_Help_Scalc_Zip
>     Dir = gid_Dir_Help_Isolanguage;
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
>     Patchfiles = ();
> End
>+#endif
> 
> // new user interface configuration files
> /*
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/folderitem_calc.scp scp2//source/calc/folderitem_calc.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/folderitem_calc.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/calc/folderitem_calc.scp	2011-11-23 11:35:42.325833796 +0100
>@@ -27,16 +27,17 @@
> 
> #include "macros.inc"
> 
>+#ifndef ENABLE_SILENT_MSI
> FolderItem gid_Folderitem_Scalc
>     Name = "%PRODUCTNAME Calc";
>-    Name (pt-BR) = "%PRODUCTNAME_BR Calc";
>     ModuleID = gid_Module_Prg_Calc_Bin;
>     FolderID = gid_Folder_Staroffice51;
>     FileID = gid_File_Exe_Scalc;
>     IconFile = gid_File_Exe_Scalc;
>     IconID = 0;
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>     Styles = (NOWEB, NON_ADVERTISED);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
> End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/folderitem_calc.ulf scp2//source/calc/folderitem_calc.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/folderitem_calc.ulf	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/calc/folderitem_calc.ulf	2011-09-13 16:39:36.073306253 +0200
>@@ -29,4 +29,4 @@
> en-US = "Spreadsheet"
> 
> [STR_FI_TOOLTIP_CALC]
>-en-US = "Perform calculation, analyze information and manage lists in spreadsheets by using Calc."
>+en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using Calc."
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/makefile.mk scp2//source/calc/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/calc/makefile.mk	2011-11-29 09:56:02.924323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=calc
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/module_calc.ulf scp2//source/calc/module_calc.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/module_calc.ulf	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/calc/module_calc.ulf	2011-09-13 16:39:36.073306253 +0200
>@@ -28,7 +28,7 @@
> en-US = "%PRODUCTNAME Calc"
> 
> [STR_DESC_MODULE_PRG_CALC]
>-en-US = "Perform calculation, analyze information and manage lists in spreadsheets by using %PRODUCTNAME Calc."
>+en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using %PRODUCTNAME Calc."
> 
> [STR_NAME_MODULE_PRG_CALC_BIN]
> en-US = "Program Module"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/registryitem_calc.scp scp2//source/calc/registryitem_calc.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/calc/registryitem_calc.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/calc/registryitem_calc.scp	2012-02-24 13:39:12.642661265 +0100
>@@ -76,7 +76,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Calc_Bin;
>     Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochandler32
>@@ -97,7 +97,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Calc_Bin;
>     Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Miscstatus
>@@ -195,7 +195,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Calc_Bin;
>     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochandler32
>@@ -216,7 +216,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Calc_Bin;
>     Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Miscstatus
>@@ -291,7 +291,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Calc_Bin;
>     Subkey = "soffice.StarCalcDocument.6\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,29";
>+    Value = "<progpath>\program\soffice.bin,3";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
>@@ -388,7 +388,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarCalcTemplate.6\DefaultIcon";
>     ModuleID = gid_Module_Prg_Calc_Bin;
>-    Value = "<progpath>\program\soffice.exe,30";
>+    Value = "<progpath>\program\soffice.bin,4";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
>@@ -504,6 +504,7 @@
>     Value = "application/vnd.sun.xml.calc.template";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_stc_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -511,6 +512,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Sxc_Contenttype
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -545,6 +547,7 @@
>     Styles = ();
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_sxc_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -552,7 +555,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>-
>+#endif
> 
> // new ods file extension 
> 
>@@ -662,9 +665,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Calc_Bin;
>     Subkey = "opendocument.CalcDocument.1\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,3";
>+    Value = "<progpath>\program\soffice.bin,3";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_ods_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -672,6 +676,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -853,9 +858,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "opendocument.CalcTemplate.1\DefaultIcon";
>     ModuleID = gid_Module_Prg_Calc_Bin;
>-    Value = "<progpath>\program\soffice.exe,4";
>+    Value = "<progpath>\program\soffice.bin,4";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_ots_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -863,6 +869,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -1169,11 +1176,11 @@
> 
> // registering the mso file types
> 
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/canvas/cairocanvas.scp scp2//source/canvas/cairocanvas.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/canvas/cairocanvas.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/canvas/cairocanvas.scp	2011-12-05 16:23:33.965716511 +0100
>@@ -28,7 +28,7 @@
> #include "macros.inc"
> 
> File gid_File_Lib_CairoCanvas
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/canvas/makefile.mk scp2//source/canvas/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/canvas/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/canvas/makefile.mk	2012-02-24 13:39:12.642661265 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=canvas
> TARGETTYPE=CUI
>@@ -41,11 +39,12 @@
> 
> PARFILES= canvascommons.par		\
>           vclcanvas.par         \
>-          mtfrenderer.par
>+		  mtfrenderer.par
> 
>-.IF "$(ENABLE_CAIRO)" == "TRUE"
>+.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE"
> PARFILES+= cairocanvas.par
> .ENDIF
>+
> .IF "$(ENABLE_DIRECTX)" != ""
> .IF "$(USE_DIRECTX5)" != ""
> SCPDEFS+=-DUSE_DIRECTX5
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/canvas/mtfrenderer.scp scp2//source/canvas/mtfrenderer.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/canvas/mtfrenderer.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/canvas/mtfrenderer.scp	2011-12-05 16:23:33.965716511 +0100
>@@ -28,12 +28,12 @@
> #include "macros.inc"
> 
> File gid_File_Lib_MtfRenderer
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED,UNO_COMPONENT);
>     RegistryID = gid_Starregistry_Services_Rdb;
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>-    Name = STRING(CONCAT2(libmtfrenderer.uno,UNXSUFFIX));
>+    Name = STRING(CONCAT2(mtfrenderer.uno,UNXSUFFIX));
>   #else
>     Name = "mtfrenderer.uno.dll";
>   #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/crashrep/file_crashrep.scp scp2//source/crashrep/file_crashrep.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/crashrep/file_crashrep.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/crashrep/file_crashrep.scp	2011-12-05 16:23:33.965716511 +0100
>@@ -55,7 +55,7 @@
> #ifdef WNT
> 
> File gid_Brand_File_Lib_Dbghelp
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Name = "dbghelp.dll";
>     Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/crashrep/makefile.mk scp2//source/crashrep/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/crashrep/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/crashrep/makefile.mk	2011-11-29 09:56:02.924323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=crashrep
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/file_draw.scp scp2//source/draw/file_draw.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/file_draw.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/draw/file_draw.scp	2011-10-17 18:59:33.603146577 +0200
>@@ -30,16 +30,18 @@
> File gid_File_Share_Registry_Draw_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "draw.xcd";
> End
> 
>+#if defined WITH_HELP
> File gid_File_Help_Sdraw_Zip
>     Dir = gid_Dir_Help_Isolanguage;
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
>     Patchfiles = (); 
> End
>+#endif
> 
> File gid_File_Exe_Sdraw
>     BIN_FILE_BODY;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/folderitem_draw.scp scp2//source/draw/folderitem_draw.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/folderitem_draw.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/draw/folderitem_draw.scp	2011-11-23 11:35:42.325833796 +0100
>@@ -27,16 +27,17 @@
> 
> #include "macros.inc"
> 
>+#ifndef ENABLE_SILENT_MSI
> FolderItem gid_Folderitem_Sdraw
>     Name = "%PRODUCTNAME Draw";
>-    Name (pt-BR) = "%PRODUCTNAME_BR Draw";
>     ModuleID = gid_Module_Prg_Draw_Bin;
>     FolderID = gid_Folder_Staroffice51;
>     FileID = gid_File_Exe_Sdraw;
>     IconFile = gid_File_Exe_Sdraw;
>     IconID = 0;
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>     Styles = (NOWEB, NON_ADVERTISED);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
> End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/makefile.mk scp2//source/draw/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/draw/makefile.mk	2011-11-29 09:56:02.924323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=draw
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/registryitem_draw.scp scp2//source/draw/registryitem_draw.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/draw/registryitem_draw.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/draw/registryitem_draw.scp	2012-02-24 13:39:12.642661265 +0100
>@@ -76,7 +76,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Draw_Bin;
>     Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochandler32
>@@ -97,7 +97,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Draw_Bin;
>     Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Miscstatus
>@@ -195,7 +195,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Draw_Bin;
>     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochandler32
>@@ -216,7 +216,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Draw_Bin;
>     Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Miscstatus
>@@ -291,7 +291,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Draw_Bin;
>     Subkey = "soffice.StarDrawDocument.6\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,31";
>+    Value = "<progpath>\program\soffice.bin,5";
> End
> 
> RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
>@@ -388,7 +388,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarDrawTemplate.6\DefaultIcon";
>     ModuleID = gid_Module_Prg_Draw_Bin;
>-    Value = "<progpath>\program\soffice.exe,32";
>+    Value = "<progpath>\program\soffice.bin,6";
> End
> 
> RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell
>@@ -476,6 +476,7 @@
>     Value = "application/vnd.sun.xml.draw.template";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_std_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -483,6 +484,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Sxd_PersistentHandler
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -544,6 +546,7 @@
>     Styles = ();
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_sxd_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -551,6 +554,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> // new odg file extension 
> 
>@@ -660,9 +664,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Draw_Bin;
>     Subkey = "opendocument.DrawDocument.1\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,5";
>+    Value = "<progpath>\program\soffice.bin,5";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_odg_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -670,6 +675,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -851,9 +857,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "opendocument.DrawTemplate.1\DefaultIcon";
>     ModuleID = gid_Module_Prg_Draw_Bin;
>-    Value = "<progpath>\program\soffice.exe,6";
>+    Value = "<progpath>\program\soffice.bin,6";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_otg_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -861,6 +868,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/directory_extensions.scp scp2//source/extensions/directory_extensions.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/directory_extensions.scp	2011-12-22 16:12:27.000000000 +0100
>+++ scp2//source/extensions/directory_extensions.scp	2012-02-24 13:39:12.642661265 +0100
>@@ -2,12 +2,6 @@
> *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile: directory_extensions.scp,v $
>- *
>- *  $Revision: 1.2 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
>- *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 3.
>  *
>@@ -94,20 +88,6 @@
> 
> #endif
> 
>-/* ** Lightproof ** */
>-
>-#ifdef WITH_EXTENSION_LIGHTPROOF
>-
>-Directory gid_Brand_Dir_Share_Extensions_LightProof
>-    ParentID = gid_Brand_Dir_Share_Extensions;
>-    DosName (en-US) = "lightproof-en-US";
>-    DosName (hu) = "lightproof-hu";
>-    DosName (ru) = "lightproof-ru";
>-    DosName = "lightproof";
>-End
>-
>-#endif
>-
> /* ** Numbertext ** */
> 
> #ifdef WITH_EXTENSION_NUMBERTEXT
>@@ -213,7 +193,7 @@
> 
> Directory gid_Brand_Dir_Share_Extensions_NLPSolver
> 	ParentID = gid_Brand_Dir_Share_Extensions;
>-	DosName = "NLPSolver";
>+	DosName = "nlpsolver";
> End
> 
> #endif
>@@ -267,28 +247,6 @@
> End
> 
> #endif
>-
>-/* ** Script provider for BeanShell ** */
>-
>-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
>-
>-Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
>-    ParentID = gid_Brand_Dir_Share_Extensions;
>-    DosName = "script-provider-for-beanshell";
>-End
>-
>-#endif
>-
>-/* ** Script provider for JavaScript ** */
>-
>-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
>-
>-Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
>-    ParentID = gid_Brand_Dir_Share_Extensions;
>-    DosName = "script-provider-for-javascript";
>-End
>-
>-#endif
> 
> /* ** Script provider for Python ** */
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/file_extensions.scp scp2//source/extensions/file_extensions.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/file_extensions.scp	2011-12-22 16:12:27.000000000 +0100
>+++ scp2//source/extensions/file_extensions.scp	2012-02-24 13:39:12.642661265 +0100
>@@ -2,12 +2,6 @@
> *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile: file_extensions.scp,v $
>- *
>- *  $Revision: 1.4 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
>- *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 3.
>  *
>@@ -104,21 +98,6 @@
> 
> #endif
> 
>-/* ** Lightproof ** */
>-
>-#ifdef WITH_EXTENSION_LIGHTPROOF
>-
>-File gid_File_Oxt_LightProof
>-    TXT_FILE_BODY;
>-    Styles = (PACKED, ARCHIVE);
>-    Dir = gid_Brand_Dir_Share_Extensions_LightProof;
>-    Name (en-US) = "lightproof-en-US.oxt";
>-    Name (hu) = "lightproof-hu.oxt";
>-    Name (ru) = "lightproof-ru.oxt";
>-End
>-
>-#endif
>-
> /* ** Numbertext ** */
> 
> #ifdef WITH_EXTENSION_NUMBERTEXT
>@@ -192,7 +171,7 @@
>     TXT_FILE_BODY;
>     Styles = (PACKED, ARCHIVE);
>     Dir = gid_Brand_Dir_Share_Extensions_Diagram;
>-    Name = "Diagram.oxt";
>+    Name = "SmART.oxt";
> End
> 
> #endif
>@@ -244,7 +223,7 @@
>     TXT_FILE_BODY;
>     Styles = (PACKED, ARCHIVE);
>     Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
>-    Name = "NLPSolver.oxt";
>+    Name = "nlpsolver.oxt";
> End
> 
> #endif
>@@ -308,26 +287,36 @@
> 
> /* ** Script provider for BeanShell ** */
> 
>-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
>+#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
>+
>+#if !defined SYSTEM_BSH
>+STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
>+#endif
>+
>+STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
> 
>-File gid_File_Oxt_Script_Provider_For_Beanshell
>+File gid_File_Rdb_Scriptproviderforbeanshell
>     TXT_FILE_BODY;
>-    Styles = (PACKED, ARCHIVE);
>-    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
>-    Name = "script-provider-for-beanshell.oxt";
>+    Name = "scriptproviderforbeanshell.rdb";
>+    Dir = gid_Brand_Dir_Program_Services;
>+    Styles = (PACKED);
> End
> 
> #endif
> 
> /* ** Script provider for JavaScript ** */
> 
>-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
>+#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
>+
>+STD_JAR_FILE( gid_File_Jar_Js, js )
> 
>-File gid_File_Oxt_Script_Provider_For_Javascript
>+STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
>+
>+File gid_File_Rdb_Scriptproviderforjavascript
>     TXT_FILE_BODY;
>-    Styles = (PACKED, ARCHIVE);
>-    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
>-    Name = "script-provider-for-javascript.oxt";
>+    Name = "scriptproviderforjavascript.rdb";
>+    Dir = gid_Brand_Dir_Program_Services;
>+    Styles = (PACKED);
> End
> 
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/makefile.mk scp2//source/extensions/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/extensions/makefile.mk	2011-12-28 13:34:06.573199178 +0100
>@@ -2,12 +2,6 @@
> #
> #  OpenOffice.org - a multi-platform office productivity suite
> #
>-#  $RCSfile: makefile.mk,v $
>-#
>-#  $Revision: 1.1 $
>-#
>-#  last change: $Author: KAMI $ $Date: 2010/08/12 22:05:54 $
>-#
> #  The Contents of this file are made available subject to
> #  the terms of GNU Lesser General Public License Version 3.
> #
>@@ -35,8 +29,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=extensions
> TARGETTYPE=CUI
>@@ -45,18 +37,20 @@
> 
> .INCLUDE :	settings.mk
> 
>+.IF "$(SYSTEM_BSH)" == "YES"
>+SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
>+.ENDIF
>+
> SCP_PRODUCT_TYPE=osl
> PARFILES= \
>         module_extensions.par                        \
>         module_extensions_sun_templates.par          \
>-        module_extensions_lightproof.par             \
>         directory_extensions.par                     \
>         file_extensions.par
> 
> ULFFILES= \
>         module_extensions.ulf                        \
>-        module_extensions_sun_templates.ulf          \
>-        module_extensions_lightproof.ulf
>+        module_extensions_sun_templates.ulf
> 
> #--- File ---------------------------------------------------------
> .INCLUDE :  target.mk
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_lightproof.scp scp2//source/extensions/module_extensions_lightproof.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_lightproof.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/extensions/module_extensions_lightproof.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,58 +0,0 @@
>-/*************************************************************************
>- *
>- *  OpenOffice.org - a multi-platform office productivity suite
>- *
>- *  $RCSfile: module_extensions_sun_templates.scp,v $
>- *
>- *  $Revision: 1.0 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
>- *
>- *  The Contents of this file are made available subject to
>- *  the terms of GNU Lesser General Public License Version 3.
>- *
>- *
>- *    GNU Lesser General Public License Version 3
>- *    =============================================
>- *    Copyright 2005 by Sun Microsystems, Inc.
>- *    901 San Antonio Road, Palo Alto, CA 94303, USA
>- *
>- *    This library is free software; you can redistribute it and/or
>- *    modify it under the terms of the GNU Lesser General Public
>- *    License version 2.1, as published by the Free Software Foundation.
>- *
>- *    This library is distributed in the hope that it will be useful,
>- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
>- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>- *    Lesser General Public License for more details.
>- *
>- *    You should have received a copy of the GNU Lesser General Public
>- *    License along with this library; if not, write to the Free Software
>- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>- *    MA  02111-1307  USA
>- *
>- ************************************************************************/
>-
>-#include "macros.inc"
>-
>-/* ** LightProof ** */
>-
>-#ifdef WITH_EXTENSION_INTEGRATION
>-
>-#ifdef WITH_EXTENSION_LIGHTPROOF
>-
>-Module gid_Module_Optional_Extensions_LightProof_Template
>-    ParentID = gid_Module_Optional_Extensions_LightProof;
>-    Name = "gid_Module_Optional_Extensions_LightProof_Template";
>-    Description = "gid_Module_Optional_Extensions_LightProof_Template";
>-    Styles = (TEMPLATEMODULE);
>-    Files = ( gid_File_Oxt_LightProof );
>-    Minimal = NO;
>-    Default = YES;
>-End
>-
>-#include "alllangmodules_extensions_lightproof.inc"
>-
>-#endif
>-
>-#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_lightproof.ulf scp2//source/extensions/module_extensions_lightproof.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_lightproof.ulf	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/extensions/module_extensions_lightproof.ulf	1970-01-01 01:00:00.000000000 +0100
>@@ -1,701 +0,0 @@
>-/*************************************************************************
>- *
>- *  OpenOffice.org - a multi-platform office productivity suite
>- *
>- *  $RCSfile: module_accessories.ulf,v $
>- *
>- *  $Revision: 1.0 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
>- *
>- *  The Contents of this file are made available subject to
>- *  the terms of GNU Lesser General Public License Version 3.
>- *
>- *
>- *    GNU Lesser General Public License Version 3
>- *    =============================================
>- *    Copyright 2005 by Sun Microsystems, Inc.
>- *    901 San Antonio Road, Palo Alto, CA 94303, USA
>- *
>- *    This library is free software; you can redistribute it and/or
>- *    modify it under the terms of the GNU Lesser General Public
>- *    License version 2.1, as published by the Free Software Foundation.
>- *
>- *    This library is distributed in the hope that it will be useful,
>- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
>- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>- *    Lesser General Public License for more details.
>- *
>- *    You should have received a copy of the GNU Lesser General Public
>- *    License along with this library; if not, write to the Free Software
>- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>- *    MA  02111-1307  USA
>- *
>- ************************************************************************/
>-
>-
>-[STR_NAME_MODULE_LANGPACK_EN_US]
>-en-US = "English"
>-
>-[STR_DESC_MODULE_LANGPACK_EN_US]
>-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_DE]
>-en-US = "German"
>-
>-[STR_DESC_MODULE_LANGPACK_DE]
>-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FR]
>-en-US = "French"
>-
>-[STR_DESC_MODULE_LANGPACK_FR]
>-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_IT]
>-en-US = "Italian"
>-
>-[STR_DESC_MODULE_LANGPACK_IT]
>-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ES]
>-en-US = "Spanish"
>-
>-[STR_DESC_MODULE_LANGPACK_ES]
>-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SV]
>-en-US = "Swedish"
>-
>-[STR_DESC_MODULE_LANGPACK_SV]
>-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PT]
>-en-US = "Portuguese"
>-
>-[STR_DESC_MODULE_LANGPACK_PT]
>-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PT_BR]
>-en-US = "Portuguese (Brazil)"
>-
>-[STR_DESC_MODULE_LANGPACK_PT_BR]
>-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_JA]
>-en-US = "Japanese"
>-
>-[STR_DESC_MODULE_LANGPACK_JA]
>-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KO]
>-en-US = "Korean"
>-
>-[STR_DESC_MODULE_LANGPACK_KO]
>-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ZH_CN]
>-en-US = "Chinese (simplified)"
>-
>-[STR_DESC_MODULE_LANGPACK_ZH_CN]
>-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ZH_TW]
>-en-US = "Chinese (traditional)"
>-
>-[STR_DESC_MODULE_LANGPACK_ZH_TW]
>-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NL]
>-en-US = "Dutch"
>-
>-[STR_DESC_MODULE_LANGPACK_NL]
>-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HU]
>-en-US = "Hungarian"
>-
>-[STR_DESC_MODULE_LANGPACK_HU]
>-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PL]
>-en-US = "Polish"
>-
>-[STR_DESC_MODULE_LANGPACK_PL]
>-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RU]
>-en-US = "Russian"
>-
>-[STR_DESC_MODULE_LANGPACK_RU]
>-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TR]
>-en-US = "Turkish"
>-
>-[STR_DESC_MODULE_LANGPACK_TR]
>-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EL]
>-en-US = "Greek"
>-
>-[STR_DESC_MODULE_LANGPACK_EL]
>-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TH]
>-en-US = "Thai"
>-
>-[STR_DESC_MODULE_LANGPACK_TH]
>-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_CS]
>-en-US = "Czech"
>-
>-[STR_DESC_MODULE_LANGPACK_CS]
>-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SK]
>-en-US = "Slovak"
>-
>-[STR_DESC_MODULE_LANGPACK_SK]
>-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HR]
>-en-US = "Croatian"
>-
>-[STR_DESC_MODULE_LANGPACK_HR]
>-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ET]
>-en-US = "Estonian"
>-
>-[STR_DESC_MODULE_LANGPACK_ET]
>-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_VI]
>-en-US = "Vietnamese"
>-
>-[STR_DESC_MODULE_LANGPACK_VI]
>-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BG]
>-en-US = "Bulgarian"
>-
>-[STR_DESC_MODULE_LANGPACK_BG]
>-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KM]
>-en-US = "Khmer"
>-
>-[STR_DESC_MODULE_LANGPACK_KM]
>-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PA_IN]
>-en-US = "Punjabi"
>-
>-[STR_DESC_MODULE_LANGPACK_PA_IN]
>-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GU_IN]
>-en-US = "Gujarati"
>-
>-[STR_DESC_MODULE_LANGPACK_GU_IN]
>-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TA]
>-en-US = "Tamil"
>-
>-[STR_DESC_MODULE_LANGPACK_TA]
>-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TA_IN]
>-en-US = "Tamil"
>-
>-[STR_DESC_MODULE_LANGPACK_TA_IN]
>-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HI]
>-en-US = "Hindi"
>-
>-[STR_DESC_MODULE_LANGPACK_HI]
>-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HI_IN]
>-en-US = "Hindi"
>-
>-[STR_DESC_MODULE_LANGPACK_HI_IN]
>-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ST]
>-en-US = "Southern Sotho (Sutu)"
>-
>-[STR_DESC_MODULE_LANGPACK_ST]
>-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TN]
>-en-US = "Tswana"
>-
>-[STR_DESC_MODULE_LANGPACK_TN]
>-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_XH]
>-en-US = "Xhosa"
>-
>-[STR_DESC_MODULE_LANGPACK_XH]
>-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ZU]
>-en-US = "Zulu"
>-
>-[STR_DESC_MODULE_LANGPACK_ZU]
>-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AF]
>-en-US = "Afrikaans"
>-
>-[STR_DESC_MODULE_LANGPACK_AF]
>-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SW]
>-en-US = "Swahili"
>-
>-[STR_DESC_MODULE_LANGPACK_SW]
>-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SW_TZ]
>-en-US = "Swahili"
>-
>-[STR_DESC_MODULE_LANGPACK_SW_TZ]
>-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_LO]
>-en-US = "Lao"
>-
>-[STR_DESC_MODULE_LANGPACK_LO]
>-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[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_NSO]
>-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN]
>-en-US = "Bengali"
>-
>-[STR_DESC_MODULE_LANGPACK_BN]
>-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN_BD]
>-en-US = "Bengali (Bangladesh)"
>-
>-[STR_DESC_MODULE_LANGPACK_BN_BD]
>-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN_IN]
>-en-US = "Bengali (India)"
>-
>-[STR_DESC_MODULE_LANGPACK_BN_IN]
>-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_OR]
>-en-US = "Oriya"
>-
>-[STR_DESC_MODULE_LANGPACK_OR]
>-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_OR_IN]
>-en-US = "Oriya"
>-
>-[STR_DESC_MODULE_LANGPACK_OR_IN]
>-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MR]
>-en-US = "Marathi"
>-
>-[STR_DESC_MODULE_LANGPACK_MR]
>-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MR_IN]
>-en-US = "Marathi"
>-
>-[STR_DESC_MODULE_LANGPACK_MR_IN]
>-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NE]
>-en-US = "Nepali"
>-
>-[STR_DESC_MODULE_LANGPACK_NE]
>-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AR]
>-en-US = "Arabic"
>-
>-[STR_DESC_MODULE_LANGPACK_AR]
>-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AR_SA]
>-en-US = "Arabic"
>-
>-[STR_DESC_MODULE_LANGPACK_AR_SA]
>-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_CA]
>-en-US = "Catalan"
>-
>-[STR_DESC_MODULE_LANGPACK_CA]
>-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_DA]
>-en-US = "Danish"
>-
>-[STR_DESC_MODULE_LANGPACK_DA]
>-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FI]
>-en-US = "Finnish"
>-
>-[STR_DESC_MODULE_LANGPACK_FI]
>-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HE]
>-en-US = "Hebrew"
>-
>-[STR_DESC_MODULE_LANGPACK_HE]
>-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_IS]
>-en-US = "Icelandic"
>-
>-[STR_DESC_MODULE_LANGPACK_IS]
>-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NB]
>-en-US = "Norwegian (Bokmal)"
>-
>-[STR_DESC_MODULE_LANGPACK_NB]
>-en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NN]
>-en-US = "Norwegian (Nynorsk)"
>-
>-[STR_DESC_MODULE_LANGPACK_NN]
>-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RM]
>-en-US = "Rhaeto-Romance"
>-
>-[STR_DESC_MODULE_LANGPACK_RM]
>-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RO]
>-en-US = "Romanian"
>-
>-[STR_DESC_MODULE_LANGPACK_RO]
>-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SQ]
>-en-US = "Albanian"
>-
>-[STR_DESC_MODULE_LANGPACK_SQ]
>-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UR]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_LANGPACK_UR]
>-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ID]
>-en-US = "Indonesian"
>-
>-[STR_DESC_MODULE_LANGPACK_ID]
>-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UK]
>-en-US = "Ukrainian"
>-
>-[STR_DESC_MODULE_LANGPACK_UK]
>-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BE]
>-en-US = "Belarusian"
>-
>-[STR_DESC_MODULE_LANGPACK_BE]
>-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SL]
>-en-US = "Slovenian"
>-
>-[STR_DESC_MODULE_LANGPACK_SL]
>-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_LV]
>-en-US = "Latvian"
>-
>-[STR_DESC_MODULE_LANGPACK_LV]
>-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_LT]
>-en-US = "Lithuanian"
>-
>-[STR_DESC_MODULE_LANGPACK_LT]
>-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HY]
>-en-US = "Armenian"
>-
>-[STR_DESC_MODULE_LANGPACK_HY]
>-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EU]
>-en-US = "Basque"
>-
>-[STR_DESC_MODULE_LANGPACK_EU]
>-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MK]
>-en-US = "Macedonian"
>-
>-[STR_DESC_MODULE_LANGPACK_MK]
>-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MT]
>-en-US = "Maltese"
>-
>-[STR_DESC_MODULE_LANGPACK_MT]
>-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_CY]
>-en-US = "Welsh"
>-
>-[STR_DESC_MODULE_LANGPACK_CY]
>-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GL]
>-en-US = "Galician"
>-
>-[STR_DESC_MODULE_LANGPACK_GL]
>-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SH_YU]
>-en-US = "Serbian (Latin)"
>-
>-[STR_DESC_MODULE_LANGPACK_SH_YU]
>-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SH]
>-en-US = "Serbian (Latin)"
>-
>-[STR_DESC_MODULE_LANGPACK_SH]
>-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GA]
>-en-US = "Irish"
>-
>-[STR_DESC_MODULE_LANGPACK_GA]
>-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SR_CS]
>-en-US = "Serbian (Cyrillic)"
>-
>-[STR_DESC_MODULE_LANGPACK_SR_CS]
>-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SR]
>-en-US = "Serbian (Cyrillic)"
>-
>-[STR_DESC_MODULE_LANGPACK_SR]
>-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BS]
>-en-US = "Bosnian"
>-
>-[STR_DESC_MODULE_LANGPACK_BS]
>-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AS_IN]
>-en-US = "Assamese"
>-
>-[STR_DESC_MODULE_LANGPACK_AS_IN]
>-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RW]
>-en-US = "Kinyarwanda"
>-
>-[STR_DESC_MODULE_LANGPACK_RW]
>-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SA]
>-en-US = "Sanskrit"
>-
>-[STR_DESC_MODULE_LANGPACK_SA]
>-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FA]
>-en-US = "Farsi"
>-
>-[STR_DESC_MODULE_LANGPACK_FA]
>-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FO]
>-en-US = "Faroese"
>-
>-[STR_DESC_MODULE_LANGPACK_FO]
>-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SB]
>-en-US = "Sorbian"
>-
>-[STR_DESC_MODULE_LANGPACK_SB]
>-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TT]
>-en-US = "Tatar"
>-
>-[STR_DESC_MODULE_LANGPACK_TT]
>-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TS]
>-en-US = "Tsonga"
>-
>-[STR_DESC_MODULE_LANGPACK_TS]
>-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_YI]
>-en-US = "Yiddish"
>-
>-[STR_DESC_MODULE_LANGPACK_YI]
>-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BR]
>-en-US = "Breton"
>-
>-[STR_DESC_MODULE_LANGPACK_BR]
>-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NR]
>-en-US = "Ndebele South"
>-
>-[STR_DESC_MODULE_LANGPACK_NR]
>-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SS]
>-en-US = "Swazi"
>-
>-[STR_DESC_MODULE_LANGPACK_SS]
>-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_VE]
>-en-US = "Venda"
>-
>-[STR_DESC_MODULE_LANGPACK_VE]
>-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KN]
>-en-US = "Kannada"
>-
>-[STR_DESC_MODULE_LANGPACK_KN]
>-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MS]
>-en-US = "Malay (Malaysian)"
>-
>-[STR_DESC_MODULE_LANGPACK_MS]
>-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TG]
>-en-US = "Tajik"
>-
>-[STR_DESC_MODULE_LANGPACK_TG]
>-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KU]
>-en-US = "Kurdish"
>-
>-[STR_DESC_MODULE_LANGPACK_KU]
>-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_DZ]
>-en-US = "Dzongkha"
>-
>-[STR_DESC_MODULE_LANGPACK_DZ]
>-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KA]
>-en-US = "Georgian"
>-
>-[STR_DESC_MODULE_LANGPACK_KA]
>-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EO]
>-en-US = "Esperanto"
>-
>-[STR_DESC_MODULE_LANGPACK_EO]
>-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GU]
>-en-US = "Gujarati"
>-
>-[STR_DESC_MODULE_LANGPACK_GU]
>-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EN_ZA]
>-en-US = "English (South Africa)"
>-
>-[STR_DESC_MODULE_LANGPACK_EN_ZA]
>-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EN_GB]
>-en-US = "English (United Kingdom)"
>-
>-[STR_DESC_MODULE_LANGPACK_EN_GB]
>-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UR_IN]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_LANGPACK_UR_IN]
>-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ML_IN]
>-en-US = "Malayalam"
>-
>-[STR_DESC_MODULE_LANGPACK_ML_IN]
>-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TE_IN]
>-en-US = "Telugu"
>-
>-[STR_DESC_MODULE_LANGPACK_TE_IN]
>-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TI_ER]
>-en-US = "Tigrinya"
>-
>-[STR_DESC_MODULE_LANGPACK_TI_ER]
>-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UZ]
>-en-US = "Uzbek"
>-
>-[STR_DESC_MODULE_LANGPACK_UZ]
>-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MN]
>-en-US = "Mongolian"
>-
>-[STR_DESC_MODULE_LANGPACK_MN]
>-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KK]
>-en-US = "Kazakh"
>-
>-[STR_DESC_MODULE_LANGPACK_KK]
>-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions.scp scp2//source/extensions/module_extensions.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/extensions/module_extensions.scp	2012-02-24 13:39:12.642661265 +0100
>@@ -2,12 +2,6 @@
>  *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile: module_accessories.scp,v $
>- *
>- *  $Revision: 1.2 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
>- *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 3.
>  *
>@@ -123,19 +117,6 @@
> End
> #endif
> 
>-/* ** Lightproof ** */
>-
>-#ifdef WITH_EXTENSION_LIGHTPROOF
>-Module gid_Module_Optional_Extensions_LightProof
>-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF);
>-    ParentID = gid_Module_Optional_Extensions;
>-    Minimal = NO;
>-    Default = YES;
>-    Styles = ( );
>-End
>-
>-#endif
>-
> /* ** Numbertext ** */
> 
> #ifdef WITH_EXTENSION_NUMBERTEXT
>@@ -345,14 +326,16 @@
> 
> /* ** Script provider for BeanShell ** */
> 
>-#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
>+#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
> 
> Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
>     PackageInfo = "packinfo_extensions.txt";
>     MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
>     ParentID = gid_Module_Optional_Extensions;
>     Files = (
>-        gid_File_Oxt_Script_Provider_For_Beanshell );
>+        gid_File_Jar_Bsh,
>+        gid_File_Jar_Scriptproviderforbeanshell,
>+        gid_File_Rdb_Scriptproviderforbeanshell );
>     Minimal = NO;
>     Default = YES;
>     Styles = ( );
>@@ -362,14 +345,16 @@
> 
> /* ** Script provider for JavaScript ** */
> 
>-#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
>+#if defined SOLAR_JAVA && !defined WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
> 
> Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
>     PackageInfo = "packinfo_extensions.txt";
>     MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
>     ParentID = gid_Module_Optional_Extensions;
>     Files = (
>-        gid_File_Oxt_Script_Provider_For_Javascript );
>+        gid_File_Jar_Js,
>+        gid_File_Jar_Scriptproviderforjavascript,
>+        gid_File_Rdb_Scriptproviderforjavascript );
>     Minimal = NO;
>     Default = YES;
>     Styles = ( );
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_sun_templates.scp scp2//source/extensions/module_extensions_sun_templates.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_sun_templates.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/extensions/module_extensions_sun_templates.scp	2011-09-20 11:33:20.837130586 +0200
>@@ -2,12 +2,6 @@
>  *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile: module_extensions_sun_templates.scp,v $
>- *
>- *  $Revision: 1.0 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
>- *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 3.
>  *
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_sun_templates.ulf scp2//source/extensions/module_extensions_sun_templates.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions_sun_templates.ulf	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/extensions/module_extensions_sun_templates.ulf	2011-11-29 09:56:02.925323818 +0100
>@@ -2,12 +2,6 @@
>  *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile: module_accessories.ulf,v $
>- *
>- *  $Revision: 1.0 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
>- *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 3.
>  *
>@@ -64,638 +58,8 @@
> [STR_DESC_MODULE_LANGPACK_ES]
> en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_LANGPACK_SV]
>-en-US = "Swedish"
>-
>-[STR_DESC_MODULE_LANGPACK_SV]
>-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PT]
>-en-US = "Portuguese"
>-
>-[STR_DESC_MODULE_LANGPACK_PT]
>-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PT_BR]
>-en-US = "Portuguese (Brazil)"
>-
>-[STR_DESC_MODULE_LANGPACK_PT_BR]
>-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_JA]
>-en-US = "Japanese"
>-
>-[STR_DESC_MODULE_LANGPACK_JA]
>-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KO]
>-en-US = "Korean"
>-
>-[STR_DESC_MODULE_LANGPACK_KO]
>-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ZH_CN]
>-en-US = "Chinese (simplified)"
>-
>-[STR_DESC_MODULE_LANGPACK_ZH_CN]
>-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ZH_TW]
>-en-US = "Chinese (traditional)"
>-
>-[STR_DESC_MODULE_LANGPACK_ZH_TW]
>-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NL]
>-en-US = "Dutch"
>-
>-[STR_DESC_MODULE_LANGPACK_NL]
>-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_LANGPACK_HU]
> en-US = "Hungarian"
> 
> [STR_DESC_MODULE_LANGPACK_HU]
> en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PL]
>-en-US = "Polish"
>-
>-[STR_DESC_MODULE_LANGPACK_PL]
>-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RU]
>-en-US = "Russian"
>-
>-[STR_DESC_MODULE_LANGPACK_RU]
>-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TR]
>-en-US = "Turkish"
>-
>-[STR_DESC_MODULE_LANGPACK_TR]
>-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EL]
>-en-US = "Greek"
>-
>-[STR_DESC_MODULE_LANGPACK_EL]
>-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TH]
>-en-US = "Thai"
>-
>-[STR_DESC_MODULE_LANGPACK_TH]
>-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_CS]
>-en-US = "Czech"
>-
>-[STR_DESC_MODULE_LANGPACK_CS]
>-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SK]
>-en-US = "Slovak"
>-
>-[STR_DESC_MODULE_LANGPACK_SK]
>-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HR]
>-en-US = "Croatian"
>-
>-[STR_DESC_MODULE_LANGPACK_HR]
>-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ET]
>-en-US = "Estonian"
>-
>-[STR_DESC_MODULE_LANGPACK_ET]
>-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_VI]
>-en-US = "Vietnamese"
>-
>-[STR_DESC_MODULE_LANGPACK_VI]
>-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BG]
>-en-US = "Bulgarian"
>-
>-[STR_DESC_MODULE_LANGPACK_BG]
>-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KM]
>-en-US = "Khmer"
>-
>-[STR_DESC_MODULE_LANGPACK_KM]
>-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PA_IN]
>-en-US = "Punjabi"
>-
>-[STR_DESC_MODULE_LANGPACK_PA_IN]
>-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GU_IN]
>-en-US = "Gujarati"
>-
>-[STR_DESC_MODULE_LANGPACK_GU_IN]
>-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TA]
>-en-US = "Tamil"
>-
>-[STR_DESC_MODULE_LANGPACK_TA]
>-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TA_IN]
>-en-US = "Tamil"
>-
>-[STR_DESC_MODULE_LANGPACK_TA_IN]
>-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HI]
>-en-US = "Hindi"
>-
>-[STR_DESC_MODULE_LANGPACK_HI]
>-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HI_IN]
>-en-US = "Hindi"
>-
>-[STR_DESC_MODULE_LANGPACK_HI_IN]
>-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ST]
>-en-US = "Southern Sotho (Sutu)"
>-
>-[STR_DESC_MODULE_LANGPACK_ST]
>-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TN]
>-en-US = "Tswana"
>-
>-[STR_DESC_MODULE_LANGPACK_TN]
>-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_XH]
>-en-US = "Xhosa"
>-
>-[STR_DESC_MODULE_LANGPACK_XH]
>-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ZU]
>-en-US = "Zulu"
>-
>-[STR_DESC_MODULE_LANGPACK_ZU]
>-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AF]
>-en-US = "Afrikaans"
>-
>-[STR_DESC_MODULE_LANGPACK_AF]
>-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SW]
>-en-US = "Swahili"
>-
>-[STR_DESC_MODULE_LANGPACK_SW]
>-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SW_TZ]
>-en-US = "Swahili"
>-
>-[STR_DESC_MODULE_LANGPACK_SW_TZ]
>-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_LO]
>-en-US = "Lao"
>-
>-[STR_DESC_MODULE_LANGPACK_LO]
>-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[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_NSO]
>-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN]
>-en-US = "Bengali"
>-
>-[STR_DESC_MODULE_LANGPACK_BN]
>-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN_BD]
>-en-US = "Bengali (Bangladesh)"
>-
>-[STR_DESC_MODULE_LANGPACK_BN_BD]
>-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN_IN]
>-en-US = "Bengali (India)"
>-
>-[STR_DESC_MODULE_LANGPACK_BN_IN]
>-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_OR]
>-en-US = "Oriya"
>-
>-[STR_DESC_MODULE_LANGPACK_OR]
>-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_OR_IN]
>-en-US = "Oriya"
>-
>-[STR_DESC_MODULE_LANGPACK_OR_IN]
>-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MR]
>-en-US = "Marathi"
>-
>-[STR_DESC_MODULE_LANGPACK_MR]
>-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MR_IN]
>-en-US = "Marathi"
>-
>-[STR_DESC_MODULE_LANGPACK_MR_IN]
>-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NE]
>-en-US = "Nepali"
>-
>-[STR_DESC_MODULE_LANGPACK_NE]
>-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AR]
>-en-US = "Arabic"
>-
>-[STR_DESC_MODULE_LANGPACK_AR]
>-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AR_SA]
>-en-US = "Arabic"
>-
>-[STR_DESC_MODULE_LANGPACK_AR_SA]
>-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_CA]
>-en-US = "Catalan"
>-
>-[STR_DESC_MODULE_LANGPACK_CA]
>-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_DA]
>-en-US = "Danish"
>-
>-[STR_DESC_MODULE_LANGPACK_DA]
>-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FI]
>-en-US = "Finnish"
>-
>-[STR_DESC_MODULE_LANGPACK_FI]
>-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HE]
>-en-US = "Hebrew"
>-
>-[STR_DESC_MODULE_LANGPACK_HE]
>-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_IS]
>-en-US = "Icelandic"
>-
>-[STR_DESC_MODULE_LANGPACK_IS]
>-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NB]
>-en-US = "Norwegian (Bokmal)"
>-
>-[STR_DESC_MODULE_LANGPACK_NB]
>-en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NN]
>-en-US = "Norwegian (Nynorsk)"
>-
>-[STR_DESC_MODULE_LANGPACK_NN]
>-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RM]
>-en-US = "Rhaeto-Romance"
>-
>-[STR_DESC_MODULE_LANGPACK_RM]
>-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RO]
>-en-US = "Romanian"
>-
>-[STR_DESC_MODULE_LANGPACK_RO]
>-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SQ]
>-en-US = "Albanian"
>-
>-[STR_DESC_MODULE_LANGPACK_SQ]
>-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UR]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_LANGPACK_UR]
>-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ID]
>-en-US = "Indonesian"
>-
>-[STR_DESC_MODULE_LANGPACK_ID]
>-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UK]
>-en-US = "Ukrainian"
>-
>-[STR_DESC_MODULE_LANGPACK_UK]
>-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BE]
>-en-US = "Belarusian"
>-
>-[STR_DESC_MODULE_LANGPACK_BE]
>-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SL]
>-en-US = "Slovenian"
>-
>-[STR_DESC_MODULE_LANGPACK_SL]
>-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_LV]
>-en-US = "Latvian"
>-
>-[STR_DESC_MODULE_LANGPACK_LV]
>-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_LT]
>-en-US = "Lithuanian"
>-
>-[STR_DESC_MODULE_LANGPACK_LT]
>-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HY]
>-en-US = "Armenian"
>-
>-[STR_DESC_MODULE_LANGPACK_HY]
>-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EU]
>-en-US = "Basque"
>-
>-[STR_DESC_MODULE_LANGPACK_EU]
>-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MK]
>-en-US = "Macedonian"
>-
>-[STR_DESC_MODULE_LANGPACK_MK]
>-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MT]
>-en-US = "Maltese"
>-
>-[STR_DESC_MODULE_LANGPACK_MT]
>-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_CY]
>-en-US = "Welsh"
>-
>-[STR_DESC_MODULE_LANGPACK_CY]
>-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GL]
>-en-US = "Galician"
>-
>-[STR_DESC_MODULE_LANGPACK_GL]
>-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SH_YU]
>-en-US = "Serbian (Latin)"
>-
>-[STR_DESC_MODULE_LANGPACK_SH_YU]
>-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SH]
>-en-US = "Serbian (Latin)"
>-
>-[STR_DESC_MODULE_LANGPACK_SH]
>-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GA]
>-en-US = "Irish"
>-
>-[STR_DESC_MODULE_LANGPACK_GA]
>-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SR_CS]
>-en-US = "Serbian (Cyrillic)"
>-
>-[STR_DESC_MODULE_LANGPACK_SR_CS]
>-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SR]
>-en-US = "Serbian (Cyrillic)"
>-
>-[STR_DESC_MODULE_LANGPACK_SR]
>-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BS]
>-en-US = "Bosnian"
>-
>-[STR_DESC_MODULE_LANGPACK_BS]
>-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AS_IN]
>-en-US = "Assamese"
>-
>-[STR_DESC_MODULE_LANGPACK_AS_IN]
>-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RW]
>-en-US = "Kinyarwanda"
>-
>-[STR_DESC_MODULE_LANGPACK_RW]
>-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SA]
>-en-US = "Sanskrit"
>-
>-[STR_DESC_MODULE_LANGPACK_SA]
>-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FA]
>-en-US = "Farsi"
>-
>-[STR_DESC_MODULE_LANGPACK_FA]
>-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FO]
>-en-US = "Faroese"
>-
>-[STR_DESC_MODULE_LANGPACK_FO]
>-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SB]
>-en-US = "Sorbian"
>-
>-[STR_DESC_MODULE_LANGPACK_SB]
>-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TT]
>-en-US = "Tatar"
>-
>-[STR_DESC_MODULE_LANGPACK_TT]
>-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TS]
>-en-US = "Tsonga"
>-
>-[STR_DESC_MODULE_LANGPACK_TS]
>-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_YI]
>-en-US = "Yiddish"
>-
>-[STR_DESC_MODULE_LANGPACK_YI]
>-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BR]
>-en-US = "Breton"
>-
>-[STR_DESC_MODULE_LANGPACK_BR]
>-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_NR]
>-en-US = "Ndebele South"
>-
>-[STR_DESC_MODULE_LANGPACK_NR]
>-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SS]
>-en-US = "Swazi"
>-
>-[STR_DESC_MODULE_LANGPACK_SS]
>-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_VE]
>-en-US = "Venda"
>-
>-[STR_DESC_MODULE_LANGPACK_VE]
>-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KN]
>-en-US = "Kannada"
>-
>-[STR_DESC_MODULE_LANGPACK_KN]
>-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MS]
>-en-US = "Malay (Malaysian)"
>-
>-[STR_DESC_MODULE_LANGPACK_MS]
>-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TG]
>-en-US = "Tajik"
>-
>-[STR_DESC_MODULE_LANGPACK_TG]
>-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KU]
>-en-US = "Kurdish"
>-
>-[STR_DESC_MODULE_LANGPACK_KU]
>-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_DZ]
>-en-US = "Dzongkha"
>-
>-[STR_DESC_MODULE_LANGPACK_DZ]
>-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KA]
>-en-US = "Georgian"
>-
>-[STR_DESC_MODULE_LANGPACK_KA]
>-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EO]
>-en-US = "Esperanto"
>-
>-[STR_DESC_MODULE_LANGPACK_EO]
>-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GU]
>-en-US = "Gujarati"
>-
>-[STR_DESC_MODULE_LANGPACK_GU]
>-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EN_ZA]
>-en-US = "English (South Africa)"
>-
>-[STR_DESC_MODULE_LANGPACK_EN_ZA]
>-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_EN_GB]
>-en-US = "English (United Kingdom)"
>-
>-[STR_DESC_MODULE_LANGPACK_EN_GB]
>-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UR_IN]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_LANGPACK_UR_IN]
>-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ML_IN]
>-en-US = "Malayalam"
>-
>-[STR_DESC_MODULE_LANGPACK_ML_IN]
>-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TE_IN]
>-en-US = "Telugu"
>-
>-[STR_DESC_MODULE_LANGPACK_TE_IN]
>-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TI_ER]
>-en-US = "Tigrinya"
>-
>-[STR_DESC_MODULE_LANGPACK_TI_ER]
>-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UZ]
>-en-US = "Uzbek"
>-
>-[STR_DESC_MODULE_LANGPACK_UZ]
>-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MN]
>-en-US = "Mongolian"
>-
>-[STR_DESC_MODULE_LANGPACK_MN]
>-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KK]
>-en-US = "Kazakh"
>-
>-[STR_DESC_MODULE_LANGPACK_KK]
>-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions.ulf scp2//source/extensions/module_extensions.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/extensions/module_extensions.ulf	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/extensions/module_extensions.ulf	2012-02-24 13:39:12.642661265 +0100
>@@ -2,12 +2,6 @@
>  *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile: module_accessories.ulf,v $
>- *
>- *  $Revision: 1.2 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
>- *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 3.
>  *
>@@ -69,12 +63,6 @@
> [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
> en-US = "PDF Import"
> 
>-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
>-en-US = "Lightproof"
>-
>-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
>-en-US = "Lightproof"
>-
> [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
> en-US = "Numbertext"
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/gnome/file_gnome.scp scp2//source/gnome/file_gnome.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/gnome/file_gnome.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/gnome/file_gnome.scp	2011-12-05 16:23:33.965716511 +0100
>@@ -28,7 +28,7 @@
> 
> #ifdef ENABLE_GIO
> File gid_File_Lib_GIO
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
>@@ -37,27 +37,36 @@
> 
> #ifdef ENABLE_GNOMEVFS
> File gid_File_Lib_Gnomevfs
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
> End
> #endif
> 
>-#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
>+#if (defined ENABLE_GCONF && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
> File gid_File_Share_Registry_Gnome_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "gnome.xcd";
> End
> #endif
> 
> #ifdef ENABLE_GCONF
> File gid_File_Lib_Gconfbe
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
> End
> #endif
>+
>+#ifdef ENABLE_SYSTRAY_GTK
>+File gid_File_Lib_QStart_Gtk
>+    Name = LIBNAME(qstart_gtk);
>+    LIB_FILE_BODY;
>+    Styles = (PACKED);
>+    Dir = SCP2_OOO_BIN_DIR;
>+End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/gnome/makefile.mk scp2//source/gnome/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/gnome/makefile.mk	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/gnome/makefile.mk	2011-11-29 09:56:02.925323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=gnome
> TARGETTYPE=CUI
>@@ -39,6 +37,10 @@
> 
> SCP_PRODUCT_TYPE=osl
> 
>+.IF "$(ENABLE_SYSTRAY_GTK)" != ""
>+SCPDEFS+=-DENABLE_SYSTRAY_GTK
>+.ENDIF
>+
> .IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
> 
> .IF "$(ENABLE_GCONF)" != ""
>@@ -57,6 +59,10 @@
> SCPDEFS+=-DENABLE_GIO
> .ENDIF
> 
>+.IF "$(ENABLE_GTK3)" != ""
>+SCPDEFS+=-DENABLE_GTK3
>+.ENDIF
>+
> PARFILES =                   \
>         module_gnome.par     \
>         file_gnome.par
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/gnome/module_gnome.scp scp2//source/gnome/module_gnome.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/gnome/module_gnome.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/gnome/module_gnome.scp	2011-12-28 13:34:06.574199178 +0100
>@@ -41,6 +41,17 @@
>     XpdCheckSolaris = "SUNWgnome-vfs";
> #endif
>     Files = (
>+      gid_File_Lib_Evoab,
>+      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
>+      gid_File_Lib_QStart_Gtk,
>+#endif
> #ifdef ENABLE_GNOMEVFS
>       gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/graphicfilter/file_graphicfilter.scp scp2//source/graphicfilter/file_graphicfilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/graphicfilter/file_graphicfilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/graphicfilter/file_graphicfilter.scp	2012-02-24 13:38:59.910662459 +0100
>@@ -30,7 +30,7 @@
> File gid_File_Share_Registry_Graphicfilter_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "graphicfilter.xcd";
> End
> 
>@@ -39,3 +39,5 @@
> 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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/graphicfilter/makefile.mk scp2//source/graphicfilter/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/graphicfilter/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/graphicfilter/makefile.mk	2011-11-29 09:56:02.925323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=graphicfilter
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/graphicfilter/module_graphicfilter.scp scp2//source/graphicfilter/module_graphicfilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/graphicfilter/module_graphicfilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/graphicfilter/module_graphicfilter.scp	2011-12-28 13:34:06.574199178 +0100
>@@ -34,5 +34,5 @@
>     ParentID = gid_Module_Optional;
>     Default = YES;
>     Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
>-    		 gid_File_Share_Registry_Graphicfilter_Xcd);
>+    		 gid_File_Lib_VisioImport, gid_File_Share_Registry_Graphicfilter_Xcd);
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/file_impress.scp scp2//source/impress/file_impress.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/file_impress.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/impress/file_impress.scp	2011-10-17 18:59:33.604146577 +0200
>@@ -33,23 +33,25 @@
> End
> 
> File gid_File_Lib_Animcore
>-	Name = SPECIAL_NAME(animcore);
>+	Name = LIBNAME(animcore);
> 	PACKED_LIB_FILE_BODY;
> End
> 
> File gid_File_Share_Registry_Impress_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "impress.xcd";
> End
> 
>+#if defined WITH_HELP
> File gid_File_Help_Simpress_Zip
>     Dir = gid_Dir_Help_Isolanguage;
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
>     Patchfiles = (); 
> End
>+#endif
> 
> File gid_File_Exe_Simpress
>     BIN_FILE_BODY;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/folderitem_impress.scp scp2//source/impress/folderitem_impress.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/folderitem_impress.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/impress/folderitem_impress.scp	2011-11-23 11:35:42.325833796 +0100
>@@ -27,16 +27,17 @@
> 
> #include "macros.inc"
> 
>+#ifndef ENABLE_SILENT_MSI
> FolderItem gid_Folderitem_Simpress
>     Name = "%PRODUCTNAME Impress";
>-    Name (pt-BR) = "%PRODUCTNAME_BR Impress";
>     ModuleID = gid_Module_Prg_Impress_Bin;
>     FolderID = gid_Folder_Staroffice51;
>     FileID = gid_File_Exe_Simpress;
>     IconFile = gid_File_Exe_Simpress;
>     IconID = 0;
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>     Styles = (NOWEB, NON_ADVERTISED);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
> End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/makefile.mk scp2//source/impress/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/impress/makefile.mk	2011-11-29 09:56:02.925323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=impress
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/module_ogltrans.scp scp2//source/impress/module_ogltrans.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/module_ogltrans.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/impress/module_ogltrans.scp	2011-12-05 16:23:33.965716511 +0100
>@@ -37,15 +37,11 @@
> End
> 
> File gid_File_Lib_OpenGLTransitions
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>-    #ifdef QUARTZ
>-    Name = STRING(CONCAT2(libOGLTrans.uno,UNXSUFFIX));
>-    #else
>     Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
>-    #endif
>   #else
>     Name = "OGLTrans.uno.dll";
>   #endif
>@@ -61,6 +57,6 @@
> File gid_File_Share_Registry_Ogltrans_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "ogltrans.xcd";
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/registryitem_impress.scp scp2//source/impress/registryitem_impress.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/impress/registryitem_impress.scp	2011-12-22 16:36:28.000000000 +0100
>+++ scp2//source/impress/registryitem_impress.scp	2012-02-24 13:39:12.643661265 +0100
>@@ -76,7 +76,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Impress_Bin;
>     Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochandler32
>@@ -97,7 +97,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Impress_Bin;
>     Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Miscstatus
>@@ -195,7 +195,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Impress_Bin;
>     Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochandler32
>@@ -216,7 +216,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Impress_Bin;
>     Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Miscstatus
>@@ -291,7 +291,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Impress_Bin;
>     Subkey = "soffice.StarImpressDocument.6\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,33";
>+    Value = "<progpath>\program\soffice.bin,7";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Insertable
>@@ -402,7 +402,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarImpressTemplate.6\DefaultIcon";
>     ModuleID = gid_Module_Prg_Impress_Bin;
>-    Value = "<progpath>\program\soffice.exe,34";
>+    Value = "<progpath>\program\soffice.bin,8";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell
>@@ -490,6 +490,7 @@
>     Value = "application/vnd.sun.xml.impress.template";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_sti_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -497,6 +498,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Sxi_PersistentHandler
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -558,6 +560,7 @@
>     Styles = ();
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_sxi_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -565,6 +568,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> // new odp file extension
> 
>@@ -675,9 +679,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Impress_Bin;
>     Subkey = "opendocument.ImpressDocument.1\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,7";
>+    Value = "<progpath>\program\soffice.bin,7";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_odp_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -685,6 +690,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -880,9 +886,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "opendocument.ImpressTemplate.1\DefaultIcon";
>     ModuleID = gid_Module_Prg_Impress_Bin;
>-    Value = "<progpath>\program\soffice.exe,8";
>+    Value = "<progpath>\program\soffice.bin,8";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_otp_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -890,6 +897,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -1032,11 +1040,11 @@
> 
> // registering the mso file types
> 
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/javafilter/file_javafilter.scp scp2//source/javafilter/file_javafilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/javafilter/file_javafilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/javafilter/file_javafilter.scp	2011-12-05 16:23:33.966716511 +0100
>@@ -30,7 +30,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Xmergesync
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "xmergesync.dll";
>@@ -38,10 +38,10 @@
> 
> #endif
> 
>-#ifdef WNT
>+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
> 
> File gid_File_Lib_Jfregca
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "jfregca.dll";
>@@ -52,21 +52,21 @@
> File gid_File_Share_Registry_Palm_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "palm.xcd";
> End
> 
> File gid_File_Share_Registry_Pocketexcel_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "pocketexcel.xcd";
> End
> 
> File gid_File_Share_Registry_Pocketword_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "pocketword.xcd";
> End
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/javafilter/makefile.mk scp2//source/javafilter/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/javafilter/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/javafilter/makefile.mk	2011-11-29 09:56:02.925323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=javafilter
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/kde/file_kde.scp scp2//source/kde/file_kde.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/kde/file_kde.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/kde/file_kde.scp	2011-12-05 16:23:33.966716511 +0100
>@@ -28,7 +28,7 @@
> 
> #ifdef ENABLE_KDE
> File gid_File_Lib_Kdebe
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
>@@ -37,9 +37,9 @@
> 
> #ifdef ENABLE_KDE4
> File gid_File_Lib_Kde4be
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>+    Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
> End
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/kde/makefile.mk scp2//source/kde/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/kde/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/kde/makefile.mk	2011-11-29 09:56:02.925323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=kde
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/layout/layout.scp scp2//source/layout/layout.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/layout/layout.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/layout/layout.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,62 +0,0 @@
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>-************************************************************************/
>-
>-#include "macros.inc"
>-
>-Directory gid_Dir_Share_Layout
>-    ParentID = gid_Dir_Share;
>-    DosName = "layout";
>-End
>-
>-File gid_File_Zip_Toolkit_Layout
>-   Dir = gid_Dir_Share_Layout;
>-   USER_FILE_BODY;
>-   Styles = (ARCHIVE);
>-   Name = "toolkit-layout.zip";
>-End
>-
>-File gid_File_Zip_Sc_Layout
>-   Dir = gid_Dir_Share_Layout;
>-   USER_FILE_BODY;
>-   Styles = (ARCHIVE);
>-   Name = "sc-layout.zip";
>-End
>-
>-File gid_File_Zip_Svx_Layout
>-   Dir = gid_Dir_Share_Layout;
>-   USER_FILE_BODY;
>-   Styles = (ARCHIVE);
>-   Name = "svx-layout.zip";
>-End
>-
>-File gid_File_Zip_Sw_Layout
>-   Dir = gid_Dir_Share_Layout;
>-   USER_FILE_BODY;
>-   Styles = (ARCHIVE);
>-   Name = "sw-layout.zip";
>-End
>-
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/layout/makefile.mk scp2//source/layout/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/layout/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/layout/makefile.mk	1970-01-01 01:00:00.000000000 +0100
>@@ -1,50 +0,0 @@
>-#*************************************************************************
>-#
>-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>-# 
>-# Copyright 2000, 2010 Oracle and/or its affiliates.
>-#
>-# OpenOffice.org - a multi-platform office productivity suite
>-#
>-# This file is part of OpenOffice.org.
>-#
>-# OpenOffice.org is free software: you can redistribute it and/or modify
>-# it under the terms of the GNU Lesser General Public License version 3
>-# only, as published by the Free Software Foundation.
>-#
>-# OpenOffice.org is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU Lesser General Public License version 3 for more details
>-# (a copy is included in the LICENSE file that accompanied this code).
>-#
>-# You should have received a copy of the GNU Lesser General Public License
>-# version 3 along with OpenOffice.org.  If not, see
>-# <http://www.openoffice.org/license.html>
>-# for a copy of the LGPLv3 License.
>-#
>-#*************************************************************************
>-
>-PRJ=..$/..
>-
>-PRJPCH=
>-
>-PRJNAME=scp2
>-TARGET=layout
>-TARGETTYPE=CUI
>-
>-# --- Settings -----------------------------------------------------
>-
>-.INCLUDE :	settings.mk
>-
>-SCP_PRODUCT_TYPE=osl
>-
>-PARFILES=
>-
>-.IF "$(ENABLE_LAYOUT)" == "TRUE"
>-PARFILES+= layout.par
>-.ENDIF # ENABLE_LAYOUT == TRUE
>-
>-# --- File ---------------------------------------------------------
>-
>-.INCLUDE :  target.mk
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/file_math.scp scp2//source/math/file_math.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/file_math.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/math/file_math.scp	2011-10-17 18:59:33.612146577 +0200
>@@ -46,16 +46,18 @@
> File gid_File_Share_Registry_Math_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "math.xcd";
> End
> 
>+#if defined WITH_HELP
> File gid_File_Help_Smath_Zip
>     Dir = gid_Dir_Help_Isolanguage;
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
>     Patchfiles = ();
> End
>+#endif
> 
> File gid_File_Exe_Smath
>     BIN_FILE_BODY;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/folderitem_math.scp scp2//source/math/folderitem_math.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/folderitem_math.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/math/folderitem_math.scp	2011-11-23 11:35:42.325833796 +0100
>@@ -27,16 +27,17 @@
> 
> #include "macros.inc"
> 
>+#ifndef ENABLE_SILENT_MSI
> FolderItem gid_Folderitem_Smath
>     Name = "%PRODUCTNAME Math";
>-    Name (pt-BR) = "%PRODUCTNAME_BR Math";
>     ModuleID = gid_Module_Prg_Math_Bin;
>     FolderID = gid_Folder_Staroffice51;
>     FileID = gid_File_Exe_Smath;
>     IconFile = gid_File_Exe_Smath;
>     IconID = 0;
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>     Styles = (NOWEB, NON_ADVERTISED);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
> End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/makefile.mk scp2//source/math/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/math/makefile.mk	2011-11-29 09:56:02.925323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=math
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/registryitem_math.scp scp2//source/math/registryitem_math.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/math/registryitem_math.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/math/registryitem_math.scp	2012-02-24 13:39:12.643661265 +0100
>@@ -75,7 +75,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Math_Bin;
>     Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochandler32
>@@ -96,8 +96,8 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Math_Bin;
>     Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>-End
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
>+    End
> 
> RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Miscstatus
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -194,7 +194,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Math_Bin;
>     Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochandler32
>@@ -215,7 +215,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Math_Bin;
>     Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Miscstatus
>@@ -290,7 +290,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Math_Bin;
>     Subkey = "soffice.StarMathDocument.6\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,38";
>+    Value = "<progpath>\program\soffice.bin,12";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Insertable
>@@ -436,6 +436,7 @@
>     Styles = ();
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_sxm_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -443,6 +444,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> // new odf file extension
> 
>@@ -544,9 +546,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Math_Bin;
>     Subkey = "opendocument.MathDocument.1\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,14";
>+    Value = "<progpath>\program\soffice.bin,12";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_odf_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -554,6 +557,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/onlineupdate/file_onlineupdate.scp scp2//source/onlineupdate/file_onlineupdate.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/onlineupdate/file_onlineupdate.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/onlineupdate/file_onlineupdate.scp	2012-02-24 13:38:59.910662459 +0100
>@@ -32,14 +32,14 @@
> File gid_File_Share_Registry_Onlineupdate_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "onlineupdate.xcd";
> End
> 
> #if defined LINUX || defined SOLARIS
> File gid_File_Bin_UnpackUpdate
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "unpack_update";
>     Styles = (PACKED);
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/onlineupdate/makefile.mk scp2//source/onlineupdate/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/onlineupdate/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/onlineupdate/makefile.mk	2011-11-29 09:56:02.925323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=update
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/common_brand.scp scp2//source/ooo/common_brand.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/common_brand.scp	2011-12-22 16:36:28.000000000 +0100
>+++ scp2//source/ooo/common_brand.scp	2012-02-24 13:39:12.643661265 +0100
>@@ -49,11 +49,11 @@
>             gid_Brand_Dir_Share_Uno_Packages_Cache,
>             gid_Brand_Dir_Share_Registry,
>             gid_Brand_Dir_Share_Xdg);
>-    Files = (gid_Brand_File_BasisLink,
>-             gid_Brand_File_Bin_Crashreport,
>+    Files = (gid_Brand_File_Bin_Crashreport,
>              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,
>@@ -63,8 +63,7 @@
>              gid_Brand_File_Bin_Unopkgexe,
>              gid_Brand_File_Bin_Unopkg,
>              gid_Brand_File_Bin_Libxml2,
>-             gid_Brand_File_Bmp_Shell,
>-             gid_Brand_File_Bmp_IntroAbout,
>+             gid_Brand_File_Bmp_IntroAboutShell,
>              gid_Brand_File_C05_Zip_Faq,
>              gid_Brand_File_C05_Zip_Register,
>              gid_Brand_File_C05_Htm_Faq,
>@@ -77,7 +76,6 @@
>              gid_Brand_File_Lib_Dbghelp,
>              gid_Brand_File_Lib_Mingw_GccS,
>              gid_Brand_File_Lib_Mingw_Stdcpp,
>-             gid_Brand_File_Lib_Mingwm10,
>              gid_Brand_File_Lib_Msvcr80,
>              gid_Brand_File_Lib_Msvcp80,
>              gid_Brand_File_Lib_Msvcm80,
>@@ -86,8 +84,6 @@
>              gid_Brand_File_Msvcm80crt_Manifest,
>              gid_Brand_File_Lib_Npsoplugin,
>              gid_Brand_File_Lib_Subscrib_C05,
>-             gid_Brand_File_ServicesRdb,
>-             gid_Brand_File_Share_Registry_Brand_Xcd,
>              gid_Brand_File_Share_Registry_O5oo_Xcd,
>              gid_Brand_File_Script_Unopkg,
>              gid_Brand_File_Share_Xdg_Base,
>@@ -105,8 +101,7 @@
> 	     gid_License_Txt,
> 	     git_License_Odt,
> 	     gid_Credits_Odt);
>-    Unixlinks = (gid_Brand_Unixlink_BasisLink,
>-                 gid_Brand_Unixlink_Program,
>+    Unixlinks = (gid_Brand_Unixlink_Program,
>                  gid_Brand_Unixlink_Unopkg,
>                  gid_Brand_Unixlink_Urelibs);
> End
>@@ -121,7 +116,6 @@
>     InstallOrder = "1050";
>     Dirs = (gid_Brand_Dir_Program,
>             gid_Brand_Dir_Program_Shell,
>-            gid_Brand_Dir_Program_Resource,
>             gid_Brand_Dir_Readme);
>     Files = (gid_Brand_File_Res_Iso,
>              gid_Brand_File_Res_Ooo,
>@@ -148,11 +142,6 @@
> #endif
> End
> 
>-Directory gid_Brand_Dir_Program_Resource
>-    ParentID = gid_Brand_Dir_Program;
>-    DosName = "resource";
>-End
>-
> Directory gid_Brand_Dir_Program_Shell
>     ParentID = gid_Brand_Dir_Program;
>     DosName = "shell";
>@@ -160,25 +149,11 @@
> 
> Directory gid_Brand_Dir_Readme
> #if defined MACOSX
>-    ParentID = gid_Brand_Dir_BasisLink;
>-#else
>-    ParentID = gid_Dir_Brand_Root;
>-#endif
>-    DosName = "readmes";
>-End
>-
>-Directory gid_Brand_Dir_Help
>-#if defined MACOSX
>     ParentID = gid_Dir_Bundle_Contents;
> #else
>     ParentID = gid_Dir_Brand_Root;
> #endif
>-    DosName = "help";
>-End
>-
>-Directory gid_Brand_Dir_Help_Isolanguage
>-    ParentID = gid_Brand_Dir_Help;
>-    DIR_ISOLANGUAGE_ALL_LANG;
>+    DosName = "readmes";
> End
> 
> Directory gid_Brand_Dir_Share
>@@ -221,6 +196,31 @@
>     DosName = "dict-af";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_An
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-an";
>+End
>+
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Ar
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-ar";
>+End
>+
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Be
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-be";
>+End
>+
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Bg
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-bg";
>+End
>+
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Bn
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-bn";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_Br
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-br";
>@@ -241,24 +241,19 @@
>     DosName = "dict-da";
> End
> 
>-Directory gid_Brand_Dir_Share_Extensions_Dict_De_At
>-    ParentID = gid_Brand_Dir_Share_Extensions;
>-    DosName = "dict-de-AT";
>-End
>-
>-Directory gid_Brand_Dir_Share_Extensions_Dict_De_Ch
>+Directory gid_Brand_Dir_Share_Extensions_Dict_De
>     ParentID = gid_Brand_Dir_Share_Extensions;
>-    DosName = "dict-de-CH";
>+    DosName = "dict-de";
> End
> 
>-Directory gid_Brand_Dir_Share_Extensions_Dict_De_De
>+Directory gid_Brand_Dir_Share_Extensions_Dict_En
>     ParentID = gid_Brand_Dir_Share_Extensions;
>-    DosName = "dict-de-DE";
>+    DosName = "dict-en";
> End
> 
>-Directory gid_Brand_Dir_Share_Extensions_Dict_En
>+Directory gid_Brand_Dir_Share_Extensions_Dict_El
>     ParentID = gid_Brand_Dir_Share_Extensions;
>-    DosName = "dict-en";
>+    DosName = "dict-el";
> End
> 
> Directory gid_Brand_Dir_Share_Extensions_Dict_Es
>@@ -276,16 +271,31 @@
>     DosName = "dict-fr";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Gd
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-gd";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_Gl
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-gl";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Gu
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-gu";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_He
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-he";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Hi
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-hi";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_Hu
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-hu";
>@@ -311,6 +321,11 @@
>     DosName = "dict-lt";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Lv
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-lv";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_Ne
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-ne";
>@@ -341,6 +356,11 @@
>     DosName = "dict-pt";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-pt-pt";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_Ro
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-ro";
>@@ -351,6 +371,11 @@
>     DosName = "dict-ru";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Si
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-si";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_Sk
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-sk";
>@@ -376,6 +401,11 @@
>     DosName = "dict-sw";
> End
> 
>+Directory gid_Brand_Dir_Share_Extensions_Dict_Te
>+    ParentID = gid_Brand_Dir_Share_Extensions;
>+    DosName = "dict-te";
>+End
>+
> Directory gid_Brand_Dir_Share_Extensions_Dict_Th
>     ParentID = gid_Brand_Dir_Share_Extensions;
>     DosName = "dict-th";
>@@ -431,38 +461,13 @@
> End
> #endif
> 
>-// Link to basis
>-
>-#if defined WNT
>-File gid_Brand_File_BasisLink
>-   TXT_FILE_BODY;
>-   Dir = gid_Dir_Brand_Root;
>-   Name = "basis-link";
>-   Styles = (PACKED);
>-End
>-#elif defined MACOSX
>-Directory gid_Brand_Dir_BasisLink
>-    ParentID = gid_Dir_Bundle_Contents;
>-    DosName = "basis-link";
>-End
>-#else
>-Unixlink gid_Brand_Unixlink_BasisLink
>-    BIN_FILE_BODY;
>-    Styles = ();
>-    // Styles = (LAYERLINK);
>-    Name = "basis-link";
>-    Dir = gid_Dir_Brand_Root;
>-    Target = "basis${OOOBASEVERSION}";
>-End
>-#endif
>-
> // UnixLinks
> 
> #if defined MACOSX
> Unixlink gid_Brand_Unixlink_Urelibs
>     Dir = gid_Brand_Dir_Program;
>     Name = "urelibs";
>-    Target = "../basis-link/ure-link/lib";
>+    Target = "../ure-link/lib";
> End
> #endif
> 
>@@ -481,7 +486,7 @@
> File gid_Brand_File_Html_Thirdpartylicensereadme
>     Name = "THIRDPARTYLICENSEREADME.html";
> #ifdef MACOSX
>-    Dir = gid_Brand_Dir_BasisLink;
>+    Dir = gid_Dir_Bundle_Contents;
> #else
>     Dir = gid_Dir_Brand_Root;
> #endif
>@@ -489,15 +494,32 @@
>     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;
>+#if defined MACOSX
>+    Name = "soffice.bin";
>+    InstallName = "soffice";
>+    Styles = (PACKED, SUBST_FILENAME);
>+#else
>     Name = EXENAME(soffice);
>   #ifdef WNT
>     Styles = (PACKED, PATCH_SO_NAME);
>   #else
>     Styles = (PACKED);
>   #endif
>+#endif
> End
> 
> #if defined(UNX) && !defined(QUARTZ)
>@@ -526,13 +548,13 @@
>     BIN_FILE_BODY;
>     Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED, PATCH);
>-    Name = "oosplash.bin";
>+    Name = "oosplash";
> End
> 
> #endif
> 
> // use this for high detail file open dialog >= 5.1 windows
>-#ifdef WNT
>+#if defined( _MSC_VER )
> File gid_Brand_File_Bin_Soffice_Bin_Manifest
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>@@ -620,7 +642,7 @@
> End
> #endif
> 
>-#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
>+#ifdef ENABLE_NSPLUGIN
> File gid_Brand_File_Lib_Npsoplugin
>     BIN_FILE_BODY;
>     Name = SPECIAL_NAME(npsoplugin);
>@@ -629,7 +651,7 @@
> End
> #endif
> 
>-File gid_Brand_File_Bmp_IntroAbout
>+File gid_Brand_File_Bmp_IntroAboutShell
>     TXT_FILE_BODY;
>     Dir = gid_Brand_Dir_Program;
>     Name = "intro.zip";
>@@ -643,13 +665,6 @@
>     Styles = (PACKED);
> End
> 
>-File gid_Brand_File_Bmp_Shell
>-    TXT_FILE_BODY;
>-    Dir = gid_Brand_Dir_Program_Shell;
>-    Name = "shell.zip";
>-    Styles = (ARCHIVE);
>-End
>-
> File gid_Brand_File_Txt_Package
>     TXT_FILE_BODY;
>     Dir = gid_Brand_Dir_Share_Extensions;
>@@ -657,13 +672,6 @@
>     Styles = (PACKED);
> End
> 
>-File gid_Brand_File_Share_Registry_Brand_Xcd
>-    TXT_FILE_BODY;
>-    Styles = (PACKED, SCPZIP_REPLACE);
>-    Dir = gid_Brand_Dir_Share_Registry;
>-    Name = "brand.xcd";
>-End
>-
> File gid_Brand_File_Share_Registry_Cjk_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED,MAKE_LANG_SPECIFIC);
>@@ -774,109 +782,6 @@
> #endif
> 
> 
>-#if defined WNT && defined(_gcc3)
>-File gid_Brand_File_Lib_Mingwm10
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Brand_Dir_Program;
>-    Name = "mingwm10.dll";
>-End
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_Brand_File_Lib_Msvcr80
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Brand_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcr80.dll";
>-#else
>-    Name = "msvcr80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT) && defined( _gcc3 )
>-
>-#if defined(MINGW_GCCDLL)
>-
>-File gid_Brand_File_Lib_Mingw_GccS
>-    TXT_FILE_BODY;
>-    Dir = gid_Brand_Dir_Program;
>-    Name = MINGW_GCCDLL;
>-    Styles = (PACKED);
>-End
>-
>-#endif
>-
>-#if defined(MINGW_GXXDLL)
>-
>-File gid_Brand_File_Lib_Mingw_Stdcpp
>-    TXT_FILE_BODY;
>-    Dir = gid_Brand_Dir_Program;
>-    Name = MINGW_GXXDLL;
>-    Styles = (PACKED);
>-End
>-
>-#endif
>-
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_Brand_File_Lib_Msvcp80
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Brand_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcp80.dll";
>-#else
>-    Name = "msvcp80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_Brand_File_Lib_Msvcm80
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Brand_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcm80.dll";
>-#else
>-    Name = "msvcm80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_Brand_File_Msvcm80crt_Manifest
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Brand_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "Microsoft.VC80.CRT.manifest";
>-#else
>-    Name = "Microsoft.VC80.DebugCRT.manifest";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
> // Profiles
> 
> Profile gid_Brand_Profile_Bootstrap_Ini
>@@ -923,15 +828,6 @@
> 
> // ProfileItems
> 
>-ProfileItem gid_Brand_Profileitem_Bootstrap_Baseinstall
>-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
>-    ModuleID = gid_Module_Root_Brand;
>-    Section = "Bootstrap";
>-    Order = 2;
>-    Key = "BaseInstallation";
>-    Value = "${OOO_BASE_DIR}";
>-End
>-
> ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
>     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
>     ModuleID = gid_Module_Root_Brand;
>@@ -970,7 +866,7 @@
>   #elif defined MACOSX
>     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
>   #else
>-    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
>+    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
>   #endif
> End
> 
>@@ -1205,22 +1101,21 @@
>     Value = "<buildversion>";
> End
> 
>-ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
>+ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
>     ProfileID = gid_Brand_Profile_Version_Ini;
>     ModuleID = gid_Module_Root_Brand;
>     Section = "Version";
>     Order = 18;
>-    Key = "OOOBaseVersion";
>-    Value = "${OOOBASEVERSION}";
>+    Key = "ExtensionUpdateURL";
>+    Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";
> End
> 
>-ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
>+ProfileItem gid_Brand_Profileitem_Version_ReferenceOOoMajorMinor
>     ProfileID = gid_Brand_Profile_Version_Ini;
>     ModuleID = gid_Module_Root_Brand;
>     Section = "Version";
>-    Order = 18;
>-    Key = "ExtensionUpdateURL";
>-    Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";
>+    Key = "ReferenceOOoMajorMinor";
>+    Value = "${REFERENCEOOOMAJORMINOR}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
>@@ -1231,16 +1126,20 @@
>     Value = "${ORIGIN}/..";
> End
> 
>-ProfileItem gid_Brand_Profileitem_Fundamental_Ooo_Base_Dir
>+ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir
>     ModuleID = gid_Module_Root_Brand;
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>-    Key = "OOO_BASE_DIR";
>-#if defined WNT
>-    Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
>-#else
>-    Value = "${BRAND_BASE_DIR}/basis-link";
>-#endif
>+    Key = "LO_LIB_DIR";
>+    Value = "${BRAND_BASE_DIR}/program";
>+End
>+
>+ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir
>+    ModuleID = gid_Module_Root_Brand;
>+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
>+    Section = "Bootstrap";
>+    Key = "LO_JAVA_DIR";
>+    Value = "${BRAND_BASE_DIR}/program/classes";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
>@@ -1248,7 +1147,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "BUNDLED_EXTENSIONS";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS}";
>+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
>@@ -1256,7 +1155,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "BUNDLED_EXTENSIONS_USER";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_USER}";
>+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_Prereg
>@@ -1264,7 +1163,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "BUNDLED_EXTENSIONS_PREREG";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_PREREG}";
>+    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_PREREG}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
>@@ -1272,7 +1171,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "UNO_SHARED_PACKAGES_CACHE";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_SHARED_PACKAGES_CACHE}";
>+    Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
>@@ -1280,7 +1179,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "SHARED_EXTENSIONS_USER";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":SHARED_EXTENSIONS_USER}";
>+    Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
>@@ -1288,7 +1187,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "UNO_USER_PACKAGES_CACHE";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_USER_PACKAGES_CACHE}";
>+    Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
>@@ -1296,7 +1195,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "TMP_EXTENSIONS";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":TMP_EXTENSIONS}";
>+    Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
>@@ -1304,7 +1203,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_MORE_TYPES";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}";
>+    Value = "<$ORIGIN/types>* ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
>@@ -1312,7 +1211,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_MORE_SERVICES";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES} $ORIGIN/services.rdb";
>+    Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
>@@ -1320,7 +1219,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_MORE_JAVA_TYPES";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_TYPES}";
>+    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
>@@ -1328,7 +1227,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_OVERRIDE_JAVA_JFW_SHARED_DATA}";
>+    Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data
>@@ -1336,7 +1235,7 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_OVERRIDE_JAVA_JFW_USER_DATA}";
>+    Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
>@@ -1344,7 +1243,13 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_MORE_JAVA_CLASSPATH_URLS";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_CLASSPATH_URLS}";
>+    Value = "";
>+#ifdef SYSTEM_HSQLDB
>+    ValueList1 = HSQLDB_JAR;
>+#endif
>+#ifdef SYSTEM_SAXON
>+    ValueList2 = SAXON_JAR;
>+#endif
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
>@@ -1352,7 +1257,11 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_BIN_DIR";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_BIN_DIR}";
>+#if defined WNT
>+    Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
>+#else
>+    Value = "${BRAND_BASE_DIR}/ure-link/bin";
>+#endif
> End
> 
> ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
>@@ -1360,7 +1269,23 @@
>     ProfileID = gid_Brand_Profile_Fundamental_Ini;
>     Section = "Bootstrap";
>     Key = "URE_LIB_DIR";
>-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_LIB_DIR}";
>+#if defined WNT
>+    Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
>+#else
>+    Value = "${BRAND_BASE_DIR}/ure-link/lib";
>+#endif
>+End
>+
>+ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers
>+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
>+    ModuleID = gid_Module_Root_Brand;
>+    Section = "Bootstrap";
>+    Key = "CONFIGURATION_LAYERS";
>+    Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry module:${BRAND_BASE_DIR}/share/registry/modules res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini xcsxcu:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry userext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
>+        // "xcsxcu:${${BRAND_BASE_DIR}/program/"PROFILENAME(uno)
>+        // ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment."
>+        // "configuration.PackageRegistryBackend/registry" can be dropped once
>+        // old UserInstallation format can no longer exist (probably OOo 4)
> End
> 
> #if !defined MACOSX
>@@ -1462,7 +1387,7 @@
>     Section = "Bootstrap";
>     Order = 4;
>     Key = "BASISINSTALLLOCATION";
>-    Value = "[INSTALLLOCATION]Basis\\";
>+    Value = "[INSTALLLOCATION]";
>     Inifiletablekey = "BasisInstallLocation";
>     Inifiletableaction = "1";
>     Styles = (INIFILETABLE);
>@@ -1510,7 +1435,7 @@
> File gid_License_Txt
>   TXT_FILE_BODY;
> #if defined MACOSX
>-    Dir = gid_Brand_Dir_BasisLink;
>+    Dir = gid_Dir_Bundle_Contents;
> #else
>     Dir = gid_Dir_Brand_Root;
> #endif
>@@ -1526,7 +1451,7 @@
> File gid_License_Odt
>     BIN_FILE_BODY;
> #if defined MACOSX
>-    Dir = gid_Brand_Dir_BasisLink;
>+    Dir = gid_Dir_Bundle_Contents;
> #else
>     Dir = gid_Dir_Brand_Root;
> #endif
>@@ -1537,7 +1462,7 @@
> File gid_Credits_Odt
>     BIN_FILE_BODY;
> #if defined MACOSX
>-    Dir = gid_Brand_Dir_BasisLink;
>+    Dir = gid_Dir_Bundle_Contents;
> #else
>     Dir = gid_Dir_Brand_Root;
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/directory_ooo_macosx.scp scp2//source/ooo/directory_ooo_macosx.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/directory_ooo_macosx.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/directory_ooo_macosx.scp	2011-09-13 16:39:36.073306253 +0200
>@@ -34,9 +34,7 @@
>     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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/directory_ooo.scp scp2//source/ooo/directory_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/directory_ooo.scp	2011-12-22 12:36:41.000000000 +0100
>+++ scp2//source/ooo/directory_ooo.scp	2011-12-07 10:31:08.561727561 +0100
>@@ -69,42 +69,6 @@
> End
> #endif
> 
>-#ifndef MACOSX
>-Directory gid_Dir_Ooo_Openofficeorg
>-    ParentID = PREDEFINED_PROGDIR;
>-  #ifdef WNT
>-    HostName = "${BASISROOTNAME}";
>-  #else
>-    HostName = ".";
>-  #endif
>-End
>-#endif
>-
>-#ifndef MACOSX
>-Directory gid_Dir_Ooo_Basis
>-  #ifdef WNT
>-    ParentID = gid_Dir_Brand_Root;
>-  #else
>-    ParentID = gid_Dir_Ooo_Openofficeorg;
>-  #endif
>-  #ifdef WNT
>-    HostName = "Basis";
>-  #else
>-    HostName = "basis${OOOBASEVERSION}";
>-  #endif
>-    Styles = (BASISDIRECTORY);
>-End
>-#endif
>-
>-Directory gid_Dir_Program
>-#if defined MACOSX
>-    ParentID = gid_Brand_Dir_BasisLink;
>-#else
>-    ParentID = gid_Dir_Ooo_Basis;
>-#endif
>-    DosName = "program";
>-End
>-
> #if defined MACOSX
> Unixlink gid_Unixlink_Applications
>     BIN_FILE_BODY;
>@@ -115,19 +79,9 @@
> End
> #endif
> 
>-Directory gid_Dir_Program_Remote
>-    ParentID = gid_Dir_Program;
>-    DosName = "remote";
>-End
>-
>-Directory gid_Dir_Program_Local
>-    ParentID = gid_Dir_Program;
>-    DosName = "local";
>-End
>-
> Directory gid_Dir_Addin
>     Styles = (CREATE);
>-    ParentID = gid_Dir_Program;
>+    ParentID = gid_Brand_Dir_Program;
>     DosName = "addin";
> End
> 
>@@ -136,45 +90,81 @@
>     DosName = "source";
> End
> 
>+Directory gid_Dir_Wizards
>+    Styles = (CREATE);
>+    ParentID = gid_Brand_Dir_Program;
>+    DosName = "wizards";
>+End
>+
>+Directory gid_Dir_Wizards_Ui
>+    Styles = (CREATE);
>+    ParentID = gid_Dir_Wizards;
>+    DosName = "ui";
>+End
>+
>+Directory gid_Dir_Wizards_Ui_Event
>+    Styles = (CREATE);
>+    ParentID = gid_Dir_Wizards_Ui;
>+    DosName = "event";
>+End
>+
>+Directory gid_Dir_Wizards_Fax
>+    Styles = (CREATE);
>+    ParentID = gid_Dir_Wizards;
>+    DosName = "fax";
>+End
>+
>+Directory gid_Dir_Wizards_Text
>+    Styles = (CREATE);
>+    ParentID = gid_Dir_Wizards;
>+    DosName = "text";
>+End
>+
>+Directory gid_Dir_Wizards_Common
>+    Styles = (CREATE);
>+    ParentID = gid_Dir_Wizards;
>+    DosName = "common";
>+End
>+
>+Directory gid_Dir_Wizards_Document
>+    Styles = (CREATE);
>+    ParentID = gid_Dir_Wizards;
>+    DosName = "document";
>+End
> Directory gid_Dir_Filter
>-    ParentID = gid_Dir_Program;
>+    ParentID = gid_Brand_Dir_Program;
>     DosName = "filter";
> End
> 
> Directory gid_Dir_Resource
>-    ParentID = gid_Dir_Program;
>+    ParentID = gid_Brand_Dir_Program;
>     DosName = "resource";
> End
> 
>-Directory gid_Dir_Httphome
>-    ParentID = gid_Dir_Program;
>-    DosName = "httphome";
>-End
>-
> Directory gid_Dir_Classes
>-    ParentID = gid_Dir_Program;
>+    ParentID = gid_Brand_Dir_Program;
>     DosName = "classes";
> End
> 
> #ifdef WNT
> 
> Directory gid_Dir_Shellnew
>-    ParentID = gid_Dir_Program;
>-    DosName = "shellnew";
>+    ParentID = gid_Brand_Dir_Program;
>+    DosName = "shlnew";
> End
> 
> Directory gid_Dir_ShellnewToo
>-    ParentID = gid_Dir_Program;
>-    DosName = "2shellnew";
>+    ParentID = gid_Brand_Dir_Program;
>+    DosName = "2shlnew";
> End
> 
> #endif
> 
> Directory gid_Dir_User
> #if defined MACOSX
>-    ParentID = gid_Brand_Dir_BasisLink;
>+    ParentID = gid_Dir_Bundle_Contents;
> #else
>-    ParentID = gid_Dir_Ooo_Basis;
>+    ParentID = gid_Dir_Brand_Root;
> #endif
>     DosName = "presets";
> End
>@@ -344,27 +334,18 @@
> End
> 
> Directory gid_Dir_Plugin
>-    ParentID = gid_Dir_Program;
>+    ParentID = gid_Brand_Dir_Program;
>     DosName = "plugin";
>     Styles = (WORKSTATION, CREATE);
> End
> 
>-Directory gid_Dir_Share
>-#if defined MACOSX
>-    ParentID = gid_Brand_Dir_BasisLink;
>-#else
>-    ParentID = gid_Dir_Ooo_Basis;
>-#endif
>-    DosName = "share";
>-End
>-
> Directory gid_Dir_Share_Migration
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "migration";
> End
> 
> Directory gid_Dir_Fonts
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "fonts";
> End
> 
>@@ -378,7 +359,7 @@
> #endif
> 
> Directory gid_Dir_Share_Xslt
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "xslt";
> End
> 
>@@ -460,7 +441,7 @@
> End
> 
> Directory gid_Dir_Share_Dtd
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "dtd";
> End
> 
>@@ -485,17 +466,12 @@
> End
> 
> Directory gid_Dir_Share_Pqa
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "pqa";
> End
> 
>-Directory gid_Dir_Share_Config
>-    ParentID = gid_Dir_Share;
>-    DosName = "config";
>-End
>-
> Directory gid_Dir_Share_Config_Wizard
>-    ParentID = gid_Dir_Share_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "wizard";
> End
> 
>@@ -510,7 +486,7 @@
> End
> 
> Directory gid_Dir_Share_Config_Sofficecfg
>-    ParentID = gid_Dir_Share_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "soffice.cfg";
> End
> 
>@@ -674,18 +650,13 @@
>     DosName = "menubar";
> End
> 
>-Directory gid_Dir_Share_Registry
>-    ParentID = gid_Dir_Share;
>-    DosName = "registry";
>-End
>-
> Directory gid_Dir_Share_Registry_Res
>-    ParentID = gid_Dir_Share_Registry;
>+    ParentID = gid_Brand_Dir_Share_Registry;
>     HostName = "res";
> End
> 
> Directory gid_Dir_Autotext
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "autotext";
> End
> 
>@@ -695,13 +666,13 @@
> End
> 
> Directory gid_Dir_Share_Autocorr
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "autocorr";
>     Styles = (WORKSTATION, CREATE);
> End
> 
> Directory gid_Dir_Basic
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "basic";
> End
> 
>@@ -761,62 +732,57 @@
> End
> 
> Directory gid_Dir_Share_Scripts
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "Scripts";
> End
> 
> Directory gid_Dir_Share_Dict
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "dict";
> End
> 
>-Directory gid_Dir_Config
>-    ParentID = gid_Dir_Share;
>-    DosName = "config";
>-End
>-
> Directory gid_Dir_Config_Language
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DIR_ISOLANGUAGE_ALL_LANG_2;
> End
> 
> Directory gid_Dir_Share_Config_Help
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "help";
> End
> 
> Directory gid_Dir_Config_More
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "more";
> End
> 
> Directory gid_Dir_Config_Start
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "start";
> End
> 
> Directory gid_Dir_Config_Tasks
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "tasks";
> End
> 
> Directory gid_Dir_Config_Settings
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "settings";
> End
> 
> Directory gid_Dir_Config_Symbol
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "symbol";
> End
> 
> Directory gid_Dir_Config_Webcast
>-    ParentID = gid_Dir_Config;
>+    ParentID = gid_Brand_Dir_Share_Config;
>     DosName = "webcast";
> End
> 
> Directory gid_Dir_Gallery
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "gallery";
> End
> 
>@@ -961,7 +927,7 @@
> End
> 
> Directory gid_Dir_Template
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "template";
> End
> 
>@@ -1076,7 +1042,7 @@
> End
> 
> Directory gid_Dir_Share_Database
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "database";
> End
> 
>@@ -1086,12 +1052,12 @@
> End
> 
> Directory gid_Dir_Explorer
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "explorer";
> End
> 
> Directory gid_Dir_Bookmark
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "bookmark";
> End
> 
>@@ -1131,12 +1097,12 @@
> End
> 
> Directory gid_Dir_Palmpilot
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "palmpilot";
> End
> 
> Directory gid_Dir_Samples
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "samples";
> End
> 
>@@ -1187,39 +1153,25 @@
> End
> 
> Directory gid_Dir_Wordbook
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "wordbook";
> End
> 
>-Directory gid_Dir_Wordbook_Language
>-    ParentID = gid_Dir_Wordbook;
>-    DIR_ISOLANGUAGE_ALL_LANG_2;
>-End
>-
> Directory gid_Dir_Share_Plugin
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "plugin";
> End
> 
> Directory gid_Dir_Share_Fingerprint
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "fingerprint";
> End
> 
>-Directory gid_Dir_Basis_Sdk
>-#if defined MACOSX
>-    ParentID = gid_Brand_Dir_BasisLink;
>-#else
>-    ParentID = gid_Dir_Ooo_Basis;
>-#endif
>-    DosName = "sdk";
>-End
>-
> Directory gid_Dir_Help
> #if defined MACOSX
>-    ParentID = gid_Brand_Dir_BasisLink;
>+    ParentID = gid_Dir_Bundle_Contents;
> #else
>-    ParentID = gid_Dir_Ooo_Basis;
>+    ParentID = gid_Dir_Brand_Root;
> #endif
>     DosName = "help";
> End
>@@ -1312,7 +1264,7 @@
> #ifdef UNX
> 
> Directory gid_Dir_Psprint
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "psprint";
> End
> 
>@@ -1339,7 +1291,7 @@
> #ifdef UNX
> 
> Directory gid_Dir_Share_Icons
>-    ParentID = gid_Dir_Share;
>+    ParentID = gid_Brand_Dir_Share;
>     DosName = "icons";
> End
> 
>@@ -1524,3 +1476,13 @@
>     ParentID = gid_Dir_Template_Common;
>     DosName = "presnt";
> End
>+
>+Directory gid_Brand_Dir_Program_Services
>+    ParentID = gid_Brand_Dir_Program;
>+    DosName = "services";
>+End
>+
>+Directory gid_Brand_Dir_Program_Types
>+    ParentID = gid_Brand_Dir_Program;
>+    DosName = "types";
>+End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_extra_ooo.scp scp2//source/ooo/file_extra_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_extra_ooo.scp	2011-12-22 12:36:41.000000000 +0100
>+++ scp2//source/ooo/file_extra_ooo.scp	2011-10-17 18:59:33.613146577 +0200
>@@ -51,7 +51,7 @@
> #ifdef UNX
> 
> File gid_File_Extra_Cfgsrv_Bitmap_Unx
>-    Dir = gid_Dir_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     ARCHIVE_TXT_FILE_BODY;
>     Name = "cfgsrvbitmapunx.zip";
> End
>@@ -66,7 +66,7 @@
> End
> 
> File gid_File_Extra_Cfgsrv
>-    Dir = gid_Dir_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     TXT_FILE_BODY;
>     Styles = (ARCHIVE);
>     Name = "cfgsrvnolang.zip";
>@@ -416,15 +416,8 @@
> End
> 
> File gid_File_Extra_Wordbook
>-    Dir = gid_Dir_Wordbook_Language;
>+    Dir = gid_Dir_Wordbook;
>     TXT_FILE_BODY;
>     Styles = (ARCHIVE, DONT_OVERWRITE);
>-    EXTRA_IDENT_ALL_LANG(wordbook.zip);
>-End
>-
>-File gid_File_Extra_Wordbook_Lang
>-    Dir = gid_Dir_Wordbook_Language;
>-    TXT_FILE_BODY;
>-    Styles = (ARCHIVE, DONT_OVERWRITE);
>-    EXTRA_ALL_LANG(wordbook,zip);
>+    Name = "wordbook.zip";
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_font_ooo.scp scp2//source/ooo/file_font_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_font_ooo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/file_font_ooo.scp	2012-02-24 13:39:12.643661265 +0100
>@@ -91,33 +91,27 @@
> 
> // Liberation Mono
> #ifndef WITHOUT_FONTS 
>-#ifndef WNT 
> STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular) 
> STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) 
> STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic) 
> STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic) 
> #endif
>-#endif
> 
> // Liberation Sans
> #ifndef WITHOUT_FONTS 
>-#ifndef WNT 
> STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular) 
> STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic) 
>-STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) 
>+STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Sans Bold) 
> STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic) 
> #endif
>-#endif
> 
> // Liberation Serif
> #ifndef WITHOUT_FONTS 
>-#ifndef WNT 
> STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular) 
> STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) 
> STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic) 
> STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic) 
> #endif
>-#endif
> 
> // Gentium fonts
> 
>@@ -138,13 +132,15 @@
> // Linux Libertine G and Linux Biolinum G fonts
> 
> #ifndef WITHOUT_FONTS
>-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertineG_Re.ttf, Linux Libertine G Regular)
>-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertineG_Bd.ttf, Linux Libertine G Bold)
>-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertineG_It.ttf, Linux Libertine G Italic)
>-STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertineG_BI.ttf, Linux Libertine G Bold Italic)
>-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinumG_Re.ttf, Linux Biolinum G Regular)
>-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinumG_Bd.ttf, Linux Biolinum G Bold)
>-STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinumG_It.ttf, Linux Biolinum G Italic)
>+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertine_R_G.ttf, Linux Libertine G Regular)
>+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Semibold, LinLibertine_RZ_G.ttf, Linux Libertine G Semibold)
>+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertine_RB_G.ttf, Linux Libertine G Bold)
>+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertine_RI_G.ttf, Linux Libertine G Italic)
>+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_SemiboldItalic, LinLibertine_RZI_G.ttf, Linux Libertine G Semibold Italic)
>+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertine_RBI_G.ttf, Linux Libertine G Bold Italic)
>+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinum_R_G.ttf, Linux Biolinum G Regular)
>+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinum_RB_G.ttf, Linux Biolinum G Bold)
>+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinum_RI_G.ttf, Linux Biolinum G Italic)
> #endif
> 
> // fontconfig updates to allow proper use of local fonts
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_improvement.scp scp2//source/ooo/file_improvement.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_improvement.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/file_improvement.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,41 +0,0 @@
>-/*************************************************************************
>-*
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>-************************************************************************/
>-
>-#include "macros.inc"
>-
>-#if defined(BUILD_SPECIAL)
>-File gid_File_Share_Registry_Oooimprovement_Xcd
>-    TXT_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>-    Name = "oooimprovement.xcd";
>-End
>-#endif
>-
>-#if defined(BUILD_SPECIAL)
>-STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
>-#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_library_ooo.scp scp2//source/ooo/file_library_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_library_ooo.scp	2011-12-05 11:53:51.000000000 +0100
>+++ scp2//source/ooo/file_library_ooo.scp	2012-02-24 13:39:12.643661265 +0100
>@@ -28,15 +28,12 @@
> 
> #if defined SOLAR_JAVA && defined WNT
> File gid_File_Lib_Accessbridge
>-    BIN_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     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)
>@@ -45,31 +42,31 @@
> STD_LIB_FILE( gid_File_Lib_Basctl, basctl)
> 
> File gid_File_Lib_Basprov
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>-    Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
>+    Name = STRING(CONCAT3(basprov,.uno,UNXSUFFIX));
>   #else
>-    Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,.dll));
>+    Name = STRING(CONCAT3(basprov,.uno,.dll));
>   #endif
> End
> 
> File gid_File_Lib_Vbaevent
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>-    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
>+    Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX));
>   #else
>-    Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
>+    Name = STRING(CONCAT3(vbaevents,.uno,.dll));
>   #endif
> End
> 
> STD_LIB_FILE( gid_File_Lib_Bib , bib)
> 
> File gid_File_Lib_Cached1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -83,7 +80,7 @@
> 
> #ifdef WITH_LDAP
> File gid_File_Lib_Ldapbe2
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -100,50 +97,46 @@
> STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
> 
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Lib_Cli_Oootypes_Assembly
>     TXT_FILE_BODY;
>     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
>     Name = "cli_oootypes.dll";
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Assemblyname = "cli_oootypes";
>     PublicKeyToken = "ce2cb7e279207b9e";
>     Version = "${CLI_OOOTYPES_NEW_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> File gid_File_Lib_Policy_Cli_Oootypes_Assembly
>     TXT_FILE_BODY;
>     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
>     Name = "${CLI_OOOTYPES_POLICY_ASSEMBLY}.dll";
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Assemblyname = "${CLI_OOOTYPES_POLICY_ASSEMBLY}";
>     PublicKeyToken = "ce2cb7e279207b9e";
>     Version = "${CLI_OOOTYPES_POLICY_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Lib_Policy_Cli_Oootypes_Config
>     TXT_FILE_BODY;
>     Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
>     Name = "cli_oootypes.config";
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
> End
> 
>@@ -156,7 +149,7 @@
> 
> 
> File gid_File_Lib_Comphelper2
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX));
>   #else
>@@ -173,7 +166,7 @@
> #ifndef SYSTEM_CURL
> 
> File gid_File_Lib_Curl
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -196,7 +189,7 @@
> #ifndef SYSTEM_DB
> 
> File gid_File_Lib_Db
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -213,7 +206,7 @@
> #ifdef ENABLE_SYSTRAY_GTK
> File gid_File_Lib_QStart_Gtk
>     Name = LIBNAME(qstart_gtk);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -234,7 +227,7 @@
> 
> 
> File gid_File_Lib_Dbpool
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -249,7 +242,7 @@
> STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
> 
> File gid_File_Lib_Dict_Ja
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(libdict_ja,UNXSUFFIX));
>   #else
>@@ -260,7 +253,7 @@
> End
> 
> File gid_File_Lib_Dict_Zh
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(libdict_zh,UNXSUFFIX));
>   #else
>@@ -271,7 +264,7 @@
> End
> 
> File gid_File_Lib_Collator_Data
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(libcollator_data,UNXSUFFIX));
>   #else
>@@ -282,7 +275,7 @@
> End
> 
> File gid_File_Lib_Index_Data
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(libindex_data,UNXSUFFIX));
>   #else
>@@ -293,7 +286,7 @@
> End
> 
> File gid_File_Lib_Textconv_Dict
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(libtextconv_dict,UNXSUFFIX));
>   #else
>@@ -304,29 +297,29 @@
> End
> 
> File gid_File_Lib_Dlgprov
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>-    Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
>+    Name = STRING(CONCAT3(dlgprov,.uno,UNXSUFFIX));
>   #else
>-    Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,.dll));
>+    Name = STRING(CONCAT3(dlgprov,.uno,.dll));
>   #endif
> End
> 
> File gid_File_Lib_Stringresource
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>-    Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
>+    Name = STRING(CONCAT3(stringresource,.uno,UNXSUFFIX));
>   #else
>-    Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,.dll));
>+    Name = STRING(CONCAT3(stringresource,.uno,.dll));
>   #endif
> End
> 
> File gid_File_Lib_Vbaobj
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -337,7 +330,7 @@
> End
> 
> File gid_File_Lib_Vbaswobj
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -348,7 +341,7 @@
> End
> 
> File gid_File_Lib_Vbamsforms
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -359,7 +352,7 @@
> End
> 
> File gid_File_Lib_Vbahelper
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -373,7 +366,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Dnd
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "dnd.dll";
>@@ -384,7 +377,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Dtrans
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Name = "dtrans.dll";
>     Dir = SCP2_OOO_BIN_DIR;
>     Styles = (PACKED);
>@@ -405,7 +398,7 @@
> STD_LIB_FILE( gid_File_Lib_Emser, emser )
> 
> File gid_File_Lib_Inprocserv
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "inprocserv.dll";
>@@ -417,14 +410,14 @@
> 
> #ifdef ENABLE_KAB
> File gid_File_Lib_Kab_1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
> End
> 
> File gid_File_Lib_Kab_Drv_1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX));
>@@ -434,14 +427,14 @@
> 
> #ifdef MACOSX
> File gid_File_Lib_Macab_1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
> End
> 
> File gid_File_Lib_Macab_Drv_1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
>@@ -457,32 +450,18 @@
> 
> #endif  // #ifdef UNX
> 
>-File gid_File_Lib_Evtatt
>-    TXT_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_OOO_BIN_DIR;
>-  #ifdef UNX
>-    Name = STRING(CONCAT2(libevtatt,UNXSUFFIX));
>-  #else
>-    Name = "evtatt.dll";
>-  #endif
>-End
>+STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
> 
> SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
> 
>-File gid_File_Lib_Filterconfig1
>-    TXT_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_OOO_BIN_DIR;
>-    Name = SPECIAL_NAME(filterconfig1);
>-End
>+STD_LIB_FILE(gid_File_Lib_Filterconfig1, filterconfig)
> 
> STD_LIB_FILE( gid_File_Lib_Flat, flat)
> 
> #ifdef WNT
> 
> File gid_File_Lib_Fop
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "fop.dll";
>@@ -493,7 +472,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Fps
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "fps.dll";
>@@ -504,28 +483,18 @@
> #if defined UNX && ! defined MACOSX
> 
> File gid_File_Lib_Desktopbe
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
> End
> 
>-#ifdef ENABLE_GTK
>-#ifdef GTK_TWO_FOUR
>-File gid_File_Lib_Fps_Gnome
>-    TXT_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_OOO_BIN_DIR;
>-    Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno);
>-End
>-#endif
>-#endif
> #ifdef ENABLE_KDE4
> #ifndef MACOSX
> File gid_File_Lib_Fps_Kde4
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>+    Dir = SCP2_OOO_BIN_DIR;
>     Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
> End
> #endif
>@@ -533,9 +502,9 @@
> #ifdef ENABLE_KDE
> #ifndef MACOSX
> File gid_File_Lib_Fps_Kde
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>+    Dir = SCP2_OOO_BIN_DIR;
>     Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
> End
> File gid_File_Bin_KdeFilePicker
>@@ -550,21 +519,21 @@
> 
> #ifdef QUARTZ
> File gid_File_Lib_Fps_Aqua
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
> End
> 
> File gid_File_Lib_MacOSXSpell
>-	TXT_FILE_BODY;
>+	LIB_FILE_BODY;
> 	Styles = (PACKED);
> 	Name = LIBNAME(MacOSXSpell);
> 	Dir = SCP2_OOO_BIN_DIR;
> End
> 
> File gid_File_Lib_avmediaQuickTime
>-	TXT_FILE_BODY;
>+	LIB_FILE_BODY;
> 	Styles = (PACKED);
> 	Name = LIBNAME(avmediaQuickTime);
> 	Dir = SCP2_OOO_BIN_DIR;
>@@ -579,10 +548,10 @@
> 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;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -600,23 +569,25 @@
>   #endif
> End
> 
>+#ifndef WNT
>+
> File gid_File_Lib_Pixman
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>+    Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>     #ifdef MACOSX
>-       Name = STRING(CONCAT3(libpixman-1,.0,UNXSUFFIX));
>+       Name = "libpixman-1.a";
>     #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 )
>@@ -624,7 +595,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Ftransl
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "ftransl.dll";
>@@ -638,7 +609,7 @@
> 
> File gid_File_Lib_Fwk
>     Name = LIBNAME(fwk);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -647,9 +618,9 @@
> 
> STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
> 
>-#ifdef WNT
>+#ifdef ENABLE_DIRECTX
> File gid_File_Lib_Gdiplus
>-    BIN_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "gdiplus.dll";
>@@ -661,7 +632,7 @@
> STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
> 
> File gid_File_Lib_I18npool
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -671,19 +642,10 @@
>   #endif
> End
> 
>-File gid_File_Lib_I18nregexp
>-    TXT_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_OOO_BIN_DIR;
>-  #ifdef UNX
>-    Name = STRING(CONCAT3(libi18nregexp,COMID,UNXSUFFIX));
>-  #else
>-    Name = STRING(CONCAT3(i18nregexp,COMID,.dll));
>-  #endif
>-End
>+STD_LIB_FILE( gid_File_I18nregexp, i18nregexp )
> 
> File gid_File_Lib_I18nsearch
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -703,7 +665,7 @@
> End
> 
> File gid_File_Lib_I18nutil
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT3(libi18nutil,COMID,UNXSUFFIX));
>   #else
>@@ -718,7 +680,7 @@
> #ifndef SYSTEM_ICU
> 
> File gid_File_Lib_Icudata
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
>   #else
>@@ -729,7 +691,7 @@
> End
> 
> File gid_File_Lib_Icui18n
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
>   #else
>@@ -740,7 +702,7 @@
> End
> 
> File gid_File_Lib_Icule
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
>   #else
>@@ -751,7 +713,7 @@
> End
> 
> File gid_File_Lib_Icuuc
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
>   #else
>@@ -771,7 +733,7 @@
> 
> #ifdef SOLAR_JAVA
> File gid_File_Lib_Hsqldb_2
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -786,7 +748,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Lngpckinsthlp
>-    BIN_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, LANGUAGEPACK, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "lngpckinsthlp.dll";
>@@ -794,10 +756,10 @@
> 
> #endif
> 
>-#ifdef WNT
>+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
> 
> File gid_File_Lib_sn_tools
>-    BIN_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "sn_tools.dll";
>@@ -808,7 +770,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Patchmsi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Name = "patchmsi.dll";
>     Dir = SCP2_OOO_BIN_DIR;
>     Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
>@@ -816,21 +778,21 @@
> 
> #endif
> 
>-#ifdef WNT
>+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
> 
> File gid_File_Lib_Rebasemsi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Name = "rebase.dll";
>     Dir = SCP2_OOO_BIN_DIR;
>     Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
> End
> 
>-#endif
>+#endif /* WNT && HAVE_WINDOWS_SDK */
> 
> STD_LIB_FILE( gid_File_Lib_Lng, lng)
> 
> File gid_File_Lib_Localedata_En
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(liblocaledata_en,UNXSUFFIX));
>   #else
>@@ -841,7 +803,7 @@
> End
> 
> File gid_File_Lib_Localedata_Es
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(liblocaledata_es,UNXSUFFIX));
>   #else
>@@ -852,7 +814,7 @@
> End
> 
> File gid_File_Lib_Localedata_Euro
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(liblocaledata_euro,UNXSUFFIX));
>   #else
>@@ -863,7 +825,7 @@
> End
> 
> File gid_File_Lib_Localedata_Others
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(liblocaledata_others,UNXSUFFIX));
>   #else
>@@ -874,7 +836,7 @@
> End
> 
> File gid_File_Lib_Mcnttype
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -892,7 +854,7 @@
> #else
> 
> File gid_File_Lib_Mozbootstrap
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -914,112 +876,13 @@
> 
> STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
> 
>-#ifdef WNT
>-#if defined(_gcc3)
>-
>-File gid_File_Lib_Mingwm10
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>-    Name = "mingwm10.dll";
>-End
>-
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Lib_Msvcr80
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcr80.dll";
>-#else
>-    Name = "msvcr80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Lib_Msvcp80
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcp80.dll";
>-#else
>-    Name = "msvcp80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Lib_Msvcm80
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcm80.dll";
>-#else
>-    Name = "msvcm80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT) && defined( _gcc3 )
>-
>-#if defined(MINGW_GCCDLL)
>-
>-File gid_File_Lib_Mingw_GccS
>-    TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Name = MINGW_GCCDLL;
>-    Styles = (PACKED);
>-End
>+STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
> 
>-#endif
>+STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
> 
>-#if defined(MINGW_GXXDLL)
>+STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
> 
>-File gid_File_Lib_Mingw_Stdcpp
>-    TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Name = MINGW_GXXDLL;
>-    Styles = (PACKED);
>-End
>-
>-#endif
>-
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Msvcm80crt_Manifest
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "Microsoft.VC80.CRT.manifest";
>-#else
>-    Name = "Microsoft.VC80.DebugCRT.manifest";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>+STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
> 
> STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
> STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
>@@ -1031,16 +894,7 @@
> #ifdef SOLAR_JAVA
> #ifndef MACOSX
> 
>-File gid_File_Lib_Officebean
>-    TXT_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_OOO_BIN_DIR;
>-  #ifdef UNX
>-    Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
>-  #else
>-    Name = "officebean.dll";
>-  #endif
>-End
>+STD_LIB_FILE(gid_File_Lib_Officebean, officebean)
> 
> #endif
> #endif
>@@ -1048,7 +902,7 @@
> #if defined(WNT) && !defined(DISABLE_ATL)
> 
> File gid_File_Lib_Ole
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "oleautobridge.uno.dll";
>@@ -1066,23 +920,9 @@
> 
> STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
> 
>-File gid_File_Lib_Deployment
>-#if defined UNX
>-    Name = STRING(CONCAT4(deployment,DLLPOSTFIX,.uno,UNXSUFFIX));
>-#else
>-    Name = STRING(CONCAT3(deployment,DLLPOSTFIX,.uno.dll));
>-#endif
>-    PACKED_LIB_FILE_BODY;
>-End
>+SPECIAL_LIB_FILE(gid_File_Lib_Deployment,deployment)
> 
>-File gid_File_Lib_DeploymentGui
>-#if defined UNX
>-    Name = STRING(CONCAT4(deploymentgui,DLLPOSTFIX,.uno,UNXSUFFIX));
>-#else
>-    Name = STRING(CONCAT3(deploymentgui,DLLPOSTFIX,.uno.dll));
>-#endif
>-    PACKED_LIB_FILE_BODY;
>-End
>+SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
> 
> STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
> 
>@@ -1090,20 +930,16 @@
> 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)
> File gid_File_Lib_Desktop_Detector
>     Name = LIBNAME(desktop_detector);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
> File gid_File_Lib_Vclplug_Gen
>     Name = LIBNAME(vclplug_gen);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1113,7 +949,15 @@
> #ifdef ENABLE_GTK
> File gid_File_Lib_Vclplug_Gtk
>     Name = LIBNAME(vclplug_gtk);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>+    Styles = (PACKED);
>+    Dir = SCP2_OOO_BIN_DIR;
>+End
>+#endif
>+#ifdef ENABLE_GTK3
>+File gid_File_Lib_Vclplug_Gtk3
>+    Name = LIBNAME(vclplug_gtk3);
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1122,7 +966,7 @@
> #ifndef MACOSX
> File gid_File_Lib_Vclplug_Kde
>     Name = LIBNAME(vclplug_kde);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1132,9 +976,9 @@
> #ifndef MACOSX
> File gid_File_Lib_Vclplug_Kde4
>     Name = LIBNAME(vclplug_kde4);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>+    Dir = SCP2_OOO_BIN_DIR;
> End
> #endif
> #endif
>@@ -1143,7 +987,7 @@
> #if defined(QUARTZ)
> File gid_File_Lib_AppleRemote
>     Name = LIBNAME(AppleRemote);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1152,7 +996,7 @@
> #if defined(QUARTZ)
> File gid_File_Lib_Basebmp
>     Name = LIBNAME(basebmp);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1166,7 +1010,7 @@
> #if defined UNX && ! defined MACOSX
> 
> File gid_File_Lib_Recentfile
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
>@@ -1174,59 +1018,52 @@
> 
> #endif
> 
>-#ifdef WNT
>+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
> 
> File gid_File_Lib_Reg4allmsdoc
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "reg4allmsdoc.dll";
> End
> 
>-#endif
>-
>-#ifdef WNT
>-
> File gid_File_Lib_Qslnkmsi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "qslnkmsi.dll";
> End
> 
>-#endif
>-
>-#ifdef WNT
> 
> File gid_File_Lib_Sdqsmsi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "sdqsmsi.dll";
> End
> 
>-#endif
>+#endif /* WNT && HAVE_WINDOWS_SDK */
> 
> File gid_File_Lib_Res
>     Name = LIBNAME(res);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
> 
>-File gid_File_Lib_Sax_Uno
>-    TXT_FILE_BODY;
>+File gid_File_Lib_Expwrap_Uno
>+    LIB_FILE_BODY;
>     Styles = (PACKED,DONT_OVERWRITE);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>-    Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
>+    Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX));
>   #else
>-    Name = "sax.uno.dll";
>+    Name = "expwrap.uno.dll";
>   #endif
> End
> 
> File gid_File_Lib_Fastsax_Uno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED,DONT_OVERWRITE);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1245,7 +1082,7 @@
> STD_LIB_FILE( gid_File_Lib_Scn, scn)
> 
> File gid_File_Lib_Scriptframe
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     #ifdef MACOSX
>        Name = "libscriptframe.dylib";
>@@ -1263,7 +1100,7 @@
> STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
> 
> File gid_File_Lib_Slideshow
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1274,7 +1111,7 @@
> End
> 
> File gid_File_Lib_Sdbc_2
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1290,7 +1127,7 @@
> 
> File gid_File_Lib_Sfx
>     Name = LIBNAME(sfx);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1298,7 +1135,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Instooofiltmsi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "instooofiltmsi.dll";
>@@ -1309,7 +1146,7 @@
> #ifdef WNT
> 
> File gid_File_Lib_Smplmail
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "smplmail.uno.dll";
>@@ -1323,7 +1160,7 @@
> 
> File gid_File_Lib_Spa
>     Name = LIBNAME(spa);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1331,7 +1168,7 @@
> #endif
> 
> File gid_File_Lib_Spell
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Name = LIBNAME(spell);
>     Dir = SCP2_OOO_BIN_DIR;
>@@ -1345,8 +1182,6 @@
> 
> SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
> 
>-STD_LIB_FILE( gid_File_Lib_Sts , sts)
>-
> STD_LIB_FILE( gid_File_Lib_Svl, svl )
> STD_LIB_FILE( gid_File_Lib_Svtools, svt )
> 
>@@ -1362,9 +1197,13 @@
> 
> STD_LIB_FILE( gid_File_Lib_Msword, msword )
> 
>+#ifdef MERGELIBS
>+STD_LIB_FILE( gid_File_Lib_Merged, merged )
>+#endif
>+
> #if ! defined UNX
> File gid_File_Lib_Sysdtrans
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "sysdtrans.dll";
>@@ -1388,7 +1227,7 @@
> STD_LIB_FILE( gid_File_Lib_Tools, tl )
> 
> File gid_File_Lib_Tvhlp1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1399,7 +1238,7 @@
> End
> 
> File gid_File_Lib_Ucb1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1410,7 +1249,7 @@
> End
> 
> File gid_File_Lib_Ucbhelper
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_OOO_BIN_DIR;
>     Styles = (PACKED);
>   #ifdef UNX
>@@ -1421,7 +1260,7 @@
> End
> 
> File gid_File_Lib_Ucpchelp1
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
>   #else
>@@ -1456,15 +1295,17 @@
> SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
> #endif
> 
>+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
>+
> File gid_File_Lib_Lnth
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Name = LIBNAME(lnth);
>     Dir = SCP2_OOO_BIN_DIR;
> End
> 
> File gid_File_Lib_Hyph
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Name = LIBNAME(hyphen);
>     Dir = SCP2_OOO_BIN_DIR;
>@@ -1478,7 +1319,7 @@
> 
> File gid_File_Lib_Vcl
>     Name = LIBNAME(vcl);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1489,7 +1330,7 @@
> 
> File gid_File_Lib_Xo
>     Name = LIBNAME(xo);
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> End
>@@ -1509,7 +1350,7 @@
> 
> #ifndef SYSTEM_LIBXSLT
> File gid_File_Lib_Xslt
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1536,47 +1377,41 @@
> 
> #ifdef GSTREAMER
> SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
>-#else
>-#if defined UNX
>-#ifdef SOLAR_JAVA
>-STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
>-#endif
> #elif defined WNT
> #ifdef ENABLE_DIRECTX
> SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
> #endif
> #endif
>-#endif
> 
>-#ifndef WITHOUT_MOZILLA
>-File gid_File_Lib_XSec_Framework
>-    TXT_FILE_BODY;
>+File gid_File_Lib_XSec_XMLSecurity
>+    LIB_FILE_BODY;
> 	#ifdef UNX
>-        Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
>+        Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
>     #else
>-        Name = "xsec_fw.dll";
>+        Name = "xmlsecurity.dll";
>     #endif
>     Dir = SCP2_OOO_BIN_DIR;
>     Styles = (PACKED);
> End
> 
>-File gid_File_Lib_XSec_XmlSec
>-    TXT_FILE_BODY;
>+File gid_File_Lib_XSec_Framework
>+    LIB_FILE_BODY;
> 	#ifdef UNX
>-        Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
>+        Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
>     #else
>-        Name = "xsec_xmlsec.dll";
>+        Name = "xsec_fw.dll";
>     #endif
>     Dir = SCP2_OOO_BIN_DIR;
>     Styles = (PACKED);
> End
> 
>-File gid_File_Lib_XSec_XMLSecurity
>-    TXT_FILE_BODY;
>-	#ifdef UNX
>-        Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
>+#if defined(ENABLE_XMLSEC)
>+File gid_File_Lib_XSec_XmlSec
>+    LIB_FILE_BODY;
>+    #ifdef UNX
>+        Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
>     #else
>-        Name = "xmlsecurity.dll";
>+        Name = "xsec_xmlsec.dll";
>     #endif
>     Dir = SCP2_OOO_BIN_DIR;
>     Styles = (PACKED);
>@@ -1584,7 +1419,7 @@
> 
> #ifdef WNT
> File gid_File_Lib_LibXMLSec_xmlseccore
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     #ifdef _gcc3
>       Name = "libxmlsec1.dll";
>     #else
>@@ -1595,7 +1430,7 @@
> End
> 
> File gid_File_Lib_LibXMLSec_xmlsecmscrypto
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef _gcc3
>     Name = "libxmlsec1-mscrypto.dll";
>   #else
>@@ -1605,12 +1440,10 @@
>     Styles = (PACKED);
> End
> #endif
>-
>-//i20156 - end
> #endif
> 
> File gid_File_Lib_Migrationoo2
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1621,7 +1454,7 @@
> End
> 
> File gid_File_Lib_Migrationoo3
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1631,16 +1464,12 @@
>   #endif
> End
> 
>-#ifndef SYSTEM_LIBTEXTCAT
>+#if defined(WNT) && !defined(SYSTEM_LIBEXTTEXTCAT)
> File gid_File_Lib_Libtextcat
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>-  #ifdef UNX
>-    Name = STRING(CONCAT2(libtextcat,UNXSUFFIX));
>-  #else
>-    Name = "libtextcat.dll";
>-  #endif
>+    Name = "libexttextcat.dll";
> End
> #endif
> 
>@@ -1652,16 +1481,16 @@
> 
> #ifdef WNT
> File gid_File_Lib_Onlinecheck
>-    BIN_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "onlinecheck.dll";
> End
> #endif
> 
>-#ifdef OPENSSL
>+#ifndef SYSTEM_OPENSSL
> File gid_File_Lib_Openssl
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef WNT
>@@ -1670,9 +1499,9 @@
> End
> #endif
> 
>-#ifdef OPENSSL
>+#ifndef SYSTEM_OPENSSL
> File gid_File_Lib_Crypto
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
> 
>@@ -1683,14 +1512,14 @@
> #endif
> 
> File gid_File_Lib_Soffice
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = SCP2_URE_DL_NORMAL("sofficeapp");
>     Styles = (PACKED);
> End
> 
> File gid_File_Lib_Unopkgapp
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = SCP2_URE_DL_NORMAL("unopkgapp");
>     Styles = (PACKED);
>@@ -1698,18 +1527,17 @@
> 
> STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
> 
>-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
>-    !(defined M1400 && defined PROF_EDITION && !defined _DEBUG_RUNTIME)
>+#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
>         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
>         // gid_Brand_File_Lib_Msvcr80
> File gid_File_Moz_Msvcp80
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = SCP2_URE_DL_NORMAL("msvcp80");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
> End
> File gid_File_Moz_Msvcr80
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = SCP2_URE_DL_NORMAL("msvcr80");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -1717,14 +1545,14 @@
> File gid_File_Moz_Msvc80crt_Manifest
>     BIN_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "Microsoft.VC80.CRT.manifest";
> End
> #endif
> 
> #ifndef SYSTEM_REDLAND
> File gid_File_Lib_Raptor
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1743,7 +1571,7 @@
> End
> 
> File gid_File_Lib_Rasqal
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1762,7 +1590,7 @@
> End
> 
> File gid_File_Lib_Rdf
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = SCP2_OOO_BIN_DIR;
>   #ifdef UNX
>@@ -1786,14 +1614,167 @@
> 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
>+    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_GLIB
>+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
>+
>+#if ENABLE_LIBRSVG
>+
>+#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 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
>+
>+#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 defined(WNT) && defined(HAVE_WINDOWS_SDK)
>+
> File gid_File_Lib_sellangmsi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "sellangmsi.dll";
> End
>+
> #endif
> 
> #ifdef ENABLE_LOMENUBAR
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_ooo.scp scp2//source/ooo/file_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_ooo.scp	2011-12-05 11:53:51.000000000 +0100
>+++ scp2//source/ooo/file_ooo.scp	2012-02-24 13:39:12.643661265 +0100
>@@ -108,24 +108,11 @@
>     Name = "basicsrvtutorials.zip";
> End
> 
>-#if defined UNX && ! defined MACOSX
>-
>-File gid_File_Bin_Pagein
>-    BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Styles = (PACKED);
>-    Name = "pagein";
>-End
>-
>-#endif
>-
>-#ifndef WITHOUT_MOZILLA
>-
>-#if !defined(UNX) || defined(ENABLE_GTK)
>+#ifdef ENABLE_NSPLUGIN
> File gid_File_Exe_Nsplugin
>         BIN_FILE_BODY;
>         Styles          = (PACKED);
>-        Dir             = gid_Dir_Program;
>+        Dir             = gid_Brand_Dir_Program;
>  #ifdef UNX
>         Name            = "nsplugin";
>  #else
>@@ -133,13 +120,34 @@
>   #endif
> End
> #endif
>+
>+File gid_File_Bin_Gengal
>+    BIN_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program;
>+    Styles = (PACKED);
>+  #ifdef UNX
>+    Name = "gengal.bin";
>+  #else
>+    Name = "gengal.exe";
>+  #endif
>+End
>+
>+#ifdef UNX
>+
>+File gid_File_Script_Gengal
>+    BIN_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program;
>+    Styles = (PACKED);
>+    Name = "gengal";
>+End
>+
> #endif
> 
> #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
> 
> File gid_File_Bin_Pluginapp
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "pluginapp.bin";
>     Styles = (PACKED);
> End
>@@ -150,7 +158,7 @@
> 
> File gid_File_Bin_Open_Url
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "open-url";
>     Styles = (PACKED);
> End
>@@ -161,28 +169,28 @@
> 
> File gid_File_Bin_Gnome_Open_Url
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "gnome-open-url";
>     Styles = (PACKED);
> End
> 
> File gid_File_Bin_Gnome_Open_Url_Bin
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "gnome-open-url.bin";
>     Styles = (PACKED);
> End
> 
> File gid_File_Bin_Kde_Open_Url
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "kde-open-url";
>     Styles = (PACKED);
> End
> 
> File gid_File_Bin_Cde_Open_Url
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "cde-open-url";
>     Styles = (PACKED);
> End
>@@ -193,7 +201,7 @@
> 
> File gid_File_Bin_Uri_Encode
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "uri-encode";
>     Styles = (PACKED);
> End
>@@ -202,7 +210,7 @@
> 
> File gid_File_Bin_Senddoc
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>   #ifdef UNX
>     Name = "senddoc";
>     Styles = (PACKED);
>@@ -216,7 +224,7 @@
> 
> File gid_File_Bin_Spadmin_Bin
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
>     Name = "spadmin.bin";
> End
>@@ -362,6 +370,7 @@
> 
> STD_RES_FILE( gid_File_Res_Eps, eps )
> 
>+#if defined WITH_HELP
> File gid_File_Help_Common_Zip
>     Dir = gid_Dir_Help_Isolanguage;
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>@@ -387,23 +396,8 @@
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
> End
>-
>-#if defined WNT
>-
>-File gid_File_Jar_Accessbridge
>-    TXT_FILE_BODY;
>-    Name = "java_uno_accessbridge.jar";
>-    Dir = gid_Dir_Classes;
>-    Styles = (PACKED,DONT_OVERWRITE);
>-End
>-
> #endif
> 
>-#ifdef SOLAR_JAVA
>-#ifndef SYSTEM_BSH
>-STD_JAR_FILE( gid_File_Jar_Bsh, bsh )
>-#endif
>-#endif
> 
> #ifdef SOLAR_JAVA
> #ifndef SYSTEM_LUCENE
>@@ -412,596 +406,107 @@
> #endif
> #endif
> 
>-#ifdef SOLAR_JAVA
>-STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
>-#endif
>-
>-#ifdef SOLAR_JAVA
>-
>-#ifndef MACOSX
>-
>-File gid_File_Jar_Officebean
>-    TXT_FILE_BODY;
>-    Name = JARFILENAME(officebean);
>-    Dir = gid_Dir_Classes;
>-    Styles = (PACKED);
>-End
>-
>-#endif
>-
>-#endif
>-
>-
>-#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 )
>-#endif
>-
>-#ifdef SOLAR_JAVA
>-#ifndef SYSTEM_HSQLDB
>-STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
>-#endif
>-STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
>-#endif
>-
>-#ifdef SOLAR_JAVA
>-File gid_File_Jar_Commonwizards
>-    TXT_FILE_BODY;
>-    Name = JARFILENAME(commonwizards);
>-    Dir = gid_Dir_Classes;
>-    Styles = (PACKED);
>-End
>-#endif
>-
>-#ifdef SOLAR_JAVA
>-STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
>-STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
>-#endif
>-
>-#ifdef SOLAR_JAVA
>-
>-File gid_File_Jar_Unoil
>-    TXT_FILE_BODY;
>-    Name = "unoil.jar";
>-    Dir = gid_Dir_Classes;
>-    Styles = (PACKED,DONT_OVERWRITE);
>-End
>-
>-#endif
>-
>-#ifdef SOLAR_JAVA
>-#ifndef SYSTEM_SAXON
>-STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
>-#endif
>-#endif
>-
>-#ifndef SYSTEM_LIBTEXTCAT_DATA
>-// fingerprint files (lm)
>-
>-File gid_File_Conf_Fpdb
>-    TXT_FILE_BODY;
>-    Name = "fpdb.conf";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Afrikaans
>-    TXT_FILE_BODY;
>-    Name = "afrikaans.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Albanian
>-    TXT_FILE_BODY;
>-    Name = "albanian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Amharic_Utf
>-    TXT_FILE_BODY;
>-    Name = "amharic_utf.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Arabic
>-    TXT_FILE_BODY;
>-    Name = "arabic.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Armenian
>-    TXT_FILE_BODY;
>-    Name = "armenian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Basque
>-    TXT_FILE_BODY;
>-    Name = "basque.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Belarus
>-    TXT_FILE_BODY;
>-    Name = "belarus.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Bosnian
>-    TXT_FILE_BODY;
>-    Name = "bosnian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Breton
>-    TXT_FILE_BODY;
>-    Name = "breton.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Catalan
>-    TXT_FILE_BODY;
>-    Name = "catalan.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Chinese_Simplified
>-    TXT_FILE_BODY;
>-    Name = "chinese_simplified.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Chinese_Traditional
>-    TXT_FILE_BODY;
>-    Name = "chinese_traditional.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Croatian
>-    TXT_FILE_BODY;
>-    Name = "croatian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Czech
>-    TXT_FILE_BODY;
>-    Name = "czech.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Danish
>-    TXT_FILE_BODY;
>-    Name = "danish.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Drents
>-    TXT_FILE_BODY;
>-    Name = "drents.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Dutch
>-    TXT_FILE_BODY;
>-    Name = "dutch.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_English
>-    TXT_FILE_BODY;
>-    Name = "english.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Esperanto
>-    TXT_FILE_BODY;
>-    Name = "esperanto.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Estonian
>-    TXT_FILE_BODY;
>-    Name = "estonian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Finnish
>-    TXT_FILE_BODY;
>-    Name = "finnish.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_French
>-    TXT_FILE_BODY;
>-    Name = "french.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Frisian
>-    TXT_FILE_BODY;
>-    Name = "frisian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Georgian
>-    TXT_FILE_BODY;
>-    Name = "georgian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_German
>-    TXT_FILE_BODY;
>-    Name = "german.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Greek
>-    TXT_FILE_BODY;
>-    Name = "greek.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Hebrew
>-    TXT_FILE_BODY;
>-    Name = "hebrew.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Hindi
>-    TXT_FILE_BODY;
>-    Name = "hindi.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Hungarian
>-    TXT_FILE_BODY;
>-    Name = "hungarian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Icelandic
>-    TXT_FILE_BODY;
>-    Name = "icelandic.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Indonesian
>-    TXT_FILE_BODY;
>-    Name = "indonesian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Irish_Gaelic
>-    TXT_FILE_BODY;
>-    Name = "irish_gaelic.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-
>-File gid_File_Lm_Italian
>-    TXT_FILE_BODY;
>-    Name = "italian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Japanese
>-    TXT_FILE_BODY;
>-    Name = "japanese.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Korean
>-    TXT_FILE_BODY;
>-    Name = "korean.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Latin
>-    TXT_FILE_BODY;
>-    Name = "latin.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Latvian
>-    TXT_FILE_BODY;
>-    Name = "latvian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Lithuanian
>-    TXT_FILE_BODY;
>-    Name = "lithuanian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Luxembourgish
>-    TXT_FILE_BODY;
>-    Name = "luxembourgish.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Malay
>-    TXT_FILE_BODY;
>-    Name = "malay.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Manx_Gaelic
>-    TXT_FILE_BODY;
>-    Name = "manx_gaelic.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Marathi
>-    TXT_FILE_BODY;
>-    Name = "marathi.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Middle_Frisian
>-    TXT_FILE_BODY;
>-    Name = "middle_frisian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Mingo
>-    TXT_FILE_BODY;
>-    Name = "mingo.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Mongolian_Cyrillic
>-    TXT_FILE_BODY;
>-    Name = "mongolian_cyrillic.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Nepali
>-    TXT_FILE_BODY;
>-    Name = "nepali.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Norwegian
>-    TXT_FILE_BODY;
>-    Name = "norwegian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Persian
>-    TXT_FILE_BODY;
>-    Name = "persian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Polish
>-    TXT_FILE_BODY;
>-    Name = "polish.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Portuguese
>-    TXT_FILE_BODY;
>-    Name = "portuguese.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifdef SOLAR_JAVA
>+STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
>+#endif
> 
>-File gid_File_Lm_Quechua
>-    TXT_FILE_BODY;
>-    Name = "quechua.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifdef SOLAR_JAVA
> 
>-File gid_File_Lm_Romanian
>-    TXT_FILE_BODY;
>-    Name = "romanian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifndef MACOSX
> 
>-File gid_File_Lm_Romansh
>+File gid_File_Jar_Officebean
>     TXT_FILE_BODY;
>-    Name = "romansh.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>+    Name = JARFILENAME(officebean);
>+    Dir = gid_Dir_Classes;
>     Styles = (PACKED);
> End
> 
>-File gid_File_Lm_Russian
>-    TXT_FILE_BODY;
>-    Name = "russian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#endif
> 
>-File gid_File_Lm_Sanskrit
>-    TXT_FILE_BODY;
>-    Name = "sanskrit.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#endif
> 
>-File gid_File_Lm_Scots
>-    TXT_FILE_BODY;
>-    Name = "scots.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
> 
>-File gid_File_Lm_Scots_Gaelic
>-    TXT_FILE_BODY;
>-    Name = "scots_gaelic.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-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 )
>+#endif
> 
>-File gid_File_Lm_Serbian
>-    TXT_FILE_BODY;
>-    Name = "serbian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#if defined SOLAR_JAVA && defined WNT
>+STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
>+#endif
> 
>-File gid_File_Lm_Serbian_Latin
>-    TXT_FILE_BODY;
>-    Name = "serbian-latin.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifdef SOLAR_JAVA
>+#ifndef SYSTEM_HSQLDB
>+STD_JAR_FILE( gid_File_Jar_Hsqldb, hsqldb )
>+#endif
>+STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb )
>+#endif
> 
>-File gid_File_Lm_Slovak_Ascii
>+#ifdef SOLAR_JAVA
>+File gid_File_Jar_Commonwizards
>     TXT_FILE_BODY;
>-    Name = "slovak_ascii.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>+    Name = JARFILENAME(commonwizards);
>+    Dir = gid_Dir_Classes;
>     Styles = (PACKED);
> End
>+#endif
> 
>-File gid_File_Lm_Slovenian
>-    TXT_FILE_BODY;
>-    Name = "slovenian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifdef SOLAR_JAVA
>+STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
>+STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
>+#endif
> 
>-File gid_File_Lm_Spanish
>-    TXT_FILE_BODY;
>-    Name = "spanish.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifdef SOLAR_JAVA
> 
>-File gid_File_Lm_Swahili
>+File gid_File_Jar_Unoil
>     TXT_FILE_BODY;
>-    Name = "swahili.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>+    Name = "unoil.jar";
>+    Dir = gid_Dir_Classes;
>+    Styles = (PACKED,DONT_OVERWRITE);
> End
> 
>-File gid_File_Lm_Swedish
>-    TXT_FILE_BODY;
>-    Name = "swedish.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#endif
> 
>-File gid_File_Lm_Tagalog
>-    TXT_FILE_BODY;
>-    Name = "tagalog.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifdef SOLAR_JAVA
>+#ifndef SYSTEM_SAXON
>+STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
>+#endif
>+#endif
> 
>-File gid_File_Lm_Tamil
>-    TXT_FILE_BODY;
>-    Name = "tamil.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifndef AIX
>+#ifndef DISABLE_PYUNO
> 
>-File gid_File_Lm_Thai
>-    TXT_FILE_BODY;
>-    Name = "thai.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>+File gid_File_Wizards_Common
>+    Dir = gid_Dir_Wizards;
>+    ARCHIVE_TXT_FILE_BODY;
>+    Name = "wizards.zip";
> End
> 
>-File gid_File_Lm_Turkish
>-    TXT_FILE_BODY;
>-    Name = "turkish.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>+File gid_File_Wizards_Fax
>+    Dir = gid_Dir_Wizards_Fax;
>+    ARCHIVE_TXT_FILE_BODY;
>+    Name = "pyfax.zip";
> End
> 
>-File gid_File_Lm_Ukrainian
>-    TXT_FILE_BODY;
>-    Name = "ukrainian.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#endif
>+#endif
> 
>-File gid_File_Lm_Vietnamese
>-    TXT_FILE_BODY;
>-    Name = "vietnamese.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>+#ifndef SYSTEM_LIBEXTTEXTCAT
>+// fingerprint files (lm)
> 
>-File gid_File_Lm_Welsh
>-    TXT_FILE_BODY;
>-    Name = "welsh.lm";
>+File gid_File_Share_Fingerprint
>     Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
>-
>-File gid_File_Lm_Yiddish_Utf
>     TXT_FILE_BODY;
>-    Name = "yiddish_utf.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>+    Styles = (ARCHIVE, DONT_OVERWRITE);
>+    Name = "fingerprint.zip";
> End
> 
>-File gid_File_Lm_Zulu
>-    TXT_FILE_BODY;
>-    Name = "zulu.lm";
>-    Dir = gid_Dir_Share_Fingerprint;
>-    Styles = (PACKED);
>-End
> #endif
> 
> // mod files
>@@ -1118,7 +623,7 @@
> File gid_File_Share_Registry_Main_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED, SCPZIP_REPLACE);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "main.xcd";
> End
> 
>@@ -1127,7 +632,7 @@
> File gid_File_Share_Registry_Forcedefault_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "forcedefault.xcd";
> End
> 
>@@ -1136,27 +641,27 @@
> File gid_File_Oo_Ldap_Xcd_Sample
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "oo-ldap.xcd.sample";
> End
> 
> File gid_File_Oo_Ad_Ldap_Xcd_Sample
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "oo-ad-ldap.xcd.sample";
> End
> 
> File gid_File_Rdb_Offapi
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program_Types;
>     Styles = (PACKED);
>     Name = "offapi.rdb";
> End
> 
> File gid_File_Rdb_TypesVba
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program_Types;
>     Styles = (PACKED, OVERWRITE);
>     Name = "oovbaapi.rdb";
> End
>@@ -1176,29 +681,37 @@
> File gid_File_Registry_Spool_Langpack_Lang
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     FILE_ALL_LANG_LETTER(Langpack-,xcd);
> End
> 
> 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";
>+    Dir = gid_Brand_Dir_Share_Registry;
>     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_Brand_Dir_Share_Registry;
>+    Name (km) = "ctlseqcheck.xcd";
>+    Name (lo) = "ctlseqcheck.xcd";
>+    Name (th) = "ctlseqcheck.xcd";
> End
> 
> File gid_File_Scripts_Beanshell
>@@ -1290,35 +803,35 @@
> 
> File gid_File_Txt_Pagein_Calc
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
>     Name = "pagein-calc";
> End
> 
> File gid_File_Txt_Pagein_Common
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
>     Name = "pagein-common";
> End
> 
> File gid_File_Txt_Pagein_Draw
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
>     Name = "pagein-draw";
> End
> 
> File gid_File_Txt_Pagein_Impress
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
>     Name = "pagein-impress";
> End
> 
> File gid_File_Txt_Pagein_Writer
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
>     Name = "pagein-writer";
> End
>@@ -1646,7 +1159,7 @@
> File gid_File_Txt_Patchfiles
>     TXT_FILE_BODY;
>     Name = "patchlist.txt";
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED,PATCH,PATCH_ONLY,DONTRENAMEINPATCH);
> End
> #endif
>@@ -1654,14 +1167,14 @@
> File gid_Starregistry_Services_Rdb
>     TXT_FILE_BODY;
>     Name = "services.rdb";
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program_Services;
>     Styles = (PACKED);
> End
> 
> #ifdef LINUX
> File gid_File_Dat_Root3
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "root3.dat";
>     Styles = (PACKED);
> End
>@@ -1670,7 +1183,7 @@
> #ifdef LINUX
> File gid_File_Dat_Root4
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "root4.dat";
>     Styles = (PACKED);
> End
>@@ -1679,7 +1192,7 @@
> #ifdef LINUX
> File gid_File_Dat_Root5
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "root5.dat";
>     Styles = (PACKED);
> End
>@@ -1740,7 +1253,7 @@
> 
> File gid_File_Config_Javasettingsunopkginstall
>     USER_FILE_BODY;
>-    Dir = gid_Dir_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     Name = "javasettingsunopkginstall.xml";
>   #ifdef SOLARIS
>     Styles = (PACKED,VOLATILEFILE);
>@@ -1749,34 +1262,10 @@
>   #endif
> End
> 
>-#if defined( BUILD_SPECIAL )
>-#if !defined( MACOSX )
>-File gid_File_Stclient_Wrapper
>-    Dir = gid_Dir_Program;
>-    BIN_FILE_BODY;
>-#if defined ( WNT )
>-    Name = "stclient_wrapper.exe";
>-#else
>-    Name = "stclient_wrapper";
>-#endif
>-    Styles = ();
>-End
>-#endif
>-#endif
>-
>-#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;
>-    Dir = gid_Dir_Share_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     Name = "images.zip";
>     Styles = (PACKED);
> End
>@@ -1785,7 +1274,7 @@
> #ifdef THEME_CRYSTAL
> File gid_File_ImagesCrystal_Zip
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Share_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     Name = "images_crystal.zip";
>     Styles = (PACKED);
> End
>@@ -1794,7 +1283,7 @@
> #ifdef THEME_OXYGEN
> File gid_File_ImagesOxygen_Zip
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Share_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     Name = "images_oxygen.zip";
>     Styles = (PACKED);
> End
>@@ -1803,7 +1292,7 @@
> #ifdef THEME_HICONTRAST
> File gid_File_ImagesHicontrast_Zip
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Share_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     Name = "images_hicontrast.zip";
>     Styles = (PACKED);
> End
>@@ -1812,16 +1301,25 @@
> #ifdef THEME_TANGO
> File gid_File_ImagesTango_Zip
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Share_Config;
>+    Dir = gid_Brand_Dir_Share_Config;
>     Name = "images_tango.zip";
>     Styles = (PACKED);
> End
> #endif
> 
>+#ifdef THEME_HUMAN
>+File gid_File_ImagesHuman_Zip
>+    TXT_FILE_BODY;
>+    Dir = gid_Brand_Dir_Share_Config;
>+    Name = "images_human.zip";
>+    Styles = (PACKED);
>+End
>+#endif
>+
> File gid_File_Share_Registry_Lingucomponent_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "lingucomponent.xcd";
> End
> 
>@@ -1837,6 +1335,51 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_An
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_An;
>+	Name = "dict-an.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Ar
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar;
>+	Name = "dict-ar.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Be
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Be;
>+	Name = "dict-be.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Bg
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Bg;
>+	Name = "dict-bg.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Bn
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Bn;
>+	Name = "dict-bn.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_Br
> 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Br;
> 	Name = "dict-br.oxt";
>@@ -1873,36 +1416,27 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>-File gid_File_Extension_Dictionary_De_AT
>-	Dir = gid_Brand_Dir_Share_Extensions_Dict_De_At;
>-	Name = "dict-de-AT.oxt";
>+File gid_File_Extension_Dictionary_De
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_De;
>+	Name = "dict-de.oxt";
> 	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
> 	UnixRights = 444;
> End
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>-File gid_File_Extension_Dictionary_De_CH
>-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_Ch;
>-    Name = "dict-de-CH.oxt";
>-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>-    UnixRights = 444;
>-End
>-#endif
>-
>-#ifndef WITHOUT_MYSPELL_DICTS
>-File gid_File_Extension_Dictionary_De_DE
>-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_De;
>-    Name = "dict-de-DE.oxt";
>-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>-    UnixRights = 444;
>+File gid_File_Extension_Dictionary_En
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
>+	Name = "dict-en.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
> End
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>-File gid_File_Extension_Dictionary_En
>-	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
>-	Name = "dict-en.oxt";
>+File gid_File_Extension_Dictionary_El
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_El;
>+	Name = "dict-el.oxt";
> 	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
> 	UnixRights = 444;
> End
>@@ -1936,6 +1470,15 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Gd
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gd;
>+	Name = "dict-gd.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_Gl
> 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl;
> 	Name = "dict-gl.oxt";
>@@ -1945,6 +1488,15 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Gu
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gu;
>+	Name = "dict-gu.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_He
>     Dir = gid_Brand_Dir_Share_Extensions_Dict_He;
>     Name = "dict-he.oxt";
>@@ -1954,6 +1506,15 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Hi
>+    Dir = gid_Brand_Dir_Share_Extensions_Dict_Hi;
>+    Name = "dict-hi.oxt";
>+    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+    UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_Hu
> 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu;
> 	Name = "dict-hu.oxt";
>@@ -1999,6 +1560,15 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Lv
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Lv;
>+	Name = "dict-lv.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_Ne
> 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ne;
> 	Name = "dict-ne.oxt";
>@@ -2053,6 +1623,15 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Pt_Pt
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt;
>+	Name = "dict-pt-pt.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_Ro
>     Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
>     Name = "dict-ro.oxt";
>@@ -2071,6 +1650,15 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Si
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Si;
>+	Name = "dict-si.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_Sk
> 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk;
> 	Name = "dict-sk.oxt";
>@@ -2116,6 +1704,15 @@
> #endif
> 
> #ifndef WITHOUT_MYSPELL_DICTS
>+File gid_File_Extension_Dictionary_Te
>+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Te;
>+	Name = "dict-te.oxt";
>+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
>+	UnixRights = 444;
>+End
>+#endif
>+
>+#ifndef WITHOUT_MYSPELL_DICTS
> File gid_File_Extension_Dictionary_Th
> 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Th;
> 	Name = "dict-th.oxt";
>@@ -2150,12 +1747,3 @@
> 	UnixRights = 444;
> End
> #endif
>-
>-// #ifdef BUILD_SPECIAL
>-// File gid_File_Extension_Oxt_Oooimprovement
>-//    Name = "OOoImprovement.oxt";
>-//    Dir = gid_Brand_Dir_Share_Extensions_Oooimprovement;
>-//    Styles = (PACKED, ARCHIVE);
>-//    UnixRights = 444;
>-// End
>-// #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_resource_ooo.scp scp2//source/ooo/file_resource_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/file_resource_ooo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/file_resource_ooo.scp	2012-02-24 13:38:59.912662459 +0100
>@@ -66,10 +66,6 @@
> 
> 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
> 
> STD_RES_FILE( gid_File_Res_San, san )
>@@ -86,7 +82,6 @@
> 
> #endif
> 
>-STD_RES_FILE( gid_File_Res_Stt, stt )
> STD_RES_FILE( gid_File_Res_Sb, sb )
> 
> STD_RES_FILE( gid_File_Res_Svl, svl )
>@@ -118,9 +113,7 @@
> 
> STD_RES_FILE( gid_File_Res_AVMedia, avmedia )
> 
>-#ifndef WITHOUT_MOZILLA
> STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec )
>-#endif
> 
> STD_RES_FILE( gid_File_Res_UpdChk, updchk )
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/folderitem_ooo.scp scp2//source/ooo/folderitem_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/folderitem_ooo.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/folderitem_ooo.scp	2012-02-24 13:39:12.643661265 +0100
>@@ -27,32 +27,38 @@
> 
> #include "macros.inc"
> 
>-FolderItem gid_Folderitem_Soffice
>+FolderItem gid_Folderitem_LibreOffice
>     Name = "%PRODUCTNAME";
>-    Name (pt-BR) = "%PRODUCTNAME_BR";
>     ModuleID = gid_Module_Root;
>+#ifdef ENABLE_SILENT_MSI
>+    FolderID = PREDEFINED_STARTMENU;
>+#else
>     FolderID = gid_Folder_Staroffice51;
>+#endif
>     FileID = gid_Brand_File_Bin_Soffice;
>     IconFile = gid_Brand_File_Bin_Soffice;
>     IconID = 0;
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>     Styles = (NOWEB, NON_ADVERTISED);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
> End
> 
> FolderItem gid_Folderitem_Soffice_Desktop
>+#ifdef ENABLE_SILENT_MSI
>+    Name = "%PRODUCTNAME";
>+#else
>     Name = "%PRODUCTNAME %PRODUCTVERSION";
>-    Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
>+#endif
>     ModuleID = gid_Module_Root;
>     FolderID = PREDEFINED_DESKTOP;
>     FileID = gid_Brand_File_Bin_Soffice;
>     IconFile = gid_Brand_File_Bin_Soffice;
>     IconID = 0;
>     ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>-	Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
>+    Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
>     ComponentCondition = "CREATEDESKTOPLINK=1";
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/installation_ooo.scp scp2//source/ooo/installation_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/installation_ooo.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/installation_ooo.scp	2012-02-24 13:38:59.912662459 +0100
>@@ -29,10 +29,8 @@
> 
> Installation gid_Installation_Ooo
>     ProductName = "${PRODUCTNAME}";
>-    ProductName_Br = "${PRODUCTNAME_BR}";
>     ProductVersion = "${PRODUCTVERSION}";
>     ProductExtension = "${PRODUCTEXTENSION}";
>-    OOoBaseVersion = "${OOOBASEVERSION}";
>     UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
>     JavaVersion = "${JAVAVERSION}";
>     SxwFormatName = "OpenOffice.org";
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/makefile.mk scp2//source/ooo/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/makefile.mk	2011-12-22 12:36:41.000000000 +0100
>+++ scp2//source/ooo/makefile.mk	2012-02-24 13:39:12.643661265 +0100
>@@ -26,8 +26,6 @@
> #*************************************************************************
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=ooo
> TARGETTYPE=CUI
>@@ -37,14 +35,6 @@
> .INCLUDE :  settings.mk
> .INCLUDE :  i18npool/version.mk
> 
>-.IF "$(COM)" == "MSC"
>-SCPDEFS+=-D_MSC
>-.ENDIF
>-
>-.IF "$(BUILD_SPECIAL)"!=""
>-SCPDEFS+=-DBUILD_SPECIAL
>-.ENDIF
>-
> .IF "$(ENABLE_ONLINE_UPDATE)"!=""
> SCPDEFS+=-DENABLE_ONLINE_UPDATE
> .ENDIF
>@@ -56,9 +46,6 @@
> .IF "$(ENABLE_OPENGL)"=="TRUE"
> SCPDEFS+=-DENABLE_OPENGL
> .ENDIF
>-.IF "$(PROF_EDITION)"!=""
>-SCPDEFS+=-DPROF_EDITION
>-.ENDIF
> 
> .IF "$(GUI)"=="UNX"
> .IF "$(ENABLE_GTK)" != ""
>@@ -70,10 +57,17 @@
> SCPDEFS+=-DGTK_TWO_FOUR
> .ENDIF
> .ENDIF
>+.IF "$(ENABLE_GTK3)" != ""
>+SCPDEFS+=-DENABLE_GTK3
>+.ENDIF
> .ENDIF			# "$(GUI)"=="UNX"
> 
>-.IF "$(ENABLE_SYSTRAY_GTK)" != ""
>-SCPDEFS+=-DENABLE_SYSTRAY_GTK
>+.IF "$(ENABLE_NSPLUGIN)" == "YES"
>+SCPDEFS+=-DENABLE_NSPLUGIN
>+.ENDIF
>+
>+.IF "$(MERGELIBS)" == "TRUE"
>+SCPDEFS+=-DMERGELIBS
> .ENDIF
> 
> .IF "$(ENABLE_KDE)" != ""
>@@ -96,16 +90,23 @@
> SCPDEFS+=-DENABLE_DIRECTX
> .ENDIF
> 
>-.IF "$(SYSTEM_FREETYPE)" == "YES"
>-SCPDEFS+=-DSYSTEM_FREETYPE
>+.IF "$(ENABLE_XMLSEC)"=="YES"
>+SCPDEFS+=-DENABLE_XMLSEC
> .ENDIF
> 
>-.IF "$(SYSTEM_CAIRO)" == "YES"
>-SCPDEFS+=-DSYSTEM_CAIRO
>+.IF "$(GUI)"=="UNX"
>+#X11 MacOSX has no cairo-canvas
>+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
>+SCPDEFS+=-DENABLE_CAIROCANVAS
>+.ENDIF
> .ENDIF
> 
>-.IF "$(ENABLE_CAIRO)" == "YES"
>-SCPDEFS+=-DENABLE_CAIRO
>+.IF "$(SYSTEM_EXPAT)" == "YES"
>+SCPDEFS+=-DSYSTEM_EXPAT
>+.ENDIF
>+
>+.IF "$(SYSTEM_CAIRO)" == "YES"
>+SCPDEFS+=-DSYSTEM_CAIRO
> .ENDIF
> 
> .IF "$(SYSTEM_LIBXML)" == "YES"
>@@ -159,6 +160,18 @@
> SCPDEFS+=-DSYSTEM_HUNSPELL
> .ENDIF
> 
>+.IF "$(SYSTEM_HYPH)" == "YES"
>+SCPDEFS+=-DSYSTEM_HYPH
>+.ENDIF
>+
>+.IF "$(SYSTEM_MYTHES)" == "YES"
>+SCPDEFS+=-DSYSTEM_MYTHES
>+.ENDIF
>+
>+.IF "$(SYSTEM_LPSOLVE)" == "YES"
>+SCPDEFS+=-DSYSTEM_LPSOLVE
>+.ENDIF
>+
> .IF "$(SYSTEM_REDLAND)" == "YES"
> SCPDEFS+=-DSYSTEM_REDLAND
> .ELSE
>@@ -169,10 +182,6 @@
>     -DREDLAND_MAJOR=$(REDLAND_MAJOR)
> .ENDIF
> 
>-.IF "$(SYSTEM_BSH)" == "YES"
>-SCPDEFS+=-DSYSTEM_BSH -DBSH_JAR=\""file://$(BSH_JAR)"\"
>-.ENDIF
>-
> .IF "$(SYSTEM_HSQLDB)" == "YES"
> SCPDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
> .ENDIF
>@@ -185,17 +194,16 @@
> SCPDEFS+=-DGCJ
> .ENDIF
> 
>-
>-.IF "$(ENABLE_CAIRO)" == "TRUE"
>-SCPDEFS+=-DENABLE_CAIRO
>-.ENDIF
>-
> .IF "$(SYSTEM_LUCENE)" == "YES"
> SCPDEFS+=-DSYSTEM_LUCENE
> .ENDIF
> 
> .IF "$(SYSTEM_ICU)" == "YES"
>-SCPDEFS+=-DSYSTEM_ICU
>+SCPDEFS+=\
>+    -DSYSTEM_ICU \
>+    -DICU_MAJOR=$(ICU_MAJOR) \
>+    -DICU_MINOR=$(ICU_MINOR) \
>+    -DICU_MICRO=$(ICU_MICRO)
> .ELSE
> .INCLUDE :  icuversion.mk
> SCPDEFS+=\
>@@ -204,6 +212,10 @@
>     -DICU_MICRO=$(ICU_MICRO)
> .ENDIF
> 
>+.IF "$(SYSTEM_GRAPHITE)" == "YES"
>+SCPDEFS+=-DSYSTEM_GRAPHITE
>+.ENDIF
>+
> SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
> 
> .IF "$(DISABLE_NEON)" == "TRUE"
>@@ -213,9 +225,8 @@
> SCPDEFS+=-DSYSTEM_NEON
> .ENDIF
> 
>-# if yes or unset (neon not used) -> do not install openssl library!
>-.IF $(SYSTEM_OPENSSL) != "YES"
>-SCPDEFS+=-DOPENSSL
>+.IF "$(SYSTEM_OPENSSL)" == "YES"
>+SCPDEFS+=-DSYSTEM_OPENSSL
> .ENDIF
> 
> .IF "$(DISABLE_ATL)"!=""
>@@ -230,16 +241,8 @@
> .ENDIF
> .ENDIF
> 
>-.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
>-SCPDEFS+=-DSYSTEM_LIBTEXTCAT
>-.ENDIF
>-
>-.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
>-SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
>-.ENDIF
>-
>-.IF "$(ENABLE_SVCTAGS)" == "YES"
>-SCPDEFS+=-DENABLE_SVCTAGS
>+.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
>+SCPDEFS+=-DSYSTEM_LIBEXTTEXTCAT
> .ENDIF
> 
> .IF "$(WITH_VC_REDIST)" == "TRUE"
>@@ -254,10 +257,51 @@
> 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
> 
>+# Synchronize with condition to build the jfregqa.dll custom action in setup_native
>+.IF "$(WINDOWS_SDK_HOME)"!=""
>+SCPDEFS+=-DHAVE_WINDOWS_SDK
>+.ENDIF
>+
> SCP_PRODUCT_TYPE=osl
> 
> ICUVERSION_DEPENDENT_FILES= \
>@@ -277,7 +321,6 @@
>         file_font_ooo.par          \
>         file_library_ooo.par       \
>         file_resource_ooo.par      \
>-        file_improvement.par       \
>         shortcut_ooo.par           \
>         module_ooo.par             \
>         module_hidden_ooo.par      \
>@@ -287,7 +330,6 @@
>         module_help_template.par   \
>         module_java.par            \
>         module_systemint.par       \
>-        module_improvement.par     \
>         profile_ooo.par            \
>         profileitem_ooo.par        \
>         ure.par                    \
>@@ -304,6 +346,7 @@
>         folderitem_ooo.par         \
>         registryitem_ooo.par       \
>         vc_redist.par              \
>+        mingw_dlls.par             \
>         windowscustomaction_ooo.par
> .ENDIF
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/mergemodules_ooo.scp scp2//source/ooo/mergemodules_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/mergemodules_ooo.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/mergemodules_ooo.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,56 +0,0 @@
>-/*************************************************************************
>-*
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>-************************************************************************/
>-
>-#include "macros.inc"
>-
>-#ifdef M1500
>-MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86
>-#ifdef _DEBUG_RUNTIME
>-	Name = "Microsoft_VC90_DebugCRT_x86.msm";
>-#else
>-	Name = "Microsoft_VC90_CRT_x86.msm";
>-#endif
>-	Cabfilename = "openoffice.org-vc90crt.cab";
>-	Feature = "gm_Root";
>-	RootDir = "TARGETDIR";
>-	Styles = (REMOVE_FILE_TABLE);
>-End
>-#endif
>-
>-#ifdef M1500
>-MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86
>-#ifdef _DEBUG_RUNTIME
>-	Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm";
>-#else
>-	Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
>-#endif
>-	Cabfilename = "openoffice.org-policy-vc90crt.cab";
>-	Feature = "gm_Root";
>-	RootDir = "TARGETDIR";
>-	Styles = (REMOVE_FILE_TABLE);
>-End
>-#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/mingw_dlls.scp scp2//source/ooo/mingw_dlls.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/mingw_dlls.scp	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/ooo/mingw_dlls.scp	2011-10-01 10:27:43.805134357 +0200
>@@ -0,0 +1,147 @@
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * Jan Holesovsky <kendy@suse.cz> (initial developer) ]
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+#include "macros.inc"
>+
>+#if defined(WNT) && defined( _gcc3 )
>+
>+#define MINGW_DLL(id,name) \
>+    File id \
>+        PACKED_LIB_FILE_BODY; \
>+        Dir = gid_Brand_Dir_Program; \
>+        Name = name; \
>+        Styles = (PACKED); \
>+    End
>+
>+#ifdef SYSTEM_EXPAT
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, libexpat-1.dll )
>+#endif
>+
>+#ifdef SYSTEM_LIBXSLT
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, libxslt-1.dll )
>+#endif
>+
>+#ifdef SYSTEM_LIBXML
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Zlib,    zlib1.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxml2, libxml2-2.dll )
>+#endif
>+
>+#ifdef SYSTEM_DB
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, libdb-4.8.dll )
>+#endif
>+
>+#ifdef SYSTEM_CURL
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl,     libintl-8.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn,       libidn-11.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr,     libnspr4.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Nssutil,     nssutil3.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplc,      libplc4.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libplds,     libplds4.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_nss,         nss3.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl,         ssl3.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, libgpg-error-0.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt,   libgcrypt-11.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh,      libssh2-1.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcurl,     libcurl-4.dll )
>+#endif
>+
>+#ifdef SYSTEM_ICU
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Icui18n, STRING(CONCAT4(icui18n,ICU_MAJOR,ICU_MINOR,.dll)) )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Icuuc,   STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll)) )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, STRING(CONCAT4(icudata,ICU_MAJOR,ICU_MINOR,.dll)) )
>+#endif
>+
>+#ifdef SYSTEM_GRAPHITE
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, libgraphite2.dll )
>+#endif
>+
>+#ifdef SYSTEM_NEON
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn,   libtasn1-3.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgnutls, libgnutls-26.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libneon,   libneon-27.dll )
>+#endif
>+
>+#ifdef SYSTEM_OPENSSL
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssl, libssl-8.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcrypto, libcrypto-8.dll )
>+#endif
>+
>+#ifdef SYSTEM_REDLAND
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libraptor, libraptor-1.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Librasqal, librasqal-2.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libqslite, libsqlite3-0.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Librdf,    librdf-0.dll )
>+#endif
>+
>+#ifdef SYSTEM_HUNSPELL
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhunspell, libhunspell-1.3-0.dll )
>+#endif
>+
>+#ifdef SYSTEM_HYPH
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libhyphen, libhyphen-0.dll )
>+#endif
>+
>+#ifdef SYSTEM_MYTHES
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libmythes, libmythes-1.2-0.dll )
>+#endif
>+
>+#ifdef SYSTEM_LPSOLVE
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Lpsolve, lpsolve55.dll )
>+#endif
>+
>+#ifdef SYSTEM_CAIRO
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfontconfig, libfontconfig-1.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libfreetype,   libfreetype-6.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpixman,     libpixman-1-0.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpng,        libpng15-15.dll )
>+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libcairo,      libcairo-2.dll )
>+#endif
>+
>+#if defined(MINGW_GCCDLL)
>+
>+File gid_Brand_File_Lib_Mingw_GccS
>+    TXT_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program;
>+    Name = MINGW_GCCDLL;
>+    Styles = (PACKED);
>+End
>+
>+#endif
>+
>+#if defined(MINGW_GXXDLL)
>+
>+File gid_Brand_File_Lib_Mingw_Stdcpp
>+    TXT_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program;
>+    Name = MINGW_GXXDLL;
>+    Styles = (PACKED);
>+End
>+
>+#endif
>+
>+#endif
>+
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_helppack.ulf scp2//source/ooo/module_helppack.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_helppack.ulf	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/module_helppack.ulf	2011-11-29 09:56:02.926323818 +0100
>@@ -193,36 +193,18 @@
> [STR_DESC_MODULE_HELPPACK_PA_IN]
> en-US = "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_GU_IN]
>-en-US = "Gujarati"
>-
>-[STR_DESC_MODULE_HELPPACK_GU_IN]
>-en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_TA]
> en-US = "Tamil"
> 
> [STR_DESC_MODULE_HELPPACK_TA]
> en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_TA_IN]
>-en-US = "Tamil"
>-
>-[STR_DESC_MODULE_HELPPACK_TA_IN]
>-en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_HI]
> en-US = "Hindi"
> 
> [STR_DESC_MODULE_HELPPACK_HI]
> en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_HI_IN]
>-en-US = "Hindi"
>-
>-[STR_DESC_MODULE_HELPPACK_HI_IN]
>-en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_ST]
> en-US = "Southern Sotho (Sutu)"
> 
>@@ -253,12 +235,6 @@
> [STR_DESC_MODULE_HELPPACK_AF]
> en-US = "Installs Afrikaans help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_SW]
>-en-US = "Swahili"
>-
>-[STR_DESC_MODULE_HELPPACK_SW]
>-en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_SW_TZ]
> en-US = "Swahili"
> 
>@@ -283,42 +259,18 @@
> [STR_DESC_MODULE_HELPPACK_BN]
> en-US = "Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_BN_BD]
>-en-US = "Bengali (Bangladesh)"
>-
>-[STR_DESC_MODULE_HELPPACK_BN_BD]
>-en-US = "Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_HELPPACK_BN_IN]
>-en-US = "Bengali (India)"
>-
>-[STR_DESC_MODULE_HELPPACK_BN_IN]
>-en-US = "Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_OR]
> en-US = "Oriya"
> 
> [STR_DESC_MODULE_HELPPACK_OR]
> en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_OR_IN]
>-en-US = "Oriya"
>-
>-[STR_DESC_MODULE_HELPPACK_OR_IN]
>-en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_MR]
> en-US = "Marathi"
> 
> [STR_DESC_MODULE_HELPPACK_MR]
> en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_MR_IN]
>-en-US = "Marathi"
>-
>-[STR_DESC_MODULE_HELPPACK_MR_IN]
>-en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_NE]
> en-US = "Nepali"
> 
>@@ -331,12 +283,6 @@
> [STR_DESC_MODULE_HELPPACK_AR]
> en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_AR_SA]
>-en-US = "Arabic"
>-
>-[STR_DESC_MODULE_HELPPACK_AR_SA]
>-en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_CA]
> en-US = "Catalan"
> 
>@@ -385,12 +331,6 @@
> [STR_DESC_MODULE_HELPPACK_NN]
> en-US = "Installs Norwegian (Nynorsk) help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_RM]
>-en-US = "Rhaeto-Romance"
>-
>-[STR_DESC_MODULE_HELPPACK_RM]
>-en-US = "Installs Rhaeto-Romance help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_RO]
> en-US = "Romanian"
> 
>@@ -403,12 +343,6 @@
> [STR_DESC_MODULE_HELPPACK_SQ]
> en-US = "Installs Albanian help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_UR]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_HELPPACK_UR]
>-en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_ID]
> en-US = "Indonesian"
> 
>@@ -445,12 +379,6 @@
> [STR_DESC_MODULE_HELPPACK_LT]
> en-US = "Installs Lithuanian help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_HY]
>-en-US = "Armenian"
>-
>-[STR_DESC_MODULE_HELPPACK_HY]
>-en-US = "Installs Armenian help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_EU]
> en-US = "Basque"
> 
>@@ -463,12 +391,6 @@
> [STR_DESC_MODULE_HELPPACK_MK]
> en-US = "Installs Macedonian help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_MT]
>-en-US = "Maltese"
>-
>-[STR_DESC_MODULE_HELPPACK_MT]
>-en-US = "Installs Maltese help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_CY]
> en-US = "Welsh"
> 
>@@ -481,12 +403,6 @@
> [STR_DESC_MODULE_HELPPACK_GL]
> en-US = "Installs Galician help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_SH_YU]
>-en-US = "Serbian (Latin)"
>-
>-[STR_DESC_MODULE_HELPPACK_SH_YU]
>-en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_SH]
> en-US = "Serbian (Latin)"
> 
>@@ -499,12 +415,6 @@
> [STR_DESC_MODULE_HELPPACK_GA]
> en-US = "Installs Irish help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_SR_CS]
>-en-US = "Serbian (Cyrillic)"
>-
>-[STR_DESC_MODULE_HELPPACK_SR_CS]
>-en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_SR]
> en-US = "Serbian (Cyrillic)"
> 
>@@ -517,12 +427,6 @@
> [STR_DESC_MODULE_HELPPACK_BS]
> en-US = "Installs Bosnian help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_AS_IN]
>-en-US = "Assamese"
>-
>-[STR_DESC_MODULE_HELPPACK_AS_IN]
>-en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_AST]
> en-US = "Asturian"
> 
>@@ -535,30 +439,12 @@
> [STR_DESC_MODULE_HELPPACK_RW]
> en-US = "Installs Kinyarwanda help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_SA]
>-en-US = "Sanskrit"
>-
>-[STR_DESC_MODULE_HELPPACK_SA]
>-en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_FA]
> en-US = "Farsi"
> 
> [STR_DESC_MODULE_HELPPACK_FA]
> en-US = "Installs Farsi help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_FO]
>-en-US = "Faroese"
>-
>-[STR_DESC_MODULE_HELPPACK_FO]
>-en-US = "Installs Faroese help in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_HELPPACK_SB]
>-en-US = "Sorbian"
>-
>-[STR_DESC_MODULE_HELPPACK_SB]
>-en-US = "Installs Sorbian help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_TT]
> en-US = "Tatar"
> 
>@@ -571,12 +457,6 @@
> [STR_DESC_MODULE_HELPPACK_TS]
> en-US = "Installs Tsonga help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_YI]
>-en-US = "Yiddish"
>-
>-[STR_DESC_MODULE_HELPPACK_YI]
>-en-US = "Installs Yiddish help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_BR]
> en-US = "Breton"
> 
>@@ -607,12 +487,6 @@
> [STR_DESC_MODULE_HELPPACK_KN]
> en-US = "Installs Kannada help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_MS]
>-en-US = "Malay (Malaysian)"
>-
>-[STR_DESC_MODULE_HELPPACK_MS]
>-en-US = "Installs Malay (Malaysian) help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_TG]
> en-US = "Tajik"
> 
>@@ -661,30 +535,6 @@
> [STR_DESC_MODULE_HELPPACK_EN_GB]
> en-US = "Installs English (United Kingdom) help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_UR_IN]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_HELPPACK_UR_IN]
>-en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_HELPPACK_ML_IN]
>-en-US = "Malayalam"
>-
>-[STR_DESC_MODULE_HELPPACK_ML_IN]
>-en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_HELPPACK_TE_IN]
>-en-US = "Telugu"
>-
>-[STR_DESC_MODULE_HELPPACK_TE_IN]
>-en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_HELPPACK_TI_ER]
>-en-US = "Tigrinya"
>-
>-[STR_DESC_MODULE_HELPPACK_TI_ER]
>-en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_UZ]
> en-US = "Uzbek"
> 
>@@ -775,12 +625,6 @@
> [STR_DESC_MODULE_HELPPACK_KS]
> en-US = "Installs Kashmiri help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_KY]
>-en-US = "Kyrgyz"
>-
>-[STR_DESC_MODULE_HELPPACK_KY]
>-en-US = "Installs Kyrgyz help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_MAI]
> en-US = "Maithili"
> 
>@@ -799,18 +643,6 @@
> [STR_DESC_MODULE_HELPPACK_MNI]
> en-US = "Installs Manipuri help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_PAP]
>-en-US = "Papiamento"
>-
>-[STR_DESC_MODULE_HELPPACK_PAP]
>-en-US = "Installs Papiamento help in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_HELPPACK_PS]
>-en-US = "Pashto"
>-
>-[STR_DESC_MODULE_HELPPACK_PS]
>-en-US = "Installs Pashto help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_SA_IN]
> en-US = "Sanskrit (India)"
> 
>@@ -823,12 +655,6 @@
> [STR_DESC_MODULE_HELPPACK_SAT]
> en-US = "Installs Santali help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_SC]
>-en-US = "Sardinian"
>-
>-[STR_DESC_MODULE_HELPPACK_SC]
>-en-US = "Installs Sardinian help in %PRODUCTNAME %PRODUCTVERSION"
>-
> [STR_NAME_MODULE_HELPPACK_SD]
> en-US = "Sindhi"
> 
>@@ -841,8 +667,8 @@
> [STR_DESC_MODULE_HELPPACK_TE]
> en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
> 
>-[STR_NAME_MODULE_HELPPACK_TI]
>-en-US = "Tigrinya"
>+[STR_NAME_MODULE_HELPPACK_QTZ]
>+en-US = "KeyID"
> 
>-[STR_DESC_MODULE_HELPPACK_TI]
>-en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
>+[STR_DESC_MODULE_HELPPACK_QTZ]
>+en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION with a key ID before each paragraph"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_help_template.scp scp2//source/ooo/module_help_template.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_help_template.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/module_help_template.scp	2011-10-17 18:59:33.613146577 +0200
>@@ -39,8 +39,6 @@
>              gid_File_Help_Simpress_Zip,
>              gid_File_Help_Smath_Zip,
>              gid_File_Help_Swriter_Zip);
>-    Dirs = (gid_Brand_Dir_Help,
>-            gid_Brand_Dir_Help_Isolanguage);
> End
> 
> #include "allhelpmodules_root.inc"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_hidden_ooo.scp scp2//source/ooo/module_hidden_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_hidden_ooo.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/module_hidden_ooo.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -83,8 +83,6 @@
> 	Default = YES;
> 	Styles = (HIDDEN_ROOT);
> 	Files = (gid_File_Bin_Cde_Open_Url,
>-	gid_File_Bin_Gnome_Open_Url,
>-	gid_File_Bin_Gnome_Open_Url_Bin,
> 	gid_File_Bin_Kde_Open_Url,
> 	gid_File_Bin_Open_Url,
> 	gid_File_Bin_Pagein,
>@@ -112,7 +110,6 @@
> 	gid_File_Shellnew_Odp_Soffice,
> 	gid_File_Shellnew_Odt_Soffice,
> 	gid_File_Exe_Java,
>-	gid_File_Exe_Adabas,
> 	gid_File_Exe_Userinst,
> 	gid_File_Exe_Userdeinst,
> 	gid_File_Regcleanold,
>@@ -143,6 +140,9 @@
> 	gid_File_Jar_Letter,
> 	gid_File_Jar_Form,
> 	gid_File_Jar_Fax,
>+	gid_File_Wizards_Common,
>+	gid_File_Wizards_Event,
>+	gid_File_Wizards_Fax,
> 	gid_File_Jar_Agenda,
> 	gid_File_Jar_Web,
> 	gid_File_Jar_Query,
>@@ -151,9 +151,7 @@
> 	gid_File_Jar_Scriptframework,
> 	gid_File_Jar_Scriptproviderforjava,
> 	gid_File_Jar_Xml_Apis,
>-	gid_File_Jar_Bsh,
> 	gid_File_Jar_Classes,
>-	gid_File_Jar_AVmedia,
> 	gid_File_Jar_Xsltfilter,
> 	gid_File_Jar_Xsltvalidate,
> 	gid_File_Jar_Docbook,
>@@ -236,7 +234,6 @@
> 	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,
>@@ -258,6 +255,7 @@
> 	gid_File_Lib_AVMediaWin,
>     gid_File_Lib_AVMediaGStreamer,
> 	gid_File_Lib_BaseGfx,
>+    gid_File_Lib_Merged,
> 	gid_File_Lib_Sysdtrans,
> 	gid_File_Lib_Sw,
> 	gid_File_Lib_TextConversionDlgs,
>@@ -279,7 +277,6 @@
> 	gid_File_Lib_Odfflatxml,
> 	gid_File_Lib_Zip,
> 	gid_File_Lib_Vclplug_Gen,
>-	gid_File_Lib_Vclplug_Gtk,
> 	gid_File_Lib_Vclplug_Kde,
> 	gid_File_Lib_Vclplug_Kde4,
> 	gid_File_Lib_Vclplug_Svp,
>@@ -306,6 +303,32 @@
> 	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,
>@@ -318,7 +341,6 @@
> 	gid_File_Lib_Stringresource,
> 	gid_File_Lib_Ldapbe2,
> 	gid_File_Lib_Comphelper2,
>-	gid_File_Lib_Adabas,
> 	gid_File_Lib_Cached1,
> 	gid_File_Lib_Curl,
> 	gid_Unixlink_File_Lib_Curl,
>@@ -326,7 +348,6 @@
> 	gid_File_Lib_Dbpool,
> 	gid_File_Lib_Embobj,
> 	gid_File_Lib_Emboleobj,
>-	gid_File_Lib_Evoab_2,
> 	gid_File_Lib_Kab_1,
>     gid_File_Lib_Kab_Drv_1,
> 	gid_File_Lib_Macab_1,
>@@ -334,7 +355,6 @@
> 	gid_File_Lib_Evtatt,
> 	gid_File_Lib_Fileacc,
> 	gid_File_Lib_Filterconfig1,
>-	gid_File_Lib_Fps_Gnome,
> 	gid_File_Lib_Dbodbcbase,
> 	gid_File_Lib_I18npool,
> 	gid_File_Lib_I18npaper,
>@@ -363,7 +383,7 @@
> 	gid_File_Lib_Package2,
> 	gid_File_Lib_Deployment,
> 	gid_File_Lib_DeploymentGui,
>-	gid_File_Lib_Sax_Uno,
>+	gid_File_Lib_Expwrap_Uno,
> 	gid_File_Lib_Fastsax_Uno,
> 	gid_File_Lib_Slideshow,
> 	gid_File_Lib_Recentfile,
>@@ -436,9 +456,6 @@
> #endif
>     gid_File_Lib_sn_tools,
>     GID_FILE_LIB_WPD,
>-    gid_File_Lib_Mingw_GccS,
>-    gid_File_Lib_Mingw_Stdcpp,
>-    gid_File_Lib_Mingwm10,
> 	gid_File_Lib_Msvcp70,
> 	gid_File_Lib_Msvcr70,
> 	gid_File_Lib_Ole,
>@@ -462,7 +479,6 @@
> 	gid_File_Lib_Fsstorage,
> 	gid_File_Lib_Hatchwindowfactory,
> 	gid_File_Lib_Passwordcontainer,
>-	gid_File_Lib_Productregistration,
> 	gid_File_Lib_Svtmisc,
>     gid_File_Lib_Updchkui,
>     gid_File_Lib_Updatefeed,
>@@ -581,80 +597,6 @@
> 	gid_File_Dtd_Office,
> 	gid_File_Dtd_Statusbar,
> 	gid_File_Dtd_Toolbar,
>-    gid_File_Conf_Fpdb,
>-    gid_File_Lm_Afrikaans,
>-    gid_File_Lm_Albanian,
>-    gid_File_Lm_Amharic_Utf,
>-    gid_File_Lm_Arabic,
>-    gid_File_Lm_Armenian,
>-    gid_File_Lm_Basque,
>-    gid_File_Lm_Belarus,
>-    gid_File_Lm_Bosnian,
>-    gid_File_Lm_Breton,
>-    gid_File_Lm_Catalan,
>-    gid_File_Lm_Chinese_Simplified,
>-    gid_File_Lm_Chinese_Traditional,
>-    gid_File_Lm_Croatian,
>-    gid_File_Lm_Czech,
>-    gid_File_Lm_Danish,
>-    gid_File_Lm_Drents,
>-    gid_File_Lm_Dutch,
>-    gid_File_Lm_English,
>-    gid_File_Lm_Esperanto,
>-    gid_File_Lm_Estonian,
>-    gid_File_Lm_Finnish,
>-    gid_File_Lm_French,
>-    gid_File_Lm_Frisian,
>-    gid_File_Lm_Georgian,
>-    gid_File_Lm_German,
>-    gid_File_Lm_Greek,
>-    gid_File_Lm_Hebrew,
>-    gid_File_Lm_Hindi,
>-    gid_File_Lm_Hungarian,
>-    gid_File_Lm_Icelandic,
>-    gid_File_Lm_Indonesian,
>-    gid_File_Lm_Irish_Gaelic,
>-    gid_File_Lm_Italian,
>-    gid_File_Lm_Japanese,
>-    gid_File_Lm_Korean,
>-    gid_File_Lm_Latin,
>-    gid_File_Lm_Latvian,
>-    gid_File_Lm_Lithuanian,
>-    gid_File_Lm_Luxembourgish,
>-    gid_File_Lm_Malay,
>-    gid_File_Lm_Manx_Gaelic,
>-    gid_File_Lm_Marathi,
>-    gid_File_Lm_Middle_Frisian,
>-    gid_File_Lm_Mingo,
>-    gid_File_Lm_Mongolian_Cyrillic,
>-    gid_File_Lm_Nepali,
>-    gid_File_Lm_Norwegian,
>-    gid_File_Lm_Persian,
>-    gid_File_Lm_Polish,
>-    gid_File_Lm_Portuguese,
>-    gid_File_Lm_Quechua,
>-    gid_File_Lm_Romanian,
>-    gid_File_Lm_Romansh,
>-    gid_File_Lm_Russian,
>-    gid_File_Lm_Sanskrit,
>-    gid_File_Lm_Scots,
>-    gid_File_Lm_Scots_Gaelic,
>-    gid_File_Lm_Serbian,
>-    gid_File_Lm_Serbian_Latin,
>-    gid_File_Lm_Slovak_Ascii,
>-    gid_File_Lm_Slovenian,
>-    gid_File_Lm_Spanish,
>-    gid_File_Lm_Swahili,
>-    gid_File_Lm_Swedish,
>-    gid_File_Lm_Tagalog,
>-    gid_File_Lm_Tamil,
>-    gid_File_Lm_Thai,
>-    gid_File_Lm_Turkish,
>-    gid_File_Lm_Ukrainian,
>-    gid_File_Lm_Vietnamese,
>-    gid_File_Lm_Welsh,
>-    gid_File_Lm_Yiddish_Utf,
>-    gid_File_Lm_Zulu,
> 	gid_File_Mod_Chart,
> 	gid_File_Mod_Datastyl,
> 	gid_File_Mod_Defs,
>@@ -771,6 +713,9 @@
> #ifdef THEME_HICONTRAST
>              gid_File_ImagesHicontrast_Zip,
> #endif
>+#ifdef THEME_HUMAN
>+             gid_File_ImagesHuman_Zip,
>+#endif
> #ifdef THEME_TANGO
>              gid_File_ImagesTango_Zip
> #endif
>@@ -853,16 +798,3 @@
>     PackageName = "${USERLANDPACKAGENAME}";
> End
> #endif
>-
>-// #ifdef BUILD_SPECIAL
>-// Module gid_Module_Root_Extension_Oooimprovement
>-//    Name = "gid_Module_Root_Extension_Oooimprovement";
>-//    Description = "gid_Module_Root_Extension_Oooimprovement";
>-//    Files = (gid_File_Extension_Oxt_Oooimprovement);
>-//    InstallOrder = "1990";
>-//    PackageInfo = "packinfo_office.txt";
>-//    ParentID = gid_Module_Root;
>-//    Styles = (HIDDEN_ROOT);
>-// End
>-// #endif
>-
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_improvement.scp scp2//source/ooo/module_improvement.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_improvement.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/module_improvement.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,42 +0,0 @@
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>- ************************************************************************/
>-
>-#include "macros.inc"
>-
>-// OOo improvement module
>-
>-#if defined(BUILD_SPECIAL)
>-Module gid_Module_Oooimprovement
>-    PackageInfo = "packinfo_office.txt";
>-    Name = "gid_Module_Oooimprovement";
>-    Description = "gid_Module_Oooimprovement";
>-    ParentID = gid_Module_Root;
>-    Default = YES;
>-    Styles = (HIDDEN_ROOT);
>-    Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement);
>-End
>-#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_langpack.ulf scp2//source/ooo/module_langpack.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_langpack.ulf	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/module_langpack.ulf	2011-11-29 09:56:02.926323818 +0100
>@@ -26,250 +26,226 @@
>  ************************************************************************/
>  
> [STR_NAME_MODULE_ROOT_LANGPACK]
>-en-US = "Additional language packs"
>+en-US = "Additional user interface languages"
> 
> [STR_DESC_MODULE_ROOT_LANGPACK]
>-en-US = "Additional language packs"
>+en-US = "Additional user interface languages"
> 
> [STR_NAME_MODULE_LANGPACK_EN_US]
> en-US = "English"
> 
> [STR_DESC_MODULE_LANGPACK_EN_US]
>-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the English user interface"
> 
> [STR_NAME_MODULE_LANGPACK_DE]
> en-US = "German"
> 
> [STR_DESC_MODULE_LANGPACK_DE]
>-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the German user interface"
> 
> [STR_NAME_MODULE_LANGPACK_FR]
> en-US = "French"
> 
> [STR_DESC_MODULE_LANGPACK_FR]
>-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the French user interface"
> 
> [STR_NAME_MODULE_LANGPACK_IT]
> en-US = "Italian"
> 
> [STR_DESC_MODULE_LANGPACK_IT]
>-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Italian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ES]
> en-US = "Spanish"
> 
> [STR_DESC_MODULE_LANGPACK_ES]
>-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Spanish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SV]
> en-US = "Swedish"
> 
> [STR_DESC_MODULE_LANGPACK_SV]
>-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Swedish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_PT]
> en-US = "Portuguese"
> 
> [STR_DESC_MODULE_LANGPACK_PT]
>-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Portuguese user interface"
> 
> [STR_NAME_MODULE_LANGPACK_PT_BR]
> en-US = "Portuguese (Brazil)"
> 
> [STR_DESC_MODULE_LANGPACK_PT_BR]
>-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Portuguese user interface"
> 
> [STR_NAME_MODULE_LANGPACK_JA]
> en-US = "Japanese"
> 
> [STR_DESC_MODULE_LANGPACK_JA]
>-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Japanese user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KO]
> en-US = "Korean"
> 
> [STR_DESC_MODULE_LANGPACK_KO]
>-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Korean user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ZH_CN]
> en-US = "Chinese (simplified)"
> 
> [STR_DESC_MODULE_LANGPACK_ZH_CN]
>-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Chinese (simplified) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ZH_TW]
> en-US = "Chinese (traditional)"
> 
> [STR_DESC_MODULE_LANGPACK_ZH_TW]
>-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Chinese (traditional) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_NL]
> en-US = "Dutch"
> 
> [STR_DESC_MODULE_LANGPACK_NL]
>-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Dutch user interface"
> 
> [STR_NAME_MODULE_LANGPACK_HU]
> en-US = "Hungarian"
> 
> [STR_DESC_MODULE_LANGPACK_HU]
>-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Hungarian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_PL]
> en-US = "Polish"
> 
> [STR_DESC_MODULE_LANGPACK_PL]
>-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Polish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_RU]
> en-US = "Russian"
> 
> [STR_DESC_MODULE_LANGPACK_RU]
>-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Russian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TR]
> en-US = "Turkish"
> 
> [STR_DESC_MODULE_LANGPACK_TR]
>-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Turkish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_EL]
> en-US = "Greek"
> 
> [STR_DESC_MODULE_LANGPACK_EL]
>-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Greek user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TH]
> en-US = "Thai"
> 
> [STR_DESC_MODULE_LANGPACK_TH]
>-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Thai user interface"
> 
> [STR_NAME_MODULE_LANGPACK_CS]
> en-US = "Czech"
> 
> [STR_DESC_MODULE_LANGPACK_CS]
>-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Czech user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SK]
> en-US = "Slovak"
> 
> [STR_DESC_MODULE_LANGPACK_SK]
>-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Slovak user interface"
> 
> [STR_NAME_MODULE_LANGPACK_HR]
> en-US = "Croatian"
> 
> [STR_DESC_MODULE_LANGPACK_HR]
>-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Croatian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ET]
> en-US = "Estonian"
> 
> [STR_DESC_MODULE_LANGPACK_ET]
>-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Estonian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_VI]
> en-US = "Vietnamese"
> 
> [STR_DESC_MODULE_LANGPACK_VI]
>-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Vietnamese user interface"
> 
> [STR_NAME_MODULE_LANGPACK_BG]
> en-US = "Bulgarian"
> 
> [STR_DESC_MODULE_LANGPACK_BG]
>-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Bulgarian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KM]
> en-US = "Khmer"
> 
> [STR_DESC_MODULE_LANGPACK_KM]
>-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Khmer user interface"
> 
> [STR_NAME_MODULE_LANGPACK_PA_IN]
> en-US = "Punjabi"
> 
> [STR_DESC_MODULE_LANGPACK_PA_IN]
>-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_GU_IN]
>-en-US = "Gujarati"
>-
>-[STR_DESC_MODULE_LANGPACK_GU_IN]
>-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Punjabi user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TA]
> en-US = "Tamil"
> 
> [STR_DESC_MODULE_LANGPACK_TA]
>-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TA_IN]
>-en-US = "Tamil"
>-
>-[STR_DESC_MODULE_LANGPACK_TA_IN]
>-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Tamil user interface"
> 
> [STR_NAME_MODULE_LANGPACK_HI]
> en-US = "Hindi"
> 
> [STR_DESC_MODULE_LANGPACK_HI]
>-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HI_IN]
>-en-US = "Hindi"
>-
>-[STR_DESC_MODULE_LANGPACK_HI_IN]
>-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Hindi user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ST]
> en-US = "Southern Sotho (Sutu)"
> 
> [STR_DESC_MODULE_LANGPACK_ST]
>-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Southern Sotho (Sutu) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TN]
> en-US = "Tswana"
> 
> [STR_DESC_MODULE_LANGPACK_TN]
>-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Tswana user interface"
> 
> [STR_NAME_MODULE_LANGPACK_XH]
> en-US = "Xhosa"
> 
> [STR_DESC_MODULE_LANGPACK_XH]
>-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Xhosa user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ZU]
> en-US = "Zulu"
> 
> [STR_DESC_MODULE_LANGPACK_ZU]
>-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Zulu user interface"
> 
> [STR_NAME_MODULE_LANGPACK_AF]
> en-US = "Afrikaans"
> 
> [STR_DESC_MODULE_LANGPACK_AF]
>-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SW]
>-en-US = "Swahili"
>-
>-[STR_DESC_MODULE_LANGPACK_SW]
>-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Afrikaans user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SW_TZ]
> en-US = "Swahili"
> 
> [STR_DESC_MODULE_LANGPACK_SW_TZ]
>-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Swahili user interface"
> 
> [STR_NAME_MODULE_LANGPACK_LO]
> en-US = "Lao"
> 
> [STR_DESC_MODULE_LANGPACK_LO]
>-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Lao user interface"
> 
> [STR_NAME_MODULE_LANGPACK_MY]
> en-US = "Burmese"
>@@ -281,568 +257,424 @@
> en-US = "Northern Sotho"
> 
> [STR_DESC_MODULE_LANGPACK_NSO]
>-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Northern Sotho user interface"
> 
> [STR_NAME_MODULE_LANGPACK_BN]
> en-US = "Bengali"
> 
> [STR_DESC_MODULE_LANGPACK_BN]
>-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN_BD]
>-en-US = "Bengali (Bangladesh)"
>-
>-[STR_DESC_MODULE_LANGPACK_BN_BD]
>-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_BN_IN]
>-en-US = "Bengali (India)"
>-
>-[STR_DESC_MODULE_LANGPACK_BN_IN]
>-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Bengali user interface"
> 
> [STR_NAME_MODULE_LANGPACK_OR]
> en-US = "Oriya"
> 
> [STR_DESC_MODULE_LANGPACK_OR]
>-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_OR_IN]
>-en-US = "Oriya"
>-
>-[STR_DESC_MODULE_LANGPACK_OR_IN]
>-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Oriya user interface"
> 
> [STR_NAME_MODULE_LANGPACK_MR]
> en-US = "Marathi"
> 
> [STR_DESC_MODULE_LANGPACK_MR]
>-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MR_IN]
>-en-US = "Marathi"
>-
>-[STR_DESC_MODULE_LANGPACK_MR_IN]
>-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Marathi user interface"
> 
> [STR_NAME_MODULE_LANGPACK_NE]
> en-US = "Nepali"
> 
> [STR_DESC_MODULE_LANGPACK_NE]
>-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Nepali user interface"
> 
> [STR_NAME_MODULE_LANGPACK_AR]
> en-US = "Arabic"
> 
> [STR_DESC_MODULE_LANGPACK_AR]
>-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AR_SA]
>-en-US = "Arabic"
>-
>-[STR_DESC_MODULE_LANGPACK_AR_SA]
>-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Arabic user interface"
> 
> [STR_NAME_MODULE_LANGPACK_CA]
> en-US = "Catalan"
> 
> [STR_DESC_MODULE_LANGPACK_CA]
>-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Catalan user interface"
> 
> [STR_NAME_MODULE_LANGPACK_CA_XV]
> en-US = "Catalan (Valencian)"
> 
> [STR_DESC_MODULE_LANGPACK_CA_XV]
>-en-US = "Installs Catalan (Valencian) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Catalan (Valencian) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_DA]
> en-US = "Danish"
> 
> [STR_DESC_MODULE_LANGPACK_DA]
>-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Danish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_FI]
> en-US = "Finnish"
> 
> [STR_DESC_MODULE_LANGPACK_FI]
>-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Finnish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_HE]
> en-US = "Hebrew"
> 
> [STR_DESC_MODULE_LANGPACK_HE]
>-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Hebrew user interface"
> 
> [STR_NAME_MODULE_LANGPACK_IS]
> en-US = "Icelandic"
> 
> [STR_DESC_MODULE_LANGPACK_IS]
>-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Icelandic user interface"
> 
> [STR_NAME_MODULE_LANGPACK_NB]
> en-US = "Norwegian (BokmÃ¥l)"
> 
> [STR_DESC_MODULE_LANGPACK_NB]
>-en-US = "Installs Norwegian (BokmÃ¥l) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Norwegian (BokmÃ¥l) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_NN]
> en-US = "Norwegian (Nynorsk)"
> 
> [STR_DESC_MODULE_LANGPACK_NN]
>-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_RM]
>-en-US = "Rhaeto-Romance"
>-
>-[STR_DESC_MODULE_LANGPACK_RM]
>-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Norwegian (Nynorsk) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_RO]
> en-US = "Romanian"
> 
> [STR_DESC_MODULE_LANGPACK_RO]
>-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Romanian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SQ]
> en-US = "Albanian"
> 
> [STR_DESC_MODULE_LANGPACK_SQ]
>-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UR]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_LANGPACK_UR]
>-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Albanian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ID]
> en-US = "Indonesian"
> 
> [STR_DESC_MODULE_LANGPACK_ID]
>-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Indonesian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_UK]
> en-US = "Ukrainian"
> 
> [STR_DESC_MODULE_LANGPACK_UK]
>-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Ukrainian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_BE]
> en-US = "Belarusian"
> 
> [STR_DESC_MODULE_LANGPACK_BE]
>-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Belarusian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SL]
> en-US = "Slovenian"
> 
> [STR_DESC_MODULE_LANGPACK_SL]
>-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Slovenian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_LV]
> en-US = "Latvian"
> 
> [STR_DESC_MODULE_LANGPACK_LV]
>-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Latvian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_LT]
> en-US = "Lithuanian"
> 
> [STR_DESC_MODULE_LANGPACK_LT]
>-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_HY]
>-en-US = "Armenian"
>-
>-[STR_DESC_MODULE_LANGPACK_HY]
>-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Lithuanian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_EU]
> en-US = "Basque"
> 
> [STR_DESC_MODULE_LANGPACK_EU]
>-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Basque user interface"
> 
> [STR_NAME_MODULE_LANGPACK_MK]
> en-US = "Macedonian"
> 
> [STR_DESC_MODULE_LANGPACK_MK]
>-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MT]
>-en-US = "Maltese"
>-
>-[STR_DESC_MODULE_LANGPACK_MT]
>-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Macedonian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_CY]
> en-US = "Welsh"
> 
> [STR_DESC_MODULE_LANGPACK_CY]
>-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Welsh user interface"
> 
> [STR_NAME_MODULE_LANGPACK_GL]
> en-US = "Galician"
> 
> [STR_DESC_MODULE_LANGPACK_GL]
>-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SH_YU]
>-en-US = "Serbian (Latin)"
>-
>-[STR_DESC_MODULE_LANGPACK_SH_YU]
>-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Galician user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SH]
> en-US = "Serbian (Latin)"
> 
> [STR_DESC_MODULE_LANGPACK_SH]
>-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Serbian (Latin) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_GA]
> en-US = "Irish"
> 
> [STR_DESC_MODULE_LANGPACK_GA]
>-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SR_CS]
>-en-US = "Serbian (Cyrillic)"
>-
>-[STR_DESC_MODULE_LANGPACK_SR_CS]
>-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Irish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SR]
> en-US = "Serbian (Cyrillic)"
> 
> [STR_DESC_MODULE_LANGPACK_SR]
>-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Serbian (Cyrillic) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_BS]
> en-US = "Bosnian"
> 
> [STR_DESC_MODULE_LANGPACK_BS]
>-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_AS_IN]
>-en-US = "Assamese"
>-
>-[STR_DESC_MODULE_LANGPACK_AS_IN]
>-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Bosnian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_AST]
> en-US = "Asturian"
> 
> [STR_DESC_MODULE_LANGPACK_AST]
>-en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Asturian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_RW]
> en-US = "Kinyarwanda"
> 
> [STR_DESC_MODULE_LANGPACK_RW]
>-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SA]
>-en-US = "Sanskrit"
>-
>-[STR_DESC_MODULE_LANGPACK_SA]
>-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Kinyarwanda user interface"
> 
> [STR_NAME_MODULE_LANGPACK_FA]
> en-US = "Farsi"
> 
> [STR_DESC_MODULE_LANGPACK_FA]
>-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_FO]
>-en-US = "Faroese"
>-
>-[STR_DESC_MODULE_LANGPACK_FO]
>-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SB]
>-en-US = "Sorbian"
>-
>-[STR_DESC_MODULE_LANGPACK_SB]
>-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Farsi user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TT]
> en-US = "Tatar"
> 
> [STR_DESC_MODULE_LANGPACK_TT]
>-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Tatar user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TS]
> en-US = "Tsonga"
> 
> [STR_DESC_MODULE_LANGPACK_TS]
>-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_YI]
>-en-US = "Yiddish"
>-
>-[STR_DESC_MODULE_LANGPACK_YI]
>-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Tsonga user interface"
> 
> [STR_NAME_MODULE_LANGPACK_BR]
> en-US = "Breton"
> 
> [STR_DESC_MODULE_LANGPACK_BR]
>-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Breton user interface"
> 
> [STR_NAME_MODULE_LANGPACK_NR]
> en-US = "Ndebele South"
> 
> [STR_DESC_MODULE_LANGPACK_NR]
>-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Ndebele South user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SS]
> en-US = "Swazi"
> 
> [STR_DESC_MODULE_LANGPACK_SS]
>-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Swazi user interface"
> 
> [STR_NAME_MODULE_LANGPACK_VE]
> en-US = "Venda"
> 
> [STR_DESC_MODULE_LANGPACK_VE]
>-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Venda user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KN]
> en-US = "Kannada"
> 
> [STR_DESC_MODULE_LANGPACK_KN]
>-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_MS]
>-en-US = "Malay (Malaysian)"
>-
>-[STR_DESC_MODULE_LANGPACK_MS]
>-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Kannada user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TG]
> en-US = "Tajik"
> 
> [STR_DESC_MODULE_LANGPACK_TG]
>-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Tajik user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KU]
> en-US = "Kurdish"
> 
> [STR_DESC_MODULE_LANGPACK_KU]
>-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Kurdish user interface"
> 
> [STR_NAME_MODULE_LANGPACK_DZ]
> en-US = "Dzongkha"
> 
> [STR_DESC_MODULE_LANGPACK_DZ]
>-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Dzongkha user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KA]
> en-US = "Georgian"
> 
> [STR_DESC_MODULE_LANGPACK_KA]
>-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Georgian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_EO]
> en-US = "Esperanto"
> 
> [STR_DESC_MODULE_LANGPACK_EO]
>-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Esperanto user interface"
> 
> [STR_NAME_MODULE_LANGPACK_GU]
> en-US = "Gujarati"
> 
> [STR_DESC_MODULE_LANGPACK_GU]
>-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Gujarati user interface"
> 
> [STR_NAME_MODULE_LANGPACK_EN_ZA]
> en-US = "English (South Africa)"
> 
> [STR_DESC_MODULE_LANGPACK_EN_ZA]
>-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the English (South Africa) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_EN_GB]
> en-US = "English (United Kingdom)"
> 
> [STR_DESC_MODULE_LANGPACK_EN_GB]
>-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_UR_IN]
>-en-US = "Urdu"
>-
>-[STR_DESC_MODULE_LANGPACK_UR_IN]
>-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_ML_IN]
>-en-US = "Malayalam"
>-
>-[STR_DESC_MODULE_LANGPACK_ML_IN]
>-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TE_IN]
>-en-US = "Telugu"
>-
>-[STR_DESC_MODULE_LANGPACK_TE_IN]
>-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_TI_ER]
>-en-US = "Tigrinya"
>-
>-[STR_DESC_MODULE_LANGPACK_TI_ER]
>-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the English (United Kingdom) user interface"
> 
> [STR_NAME_MODULE_LANGPACK_UZ]
> en-US = "Uzbek"
> 
> [STR_DESC_MODULE_LANGPACK_UZ]
>-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Uzbek user interface"
> 
> [STR_NAME_MODULE_LANGPACK_MN]
> en-US = "Mongolian"
> 
> [STR_DESC_MODULE_LANGPACK_MN]
>-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Mongolian user interface"
> 
> [STR_NAME_MODULE_LANGPACK_BO]
> en-US = "Tibetan"
> 
> [STR_DESC_MODULE_LANGPACK_BO]
>-en-US = "Installs Tibetan support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Tibetan user interface"
> 
> [STR_NAME_MODULE_LANGPACK_OC]
> en-US = "Occitan"
> 
> [STR_DESC_MODULE_LANGPACK_OC]
>-en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Occitan user interface"
> 
> [STR_NAME_MODULE_LANGPACK_OM]
> en-US = "Oromo"
> 
> [STR_DESC_MODULE_LANGPACK_OM]
>-en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Oromo user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SI]
> en-US = "Sinhala"
> 
> [STR_DESC_MODULE_LANGPACK_SI]
>-en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Sinhala user interface"
> 
> [STR_NAME_MODULE_LANGPACK_UG]
> en-US = "Uyghur"
> 
> [STR_DESC_MODULE_LANGPACK_UG]
>-en-US = "Installs Uyghur support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Uyghur user interface"
> 
> [STR_NAME_MODULE_LANGPACK_AS]
> en-US = "Assamese"
> 
> [STR_DESC_MODULE_LANGPACK_AS]
>-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Assamese user interface"
> 
> [STR_NAME_MODULE_LANGPACK_BRX]
> en-US = "Bodo"
> 
> [STR_DESC_MODULE_LANGPACK_BRX]
>-en-US = "Installs Bodo support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Bodo user interface"
> 
> [STR_NAME_MODULE_LANGPACK_DGO]
> en-US = "Dogri"
> 
> [STR_DESC_MODULE_LANGPACK_DGO]
>-en-US = "Installs Dogri support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Dogri user interface"
> 
> [STR_NAME_MODULE_LANGPACK_GD]
> en-US = "Scottish Gaelic"
> 
> [STR_DESC_MODULE_LANGPACK_GD]
>-en-US = "Installs Scottish Gaelic support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Scottish Gaelic user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KK]
> en-US = "Kazakh"
> 
> [STR_DESC_MODULE_LANGPACK_KK]
>-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Kazakh user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KOK]
> en-US = "Konkani"
> 
> [STR_DESC_MODULE_LANGPACK_KOK]
>-en-US = "Installs Konkani support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Konkani user interface"
> 
> [STR_NAME_MODULE_LANGPACK_KS]
> en-US = "Kashmiri"
> 
> [STR_DESC_MODULE_LANGPACK_KS]
>-en-US = "Installs Kashmiri support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_KY]
>-en-US = "Kyrgyz"
>-
>-[STR_DESC_MODULE_LANGPACK_KY]
>-en-US = "Installs Kyrgyz support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Kashmiri user interface"
> 
> [STR_NAME_MODULE_LANGPACK_MAI]
> en-US = "Maithili"
> 
> [STR_DESC_MODULE_LANGPACK_MAI]
>-en-US = "Installs Maithili support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Maithili user interface"
> 
> [STR_NAME_MODULE_LANGPACK_ML]
> en-US = "Malayalam"
> 
> [STR_DESC_MODULE_LANGPACK_ML]
>-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Malayalam user interface"
> 
> [STR_NAME_MODULE_LANGPACK_MNI]
> en-US = "Manipuri"
> 
> [STR_DESC_MODULE_LANGPACK_MNI]
>-en-US = "Installs Manipuri support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PAP]
>-en-US = "Papiamento"
>-
>-[STR_DESC_MODULE_LANGPACK_PAP]
>-en-US = "Installs Papiamento support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_PS]
>-en-US = "Pashto"
>-
>-[STR_DESC_MODULE_LANGPACK_PS]
>-en-US = "Installs Pashto support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Manipuri user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SA_IN]
> en-US = "Sanskrit (India)"
> 
> [STR_DESC_MODULE_LANGPACK_SA_IN]
>-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Sanskrit user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SAT]
> en-US = "Santali"
> 
> [STR_DESC_MODULE_LANGPACK_SAT]
>-en-US = "Installs Santali support in %PRODUCTNAME %PRODUCTVERSION"
>-
>-[STR_NAME_MODULE_LANGPACK_SC]
>-en-US = "Sardinian"
>-
>-[STR_DESC_MODULE_LANGPACK_SC]
>-en-US = "Installs Sardinian support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Santali user interface"
> 
> [STR_NAME_MODULE_LANGPACK_SD]
> en-US = "Sindhi"
> 
> [STR_DESC_MODULE_LANGPACK_SD]
>-en-US = "Installs Sindhi support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Sindhi user interface"
> 
> [STR_NAME_MODULE_LANGPACK_TE]
> en-US = "Telugu"
> 
> [STR_DESC_MODULE_LANGPACK_TE]
>-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
>+en-US = "Installs the Telugu user interface"
>+
>+[STR_NAME_MODULE_LANGPACK_LB]
>+en-US = "Luxembourgish"
>+
>+[STR_DESC_MODULE_LANGPACK_LB]
>+en-US = "Installs the Luxembourgish user interface"
> 
>-[STR_NAME_MODULE_LANGPACK_TI]
>-en-US = "Tigrinya"
>+[STR_NAME_MODULE_LANGPACK_QTZ]
>+en-US = "KeyID"
> 
>-[STR_DESC_MODULE_LANGPACK_TI]
>-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
>+[STR_DESC_MODULE_LANGPACK_QTZ]
>+en-US = "Installs the English user interface with a key ID before each UI element"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_lang_template.scp scp2//source/ooo/module_lang_template.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_lang_template.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/module_lang_template.scp	2011-09-13 16:39:36.073306253 +0200
>@@ -37,12 +37,11 @@
>              gid_File_Extra_Tplwizfax_Lang,
>              gid_File_Extra_Tplwizreport_Lang,
>              gid_File_Extra_Tplwizstyles_Lang,
>-             gid_File_Extra_Wordbook,
>-             gid_File_Extra_Wordbook_Lang,
>              gid_File_Registry_Filter_Zip,
>              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
>@@ -75,9 +74,7 @@
>              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,
>              gid_File_Res_Sd,
>              gid_File_Res_Sfx,
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_ooo.scp scp2//source/ooo/module_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_ooo.scp	2011-12-05 11:53:51.000000000 +0100
>+++ scp2//source/ooo/module_ooo.scp	2011-12-28 13:34:06.574199178 +0100
>@@ -60,13 +60,68 @@
>     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
>     Files = (gid_File_Extension_Dictionary_Af);
>     InstallOrder = "2000";
>-    Sortkey = "510";
>+    Sortkey = "500";
>     Spellcheckerlanguage = "af";
>     PackageInfo = "packinfo_office.txt";
>     ParentID = gid_Module_Dictionaries;
>     Styles = ();
> End
> 
>+Module gid_Module_Root_Extension_Dictionary_An
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AN );
>+    Files = (gid_File_Extension_Dictionary_An);
>+    InstallOrder = "2000";
>+    Sortkey = "510";
>+    Spellcheckerlanguage = "an";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
>+Module gid_Module_Root_Extension_Dictionary_Ar
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AR );
>+    Files = (gid_File_Extension_Dictionary_Ar);
>+    InstallOrder = "2000";
>+    Sortkey = "511";
>+    Spellcheckerlanguage = "ar";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
>+Module gid_Module_Root_Extension_Dictionary_Be
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BE );
>+    Files = (gid_File_Extension_Dictionary_Be);
>+    InstallOrder = "2000";
>+    Sortkey = "512";
>+    Spellcheckerlanguage = "be";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
>+Module gid_Module_Root_Extension_Dictionary_Bg
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BG );
>+    Files = (gid_File_Extension_Dictionary_Bg);
>+    InstallOrder = "2000";
>+    Sortkey = "513";
>+    Spellcheckerlanguage = "bg";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
>+Module gid_Module_Root_Extension_Dictionary_Bn
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BN );
>+    Files = (gid_File_Extension_Dictionary_Bn);
>+    InstallOrder = "2000";
>+    Sortkey = "514";
>+    Spellcheckerlanguage = "bn";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
> Module gid_Module_Root_Extension_Dictionary_Br
>     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
>     Files = (gid_File_Extension_Dictionary_Br);
>@@ -111,45 +166,34 @@
>     Styles = ();
> End
> 
>-Module gid_Module_Root_Extension_Dictionary_De_AT
>-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_AT );
>-    Files = (gid_File_Extension_Dictionary_De_AT);
>+Module gid_Module_Root_Extension_Dictionary_De
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE );
>+    Files = (gid_File_Extension_Dictionary_De);
>     InstallOrder = "2000";
>     Sortkey = "570";
>-    Spellcheckerlanguage = "de-AT";
>+    Spellcheckerlanguage = "de";
>     PackageInfo = "packinfo_office.txt";
>     ParentID = gid_Module_Dictionaries;
>     Styles = ();
> End
> 
>-Module gid_Module_Root_Extension_Dictionary_De_CH
>-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_CH );
>-    Files = (gid_File_Extension_Dictionary_De_CH);
>-    InstallOrder = "2000";
>-    Sortkey = "580";
>-    Spellcheckerlanguage = "de-CH";
>-    PackageInfo = "packinfo_office.txt";
>-    ParentID = gid_Module_Dictionaries;
>-    Styles = ();
>-End
>-
>-Module gid_Module_Root_Extension_Dictionary_De_DE
>-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_DE );
>-    Files = (gid_File_Extension_Dictionary_De_DE);
>+Module gid_Module_Root_Extension_Dictionary_En
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
>+    Files = (gid_File_Extension_Dictionary_En);
>     InstallOrder = "2000";
>-    Sortkey = "575";
>-    Spellcheckerlanguage = "de-DE";
>+    Sortkey = "550";
>+    Spellcheckerlanguage = "en";
>     PackageInfo = "packinfo_office.txt";
>     ParentID = gid_Module_Dictionaries;
>     Styles = ();
> End
> 
>-Module gid_Module_Root_Extension_Dictionary_En
>-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
>-    Files = (gid_File_Extension_Dictionary_En);
>+Module gid_Module_Root_Extension_Dictionary_El
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EL );
>+    Files = (gid_File_Extension_Dictionary_El);
>     InstallOrder = "2000";
>-    Sortkey = "550";
>-    Spellcheckerlanguage = "en";
>+    Sortkey = "719";
>+    Spellcheckerlanguage = "el";
>     PackageInfo = "packinfo_office.txt";
>     ParentID = gid_Module_Dictionaries;
>     Styles = ();
>@@ -188,6 +232,17 @@
>     Styles = ();
> End
> 
>+Module gid_Module_Root_Extension_Dictionary_Gd
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GD );
>+    Files = (gid_File_Extension_Dictionary_Gd);
>+    InstallOrder = "2000";
>+    Sortkey = "563";
>+    Spellcheckerlanguage = "gd";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
> Module gid_Module_Root_Extension_Dictionary_Gl
>     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GL );
>     Files = (gid_File_Extension_Dictionary_Gl);
>@@ -199,6 +254,17 @@
>     Styles = ();
> End
> 
>+Module gid_Module_Root_Extension_Dictionary_Gu
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GU );
>+    Files = (gid_File_Extension_Dictionary_Gu);
>+    InstallOrder = "2000";
>+    Sortkey = "567";
>+    Spellcheckerlanguage = "gu";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
> Module gid_Module_Root_Extension_Dictionary_He
>     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HE );
>     Files = (gid_File_Extension_Dictionary_He);
>@@ -210,6 +276,17 @@
>     Styles = ();
> End
> 
>+Module gid_Module_Root_Extension_Dictionary_Hi
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HI );
>+    Files = (gid_File_Extension_Dictionary_Hi);
>+    InstallOrder = "2000";
>+    Sortkey = "595";
>+    Spellcheckerlanguage = "hi";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
> Module gid_Module_Root_Extension_Dictionary_Hu
>     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HU );
>     Files = (gid_File_Extension_Dictionary_Hu);
>@@ -265,6 +342,17 @@
>     Styles = ();
> End
> 
>+Module gid_Module_Root_Extension_Dictionary_Lv
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LV );
>+    Files = (gid_File_Extension_Dictionary_Lv);
>+    InstallOrder = "2000";
>+    Sortkey = "635";
>+    Spellcheckerlanguage = "lv";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
> Module gid_Module_Root_Extension_Dictionary_Ne
>     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NE );
>     Files = (gid_File_Extension_Dictionary_Ne);
>@@ -325,7 +413,18 @@
>     Files = (gid_File_Extension_Dictionary_Pt);
>     InstallOrder = "2000";
>     Sortkey = "515";
>-    Spellcheckerlanguage = "pt";
>+    Spellcheckerlanguage = "pt-BR";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
>+Module gid_Module_Root_Extension_Dictionary_Pt_Pt
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT_PT );
>+    Files = (gid_File_Extension_Dictionary_Pt_Pt);
>+    InstallOrder = "2000";
>+    Sortkey = "515";
>+    Spellcheckerlanguage = "pt-PT";
>     PackageInfo = "packinfo_office.txt";
>     ParentID = gid_Module_Dictionaries;
>     Styles = ();
>@@ -353,6 +452,17 @@
>     Styles = ();
> End
> 
>+Module gid_Module_Root_Extension_Dictionary_Si
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SI );
>+    Files = (gid_File_Extension_Dictionary_Si);
>+    InstallOrder = "2000";
>+    Sortkey = "690";
>+    Spellcheckerlanguage = "si";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
>+End
>+
> Module gid_Module_Root_Extension_Dictionary_Sk
>     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SK );
>     Files = (gid_File_Extension_Dictionary_Sk);
>@@ -406,6 +516,17 @@
>     PackageInfo = "packinfo_office.txt";
>     ParentID = gid_Module_Dictionaries;
>     Styles = ();
>+End
>+
>+Module gid_Module_Root_Extension_Dictionary_Te
>+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TE );
>+    Files = (gid_File_Extension_Dictionary_Te);
>+    InstallOrder = "2000";
>+    Sortkey = "748";
>+    Spellcheckerlanguage = "te";
>+    PackageInfo = "packinfo_office.txt";
>+    ParentID = gid_Module_Dictionaries;
>+    Styles = ();
> End
> 
> Module gid_Module_Root_Extension_Dictionary_Th
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_ooo.ulf scp2//source/ooo/module_ooo.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/module_ooo.ulf	2011-12-05 11:53:51.000000000 +0100
>+++ scp2//source/ooo/module_ooo.ulf	2011-12-28 13:34:06.574199178 +0100
>@@ -47,61 +47,85 @@
> en-US = "Dictionaries"
> 
> [STR_DESC_MODULE_DICTIONARIES]
>-en-US = "Spelling and hyphenation dictionaries and thesauri."
>+en-US = "Spelling dictionaries, hyphenation rules, and thesauri."
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_AF]
> en-US = "Afrikaans"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
>-en-US = "Afrikaans spell checker"
>+en-US = "Afrikaans spelling dictionary, and hyphenation rules"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AN]
>+en-US = "Aragonese"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AN]
>+en-US = "Aragonese spelling dictionary"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AR]
>+en-US = "Arabic"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AR]
>+en-US = "Arabic spelling dictionary, and thesaurus"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BE]
>+en-US = "Belarusian"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BE]
>+en-US = "Belarusian spelling dictionary"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BG]
>+en-US = "Bulgarian"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BG]
>+en-US = "Bulgarian spelling dictionary, hyphenation rules, and thesaurus"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BN]
>+en-US = "Bengali"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BN]
>+en-US = "Bengali spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
> en-US = "Breton"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_BR]
>-en-US = "Breton spell checker"
>+en-US = "Breton spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
> en-US = "Catalan"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_CA]
>-en-US = "Spelling and hyphenation dictionaries and thesaurus for Catalan language (general)"
>+en-US = "Catalan spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_CS]
> en-US = "Czech"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_CS]
>-en-US = "Czech thesaurus"
>+en-US = "Czech spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_DA]
> en-US = "Danish"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_DA]
>-en-US = "Spelling and hyphenation dictionary for Danish"
>-
>-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_AT]
>-en-US = "German (Austria)"
>-
>-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_AT]
>-en-US = "German (AT-frami) spelling, hyphenation, thesaurus"
>+en-US = "Danish spelling dictionary, hyphenation rules, and thesaurus"
> 
>-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_CH]
>-en-US = "German (Switzerland)"
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE]
>+en-US = "German"
> 
>-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_CH]
>-en-US = "German (CH-frami) spelling, hyphenation, thesaurus"
>-
>-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_DE]
>-en-US = "German (Germany)"
>-
>-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_DE]
>-en-US = "German (DE-frami) spelling, hyphenation, thesaurus"
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE]
>+en-US = "German (Austria, Germany, Switzerland) spelling dictionaries, hyphenation rules, and thesauri"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_EN]
> en-US = "English"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_EN]
>-en-US = "English spelling and hyphenation dictionaries and thesaurus"
>+en-US = "English spelling dictionaries, hyphenation rules, thesaurus, and grammar checker"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_EL]
>+en-US = "Greek"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_EL]
>+en-US = "Greek spelling dictionary, and hyphenation rules"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_ES]
> en-US = "Spanish"
>@@ -113,127 +137,163 @@
> en-US = "Estonian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_ET]
>-en-US = "Estonian spelling and hyphenation dictionaries"
>+en-US = "Estonian spelling dictionary, and hyphenation rules"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_FR]
> en-US = "French"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_FR]
>-en-US = "French 'Classic and Reform 1990' spelling, thesaurus and hyphenation"
>+en-US = "French spelling dictionary, hyphenation rules, and thesaurus"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_GD]
>+en-US = "Scottish Gaelic"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_GD]
>+en-US = "Scottish Gaelic spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_GL]
> en-US = "Galician"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_GL]
>-en-US = "Galician spellchecker dictionary for %PRODUCTNAME"
>+en-US = "Galician spelling dictionary"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_GU]
>+en-US = "Gujarati"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_GU]
>+en-US = "Gujarati spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_HE]
> en-US = "Hebrew"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_HE]
>-en-US = "Hebrew spell check dictionary"
>+en-US = "Hebrew spelling dictionary"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HI]
>+en-US = "Hindi"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HI]
>+en-US = "Hindi spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_HU]
> en-US = "Hungarian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_HU]
>-en-US = "Hungarian spelling dictionary, hyphenation patterns, and thesaurus"
>+en-US = "Hungarian spelling dictionary, hyphenation rules, thesaurus, and grammar checker"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_HR]
> en-US = "Croatian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
>-en-US = "Croatian spelling dictionary and hyphenation patterns"
>+en-US = "Croatian spelling dictionary, and hyphenation rules"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
> en-US = "Italian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_IT]
>-en-US = "Italian spelling and hyphenation dictionaries and thesaurus"
>+en-US = "Italian spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_KU_TR]
> en-US = "Kurdish (Turkey)"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_KU_TR]
>-en-US = "Kurdish (Turkey) spell check dictionary"
>+en-US = "Kurdish (Turkey) spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_LT]
> en-US = "Lithuanian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_LT]
>-en-US = "Lithuanian spelling and hyphenation dictionaries"
>+en-US = "Lithuanian spelling dictionary, and hyphenation rules"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_LV]
>+en-US = "Latvian"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_LV]
>+en-US = "Latvian spelling dictionary, and hyphenation rules"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_NE]
> en-US = "Nepali"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_NE]
>-en-US = "Nepali spelling dictionary and thesaurus"
>+en-US = "Nepali spelling dictionary, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_NL]
> en-US = "Dutch"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_NL]
>-en-US = "Dutch spelling and hyphenation dictionaries"
>+en-US = "Dutch spelling dictionary, and hyphenation rules"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_NO]
> en-US = "Norwegian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
>-en-US = "Norwegian dictionaries (Nynorsk and Bokmal)"
>+en-US = "Norwegian (Nynorsk and Bokmal) spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_OC]
> en-US = "Occitan"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_OC]
>-en-US = "Occitan spell check dictionary"
>+en-US = "Occitan spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
> en-US = "Polish"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_PL]
>-en-US = "Polish spell check dictionary, hyphenation rules and thesaurus"
>+en-US = "Polish spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_PT]
> en-US = "Brazilian Portuguese"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_PT]
>-en-US = "Brazilian Portuguese Spelling Dictionary - 1990 Spelling Agreement"
>+en-US = "Brazilian Portuguese spelling Dictionary (1990 Spelling Agreement), and hyphenation rules"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_PT]
>+en-US = "Portuguese"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_PT]
>+en-US = "European Portuguese spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_RO]
> en-US = "Romanian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_RO]
>-en-US = "Romanian Dictionaries"
>+en-US = "Romanian spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_RU]
> en-US = "Russian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
>-en-US = "Russian spell check dictionary, hyphenation rules and thesaurus"
>+en-US = "Russian spelling dictionary, hyphenation rules, and thesaurus"
>+
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SI]
>+en-US = "Sinhala"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SI]
>+en-US = "Sinhala spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
> en-US = "Slovak"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_SK]
>-en-US = "Slovak spell check dictionary, hyphenation rules and thesaurus"
>+en-US = "Slovak spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_SL]
> en-US = "Slovenian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_SL]
>-en-US = "Slovenian dictionary pack"
>+en-US = "Slovenian spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_SR]
> en-US = "Serbian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_SR]
>-en-US = "Serbian spelling and hyphenation dictionaries"
>+en-US = "Serbian (Cyrillic and Latin) spelling dictionary, and hyphenation rules"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_SV]
> en-US = "Swedish"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_SV]
>-en-US = "Swedish Dictionary"
>+en-US = "Swedish spelling dictionary, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_SW]
> en-US = "Swahili"
>@@ -241,6 +301,12 @@
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_SW]
> en-US = "Swahili spelling dictionary"
> 
>+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TE]
>+en-US = "Telugu"
>+
>+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TE]
>+en-US = "Telugu spelling dictionary, and hyphenation rules"
>+
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_TH]
> en-US = "Thai"
> 
>@@ -251,16 +317,16 @@
> en-US = "Ukrainian"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_UK]
>-en-US = "Ukrainian spell check dictionary, hyphenation rules and thesaurus"
>+en-US = "Ukrainian spelling dictionary, hyphenation rules, and thesaurus"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
> en-US = "Vietnamese"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_VI]
>-en-US = "Vietnamese spellchecker dictionary"
>+en-US = "Vietnamese spelling dictionary"
> 
> [STR_NAME_MODULE_EXTENSION_DICTIONARY_ZU]
> en-US = "Zulu"
> 
> [STR_DESC_MODULE_EXTENSION_DICTIONARY_ZU]
>-en-US = "Zulu hyphenation dictionary"
>+en-US = "Zulu hyphenation rules"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ooo_brand.scp scp2//source/ooo/ooo_brand.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ooo_brand.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/ooo_brand.scp	2011-10-23 14:07:24.862868974 +0200
>@@ -39,23 +39,12 @@
> End
> #endif
> 
>-File gid_Brand_File_ServicesRdb
>-    TXT_FILE_BODY;
>-    Dir = gid_Brand_Dir_Program;
>-    Name = "/ooo/services.rdb";
>-    Styles = (PACKED);
>-End
>-
> ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
>     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
>     ModuleID = gid_Module_Root_Brand;
>     Section = "ErrorReport";
>     Order = 8;
>     Key = "ErrorReportServer";
>-  #if defined(BUILD_SPECIAL)
>     Value = "report.libreoffice.org";
>-  #else
>-    Value = "";
>-  #endif
> End
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/profileitem_ooo.scp scp2//source/ooo/profileitem_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/profileitem_ooo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/profileitem_ooo.scp	2011-11-01 08:49:03.816579069 +0100
>@@ -27,15 +27,6 @@
> 
> #include "macros.inc"
> 
>-ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath
>-    ProfileID = gid_Profile_Setup_Ini;
>-    ModuleID = gid_Module_Root;
>-    Section = "Bootstrap";
>-    Order = 1;
>-    Key = "UNO_JAVA_COMPPATH";
>-    Value = "$ORIGIN/classes";
>-End
>-
> ProfileItem gid_Profileitem_Setup_Uno_Services
>     ProfileID = gid_Profile_Setup_Ini;
>     ModuleID = gid_Module_Root;
>@@ -112,67 +103,6 @@
> 
> #endif
> 
>-ProfileItem gid_Profileitem_Soffice_Logo
>-    ProfileID = gid_Profile_Soffice_Ini;
>-    ModuleID = gid_Module_Root;
>-    Section = "Bootstrap";
>-    Order = 1;
>-    Key = "Logo";
>-    Value = "1";
>-End
>-
>-ProfileItem gid_Profileitem_Soffice_ProgressBarColor
>-    ProfileID = gid_Profile_Soffice_Ini;
>-    ModuleID = gid_Module_Root;
>-    Section = "Bootstrap";
>-    Order = 2;
>-    Key = "ProgressBarColor";
>-    Value = "0,0,128";
>-End
>-
>-ProfileItem gid_Profileitem_Soffice_ProgressSize
>-    ProfileID = gid_Profile_Soffice_Ini;
>-    ModuleID = gid_Module_Root;
>-    Section = "Bootstrap";
>-    Order = 3;
>-    Key = "ProgressSize";
>-    Value = "-1,6";
>-End
>-
>-ProfileItem gid_Profileitem_Soffice_ProgressPosition
>-    ProfileID = gid_Profile_Soffice_Ini;
>-    ModuleID = gid_Module_Root;
>-    Section = "Bootstrap";
>-    Order = 4;
>-    Key = "ProgressPosition";
>-    Value = "-1,-1";
>-End
>-
>-ProfileItem gid_Profileitem_Soffice_NativeProgress
>-    ProfileID = gid_Profile_Soffice_Ini;
>-    ModuleID = gid_Module_Root;
>-    Section = "Bootstrap";
>-    Order = 6;
>-    Key = "NativeProgress";
>-    Value = "true";
>-End
>-
>-#ifdef WNT
>-
>-ProfileItem gid_Profileitem_Soffice_Hideeula
>-    ProfileID = gid_Profile_Soffice_Ini;
>-    ModuleID = gid_Module_Root;
>-    Section = "Bootstrap";
>-    Order = 8;
>-    Key = "HideEula";
>-    Value = "[HIDEEULA]";
>-    Inifiletablekey = "HideEula";
>-    Inifiletableaction = "1";
>-    Styles = (INIFILETABLE);
>-End
>-
>-#endif
>-
> ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
>     ProfileID = gid_Profile_Uno_Ini;
>     ModuleID = gid_Module_Root;
>@@ -280,198 +210,3 @@
>     Key = "PKG_UserUnoFile";
>     Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
> End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "BUNDLED_EXTENSIONS";
>-    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_User
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "BUNDLED_EXTENSIONS_USER";
>-    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_Prereg
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "BUNDLED_EXTENSIONS_PREREG";
>-    Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_PREREG}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "UNO_SHARED_PACKAGES_CACHE";
>-    Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Extensions_User
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "SHARED_EXTENSIONS_USER";
>-    Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_User_Packages_Cache
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "UNO_USER_PACKAGES_CACHE";
>-    Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Tmp_Extensions
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "TMP_EXTENSIONS";
>-    Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_MORE_TYPES";
>-    Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_MORE_SERVICES";
>-    Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_MORE_JAVA_TYPES";
>-    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
>-    Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_User_Data
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
>-    Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Classpath_Urls
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_MORE_JAVA_CLASSPATH_URLS";
>-    Value = "";
>-#ifdef SYSTEM_BSH
>-    ValueList1 = BSH_JAR;
>-#endif
>-#ifdef SYSTEM_HSQLDB
>-    ValueList2 = HSQLDB_JAR;
>-#endif
>-#ifdef SYSTEM_SAXON
>-    ValueList3 = SAXON_JAR;
>-#endif
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Bin_Dir
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_BIN_DIR";
>-#if defined WNT
>-    Value = "${.link:$ORIGIN/../ure-link}/bin";
>-#else
>-    Value = "$ORIGIN/../ure-link/bin";
>-#endif
>-End
>-
>-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Lib_Dir
>-    ModuleID = gid_Module_Root;
>-    ProfileID = gid_Profile_Fundamentalbasis_Ini;
>-    Section = "Bootstrap";
>-    Key = "URE_LIB_DIR";
>-#if defined WNT
>-    Value = "${.link:$ORIGIN/../ure-link}/bin";
>-#else
>-    Value = "$ORIGIN/../ure-link/lib";
>-#endif
>-End
>-
>-// Basis layer: gid_Profile_Version_Ini_Basis
>-
>-ProfileItem gid_Basis_Profileitem_Version_Buildid
>-    ProfileID = gid_Profile_Version_Ini_Basis;
>-    ModuleID = gid_Module_Root;
>-    Section = "Version";
>-    Key = "buildid";
>-    Value = "<buildid>";
>-End
>-
>-ProfileItem gid_Basis_Profileitem_Version_Productsource
>-    ProfileID = gid_Profile_Version_Ini_Basis;
>-    ModuleID = gid_Module_Root;
>-    Section = "Version";
>-    Key = "ProductSource";
>-    Value = "<sourceid>";
>-End
>-
>-ProfileItem gid_Basis_Profileitem_Version_Productmajor
>-    ProfileID = gid_Profile_Version_Ini_Basis;
>-    ModuleID = gid_Module_Root;
>-    Section = "Version";
>-    Key = "ProductMajor";
>-    Value = "<productmajor>";
>-End
>-
>-ProfileItem gid_Basis_Profileitem_Version_Productminor
>-    ProfileID = gid_Profile_Version_Ini_Basis;
>-    ModuleID = gid_Module_Root;
>-    Section = "Version";
>-    Key = "ProductMinor";
>-    Value = "<productminor>";
>-End
>-
>-ProfileItem gid_Basis_Profileitem_Version_Productbuildid
>-    ProfileID = gid_Profile_Version_Ini_Basis;
>-    ModuleID = gid_Module_Root;
>-    Section = "Version";
>-    Key = "ProductBuildid";
>-    Value = "<productbuildid>";
>-End
>-
>-ProfileItem gid_Basis_Profileitem_Version_Ooobaseversion
>-    ProfileID = gid_Profile_Version_Ini_Basis;
>-    ModuleID = gid_Module_Root;
>-    Section = "Version";
>-    Key = "OOOBaseVersion";
>-    Value = "${OOOBASEVERSION}";
>-End
>-
>-ProfileItem gid_Basis_Profileitem_Version_Ooopackageversion
>-    ProfileID = gid_Profile_Version_Ini_Basis;
>-    ModuleID = gid_Module_Root;
>-    Section = "Version";
>-    Key = "OOOPackageVersion";
>-    Value = "${OOOPACKAGEVERSION}";
>-End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/profile_ooo.scp scp2//source/ooo/profile_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/profile_ooo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/profile_ooo.scp	2011-10-23 14:07:24.862868974 +0200
>@@ -34,19 +34,6 @@
>   #else
>     Name = "uno.ini";
>   #endif
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (NETWORK);
> End
>-
>-Profile gid_Profile_Version_Ini_Basis
>-    ModuleID = gid_Module_Root;
>-    Name = PROFILENAME(version);
>-    Dir = gid_Dir_Program;
>-    Styles = ();
>-End
>-
>-Profile gid_Profile_Fundamentalbasis_Ini
>-    ModuleID = gid_Module_Root;
>-    Name = PROFILENAME(fundamentalbasis);
>-    Dir = gid_Dir_Program;
>-End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/registryitem_ooo.scp scp2//source/ooo/registryitem_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/registryitem_ooo.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/registryitem_ooo.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -67,7 +67,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\LocalServer32";
>     ModuleID = gid_Module_Root;
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Notinsertable
>@@ -334,7 +334,7 @@
> 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
> 	ModuleID = gid_Module_Root;
> 	Name = "BASISINSTALLLOCATION";
>-	Value = "[INSTALLLOCATION]Basis\\";
>+	Value = "[INSTALLLOCATION]";
> 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
> End
> 
>@@ -343,17 +343,17 @@
> 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
> 	ModuleID = gid_Module_Root;
> 	Name = "BASISINSTALLLOCATION";
>-	Value = "[INSTALLLOCATION]Basis\\";
>+	Value = "[INSTALLLOCATION]";
> 	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
> End
> 
> RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
> 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
>-    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
>+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%PRODUCTVERSION";
> 	ModuleID = gid_Module_Root;
> 	Name = "BASISINSTALLLOCATION";
>-	Value = "[INSTALLLOCATION]Basis\\";
>-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
>+	Value = "[INSTALLLOCATION]";
>+	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_PRODUCTVERSION);
> End
> 
> RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
>@@ -361,7 +361,7 @@
>     Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
> 	ModuleID = gid_Module_Root;
> 	Name = "BASISINSTALLLOCATION";
>-	Value = "[INSTALLLOCATION]Basis\\";
>+	Value = "[INSTALLLOCATION]";
> 	Styles = (ALWAYS_REQUIRED);
> End
> 
>@@ -603,7 +603,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Root;
>     Subkey = "office.Extension.1\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,39";
>+    Value = "<progpath>\program\soffice.bin,13";
>     Styles = ();
> End
> 
>@@ -627,7 +627,6 @@
> 	ModuleID = gid_Module_Root;
> 	Name = "ApplicationName";
>     Value = "%PRODUCTNAME %PRODUCTVERSION";
>-    Value (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
> 	Styles = ();
> End
> 
>@@ -636,7 +635,7 @@
> 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
> 	ModuleID = gid_Module_Root;
> 	Name = "ApplicationIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> 	Styles = ();
> End
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/scpaction_ooo.scp scp2//source/ooo/scpaction_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/scpaction_ooo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/scpaction_ooo.scp	2011-11-18 23:55:32.676485561 +0100
>@@ -35,6 +35,7 @@
> End
> #endif
> 
>+#ifndef WNT
> ScpAction scp_Copy_Readme_Txt
>   #ifdef UNX
>     README_ALL_LANG(Copy, README);
>@@ -50,12 +51,9 @@
>     Subdir = "READMEs";
>   #endif
> End
>+#endif
> 
> #if defined(WNT) && defined(_gcc3)
>-ScpAction SCP_COPY_MINGWM10
>-    Copy = "mingwm10.dll";
>-    Name = "mingwm10.dll";
>-End
> #if defined(MINGW_GCCDLL)
> ScpAction SCP_COPY_MINGW_GCCS
>     Copy = MINGW_GCCDLL;
>@@ -286,11 +284,7 @@
> 
> #ifdef MACOSX
> ScpAction scp_Copy_Dmg_Background_Image
>-  #if defined(BUILD_SPECIAL)
>     Copy = "osxdndinstall.png";
>-  #else
>-    Copy = "osxdndinstall_nologo.png";
>-  #endif
>     Name = "background.png";
>     UnixRights = 444;
>     Styles = ();
>@@ -299,6 +293,7 @@
> 
> ScpAction scp_Copy_Ds_Store
>     Copy = "DS_Store";
>+    DevVersionCopy = "DS_Store_Dev";
>     LangPackCopy = "DS_Store_Langpack";
>     PatchCopy = "DS_Store_Patch";
>     Name = ".DS_Store";
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/shortcut_ooo.scp scp2//source/ooo/shortcut_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/shortcut_ooo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/shortcut_ooo.scp	2011-09-13 16:39:36.073306253 +0200
>@@ -87,6 +87,13 @@
>     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 -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/starregistry_ooo.scp scp2//source/ooo/starregistry_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/starregistry_ooo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/starregistry_ooo.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,34 +0,0 @@
>-/*************************************************************************
>-*
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>-************************************************************************/
>-
>-#include "macros.inc"
>-
>-StarRegistry gid_Starregistry_Services_Rdb
>-    Name = "services.rdb";
>-    Dir = gid_Dir_Program;
>-End
>-
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ure_into_ooo.scp scp2//source/ooo/ure_into_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ure_into_ooo.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/ure_into_ooo.scp	2011-10-27 18:41:44.757612610 +0200
>@@ -32,7 +32,7 @@
>   #ifdef WNT
>     ParentID = gid_Dir_Brand_Root;
>   #else
>-    ParentID = gid_Dir_Ooo_Openofficeorg;
>+    ParentID = PREDEFINED_PROGDIR;
>   #endif
>   #ifdef WNT
>     HostName = "URE";
>@@ -46,13 +46,13 @@
> #if defined WNT
> File gid_File_UreLink
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Ooo_Basis;
>+    Dir = gid_Dir_Brand_Root;
>     Name = "ure-link";
>     Styles = (PACKED);
> End
> #elif defined MACOSX
> Directory gid_Dir_UreLink
>-    ParentID = gid_Brand_Dir_BasisLink;
>+    ParentID = gid_Dir_Bundle_Contents;
>     DosName = "ure-link";
> End
> #else
>@@ -61,7 +61,7 @@
>     Styles = ();
>     // Styles = (LAYERLINK);
>     Name = "ure-link";
>-    Dir = gid_Dir_Ooo_Basis;
>-    Target = "../ure";
>+    Dir = gid_Dir_Brand_Root;
>+    Target = "ure";
> End
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ure.scp scp2//source/ooo/ure.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ure.scp	2011-12-05 11:53:51.000000000 +0100
>+++ scp2//source/ooo/ure.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -170,76 +170,8 @@
> 
> // Public Dynamic Libraries:
> 
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Lib_Msvcr80_Ure
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_URE_DL_DIR;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcr80.dll";
>-#else
>-    Name = "msvcr80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Lib_Msvcp80_Ure
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_URE_DL_DIR;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcp80.dll";
>-#else
>-    Name = "msvcp80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Lib_Msvcm80_Ure
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_URE_DL_DIR;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "msvcm80.dll";
>-#else
>-    Name = "msvcm80d.dll";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
>-#if defined(WNT)
>-#if defined(M1400)
>-#if defined(PROF_EDITION)
>-File gid_File_Msvcm80crt_Manifest_Ure
>-    BIN_FILE_BODY;
>-    Styles = (PACKED);
>-    Dir = SCP2_URE_DL_DIR;
>-#ifndef _DEBUG_RUNTIME
>-    Name = "Microsoft.VC80.CRT.manifest";
>-#else
>-    Name = "Microsoft.VC80.DebugCRT.manifest";
>-#endif
>-End
>-#endif
>-#endif
>-#endif
>-
> File gid_File_Dl_Cppu
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_UNO_VER("cppu", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -257,7 +189,7 @@
> #endif
> 
> File gid_File_Dl_Cppuhelper
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -275,7 +207,7 @@
> #endif
> 
> File gid_File_Dl_PurpEnvHelper
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -293,7 +225,7 @@
> #endif
> 
> File gid_File_Dl_Sal
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_UNO_VER("sal", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -311,14 +243,14 @@
> #endif
> 
> File gid_File_Dl_Sal_TextEnc
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>-    Name = SCP2_URE_DL_VER("sal_textenc", "3");
>+    Name = SCP2_URE_DL_NORMAL("sal_textenc");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
> End
> 
> File gid_File_Dl_Salhelper
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -338,7 +270,7 @@
> // Private Dynamic Libraries:
> 
> File gid_File_Dl_Profile_Uno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = PROFILENAME(/ure/uno);
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -346,7 +278,7 @@
> End
> 
> File gid_File_Dl_Reg
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_VER("reg", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -366,7 +298,7 @@
> 
> 
> File gid_File_Dl_Store
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_VER("store", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -375,7 +307,7 @@
> 
> 
> File gid_File_Dl_Xmlreader
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("xmlreader");
>     Styles = (PACKED);
>@@ -394,7 +326,7 @@
> #endif
> 
> File gid_File_Dl_Jvmaccess
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -412,7 +344,7 @@
> #endif
> 
> File gid_File_Dl_Jvmfwk
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_VER("jvmfwk", "3");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -431,7 +363,7 @@
> 
> #if defined SOLAR_JAVA
> File gid_File_Dl_Sunjavaplugin
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("sunjavaplugin");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -458,7 +390,7 @@
> End
> 
> File gid_File_Dl_ComnameUno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL(STRING(COMNAME) "_uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -467,7 +399,7 @@
> 
> #if defined SOLAR_JAVA
> File gid_File_Dl_JavaUno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("java_uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -485,7 +417,7 @@
> #endif
> 
> File gid_File_Dl_UnsafeUnoUno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("unsafe_uno_uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -493,7 +425,7 @@
> End
> 
> File gid_File_Dl_AffineUnoUno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("affine_uno_uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -501,15 +433,15 @@
> End
> 
> File gid_File_Dl_LogUnoUno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("log_uno_uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
> End
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> File gid_File_Dl_Cli_Uno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("cli_uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -517,7 +449,7 @@
> End
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Dl_Cli_Ure_Assembly
>     TXT_FILE_BODY;
>@@ -529,14 +461,12 @@
>     Version = "${CLI_URE_NEW_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Dl_Policy_Cli_Ure_Assembly
>     TXT_FILE_BODY;
>@@ -548,14 +478,12 @@
>     Version = "${CLI_URE_POLICY_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC 
>+#if defined _MSC_VER 
> 
> File gid_File_Dl_Policy_Cli_Ure_Config
>     TXT_FILE_BODY;
>@@ -567,7 +495,7 @@
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Dl_Cli_Basetypes_Assembly
>     TXT_FILE_BODY;
>@@ -579,14 +507,12 @@
>     Version = "${CLI_BASETYPES_NEW_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Dl_Policy_Cli_Basetypes_Assembly
>     TXT_FILE_BODY;
>@@ -598,13 +524,11 @@
>     Version = "${CLI_BASETYPES_POLICY_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Dl_Policy_Cli_Basetypes_Config
>     TXT_FILE_BODY;
>@@ -617,7 +541,7 @@
> #endif
> 
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Dl_Cli_Uretypes_Assembly
>     TXT_FILE_BODY;
>@@ -629,14 +553,12 @@
>     Version = "${CLI_URETYPES_NEW_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Dl_Policy_Cli_Uretypes_Assembly
>     TXT_FILE_BODY;
>@@ -648,14 +570,12 @@
>     Version = "${CLI_URETYPES_POLICY_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "MSIL";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC 
>+#if defined _MSC_VER 
> 
> File gid_File_Dl_Policy_Cli_Uretypes_Config
>     TXT_FILE_BODY;
>@@ -667,7 +587,7 @@
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Lib_Cli_Cppuhelper_Assembly
>     TXT_FILE_BODY;
>@@ -679,14 +599,12 @@
>     Version = "${CLI_CPPUHELPER_NEW_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "x86";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
>     TXT_FILE_BODY;
>@@ -698,14 +616,12 @@
>     Version = "${CLI_CPPUHELPER_POLICY_VERSION}";
>     Culture = "neutral";
>     Attributes = "0";
>-#ifndef M1310
>     ProcessorArchitecture = "x86";
>-#endif
> End
> 
> #endif
> 
>-#if defined WNT && defined _MSC
>+#if defined _MSC_VER
> 
> File gid_File_Lib_Policy_Cli_Cppuhelper_Config
>     TXT_FILE_BODY;
>@@ -719,7 +635,7 @@
> 
> #if defined SOLAR_JAVA
> File gid_File_Dl_Jpipe
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_JDL_NORMAL("jpipe");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -729,7 +645,7 @@
> 
> #if defined SOLAR_JAVA && defined WNT
> File gid_File_Dl_Jpipx
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("jpipx");
>     Styles = (PACKED);
>@@ -738,7 +654,7 @@
> 
> #if defined SOLAR_JAVA
> File gid_File_Dl_Juh
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("juh");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -748,7 +664,7 @@
> 
> #if defined SOLAR_JAVA
> File gid_File_Dl_Juhx
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("juhx");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -757,7 +673,7 @@
> #endif
> 
> File gid_File_Dl_Acceptor
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("acceptor.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -765,14 +681,14 @@
> End
> 
> File gid_File_Dl_Binaryurp
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("binaryurp.uno");
>     Styles = (PACKED);
> End
> 
> File gid_File_Dl_Bootstrap
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("bootstrap.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -780,7 +696,7 @@
> End
> 
> File gid_File_Dl_Connector
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("connector.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -788,7 +704,7 @@
> End
> 
> File gid_File_Dl_Introspection
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("introspection.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -796,7 +712,7 @@
> End
> 
> File gid_File_Dl_Invocadapt
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("invocadapt.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -804,7 +720,7 @@
> End
> 
> File gid_File_Dl_Invocation
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("invocation.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -814,7 +730,7 @@
> 
> #if defined SOLAR_JAVA
> File gid_File_Dl_Javaloader
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("javaloader.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -824,7 +740,7 @@
> 
> #if defined SOLAR_JAVA
> File gid_File_Dl_Javavm
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("javavm.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -833,7 +749,7 @@
> #endif
> 
> File gid_File_Dl_Namingservice
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("namingservice.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -841,7 +757,7 @@
> End
> 
> File gid_File_Dl_Stocservices
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("stocservices.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -849,7 +765,7 @@
> End
> 
> File gid_File_Dl_Proxyfac
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("proxyfac.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -857,7 +773,7 @@
> End
> 
> File gid_File_Dl_Reflection
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("reflection.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -865,7 +781,7 @@
> End
> 
> File gid_File_Dl_Streams
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("streams.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -873,7 +789,7 @@
> End
> 
> File gid_File_Dl_Textinstream
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("textinstream.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -881,7 +797,7 @@
> End
> 
> File gid_File_Dl_Textoutstream
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("textoutstream.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -889,7 +805,7 @@
> End
> 
> File gid_File_Dl_Uuresolver
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_BARE("uuresolver.uno");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -898,7 +814,7 @@
> 
> #if !defined SYSTEM_LIBXML
> File gid_File_Dl_Libxml2
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
> #if defined WNT
> #if defined _gcc3
>@@ -928,7 +844,7 @@
> 
> #if defined WITH_STLPORT
> File gid_File_Dl_Stlport
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
> #if defined _gcc3 && defined WNT
> #if defined _DEBUG_RUNTIME
>@@ -952,7 +868,7 @@
>     Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
> #endif
> #endif
>-#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) || defined (M1600) )
>+#elif defined _MSC_VER
> #if defined _DEBUG_RUNTIME
>     Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
> #else
>@@ -964,52 +880,12 @@
> End
> #endif
> 
>-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
>-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
>-File gid_File_Dl_GccS
>-    TXT_FILE_BODY;
>-    Dir = SCP2_URE_DL_DIR;
>-#ifdef AIX
>-    Name = "libgcc_s.a";
>-#else
>-    Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
>-#endif
>-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>-    // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
>-End
>-#endif
>-
>-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
>-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
>-File gid_File_Dl_Stdcpp
>-    Dir = SCP2_URE_DL_DIR;
>-    TXT_FILE_BODY;
>-#ifdef AIX
>-    Name = "libstdc++.a";
>-#else
>-    Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
>-#endif
>-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>-    // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
>-End
>-#endif
>-
>-#if (defined WNT && defined _gcc3)
>-File gid_File_Lib_Mingwm10_Ure
>-    TXT_FILE_BODY;
>-    Dir = SCP2_URE_DL_DIR;
>-    Name = SCP2_URE_DL_NORMAL("mingwm10");
>-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>-    // CompID = "601FEC1D-8665-4476-9911-83BDCCE83025";
>-End
>-#endif
>-
> #if defined(WNT) && defined( _gcc3 )
> 
> #if defined(MINGW_GCCDLL)
> 
> File gid_File_Lib_Mingw_GccS_Ure
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = MINGW_GCCDLL;
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -1020,7 +896,7 @@
> #if defined(MINGW_GXXDLL)
> 
> File gid_File_Lib_Mingw_Stdcpp_Ure
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = MINGW_GXXDLL;
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -1032,7 +908,7 @@
> 
> #if defined WNT
> File gid_File_Dl_Uwinapi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Dir = SCP2_URE_DL_DIR;
>     Name = SCP2_URE_DL_NORMAL("uwinapi");
>     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>@@ -1231,7 +1107,6 @@
>             gid_File_Dl_Stdcpp,
>             gid_File_Lib_Mingw_GccS_Ure,
>             gid_File_Lib_Mingw_Stdcpp_Ure,
>-            gid_File_Lib_Mingwm10_Ure,
>             gid_File_Dl_Unicows,
>             gid_File_Dl_Uwinapi,
>             gid_File_Lib_Msvcr80_Ure,
>@@ -1260,63 +1135,6 @@
>                  gid_Unixlink_File_Dl_Libxml2);
> End
> 
>-// Profile version.ini
>-
>-Profile gid_Profile_Version_Ini_Ure
>-    ModuleID = gid_Module_Root_Ure_Hidden;
>-    Name = PROFILENAME(version);
>-    Dir = gid_Dir_Ure_Bin;
>-    Styles = ();
>-End
>-
>-ProfileItem gid_Ure_Profileitem_Version_Buildid
>-    ProfileID = gid_Profile_Version_Ini_Ure;
>-    ModuleID = gid_Module_Root_Ure_Hidden;
>-    Section = "Version";
>-    Key = "buildid";
>-    Value = "<buildid>";
>-End
>-
>-ProfileItem gid_Ure_Profileitem_Version_Productsource
>-    ProfileID = gid_Profile_Version_Ini_Ure;
>-    ModuleID = gid_Module_Root_Ure_Hidden;
>-    Section = "Version";
>-    Key = "ProductSource";
>-    Value = "<sourceid>";
>-End
>-
>-ProfileItem gid_Ure_Profileitem_Version_Productmajor
>-    ProfileID = gid_Profile_Version_Ini_Ure;
>-    ModuleID = gid_Module_Root_Ure_Hidden;
>-    Section = "Version";
>-    Key = "ProductMajor";
>-    Value = "<productmajor>";
>-End
>-
>-ProfileItem gid_Ure_Profileitem_Version_Productminor
>-    ProfileID = gid_Profile_Version_Ini_Ure;
>-    ModuleID = gid_Module_Root_Ure_Hidden;
>-    Section = "Version";
>-    Key = "ProductMinor";
>-    Value = "<productminor>";
>-End
>-
>-ProfileItem gid_Ure_Profileitem_Version_Productbuildid
>-    ProfileID = gid_Profile_Version_Ini_Ure;
>-    ModuleID = gid_Module_Root_Ure_Hidden;
>-    Section = "Version";
>-    Key = "ProductBuildid";
>-    Value = "<productbuildid>";
>-End
>-
>-ProfileItem gid_Ure_Profileitem_Version_Ooobaseversion
>-    ProfileID = gid_Profile_Version_Ini_Ure;
>-    ModuleID = gid_Module_Root_Ure_Hidden;
>-    Section = "Version";
>-    Key = "OOOBaseVersion";
>-    Value = "${OOOBASEVERSION}";
>-End
>-
> // Windows Registry:
> 
> RegistryItem gid_Regitem_Path
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ure_standalone.scp scp2//source/ooo/ure_standalone.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/ure_standalone.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/ure_standalone.scp	2011-11-16 11:07:23.012555896 +0100
>@@ -31,7 +31,6 @@
>     ProductName = "${PRODUCTNAME}";
>     ProductVersion = "${PRODUCTVERSION}";
>     ProductExtension = "${PRODUCTEXTENSION}";
>-    OOoBaseVersion = "${OOOBASEVERSION}";
> #if defined WNT
>     DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
> #else
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/vc_redist.scp scp2//source/ooo/vc_redist.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/vc_redist.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/ooo/vc_redist.scp	2011-11-18 23:55:32.676485561 +0100
>@@ -29,24 +29,32 @@
> 
> #if defined(WITH_VC_REDIST)
> 
>-ScpAction scp_Copy_vcredist_x86
>-  #if defined(BUILD_SPECIAL)
>-    Copy = "vcredist_x86_9.0.30729.4148.exe";
>-  #else
>-    Copy = "vcredist_x86.exe";
>-  #endif
>-    Name = "vcredist_x86.exe";
>-    Subdir = "redist";
>+MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86
>+    Feature = gm_Root;
>+    Name = "Microsoft_VC90_CRT_x86.msm";
>+    RootDir = "TARGETDIR";
> End
> 
>-ScpAction scp_Copy_vcredist_x64
>-  #if defined(BUILD_SPECIAL)
>-    Copy = "vcredist_x64_9.0.30729.4148.exe";
>-  #else
>-    Copy = "vcredist_x64.exe";
>-  #endif
>-    Name = "vcredist_x64.exe";
>-    Subdir = "redist";
>+MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
>+    Feature = gm_Root;
>+    Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
>+    RootDir = "TARGETDIR";
> End
> 
>+#if defined(BUILD_X64)
>+
>+MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86_x64
>+    Feature = gm_Root;
>+    Name = "Microsoft_VC90_CRT_x86_x64.msm";
>+    RootDir = "TARGETDIR";
>+End
>+
>+MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86_x64
>+    Feature = gm_Root;
>+    Name = "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm";
>+    RootDir = "TARGETDIR";
>+End
>+
>+#endif
>+
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/windowscustomaction_ooo.scp scp2//source/ooo/windowscustomaction_ooo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/ooo/windowscustomaction_ooo.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/ooo/windowscustomaction_ooo.scp	2011-09-13 16:39:36.073306253 +0200
>@@ -99,6 +99,8 @@
> 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end");
> End
> 
>+#ifdef HAVE_WINDOWS_SDK
>+
> WindowsCustomAction gid_Customaction_Jfregcadll1
> 	Name = "Jfregcadll1";
> 	Typ = "65";
>@@ -135,6 +137,8 @@
> 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "sdqsmsidll");
> End
> 
>+#endif /* HAVE_WINDOWS_SDK */
>+
> WindowsCustomAction gid_Customaction_Shellextensionsdll1
> 	Name = "Shellextensionsdll1";
> 	Typ = "65";
>@@ -210,12 +214,12 @@
> 
> 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 +277,8 @@
>     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
>@@ -449,6 +453,8 @@
>       Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
> End
> 
>+#ifdef HAVE_WINDOWS_SDK
>+
> WindowsCustomAction gid_Customaction_CheckVersions
> 	Name = "CheckVersions";
> 	Typ = "321";
>@@ -474,8 +480,8 @@
> 	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
>@@ -495,3 +501,5 @@
> 	Inbinarytable = 1;
> 	Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1");
> End
>+
>+#endif /* HAVE_WINDOWS_SDK */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/file_python.scp scp2//source/python/file_python.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/file_python.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/python/file_python.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -1,7 +1,7 @@
> /*************************************************************************
>  *
>  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>+ *
>  * Copyright 2000, 2010 Oracle and/or its affiliates.
>  *
>  * OpenOffice.org - a multi-platform office productivity suite
>@@ -30,19 +30,19 @@
> #ifndef DISABLE_PYUNO
> 
> File gid_File_Lib_Pyuno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>   #ifdef UNX
>     Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
>   #else
>     Name = "pyuno.pyd";
>   #endif
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
> End
> 
> File gid_File_Lib_Pythonloader
>-    TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    LIB_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program;
>   #ifdef UNX
>     Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
>   #else
>@@ -53,28 +53,21 @@
> 
> File gid_File_Py_Unohelper
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "unohelper.py";
>     Styles = (PACKED);
> End
> 
>-File gid_File_Py_Officehelper
>-    TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Name = "officehelper.py";
>-    Styles = (PACKED);
>-End
>-
> File gid_File_Py_Uno
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "uno.py";
>     Styles = (PACKED);
> End
> 
> File gid_File_Py_Pythonloader
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "pythonloader.py";
>     Styles = (PACKED);
> End
>@@ -82,7 +75,7 @@
> #ifndef SYSTEM_PYTHON
> File gid_File_Py_Python_Core
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>   #ifdef MACOSX
>     Name = "OOoPython.framework.zip";
>     Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
>@@ -96,7 +89,7 @@
> #ifndef MACOSX
> File gid_File_Py_Python_Bin
>     BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = "python.bin";
>     Styles = (PACKED);
> End
>@@ -107,7 +100,7 @@
> //Scripting Framework Python example scripts
> 
> File gid_File_Scripts_Python
>-    TXT_FILE_BODY; 
>+    TXT_FILE_BODY;
>     Styles = (ARCHIVE);
>     Dir = gid_Dir_Share_Scripts;
>     Name = "ScriptsPython.zip";
>@@ -118,22 +111,22 @@
> File gid_File_Share_Registry_Pyuno_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "pyuno.xcd";
> End
> 
> #ifndef SYSTEM_PYTHON
> #ifndef MACOSX
> File gid_File_Lib_Python_So
>-    TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>+    LIB_FILE_BODY;
>+    Dir = gid_Brand_Dir_Program;
>     Name = STRING(PY_FULL_DLL_NAME);
>     Styles = (PACKED);
> End
> #ifdef UNX
> Shortcut gid_Shortcut_Lib_Python_So
>     FileID = gid_File_Lib_Python_So;
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
>     Styles = (NETWORK,RELATIVE);
> End
>@@ -141,7 +134,7 @@
> #else //MACOSX
> //directory entries solely to be able to create the symlinks
> Directory gid_Dir_PythonFramework
>-    ParentID = gid_Dir_Program;
>+    ParentID = gid_Brand_Dir_Program;
>     HostName = "OOoPython.framework";
> End
> 
>@@ -287,24 +280,15 @@
>     Styles = ();
> End
> #endif //MACOSX
>-
>-#ifdef WNT
>-File gid_File_Lib_Python_So_Brand // Fix for system-python-problem on windows
>-    TXT_FILE_BODY;
>-    Dir = gid_Brand_Dir_Program;
>-    Name = STRING(PY_FULL_DLL_NAME);
>-    Styles = (PACKED);
>-End
>-#endif
> #endif
> 
> #ifdef UNX
> 
> // pyuno.so even on Mac OS X, because it is a python module
> File gid_File_Pyuno
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Name = "pyuno.so";
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (PACKED);
> End
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/makefile.mk scp2//source/python/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/python/makefile.mk	2011-11-29 09:56:02.926323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=python
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/module_python_mailmerge.scp scp2//source/python/module_python_mailmerge.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/module_python_mailmerge.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/python/module_python_mailmerge.scp	2011-12-28 13:34:06.575199178 +0100
>@@ -31,9 +31,9 @@
> #ifndef DISABLE_PYUNO
> File gid_File_Pymailmerge
>     TXT_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Name = "mailmerge.py";
>-    Styles = (PACKED);
>+    Dir = gid_Brand_Dir_Program;
>+    Name = "mailmerge.zip";
>+    Styles = (ARCHIVE);
> End
> #endif
> #endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/module_python.scp scp2//source/python/module_python.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/module_python.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/python/module_python.scp	2011-12-28 13:34:06.575199178 +0100
>@@ -34,7 +34,28 @@
>     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
>     ParentID = gid_Module_Optional;
>     Sortkey = "750";
>-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
>+    Dirs = (gid_Dir_PythonFramework,
>+            gid_Dir_PythonFramework_Versions,
>+            gid_Dir_PythonFramework_Versions_ver,
>+            gid_Dir_PythonFramework_Versions_ver_bin,
>+            gid_Dir_PythonFramework_Versions_ver_lib,
>+            gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
>+            gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config);
>+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
>+    Unixlinks = (gid_Unixlink_Python_Headers,
>+                 gid_Unixlink_Python_Resources,
>+                 gid_Unixlink_Python_Versions_Current,
>+                 gid_Unixlink_Python_Versions_ver_Headers,
>+                 gid_Unixlink_Python_OOoPython,
>+                 gid_Unixlink_Python_bin_idle,
>+                 gid_Unixlink_Python_bin_pydoc,
>+                 gid_Unixlink_Python_bin_python_real,
>+                 gid_Unixlink_Python_bin_python,
>+                 gid_Unixlink_Python_bin_pythonconfig,
>+                 gid_Unixlink_Python_bin_pythonw_real,
>+                 gid_Unixlink_Python_bin_pythonw,
>+                 gid_Unixlink_Python_bin_smtpdpy,
>+                 gid_Unixlink_Python_libpython);
>     Minimal = NO;
>     Default = YES;
>     Styles = ( );
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/module_python.ulf scp2//source/python/module_python.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/module_python.ulf	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/python/module_python.ulf	2011-11-23 11:35:42.325833796 +0100
>@@ -29,4 +29,4 @@
> en-US = "Python-UNO Bridge"
> 
> [STR_DESC_MODULE_OPTIONAL_PYTHON]
>-en-US = "Adds the ability to automate %PRODUCTNAME with the python scripting language. See http://udk.openoffice.org/python/python-bridge.html for a complete documentation."
>+en-US = "Adds the ability to automate %PRODUCTNAME with the Python scripting language. See https://wiki.documentfoundation.org/Development/PyUno for a complete documentation."
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/profileitem_python.scp scp2//source/python/profileitem_python.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/python/profileitem_python.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/python/profileitem_python.scp	2011-10-23 14:07:24.862868974 +0200
>@@ -36,7 +36,7 @@
>   #else
>     Name = "pythonloader.uno.ini";
>   #endif
>-    Dir = gid_Dir_Program;
>+    Dir = gid_Brand_Dir_Program;
>     Styles = (NETWORK);
> End
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/quickstart/folderitem_quickstart.scp scp2//source/quickstart/folderitem_quickstart.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/quickstart/folderitem_quickstart.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/quickstart/folderitem_quickstart.scp	2011-09-13 16:39:36.073306253 +0200
>@@ -30,7 +30,6 @@
> FolderItem gid_Folderitem_Exe_Quickstart
>     ModuleID = gid_Module_Optional_Quickstart;
>     Name = "%PRODUCTNAME %PRODUCTVERSION";
>-    Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION";
>     FolderID = PREDEFINED_AUTOSTART;
>     FileID = gid_File_Exe_Install_Quickstart;
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/quickstart/makefile.mk scp2//source/quickstart/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/quickstart/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/quickstart/makefile.mk	2011-11-29 09:56:02.926323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=quickstart
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/sdkoo/sdkoo.scp scp2//source/sdkoo/sdkoo.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/sdkoo/sdkoo.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/sdkoo/sdkoo.scp	2011-11-16 11:07:23.013555896 +0100
>@@ -31,7 +31,6 @@
>     ProductName = "${PRODUCTNAME}";
>     ProductVersion = "${PRODUCTVERSION}";
>     ProductExtension = "${PRODUCTEXTENSION}";
>-    OOoBaseVersion = "${OOOBASEVERSION}";
> #if defined WNT
>     DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
> #else
>@@ -39,55 +38,35 @@
> #endif
> End
> 
>-#ifndef MACOSX
>+#if defined MACOSX
> 
>-#ifdef WNT
>-Directory gid_Dir_Sdkoo_Root
>+Directory gid_Dir_Basis_Sdk
>     ParentID = PREDEFINED_PROGDIR;
>-    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
>-    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
>+    DosName = "LibreOffice${PRODUCTVERSION}_SDK";
> End
>-#endif
> 
>-#ifndef WNT
>-Directory gid_Dir_Ooo_Openofficeorg_Sdk
>+#elif defined WNT
>+
>+Directory gid_Dir_Sdkoo_Root
>     ParentID = PREDEFINED_PROGDIR;
>-  #ifdef WNT
>-    HostName = "${BASISROOTNAME}";
>-  #else
>-    HostName = ".";
>-  #endif
>+    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
>+    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
> End
>-#endif
> 
>-#ifndef WNT
>-Directory gid_Dir_Ooo_Basis_Sdk
>-    ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
>-  #ifdef WNT
>-    HostName = "Basis ${OOOBASEVERSION}";
>-  #else
>-    HostName = "basis${OOOBASEVERSION}";
>-  #endif
>-    Styles = (BASISDIRECTORY);
>+Directory gid_Dir_Basis_Sdk
>+    ParentID = gid_Dir_Sdkoo_Root;
>+    DosName = "sdk";
> End
>-#endif
> 
>-#endif
>+#else
> 
> Directory gid_Dir_Basis_Sdk
>-#if defined MACOSX
>     ParentID = PREDEFINED_PROGDIR;
>-    DosName = "LibreOffice${OOOBASEVERSION}_SDK";
>-#else
>-  #if defined WNT
>-    ParentID = gid_Dir_Sdkoo_Root;
>-  #else
>-    ParentID = gid_Dir_Ooo_Basis_Sdk;
>-  #endif
>     DosName = "sdk";
>-#endif
> End
> 
>+#endif
>+
> Directory gid_Dir_Share_Sdk
>     ParentID = gid_Dir_Basis_Sdk;
>     DosName = "share";
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/makefile.mk scp2//source/smoketest/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/makefile.mk	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/smoketest/makefile.mk	2011-12-07 10:31:08.562727561 +0100
>@@ -0,0 +1,42 @@
>+#***********************************************************************
>+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+#
>+# The contents of this file are subject to the Mozilla Public License Version
>+# 1.1 (the "License"); you may not use this file except in compliance with
>+# the License or as specified alternatively below. You may obtain a copy of
>+# the License at http://www.mozilla.org/MPL/
>+#
>+# Software distributed under the License is distributed on an "AS IS" basis,
>+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+# for the specific language governing rights and limitations under the
>+# License.
>+#
>+# Major Contributor(s):
>+# [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
>+#
>+# All Rights Reserved.
>+#
>+# For minor contributions see the git repository.
>+#
>+# Alternatively, the contents of this file may be used under the terms of
>+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+# instead of those above.
>+#***********************************************************************
>+
>+PRJ=..$/..
>+PRJNAME=scp2so
>+TARGET=smoketest
>+
>+.INCLUDE: settings.mk
>+
>+SCP_PRODUCT_TYPE=osl
>+
>+PARFILES= \
>+        smoketest.par          
>+
>+
>+.INCLUDE: target.mk
>+
>+# vim:set shiftwidth=4 softtabstop=4 expandtab: #
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/module_smoketest.scp scp2//source/smoketest/module_smoketest.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/module_smoketest.scp	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/smoketest/module_smoketest.scp	2011-12-05 16:23:33.966716511 +0100
>@@ -0,0 +1,50 @@
>+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+#include "macros.inc"
>+
>+Module gid_Module_Optional_Smoketest
>+    PackageInfo = "packinfo_test.txt";
>+    MOD_NAME_DESC ( MODULE_OPTIONAL_SMOKETEST );
>+    Sortkey = "630";
>+    ParentID = gid_Module_Optional;
>+    Default = NO;
>+    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,
>+             gid_Test_File_Lib_Smoketest,
>+             gid_Test_File_Lib_Test,
>+             gid_Test_File_Lib_Unotest,
>+             gid_Test_File_Lib_Unoexceptionprotector);
>+End
>+
>+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/module_smoketest.ulf scp2//source/smoketest/module_smoketest.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/module_smoketest.ulf	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/smoketest/module_smoketest.ulf	2011-12-05 16:23:33.966716511 +0100
>@@ -0,0 +1,35 @@
>+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+[STR_NAME_MODULE_OPTIONAL_SMOKETEST]
>+en-US = "%PRODUCTNAME %PRODUCTVERSION Smoketest"
>+
>+[STR_DESC_MODULE_OPTIONAL_SMOKETEST]
>+en-US = "The smoketest of %PRODUCTNAME %PRODUCTVERSION"
>+
>+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/smoketest.scp scp2//source/smoketest/smoketest.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/smoketest/smoketest.scp	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/smoketest/smoketest.scp	2011-12-05 16:23:33.966716511 +0100
>@@ -0,0 +1,223 @@
>+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * [ Copyright (C) 2011 Petr Mladek <pmladek@suse.cz> (initial developer) ]
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+#include "macros.inc"
>+
>+Installation gid_Installation_Test
>+    ProductName = "${PRODUCTNAME}";
>+    ProductVersion = "${PRODUCTVERSION}";
>+    ProductExtension = "${PRODUCTEXTENSION}";
>+#if defined WNT
>+    DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
>+#else
>+    DefaultDestPath = "/opt/%PRODUCTNAME";
>+#endif
>+End
>+
>+Module gid_Module_Root_Smoketest
>+    Name = "smoketest";
>+    Description = "smoketest";
>+    PackageInfo = "packinfo_test.txt";
>+End
>+
>+#ifndef MACOSX
>+Directory gid_Test_Dir_Brand_Root
>+    ParentID = PREDEFINED_PROGDIR;
>+  #ifdef WNT
>+    HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
>+  #else
>+    HostName = ".";
>+  #endif
>+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
>+End
>+#endif
>+
>+#if MACOSX
>+Directory gid_Test_Dir_Bundle
>+    ParentID = PD_PROGDIR;
>+    HostName = "%PRODUCTNAME.app";
>+    LangPackHostName = "%PRODUCTNAME Language Pack.app";
>+    PatchHostName = "%PRODUCTNAME Patch.app";
>+End
>+
>+Directory gid_Test_Dir_Bundle_Contents
>+    ParentID = gid_Test_Dir_Bundle;
>+    HostName = "Contents";
>+    Styles = (OFFICEDIRECTORY);
>+End
>+#endif
>+
>+Directory gid_Test_Brand_Dir_Program
>+#if defined MACOSX
>+    ParentID = gid_Test_Dir_Bundle_Contents;
>+    DosName = "MacOS";
>+#else
>+    ParentID = gid_Test_Dir_Brand_Root;
>+    DosName = "program";
>+#endif
>+End
>+
>+Directory gid_Test_Brand_Dir_Share
>+#if defined MACOSX
>+    ParentID = gid_Test_Dir_Bundle_Contents;
>+#else
>+    ParentID = gid_Test_Dir_Brand_Root;
>+#endif
>+    DosName = "share";
>+End
>+
>+Directory gid_Test_Brand_Dir_Share_Test
>+    ParentID = gid_Test_Brand_Dir_Share;
>+    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;
>+    Dir = gid_Test_Brand_Dir_Share_Test;
>+  #ifdef UNX
>+    Name = "LICENSE";
>+  #endif
>+  #ifdef WNT
>+    Name = "license.txt";
>+  #endif
>+    Styles = (PACKED, SCPZIP_REPLACE);
>+End
>+
>+File gid_Test_File_Txt_Readme
>+    TXT_FILE_BODY;
>+    Dir = gid_Test_Brand_Dir_Share_Test;
>+  #ifdef UNX
>+    Name = "README_en-US";
>+  #endif
>+  #ifdef WNT
>+    Name = "readme_en-US.txt";
>+  #endif
>+    Styles = (PACKED, SCPZIP_REPLACE);
>+End
>+
>+File gid_Test_File_Misc_Smoketestdoc
>+    TXT_FILE_BODY;
>+    Dir = gid_Test_Brand_Dir_Share_Test;
>+    Name = "smoketestdoc.sxw";
>+    Styles = (PACKED, SCPZIP_REPLACE);
>+End
>+
>+File gid_Test_File_Misc_TypesRdb
>+    TXT_FILE_BODY;
>+    Dir = gid_Test_Dir_Ure_Misc_Test;
>+    Name = "types.rdb";
>+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>+End
>+
>+File gid_Test_File_Bin_LOSmoketest
>+    BIN_FILE_BODY;
>+    Dir = gid_Test_Brand_Dir_Program;
>+    Name = "losmoketest";
>+    Styles = (PACKED);
>+End
>+
>+File gid_Test_File_Exe_Cppunittester
>+    BIN_FILE_BODY;
>+    Dir = gid_Test_Brand_Dir_Program;
>+    Name = "cppunittester";
>+    Styles = (PACKED);
>+End
>+
>+File gid_Test_File_Lib_Cppunit
>+    TXT_FILE_BODY;
>+    Styles = (PACKED);
>+    Dir = gid_Test_Brand_Dir_Program;
>+  #ifdef UNX
>+    Name = STRING(CONCAT3(libcppunit-1.12,UNXSUFFIX,.1));
>+  #endif
>+End
>+
>+File gid_Test_File_Lib_Smoketest
>+    TXT_FILE_BODY;
>+    Styles = (PACKED);
>+    Dir = gid_Test_Brand_Dir_Program;
>+  #ifdef UNX
>+    Name = STRING(CONCAT2(libsmoketest,UNXSUFFIX));
>+  #endif
>+End
>+
>+File gid_Test_File_Lib_Test
>+    TXT_FILE_BODY;
>+    Styles = (PACKED);
>+    Dir = gid_Test_Brand_Dir_Program;
>+  #ifdef UNX
>+    Name = STRING(CONCAT2(libtest,UNXSUFFIX));
>+  #endif
>+End
>+
>+File gid_Test_File_Lib_Unotest
>+    TXT_FILE_BODY;
>+    Styles = (PACKED);
>+    Dir = gid_Test_Brand_Dir_Program;
>+  #ifdef UNX
>+    Name = STRING(CONCAT2(libunotest,UNXSUFFIX));
>+  #endif
>+End
>+
>+File gid_Test_File_Lib_Unoexceptionprotector
>+    TXT_FILE_BODY;
>+    Styles = (PACKED);
>+    Dir = gid_Test_Brand_Dir_Program;
>+  #ifdef UNX
>+    Name = STRING(CONCAT2(unoexceptionprotector,UNXSUFFIX));
>+  #endif
>+End
>+
>+
>+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/file_stdlibs.scp scp2//source/stdlibs/file_stdlibs.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/file_stdlibs.scp	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/stdlibs/file_stdlibs.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -0,0 +1,58 @@
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * Fridrich Strba <fridrich.strba@bluewin.ch> (initial developer)
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+#include "macros.inc"
>+
>+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
>+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
>+File gid_File_Dl_GccS
>+    LIB_FILE_BODY;
>+    Dir = SCP2_URE_DL_DIR;
>+#ifdef AIX
>+    Name = "libgcc_s.a";
>+#else
>+    Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
>+#endif
>+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>+    // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
>+End
>+#endif
>+
>+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
>+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
>+File gid_File_Dl_Stdcpp
>+    Dir = SCP2_URE_DL_DIR;
>+    LIB_FILE_BODY;
>+#ifdef AIX
>+    Name = "libstdc++.a";
>+#else
>+    Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
>+#endif
>+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
>+    // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
>+End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/makefile.mk scp2//source/stdlibs/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/makefile.mk	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/stdlibs/makefile.mk	2012-02-24 13:39:12.644661265 +0100
>@@ -0,0 +1,52 @@
>+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+# 
>+# The contents of this file are subject to the Mozilla Public License Version
>+# 1.1 (the "License"); you may not use this file except in compliance with
>+# the License or as specified alternatively below. You may obtain a copy of
>+# the License at http://www.mozilla.org/MPL/
>+#
>+# Software distributed under the License is distributed on an "AS IS" basis,
>+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+# for the specific language governing rights and limitations under the
>+# License.
>+#
>+# Major Contributor(s):
>+# Petr Mladek <pmladek@suse.cz> (initial developer)
>+#
>+# All Rights Reserved.
>+#
>+# For minor contributions see the git repository.
>+#
>+# Alternatively, the contents of this file may be used under the terms of
>+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+# instead of those above.
>+
>+
>+PRJ=..$/..
>+
>+PRJNAME=scp2
>+TARGET=stdlibs
>+TARGETTYPE=CUI
>+
>+# --- Settings -----------------------------------------------------
>+
>+.INCLUDE :  settings.mk
>+
>+SCP_PRODUCT_TYPE=osl
>+
>+.IF "$(SYSTEM_STDLIBS)" != "YES"
>+
>+PARFILES =                   \
>+        module_stdlibs.par     \
>+        file_stdlibs.par
>+
>+ULFFILES= \
>+        module_stdlibs.ulf
>+
>+.ENDIF
>+
>+# --- File ---------------------------------------------------------
>+
>+.INCLUDE :  target.mk
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/module_stdlibs.scp scp2//source/stdlibs/module_stdlibs.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/module_stdlibs.scp	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/stdlibs/module_stdlibs.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -0,0 +1,47 @@
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * Petr Mladek <pmladek@suse.cz> (initial developer)
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+#include "macros.inc"
>+
>+Module gid_Module_Optional_Stdlibs
>+    ParentID = gid_Module_Root;
>+    Default = NO;
>+    PackageInfo = "packinfo_ure.txt";
>+    MOD_NAME_DESC(MODULE_OPTIONAL_STDLIBS);
>+#ifdef UNX
>+    Styles = ();
>+#else
>+    Styles = (DONTSHOWINUSERINSTALL);
>+#endif
>+    Files = (
>+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
>+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
>+        gid_File_Dl_GccS,
>+        gid_File_Dl_Stdcpp
>+#endif
>+    );
>+End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/module_stdlibs.ulf scp2//source/stdlibs/module_stdlibs.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/stdlibs/module_stdlibs.ulf	1970-01-01 01:00:00.000000000 +0100
>+++ scp2//source/stdlibs/module_stdlibs.ulf	2012-02-24 13:39:12.644661265 +0100
>@@ -0,0 +1,32 @@
>+/*
>+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
>+ *
>+ * The contents of this file are subject to the Mozilla Public License Version
>+ * 1.1 (the "License"); you may not use this file except in compliance with
>+ * the License or as specified alternatively below. You may obtain a copy of
>+ * the License at http://www.mozilla.org/MPL/
>+ *
>+ * Software distributed under the License is distributed on an "AS IS" basis,
>+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>+ * for the specific language governing rights and limitations under the
>+ * License.
>+ *
>+ * Major Contributor(s):
>+ * Petr Mladek <pmladek@suse.cz> (initial developer)
>+ *
>+ * All Rights Reserved.
>+ *
>+ * For minor contributions see the git repository.
>+ *
>+ * Alternatively, the contents of this file may be used under the terms of
>+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
>+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
>+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
>+ * instead of those above.
>+ */
>+
>+[STR_NAME_MODULE_OPTIONAL_STDLIBS]
>+en-US = "Standard Compiler Libraries"
>+
>+[STR_DESC_MODULE_OPTIONAL_STDLIBS]
>+en-US = "libstdc++ and libgcc_s for too old Linux systems."
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/makefile.mk scp2//source/templates/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/makefile.mk	2011-12-28 13:34:06.575199178 +0100
>@@ -40,7 +40,7 @@
> COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
> .EXPORT : COMPLETELANGISO_VAR
> 
>-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
>+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
> 
> .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(MISC)$/$(TARGET)_help_track.mk
> .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_samples_root.sct scp2//source/templates/module_langpack_accessories_samples_root.sct
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_samples_root.sct	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/module_langpack_accessories_samples_root.sct	2011-09-20 11:33:20.837130586 +0200
>@@ -6,9 +6,6 @@
>  *
>  * OpenOffice.org - a multi-platform office productivity suite
>  *
>- * $RCSfile: module_langpack_accessories_root.sct,v $
>- * $Revision: 1.4 $
>- *
>  * This file is part of OpenOffice.org.
>  *
>  * OpenOffice.org is free software: you can redistribute it and/or modify
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_samples.sct scp2//source/templates/module_langpack_accessories_samples.sct
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_samples.sct	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/module_langpack_accessories_samples.sct	2011-09-20 11:33:20.837130586 +0200
>@@ -6,9 +6,6 @@
>  *
>  * OpenOffice.org - a multi-platform office productivity suite
>  *
>- * $RCSfile: module_langpack_accessories_samples.sct,v $
>- * $Revision: 1.4 $
>- *
>  * This file is part of OpenOffice.org.
>  *
>  * OpenOffice.org is free software: you can redistribute it and/or modify
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_templates_root.sct scp2//source/templates/module_langpack_accessories_templates_root.sct
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_templates_root.sct	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/module_langpack_accessories_templates_root.sct	2011-09-20 11:33:20.837130586 +0200
>@@ -6,9 +6,6 @@
>  *
>  * OpenOffice.org - a multi-platform office productivity suite
>  *
>- * $RCSfile: module_langpack_accessories_root.sct,v $
>- * $Revision: 1.4 $
>- *
>  * This file is part of OpenOffice.org.
>  *
>  * OpenOffice.org is free software: you can redistribute it and/or modify
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_templates.sct scp2//source/templates/module_langpack_accessories_templates.sct
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_accessories_templates.sct	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/module_langpack_accessories_templates.sct	2011-09-20 11:33:20.837130586 +0200
>@@ -6,9 +6,6 @@
>  *
>  * OpenOffice.org - a multi-platform office productivity suite
>  *
>- * $RCSfile: module_langpack_accessories_templates.sct,v $
>- * $Revision: 1.4 $
>- *
>  * This file is part of OpenOffice.org.
>  *
>  * OpenOffice.org is free software: you can redistribute it and/or modify
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_extensions_lightproof.sct scp2//source/templates/module_langpack_extensions_lightproof.sct
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_extensions_lightproof.sct	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/module_langpack_extensions_lightproof.sct	1970-01-01 01:00:00.000000000 +0100
>@@ -1,55 +0,0 @@
>-/*************************************************************************
>- *
>- *  OpenOffice.org - a multi-platform office productivity suite
>- *
>- *  $RCSfile: module_langpack_extensions_templates.sctp,v $
>- *
>- *  $Revision: 1.0 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
>- *
>- *  The Contents of this file are made available subject to
>- *  the terms of GNU Lesser General Public License Version 3.
>- *
>- *
>- *    GNU Lesser General Public License Version 3
>- *    =============================================
>- *    Copyright 2005 by Sun Microsystems, Inc.
>- *    901 San Antonio Road, Palo Alto, CA 94303, USA
>- *
>- *    This library is free software; you can redistribute it and/or
>- *    modify it under the terms of the GNU Lesser General Public
>- *    License version 2.1, as published by the Free Software Foundation.
>- *
>- *    This library is distributed in the hope that it will be useful,
>- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
>- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>- *    Lesser General Public License for more details.
>- *
>- *    You should have received a copy of the GNU Lesser General Public
>- *    License along with this library; if not, write to the Free Software
>- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
>- *    MA  02111-1307  USA
>- *
>- ************************************************************************/
>-
>-#include "macros.inc"
>-
>-Module gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>
>-    ParentID = gid_Module_Optional_Extensions_LightProof;
>-    Sortkey = "<SORTKEY>";
>-    Language = "<LANGUAGE>";
>-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
>-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
>-End
>-
>-Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
>-    ParentID = gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>;
>-    Sortkey = "50";
>-    Language = "<LANGUAGE>";
>-    Assigns = gid_Module_Optional_Extensions_LightProof_Template;
>-    Name = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
>-    Description = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
>-    PackageInfo = "packinfo_office_lang.txt";
>-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
>-End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_extensions_templates.sct scp2//source/templates/module_langpack_extensions_templates.sct
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/module_langpack_extensions_templates.sct	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/module_langpack_extensions_templates.sct	2011-09-20 11:33:20.838130586 +0200
>@@ -2,12 +2,6 @@
>  *
>  *  OpenOffice.org - a multi-platform office productivity suite
>  *
>- *  $RCSfile: module_langpack_extensions_templates.sctp,v $
>- *
>- *  $Revision: 1.0 $
>- *
>- *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
>- *
>  *  The Contents of this file are made available subject to
>  *  the terms of GNU Lesser General Public License Version 3.
>  *
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/modules.pl scp2//source/templates/modules.pl
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/templates/modules.pl	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/templates/modules.pl	2011-09-13 16:39:36.073306253 +0200
>@@ -1,7 +1,7 @@
> #*************************************************************************
> #
> # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>-# 
>+#
> # Copyright 2000, 2010 Oracle and/or its affiliates.
> #
> # OpenOffice.org - a multi-platform office productivity suite
>@@ -71,7 +71,7 @@
>         exit 1;
>     }
> }
>-    
>+
> 
> sub write_ALL_MODULES
> {
>@@ -102,7 +102,7 @@
>         print OUTFILE "\n";
>     }
>     print OUTFILE "\n";
>-    
>+
>     $globalcounter = $counter;
>     $globallinecounter = $linecounter;
> }
>@@ -170,7 +170,7 @@
>                 chomp $lastcompletelangiso_var;
>                 $lastcompletelangiso_var =~ s/^\/\/.*completelangiso:\s*//;
>                 last;
>-            }                
>+            }
>         }
>         close OLDFILE;
>     }
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/file_testtool.scp scp2//source/testtool/file_testtool.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/file_testtool.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/testtool/file_testtool.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,71 +0,0 @@
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>- ************************************************************************/
>-
>-#include "macros.inc"
>-
>-STD_LIB_FILE( gid_File_Lib_Communi, communi )
>-STD_LIB_FILE( gid_File_Lib_Simplecm, simplecm )
>-
>-#if defined WNT
>-File gid_File_Exe_Testtool
>-    BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Styles = (PACKED);
>-    Name = "testtool.exe";
>-End
>-#endif
>-
>-File gid_File_Bin_Testtool
>-    BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Styles = (PACKED);
>-    Name = "testtool.bin";
>-End
>-
>-File gid_File_Config_Testtool
>-    BIN_FILE_BODY;
>-    Dir = gid_Dir_Program;
>-    Styles = (PACKED);
>-  #ifdef UNX
>-    Name = "testtoolrc";
>-  #else
>-    Name = "testtool.ini";
>-  #endif
>-End
>-
>-// On Mac OS X, testtool needs to find the Info.plist and needs to be located in
>-// the Content/MacOS directory; since the Mac OS X dmg contains all layers,
>-// anyway, this hack works for now:
>-#if defined MACOSX
>-Unixlink gid_Unixlink_Testtool
>-    BIN_FILE_BODY;
>-    Styles = ();
>-    Name = "testtool";
>-    Dir = gid_Brand_Dir_Program;
>-    Target = "../basis-link/program/testtool.bin";
>-End
>-#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/makefile.mk scp2//source/testtool/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/testtool/makefile.mk	1970-01-01 01:00:00.000000000 +0100
>@@ -1,50 +0,0 @@
>-#*************************************************************************
>-#
>-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>-# 
>-# Copyright 2000, 2010 Oracle and/or its affiliates.
>-#
>-# OpenOffice.org - a multi-platform office productivity suite
>-#
>-# This file is part of OpenOffice.org.
>-#
>-# OpenOffice.org is free software: you can redistribute it and/or modify
>-# it under the terms of the GNU Lesser General Public License version 3
>-# only, as published by the Free Software Foundation.
>-#
>-# OpenOffice.org is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU Lesser General Public License version 3 for more details
>-# (a copy is included in the LICENSE file that accompanied this code).
>-#
>-# You should have received a copy of the GNU Lesser General Public License
>-# version 3 along with OpenOffice.org.  If not, see
>-# <http://www.openoffice.org/license.html>
>-# for a copy of the LGPLv3 License.
>-#
>-#*************************************************************************
>-
>-PRJ=..$/..
>-
>-PRJPCH=
>-
>-PRJNAME=scp2
>-TARGET=testtool
>-TARGETTYPE=CUI
>-
>-# --- Settings -----------------------------------------------------
>-
>-.INCLUDE :	settings.mk
>-
>-SCP_PRODUCT_TYPE=osl
>-
>-PARFILES= \
>-        module_testtool.par     \
>-        file_testtool.par
>-
>-ULFFILES= \
>-        module_testtool.ulf
>-
>-# --- File ---------------------------------------------------------
>-.INCLUDE :  target.mk
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/module_testtool.scp scp2//source/testtool/module_testtool.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/module_testtool.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/testtool/module_testtool.scp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,38 +0,0 @@
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>- ************************************************************************/
>-
>-#include "macros.inc"
>-
>-Module gid_Module_Optional_Testtool
>-    PackageInfo = "packinfo_office.txt";
>-    MOD_NAME_DESC ( MODULE_OPTIONAL_TESTTOOL );
>-    Sortkey = "650";
>-    ParentID = gid_Module_Optional;
>-    Default = NO;
>-    Files = (gid_File_Exe_Testtool, gid_File_Bin_Testtool, gid_File_Lib_Communi, gid_File_Lib_Simplecm, gid_File_Hid_Testtool, gid_File_Config_Testtool);
>-    Unixlinks = (gid_Unixlink_Testtool);
>-End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/module_testtool.ulf scp2//source/testtool/module_testtool.ulf
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/testtool/module_testtool.ulf	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/testtool/module_testtool.ulf	1970-01-01 01:00:00.000000000 +0100
>@@ -1,32 +0,0 @@
>-/*************************************************************************
>- *
>- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>- * 
>- * Copyright 2000, 2010 Oracle and/or its affiliates.
>- *
>- * OpenOffice.org - a multi-platform office productivity suite
>- *
>- * This file is part of OpenOffice.org.
>- *
>- * OpenOffice.org is free software: you can redistribute it and/or modify
>- * it under the terms of the GNU Lesser General Public License version 3
>- * only, as published by the Free Software Foundation.
>- *
>- * OpenOffice.org is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU Lesser General Public License version 3 for more details
>- * (a copy is included in the LICENSE file that accompanied this code).
>- *
>- * You should have received a copy of the GNU Lesser General Public License
>- * version 3 along with OpenOffice.org.  If not, see
>- * <http://www.openoffice.org/license.html>
>- * for a copy of the LGPLv3 License.
>- *
>- ************************************************************************/
>-
>-[STR_NAME_MODULE_OPTIONAL_TESTTOOL]
>-en-US = "Testtool"
>-
>-[STR_DESC_MODULE_OPTIONAL_TESTTOOL]
>-en-US = "Testtool"
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/winexplorerext/file_winexplorerext.scp scp2//source/winexplorerext/file_winexplorerext.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/winexplorerext/file_winexplorerext.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/winexplorerext/file_winexplorerext.scp	2011-12-05 16:23:33.966716511 +0100
>@@ -28,12 +28,12 @@
> #include "macros.inc"
> 
> Directory gid_Dir_Shlxthdl
>-    ParentID = gid_Dir_Program;
>+    ParentID = gid_Brand_Dir_Program;
>     DosName = "shlxthdl";
> End
> 
> File gid_File_Lib_OOoFilt
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = gid_Dir_Shlxthdl;
>     Name = "ooofilt.dll";
>@@ -42,7 +42,7 @@
> #ifdef BUILD_X64
> 
> File gid_File_Lib_OOoFilt64
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = gid_Dir_Shlxthdl;
>     Name = "ooofilt_x64.dll";
>@@ -52,7 +52,7 @@
> #endif
> 
> File gid_File_Lib_Shlxthdl
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = gid_Dir_Shlxthdl;
>     Name = "shlxthdl.dll";
>@@ -60,7 +60,7 @@
> 
> #ifdef BUILD_X64
> 	File gid_File_Lib_Shlxthdl64
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = gid_Dir_Shlxthdl;
>     Name = "shlxthdl_x64.dll";
>@@ -70,7 +70,7 @@
> #endif
> 
> File gid_File_Lib_PropertyHdl
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = gid_Dir_Shlxthdl;
>     Name = "propertyhdl.dll";
>@@ -78,7 +78,7 @@
> 
> #ifdef BUILD_X64
> 	File gid_File_Lib_PropertyHdl64
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED);
>     Dir = gid_Dir_Shlxthdl;
>     Name = "propertyhdl_x64.dll";
>@@ -88,14 +88,14 @@
> #endif
> 
> File gid_File_Lib_Shlxtmsi
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "shlxtmsi.dll";
> End
> 
> File gid_File_Lib_Reg64
>-    TXT_FILE_BODY;
>+    LIB_FILE_BODY;
>     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
>     Dir = SCP2_OOO_BIN_DIR;
>     Name = "reg64msi.dll";
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/winexplorerext/makefile.mk scp2//source/winexplorerext/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/winexplorerext/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/winexplorerext/makefile.mk	2011-11-29 09:56:02.926323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=winexpext
> TARGETTYPE=CUI
>@@ -43,7 +41,8 @@
> 
> SCP_PRODUCT_TYPE=osl
> 
>-.IF "$(GUI)"=="WNT"
>+# The Explorer extensions don't build with MinGW
>+.IF "$(GUI)" == "WNT" && "$(COM)" == "MSC"
> PARFILES= \
>         module_winexplorerext.par        \
>         file_winexplorerext.par          \
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/winexplorerext/registryitem_winexplorerext.scp scp2//source/winexplorerext/registryitem_winexplorerext.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/winexplorerext/registryitem_winexplorerext.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/winexplorerext/registryitem_winexplorerext.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -35,8 +35,8 @@
>     ModuleID = gid_Module_Optional_Winexplorerext;
>     Styles = (X64);
>     Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
>-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
>-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
>+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
>+    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
> End
> 
> RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
>@@ -58,8 +58,8 @@
>     ModuleID = gid_Module_Optional_Winexplorerext;
>     Styles = (X64);
>     Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
>-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
>-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
>+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
>+    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
> End
> 
> RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
>@@ -90,8 +90,8 @@
>     ModuleID = gid_Module_Optional_Winexplorerext;
>     Styles = (X64);
>     Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
>-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
>-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
>+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
>+    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
> End
>     
> RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
>@@ -124,8 +124,8 @@
>     ModuleID = gid_Module_Root;
>     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
>     Styles = (X64); // Values: X64 / X64_ONLY
>-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
>-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
>+    Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt.dll";
>+    Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
> End
> 
> RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
>@@ -167,8 +167,8 @@
>     ModuleID = gid_Module_Optional_Winexplorerext;
>     Styles = (X64);
>     Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
>-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
>-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
>+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
>+    Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
> End
> 
> RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
>@@ -201,8 +201,8 @@
>     ComponentCondition = "VersionNT >= 600";
>     Styles = (X64);
>     Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
>-    Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
>-    Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
>+    Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
>+    Val64 = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
> End
> 
> RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/file_writer.scp scp2//source/writer/file_writer.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/file_writer.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/writer/file_writer.scp	2011-10-17 18:59:33.613146577 +0200
>@@ -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;
>@@ -53,12 +53,14 @@
> End
> #endif
> 
>+#if defined WITH_HELP
> File gid_File_Help_Swriter_Zip
>     Dir = gid_Dir_Help_Isolanguage;
>     ARCHIVE_TXT_FILE_BODY_HELPPACK;
>     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(swriter);
>     Patchfiles = ();
> End
>+#endif
> 
> /*
> File gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml
>@@ -86,6 +88,6 @@
> File gid_File_Share_Registry_Writer_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "writer.xcd";
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/folderitem_writer.scp scp2//source/writer/folderitem_writer.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/folderitem_writer.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/writer/folderitem_writer.scp	2011-11-23 11:35:42.326833796 +0100
>@@ -27,16 +27,17 @@
> 
> #include "macros.inc"
> 
>+#ifndef ENABLE_SILENT_MSI
> FolderItem gid_Folderitem_Swriter
>     Name = "%PRODUCTNAME Writer";
>-    Name (pt-BR) = "%PRODUCTNAME_BR Writer";
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>     FolderID = gid_Folder_Staroffice51;
>     FileID = gid_File_Exe_Swriter;
>     IconFile = gid_File_Exe_Swriter;
>     IconID = 0;
>-    WkDir = gid_Dir_Program;
>+    WkDir = gid_Brand_Dir_Program;
>     Parameter = "";
>     Styles = (NOWEB, NON_ADVERTISED);
>     ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
> End
>+#endif
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/makefile.mk scp2//source/writer/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/writer/makefile.mk	2011-11-29 09:56:02.926323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=writer
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/registryitem_writer.scp scp2//source/writer/registryitem_writer.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/writer/registryitem_writer.scp	2011-05-20 18:04:45.000000000 +0200
>+++ scp2//source/writer/registryitem_writer.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -76,7 +76,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>     Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochandler32
>@@ -97,7 +97,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>     Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Miscstatus
>@@ -195,7 +195,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,0";
>+    Value = "<progpath>\program\soffice.bin,0";
> End
> 
> RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochandler32
>@@ -216,7 +216,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>     Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\LocalServer32";
>-    Value = "<progpath>\program\soffice.exe -nodefault -nologo";
>+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
> End
> 
> RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Miscstatus
>@@ -291,7 +291,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>     Subkey = "soffice.StarWriterDocument.6\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,27";
>+    Value = "<progpath>\program\soffice.bin,1";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Insertable
>@@ -395,7 +395,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarWriterGlobalDocument.6\DefaultIcon";
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>-    Value = "<progpath>\program\soffice.exe,35";
>+    Value = "<progpath>\program\soffice.bin,9";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell
>@@ -465,7 +465,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "soffice.StarWriterTemplate.6\DefaultIcon";
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>-    Value = "<progpath>\program\soffice.exe,28";
>+    Value = "<progpath>\program\soffice.bin,2";
> End
> 
> RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell
>@@ -546,6 +546,7 @@
>     Value = "application/vnd.sun.xml.writer.template";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_stw_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -553,6 +554,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Sxg_PersistentHandler
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -598,6 +600,7 @@
>     Value = ".sxg";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_sxg_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -605,6 +608,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Sxw_PersistentHandler
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -666,6 +670,7 @@
>     Styles = ();
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_sxw_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -673,7 +678,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>-
>+#endif
> 
> // new odt file extension 
> 
>@@ -783,7 +788,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>     Subkey = "opendocument.WriterDocument.1\DefaultIcon";
>-    Value = "<progpath>\program\soffice.exe,1";
>+    Value = "<progpath>\program\soffice.bin,1";
> End
> 
> RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
>@@ -792,6 +797,7 @@
>     Subkey = "opendocument.WriterDocument.1\Insertable";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_odt_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -799,6 +805,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -997,9 +1004,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "opendocument.WriterTemplate.1\DefaultIcon";
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>-    Value = "<progpath>\program\soffice.exe,2";
>+    Value = "<progpath>\program\soffice.bin,2";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_ott_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -1007,6 +1015,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -1121,9 +1130,10 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "opendocument.WriterGlobalDocument.1\DefaultIcon";
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>-    Value = "<progpath>\program\soffice.exe,10";
>+    Value = "<progpath>\program\soffice.bin,9";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_odm_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -1131,6 +1141,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>@@ -1245,7 +1256,7 @@
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     Subkey = "opendocument.WriterWebTemplate.1\DefaultIcon";
>     ModuleID = gid_Module_Prg_Wrt_Bin;
>-    Value = "<progpath>\program\soffice.exe,11";
>+    Value = "<progpath>\program\soffice.bin,10";
> End
> 
> RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
>@@ -1290,6 +1301,7 @@
>     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
> End
> 
>+#ifdef _MSC_VER
> RegistryItem gid_Regitem_oth_FullDetails
>     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
>     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
>@@ -1297,6 +1309,7 @@
>     Name = "FullDetails";
>     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
> End
>+#endif
> 
> // "OpenWith" Windows Registry keys for extensions supported by Writer
> 
>@@ -1555,11 +1568,11 @@
> // registering the mso file types
> // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
> 
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
>-CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
>-CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
>+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
>+CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/xsltfilter/file_xsltfilter.scp scp2//source/xsltfilter/file_xsltfilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/xsltfilter/file_xsltfilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/xsltfilter/file_xsltfilter.scp	2011-10-17 18:59:33.613146577 +0200
>@@ -30,7 +30,7 @@
> File gid_File_Share_Registry_Xsltfilter_Xcd
>     TXT_FILE_BODY;
>     Styles = (PACKED);
>-    Dir = gid_Dir_Share_Registry;
>+    Dir = gid_Brand_Dir_Share_Registry;
>     Name = "xsltfilter.xcd";
> End
> 
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/xsltfilter/makefile.mk scp2//source/xsltfilter/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/xsltfilter/makefile.mk	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/xsltfilter/makefile.mk	2011-11-29 09:56:02.926323818 +0100
>@@ -27,8 +27,6 @@
> 
> PRJ=..$/..
> 
>-PRJPCH=
>-
> PRJNAME=scp2
> TARGET=xsltfilter
> TARGETTYPE=CUI
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/xsltfilter/module_xsltfilter.scp scp2//source/xsltfilter/module_xsltfilter.scp
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//source/xsltfilter/module_xsltfilter.scp	2011-05-18 17:51:47.000000000 +0200
>+++ scp2//source/xsltfilter/module_xsltfilter.scp	2012-02-24 13:39:12.644661265 +0100
>@@ -45,6 +45,6 @@
>     gid_File_Xsl_Export_Xhtml_Table,
>     gid_File_Share_Registry_Xsltfilter_Xcd );
>     Minimal = NO;
>-    Default = NO;
>+    Default = YES;
>     Styles = ( );
> End
>diff -urN /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//util/makefile.mk scp2//util/makefile.mk
>--- /var/tmp/portage/app-office/libreoffice-3.4.5.2/work/libreoffice-bootstrap-3.4.5.2/scp2//util/makefile.mk	2011-12-22 12:36:41.000000000 +0100
>+++ scp2//util/makefile.mk	2012-02-24 13:39:12.644661265 +0100
>@@ -76,18 +76,16 @@
>              file_graphicfilter.par        \
>              module_extensions.par         \
>              module_extensions_sun_templates.par         \
>-             module_extensions_lightproof.par   \
>              directory_extensions.par                     \
>              file_extensions.par           \
>-             module_testtool.par           \
>-             file_testtool.par             \
>              module_xsltfilter.par         \
>              file_xsltfilter.par           \
>              module_python.par             \
>              module_python_mailmerge.par   \
>              file_python.par               \
>              profileitem_python.par        \
>-             module_accessories.par
>+             module_accessories.par        \
>+             postgresqlsdbc.par
> .IF "$(WITH_EXTRA_GALLERY)" != ""
> SCP1FILES +=                               \
>              module_gallery_accessories.par   \
>@@ -108,11 +106,14 @@
>              module_font_accessories.par      \
>              file_font_accessories.par
> .ENDIF
>+.IF "$(SYSTEM_STDLIBS)" != "YES"
>+SCP1FILES +=                               \
>+             module_stdlibs.par            \
>+             file_stdlibs.par
>+.ENDIF
> SCP1FILES +=                               \
>              ure_into_ooo.par              \
>              ure.par                       \
>-             module_improvement.par        \
>-             file_improvement.par          \
>              common_brand.par              \
>              common_brand_readme.par       \
>              ooo_brand.par
>@@ -154,6 +155,7 @@
>              folderitem_ooo.par        \
>              windowscustomaction_ooo.par \
>              vc_redist.par             \
>+             mingw_dlls.par            \
>              registryitem_writer.par   \
>              folderitem_writer.par     \
>              registryitem_calc.par     \
>@@ -168,10 +170,15 @@
>              folderitem_math.par       \
>              module_quickstart.par     \
>              file_quickstart.par       \
>-             registryitem_quickstart.par \
>+             registryitem_quickstart.par
>+
>+# The Explorer extensions don't build with MinGW
>+.IF "$(COM)" == "MSC"
>+SCP1FILES +=                           \
>              module_winexplorerext.par \
>              file_winexplorerext.par   \
>              registryitem_winexplorerext.par
>+.ENDIF
> 
> .IF "$(ENABLE_DIRECTX)"!=""
> SCP1FILES += directxcanvas.par
>@@ -205,16 +212,12 @@
> 
> SCP1FILES += \
>              vclcanvas.par \
>-             mtfrenderer.par
>+			 mtfrenderer.par
> 
>-.IF "$(ENABLE_CAIRO)" == "TRUE"
>+.IF "$(ENABLE_CAIRO_CANVAS)"=="TRUE"
> SCP1FILES += cairocanvas.par
> .ENDIF
> 
>-.IF "$(ENABLE_LAYOUT)" == "TRUE"
>-SCP1FILES += layout.par
>-.ENDIF # ENABLE_LAYOUT == TRUE
>-
> .IF "$(ENABLE_ONLINE_UPDATE)"!=""
> SCP1FILES += \
>              module_onlineupdate.par   \
>@@ -226,176 +229,11 @@
> 
> SCP2LINK_PRODUCT_TYPE=osl
> SCP2TARGET = setup_osljre
>-SCP2FILES  = installation_ooo.par          \
>-             scpaction_ooo.par             \
>-             directory_ooo.par             \
>-             file_ooo.par                  \
>-             file_extra_ooo.par            \
>-             file_font_ooo.par             \
>-             file_library_ooo.par          \
>-             file_resource_ooo.par         \
>-             shortcut_ooo.par              \
>-             module_ooo.par                \
>-             module_hidden_ooo.par         \
>-             module_langpack.par           \
>-             module_lang_template.par      \
>-             module_helppack.par           \
>-             module_help_template.par      \
>-             module_java.par               \
>-             profile_ooo.par               \
>-             profileitem_ooo.par           \
>-             module_writer.par             \
>-             file_writer.par               \
>-             module_calc.par               \
>-             file_calc.par                 \
>-             module_draw.par               \
>-             file_draw.par                 \
>-             module_impress.par            \
>-             file_impress.par              \
>-             module_base.par               \
>-             file_base.par                 \
>-             canvascommons.par             \
>-             module_math.par               \
>-             file_math.par                 \
>-             module_systemint.par          \
>-             module_graphicfilter.par      \
>-             file_graphicfilter.par        \
>-             module_extensions.par         \
>-             module_extensions_sun_templates.par         \
>-             module_extensions_lightproof.par  \
>-             directory_extensions.par                     \
>-             file_extensions.par           \
>-             module_testtool.par           \
>-             file_testtool.par             \
>-             module_xsltfilter.par         \
>-             file_xsltfilter.par           \
>-             module_python.par             \
>-             module_python_mailmerge.par   \
>-             file_python.par               \
>-             profileitem_python.par        \
>-             module_accessories.par
>-.IF "$(WITH_EXTRA_GALLERY)" != ""
>-SCP2FILES +=                               \
>-             module_gallery_accessories.par   \
>-             file_gallery_accessories.par
>-.ENDIF
>-.IF "$(WITH_EXTRA_SAMPLE)" != ""
>-SCP2FILES +=                               \
>-             module_samples_accessories.par   \
>-             file_samples_accessories.par
>-.ENDIF
>-.IF "$(WITH_EXTRA_TEMPLATE)" != ""
>-SCP2FILES +=                               \
>-             module_templates_accessories.par \
>-             file_templates_accessories.par
>-.ENDIF
>-.IF "$(WITH_EXTRA_FONT)" != ""
>-SCP2FILES +=                               \
>-             module_font_accessories.par      \
>-             file_font_accessories.par
>-.ENDIF
>-SCP2FILES +=                           \
>-             ure_into_ooo.par              \
>-             ure.par                       \
>-             module_improvement.par        \
>-             file_improvement.par          \
>-             common_brand.par              \
>-             common_brand_readme.par       \
>-             ooo_brand.par
>-
>-.IF "$(OS)"=="MACOSX" 
>-SCP2FILES +=                               \
>-             directory_ooo_macosx.par      
>-.ENDIF
>- 
>-.IF "$(WITH_BINFILTER)" != "NO"
>-SCP2FILES +=                               \
>-             module_binfilter.par          \
>-             registryitem_binfilter.par    \
>-             file_binfilter.par
>-.ENDIF
>-
>-.IF "$(SOLAR_JAVA)"!=""
>-SCP2FILES +=                               \
>-             module_javafilter.par         \
>-             file_javafilter.par
>-.ENDIF
>+SCP2FILES  = $(SCP1FILES) \
>+             module_java.par
> 
>-.IF "$(SOLAR_JAVA)"!="" 
> .IF "$(GUI)"=="WNT"
>-SCP2FILES +=                               \
>-             registryitem_javafilter.par
>-.ENDIF
>-.ENDIF
>-
>-.IF "$(GUI)"=="WNT"
>-SCP2FILES +=                           \
>-             file_jre_ooo.par          \
>-             registryitem_ooo.par      \
>-             folder_ooo.par            \
>-             folderitem_ooo.par        \
>-             windowscustomaction_ooo.par \
>-             vc_redist.par             \
>-             registryitem_writer.par   \
>-             folderitem_writer.par     \
>-             registryitem_calc.par     \
>-             folderitem_calc.par       \
>-             registryitem_draw.par     \
>-             folderitem_draw.par       \
>-             registryitem_impress.par  \
>-             folderitem_impress.par    \
>-             registryitem_base.par     \
>-             folderitem_base.par       \
>-             registryitem_math.par     \
>-             folderitem_math.par       \
>-             module_quickstart.par     \
>-             file_quickstart.par       \
>-             registryitem_quickstart.par \
>-             module_winexplorerext.par \
>-             file_winexplorerext.par   \
>-             registryitem_winexplorerext.par
>-
>-.IF "$(ENABLE_DIRECTX)"!=""
>-SCP2FILES += directxcanvas.par
>-.ENDIF
>-
>-.IF "$(DISABLE_ACTIVEX)"==""
>-SCP2FILES +=                           \
>-             module_activex.par        \
>-             file_activex.par
>-.ENDIF
>-.ENDIF
>-
>-.IF "$(GUI)"=="UNX"
>-.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
>-SCP2FILES += \
>-             module_gnome.par   \
>-             file_gnome.par
>-.ENDIF
>-
>-.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
>-SCP2FILES += \
>-             module_kde.par     \
>-             file_kde.par
>-.ENDIF
>-.ENDIF
>-
>-.IF "$(ENABLE_CRASHDUMP)" != ""
>-SCP2FILES += \
>-             file_crashrep.par
>-.ENDIF
>-
>-SCP2FILES += \
>-             vclcanvas.par
>-
>-.IF "$(ENABLE_LAYOUT)" == "TRUE"
>-SCP2FILES += layout.par
>-.ENDIF # ENABLE_LAYOUT == TRUE
>-
>-.IF "$(ENABLE_ONLINE_UPDATE)"!=""
>-SCP2FILES += \
>-             module_onlineupdate.par   \
>-             file_onlineupdate.par
>+SCP2FILES += file_jre_ooo.par
> .ENDIF
> 
> # ------------------------------------------------------------------------
>@@ -415,5 +253,12 @@
> SCP4TARGET = sdkoo
> SCP4FILES = sdkoo.par
> 
>+# ------------------------------------------------------------------------
>+# Test
>+
>+SCP5LINK_PRODUCT_TYPE = osl
>+SCP5TARGET = test
>+SCP5FILES = smoketest.par
>+
> # --- target -------------------------------------------------------------
> .INCLUDE :  target.mk

Actions: View

Attachments on bug 46506: 57586 | 57587 | 57588