merged in DEV300_m57

author: sb <sb@openoffice.org> 2009-09-04 12:24:40 +0200
committer: sb <sb@openoffice.org> 2009-09-04 12:24:40 +0200
commit: 86f98daab3f81482155a444544662c51490b0b87 (patch)
tree: 2a63c2b8a302c70859719e7ca5ed89be684252d9 /scp2/source
parent: fb6954af7263c763bf69a5989dd95646ff57a6a7 (diff)
21 files changed, 365 insertions, 148 deletions
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 6dcb531a6d7f..8cc1c45e17e7 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -33,21 +33,21 @@
 File gid_File_Lib_Soactivex
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "so_activex.dll";
 End
 
 File gid_File_Lib_Regactivex_Msi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "regactivex.dll";
 End
 
 File gid_File_Lib_Regpatchactivex_Msi
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "regpatchactivex.dll";
 End
 
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index 51ee7863dd9c..f3251634c53d 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -34,7 +34,7 @@ File gid_File_Lib_CairoCanvas
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX));
   #else
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 0161e06545c6..a7fdf1196ac3 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -33,7 +33,7 @@
 File gid_File_Lib_GIO
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
     RegistryID = gid_Starregistry_Services_Rdb;
     Regmergefile = "ucpgio-ucd.txt";
@@ -44,7 +44,7 @@ End
 File gid_File_Lib_Gnomevfs
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
     RegistryID = gid_Starregistry_Services_Rdb;
     Regmergefile = "ucpgvfs-ucd.txt";
@@ -55,7 +55,7 @@ End
 File gid_File_Lib_Gconfbe
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
     RegistryID = gid_Starregistry_Services_Rdb;
     Regmergefile = "gconfbe1-ucd.txt";
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 17d5c31e5a12..18425e88033a 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -43,7 +43,7 @@ File gid_File_Lib_OpenGLTransitions
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
   #else
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 2f6a67286589..294f0a577b9b 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -35,7 +35,7 @@
 File gid_File_Lib_Xmergesync
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "xmergesync.dll";
 End
 
@@ -46,7 +46,7 @@ End
 File gid_File_Lib_Jfregca
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "jfregca.dll";
 End
 
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index a6d6db425a22..4cd9de0b240c 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -29,12 +29,24 @@
  ************************************************************************/
 #include "macros.inc"
 
+#ifdef ENABLE_KDE
 File gid_File_Lib_Kdebe
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
     RegistryID = gid_Starregistry_Services_Rdb;
     Regmergefile = "kdebe1-ucd.txt";
 End
+#endif
 
+#ifdef ENABLE_KDE4
+File gid_File_Lib_Kde4be
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Regmergefile = "kde4be1-ucd.txt";
+End
+#endif
diff --git a/scp2/source/kde/makefile.mk b/scp2/source/kde/makefile.mk
index 0cbf6a47123d..6ddb30108ce6 100644
--- a/scp2/source/kde/makefile.mk
+++ b/scp2/source/kde/makefile.mk
@@ -43,7 +43,16 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
-.IF "$(ENABLE_KDE)" == "TRUE"
+.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
+
+.IF "$(ENABLE_KDE)" != ""
+SCPDEFS+=-DENABLE_KDE
+.ENDIF
+
+.IF "$(ENABLE_KDE4)" != ""
+SCPDEFS+=-DENABLE_KDE4
+.ENDIF
+
 PARFILES =                   \
         module_kde.par     \
         file_kde.par
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 1dce456f6726..28dacbef0583 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -30,12 +30,24 @@
 
 #include "macros.inc"
 
+#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
 Module gid_Module_Optional_Kde
     ParentID = gid_Module_Optional;
     Default = YES;
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
     Styles = (DONTSHOWINUSERINSTALL);
-    Files = (gid_File_Lib_Kdebe);
+    Files = (
+#ifdef ENABLE_KDE
+    gid_File_Lib_Kdebe
+#ifdef ENABLE_KDE4
+    ,
+#endif // ENABLE_KDE4
+#endif // ENABLE_KDE
+#ifdef ENABLE_KDE4
+    gid_File_Lib_Kde4be
+#endif // ENABLE_KDE4
+    );
 End
+#endif
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c6bbf753fd22..7fd55f47a06f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -84,6 +84,8 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Html_Thirdpartylicensereadme,
              gid_Brand_File_Images_Brand_Zip,
              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,
@@ -461,7 +463,10 @@ File gid_Brand_File_Bin_Unopkg
     Name = "unopkg.bin";
 End
 
-#if defined WNT && defined M1310
+#if defined WNT && \
+    (defined M1310 || \
+     ((defined M1400 || defined M1500) && \
+      !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
 File gid_Brand_File_Bin_Msvcr71
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -645,6 +650,32 @@ End
 #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)
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index 409afc0797f2..6bff77e6f355 100755
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -34,6 +34,8 @@
 Directory gid_Dir_Bundle
     ParentID = PD_PROGDIR;
     HostName = "%PRODUCTNAME.app";
+    LangPackHostName = "%PRODUCTNAME %PRODUCTVERSION Language Pack.app";
+    PatchHostName = "%PRODUCTNAME %PRODUCTVERSION Patch.app";
 End
 #endif
 
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index efaf3bc67ff7..f8405ed58bb0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1,4 +1,4 @@
-/*************************************************************************
+*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
@@ -33,7 +33,7 @@
 File gid_File_Lib_Accessbridge
     BIN_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "java_uno_accessbridge.dll";
 End
 #endif
@@ -44,7 +44,7 @@ File gid_File_Lib_Basprov
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
   #else
@@ -58,7 +58,7 @@ File gid_File_Lib_Cached1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
   #else
@@ -73,7 +73,7 @@ File gid_File_Lib_Ldapbe2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX));
   #else
@@ -150,7 +150,7 @@ File gid_File_Lib_Comphelper2
   #else
     Name = STRING(CONCAT3(comphelp4,COMID,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -164,7 +164,7 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
 File gid_File_Lib_Curl
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
@@ -187,11 +187,11 @@ End
 File gid_File_Lib_Db
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT2(libdb-4.2,UNXSUFFIX));
+    Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
   #else
-    Name = "libdb42.dll";
+    Name = "libdb47.dll";
   #endif
 End
 
@@ -203,7 +203,7 @@ End
 File gid_File_Lib_Egg_Tray
  TXT_FILE_BODY;
  Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
  Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
 End
 
@@ -211,7 +211,7 @@ File gid_File_Lib_QStart_Gtk
     Name = LIBNAME(qstart_gtk);
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 #endif
@@ -235,7 +235,7 @@ File gid_File_Lib_Dbpool
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
   #else
@@ -254,7 +254,7 @@ File gid_File_Lib_Dict_Ja
   #else
     Name = "dict_ja.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -265,7 +265,7 @@ File gid_File_Lib_Dict_Zh
   #else
     Name = "dict_zh.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -276,7 +276,7 @@ File gid_File_Lib_Collator_Data
   #else
     Name = "collator_data.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -287,7 +287,7 @@ File gid_File_Lib_Index_Data
   #else
     Name = "index_data.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -298,7 +298,7 @@ File gid_File_Lib_Textconv_Dict
   #else
     Name = "textconv_dict.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -306,7 +306,7 @@ File gid_File_Lib_Dlgprov
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
   #else
@@ -318,7 +318,7 @@ File gid_File_Lib_Stringresource
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
   #else
@@ -333,7 +333,7 @@ File gid_File_Lib_Vbaobj
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX));
   #else
@@ -351,7 +351,7 @@ File gid_File_Lib_Dnd
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "dnd.dll";
 End
 
@@ -362,7 +362,7 @@ End
 File gid_File_Lib_Dtrans
     TXT_FILE_BODY;
     Name = "dtrans.dll";
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED, UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -384,7 +384,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser )
 File gid_File_Lib_Inprocserv
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "inprocserv.dll";
 End
 
@@ -397,14 +397,14 @@ File gid_File_Lib_Kab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
 End
 
 File gid_File_Lib_Kab_Drv_1
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX));
 End
 
@@ -415,14 +415,14 @@ File gid_File_Lib_Macab_1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
 End
 
 File gid_File_Lib_Macab_Drv_1
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
 End
 
@@ -440,7 +440,7 @@ File gid_File_Lib_Evtatt
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libevtatt,UNXSUFFIX));
   #else
@@ -453,7 +453,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
 End
@@ -466,7 +466,7 @@ File gid_File_Lib_Fop
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "fop.dll";
 End
 
@@ -476,9 +476,9 @@ End
 
 File gid_File_Lib_Fps
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "fps.dll";
 End
 
@@ -489,7 +489,7 @@ End
 File gid_File_Lib_Desktopbe
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
     RegistryID = gid_Starregistry_Services_Rdb;
     Regmergefile = "desktopbe1-ucd.txt";
@@ -501,12 +501,24 @@ File gid_File_Lib_Fps_Gnome
     TXT_FILE_BODY;
     Styles = (PACKED);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno);
     Regmergefile = "fps-gnome-ucd.txt";
 End
 #endif
 #endif
+#ifdef ENABLE_KDE4
+#ifndef MACOSX
+File gid_File_Lib_Fps_Kde4
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = gid_Dir_Program;
+    Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
+    Regmergefile = "fps-kde4-ucd.txt";
+End
+#endif
+#endif
 #endif
 
 #ifdef MACOSX
@@ -515,7 +527,7 @@ File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
     Regmergefile = "fps-aqua-ucd.txt";
 End
@@ -525,7 +537,7 @@ File gid_File_Lib_MacOSXSpell
 	Styles = (PACKED,UNO_COMPONENT);
 	RegistryID = gid_Starregistry_Services_Rdb;
 	Name = LIBNAME(MacOSXSpell);
-	Dir = gid_Dir_Program;
+	Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_avmediaQuickTime
@@ -533,7 +545,7 @@ File gid_File_Lib_avmediaQuickTime
 	Styles = (PACKED,UNO_COMPONENT);
 	RegistryID = gid_Starregistry_Services_Rdb;
 	Name = LIBNAME(avmediaQuickTime);
-	Dir = gid_Dir_Program;
+	Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 #endif
@@ -547,7 +559,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 File gid_File_Lib_Cairo
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
@@ -575,7 +587,7 @@ File gid_File_Lib_Ftransl
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "ftransl.dll";
 End
 
@@ -589,7 +601,7 @@ File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -601,7 +613,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm)
 File gid_File_Lib_Gdiplus
     BIN_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "gdiplus.dll";
 End
 #endif
@@ -610,7 +622,7 @@ File gid_File_Lib_Go
     Name = LIBNAME(go);
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -622,7 +634,7 @@ File gid_File_Lib_I18npool
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX));
   #else
@@ -633,7 +645,7 @@ End
 File gid_File_Lib_I18nregexp
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(libi18nregexp,COMID,UNXSUFFIX));
   #else
@@ -645,7 +657,7 @@ File gid_File_Lib_I18nsearch
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX));
   #else
@@ -669,7 +681,7 @@ File gid_File_Lib_I18nutil
   #else
     Name = STRING(CONCAT3(i18nutil,COMID,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -684,7 +696,7 @@ File gid_File_Lib_Icudata
   #else
     Name = STRING(CONCAT4(icudt,ICU_MAJOR,ICU_MINOR,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -695,7 +707,7 @@ File gid_File_Lib_Icui18n
   #else
     Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -706,7 +718,7 @@ File gid_File_Lib_Icule
   #else
     Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -717,7 +729,7 @@ File gid_File_Lib_Icuuc
   #else
     Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -730,7 +742,7 @@ File gid_File_Lib_J
   #else
     Name = STRING(CONCAT4(j,DLLPOSTFIX,_g,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -745,7 +757,7 @@ File gid_File_Lib_Hsqldb_2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX));
   #else
@@ -760,7 +772,7 @@ End
 File gid_File_Lib_Lngpckinsthlp
     BIN_FILE_BODY;
     Styles = (PACKED, LANGUAGEPACK, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "lngpckinsthlp.dll";
 End
 
@@ -771,7 +783,7 @@ End
 File gid_File_Lib_sn_tools
     BIN_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "sn_tools.dll";
 End
 
@@ -782,7 +794,7 @@ End
 File gid_File_Lib_relnotes
     BIN_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "relnotes.dll";
 End
 
@@ -793,7 +805,7 @@ End
 File gid_File_Lib_Patchmsi
     TXT_FILE_BODY;
     Name = "patchmsi.dll";
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
 End
 
@@ -804,7 +816,7 @@ End
 File gid_File_Lib_Rebasemsi
     TXT_FILE_BODY;
     Name = "rebase.dll";
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
 End
 
@@ -819,7 +831,7 @@ File gid_File_Lib_Localedata_En
   #else
     Name = "localedata_en.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -830,7 +842,7 @@ File gid_File_Lib_Localedata_Es
   #else
     Name = "localedata_es.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -841,7 +853,7 @@ File gid_File_Lib_Localedata_Euro
   #else
     Name = "localedata_euro.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -852,7 +864,7 @@ File gid_File_Lib_Localedata_Others
   #else
     Name = "localedata_others.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -860,7 +872,7 @@ File gid_File_Lib_Mcnttype
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
   #else
@@ -879,7 +891,7 @@ File gid_File_Lib_Mozbootstrap
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
   #else
@@ -959,6 +971,32 @@ End
 #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, PATCH);
+End
+
+#endif
+
+#if defined(MINGW_GXXDLL)
+
+File gid_File_Lib_Mingw_Stdcpp
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Program;
+    Name = MINGW_GXXDLL;
+    Styles = (PACKED, PATCH);
+End
+
+#endif
+
+#endif
+
 #if defined(WNT)
 #if defined(M1400)
 #if defined(PROF_EDITION)
@@ -995,7 +1033,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc)
 File gid_File_Lib_Officebean
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
   #else
@@ -1012,7 +1050,7 @@ File gid_File_Lib_Ole
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "oleautobridge.uno.dll";
 End
 
@@ -1061,7 +1099,7 @@ File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
@@ -1071,7 +1109,7 @@ File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 #ifdef ENABLE_KDE
@@ -1080,6 +1118,16 @@ File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
+#endif
+#ifdef ENABLE_KDE4
+#ifndef MACOSX
+File gid_File_Lib_Vclplug_Kde4
+    Name = LIBNAME(vclplug_kde4);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
     Dir = gid_Dir_Program;
 End
 #endif
@@ -1091,7 +1139,7 @@ File gid_File_Lib_AppleRemote
     Name = LIBNAME(AppleRemote);
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
@@ -1100,7 +1148,7 @@ File gid_File_Lib_Basebmp
     Name = LIBNAME(basebmp);
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 
@@ -1114,7 +1162,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 File gid_File_Lib_Recentfile
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
 End
 
@@ -1125,7 +1173,7 @@ End
 File gid_File_Lib_Reg4allmsdoc
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "reg4allmsdoc.dll";
 End
 
@@ -1136,7 +1184,7 @@ End
 File gid_File_Lib_Qslnkmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "qslnkmsi.dll";
 End
 
@@ -1147,7 +1195,7 @@ End
 File gid_File_Lib_Sdqsmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "sdqsmsi.dll";
 End
 
@@ -1157,7 +1205,7 @@ File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1165,7 +1213,7 @@ File gid_File_Lib_Sax_Uno
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
   #else
@@ -1177,7 +1225,7 @@ File gid_File_Lib_Fastsax_Uno
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX));
   #else
@@ -1205,7 +1253,7 @@ File gid_File_Lib_Scriptframe
     Name = "scriptframe.dll";
   #endif
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,PATCH,UNO_COMPONENT);
 End
 
@@ -1216,7 +1264,7 @@ File gid_File_Lib_Slideshow
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX));
   #else
@@ -1228,7 +1276,7 @@ File gid_File_Lib_Sdbc_2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
   #else
@@ -1244,7 +1292,7 @@ File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1253,21 +1301,21 @@ End
 File gid_File_Lib_OOoFilt
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "ooofilt.dll";
 End
 
 File gid_File_Lib_OOoFiltProxy
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "ooofiltproxy.dll";
 End
 
 File gid_File_Lib_Instooofiltmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "instooofiltmsi.dll";
 End
 
@@ -1279,7 +1327,7 @@ File gid_File_Lib_Smplmail
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "smplmail.uno.dll";
 End
 
@@ -1293,7 +1341,7 @@ File gid_File_Lib_Spa
     Name = LIBNAME(spa);
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 
 #endif
@@ -1303,7 +1351,7 @@ File gid_File_Lib_Spell
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(spell);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 
 STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
@@ -1316,19 +1364,21 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Svtmisc, svtmisc.uno )
 
+STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore)
+STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Msfilter, svxmsfilter)
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
 STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
 STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
 
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
+STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
 
 File gid_File_Lib_Sysdtrans
     TXT_FILE_BODY;
     Styles = (PACKED,PATCH,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef QUARTZ
       Name = STRING(CONCAT3(libdtransaqua,DLLPOSTFIX,UNXSUFFIX));
@@ -1360,7 +1410,7 @@ File gid_File_Lib_Tvhlp1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
   #else
@@ -1372,7 +1422,7 @@ File gid_File_Lib_Ucb1
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
   #else
@@ -1382,7 +1432,7 @@ End
 
 File gid_File_Lib_Ucbhelper
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
   #ifdef UNX
     Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX));
@@ -1398,7 +1448,7 @@ File gid_File_Lib_Ucpchelp1
   #else
     Name = "ucpchelp1.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED, UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1424,7 +1474,7 @@ File gid_File_Lib_Lnth
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(lnth);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_Hyph
@@ -1432,7 +1482,7 @@ File gid_File_Lib_Hyph
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
     Name = LIBNAME(hyphen);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
 End
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl)
@@ -1445,7 +1495,7 @@ File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1456,7 +1506,7 @@ File gid_File_Lib_Vos
   #else
     Name = STRING(CONCAT3(vos3,COMID,.dll));
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -1470,7 +1520,7 @@ File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
 
@@ -1490,7 +1540,7 @@ UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
 File gid_File_Lib_Xslt
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
@@ -1531,7 +1581,7 @@ File gid_File_Lib_XSec_Framework
     #else
         Name = "xsec_fw.dll";
     #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1543,7 +1593,7 @@ File gid_File_Lib_XSec_XmlSec
     #else
         Name = "xsec_xmlsec.dll";
     #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1555,7 +1605,7 @@ File gid_File_Lib_XSec_XMLSecurity
     #else
         Name = "xmlsecurity.dll";
     #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1568,7 +1618,7 @@ File gid_File_Lib_LibXMLSec_xmlseccore
     #else
       Name = "libxmlsec.dll";
     #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 
@@ -1579,7 +1629,7 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
   #else
     Name = "libxmlsec-mscrypto.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
 End
 #endif
@@ -1591,7 +1641,7 @@ File gid_File_Lib_Migrationoo2
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX));
   #else
@@ -1602,7 +1652,7 @@ End
 File gid_File_Lib_Libtextcat
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libtextcat,UNXSUFFIX));
   #else
@@ -1620,7 +1670,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno )
 File gid_File_Lib_Onlinecheck
     BIN_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "onlinecheck.dll";
 End
 #endif
@@ -1629,7 +1679,7 @@ End
 File gid_File_Lib_Openssl
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef WNT  
     Name = "ssleay32.dll";
   #endif
@@ -1640,7 +1690,7 @@ End
 File gid_File_Lib_Crypto
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     
 	#ifdef WNT
 	  Name = "libeay32.dll";
@@ -1650,30 +1700,33 @@ End
 
 File gid_File_Lib_Soffice
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("sofficeapp");
     Styles = (PACKED);
 End
 
 File gid_File_Lib_Unopkgapp
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("unopkgapp");
     Styles = (PACKED);
 End
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
-#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
+#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
+    !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
+        // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
+        // gid_Brand_File_Lib_Msvcr80
 File gid_File_Moz_Msvcp80
     TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
+    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;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("msvcr80");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
@@ -1683,7 +1736,7 @@ End
 File gid_File_Lib_Raptor
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
@@ -1702,7 +1755,7 @@ End
 File gid_File_Lib_Rasqal
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
@@ -1721,7 +1774,7 @@ End
 File gid_File_Lib_Rdf
     TXT_FILE_BODY;
     Styles = (PACKED);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
        Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 3c7d7006bd67..f0994fe25ca8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -359,7 +359,7 @@ End
 
 STD_FILTER_FILE( gid_File_Filter_Eme, eme)
 
-STD_FILTER_FILE_PATCH( gid_File_Filter_Emp, emp)
+STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
 
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)
 
@@ -1169,7 +1169,7 @@ End
 File gid_File_Mozilla_Runtime
     TXT_FILE_BODY;
     Styles = (ARCHIVE);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "mozruntime.zip";
 End
 
@@ -1707,7 +1707,11 @@ File gid_Starregistry_Services_Rdb
     Name = "services.rdb";
     Dir = gid_Dir_Program;
     Styles = (PACKED, STARREGISTRY, PATCH);
+#if defined WNT
+    NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
+#else
     NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
+#endif
     JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
 End
 
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index adb0175252c1..0d85cc529b63 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -79,6 +79,10 @@ SCPDEFS+=-DENABLE_SYSTRAY_GTK
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
 
+.IF "$(ENABLE_KDE4)" != ""
+SCPDEFS+=-DENABLE_KDE4
+.ENDIF
+
 .IF "$(ENABLE_KAB)" != ""
 SCPDEFS+=-DENABLE_KAB
 .ENDIF
@@ -237,6 +241,14 @@ SCPDEFS+=-DENABLE_SVCTAGS
 SCPDEFS+=-DWITH_VC_REDIST
 .ENDIF
 
+.IF "$(MINGW_GCCDLL)"!=""
+SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\"
+.ENDIF
+
+.IF "$(MINGW_GXXDLL)"!=""
+SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\"
+.ENDIF
+
 SCP_PRODUCT_TYPE=osl
 
 ICUVERSION_DEPENDENT_FILES= \
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 0c7b8fe2b6dc..dbc6e2d8c6b2 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -140,7 +140,7 @@ Module gid_Module_Root_Files_4
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root4,
 	gid_File_Filter_Eme,
-	gid_File_Filter_Emp,
+	gid_File_Filter_Sdfilt,
 	gid_File_Filter_Icg,
 	gid_File_Filter_Egi,
 	gid_File_Filter_Epb,
@@ -240,6 +240,7 @@ Module gid_Module_Root_Files_4
 	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,
 	gid_File_Lib_Basctl,
 	gid_File_Lib_CanvasTools,
@@ -386,13 +387,11 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_sn_tools,
     gid_File_Lib_relnotes,
     GID_FILE_LIB_WPD,
-        gid_File_Lib_Mingwm10,
+    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_Msvcr80,
-	gid_File_Lib_Msvcp80,
-	gid_File_Lib_Msvcm80,
-	gid_File_Msvcm80crt_Manifest,
 	gid_File_Lib_Ole,
 	gid_File_Lib_Patchmsi,
 	gid_File_Lib_Reg4allmsdoc,
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 190fd50cf166..f88737451a5f 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -107,6 +107,18 @@ ScpAction SCP_COPY_MINGWM10
     Copy = "mingwm10.dll";
     Name = "mingwm10.dll";
 End
+#if defined(MINGW_GCCDLL)
+ScpAction SCP_COPY_MINGW_GCCS
+    Copy = MINGW_GCCDLL;
+    Name = MINGW_GCCDLL;
+End
+#endif
+#if defined(MINGW_GXXDLL)
+ScpAction SCP_COPY_MINGW_STDCPP
+    Copy = MINGW_GXXDLL;
+    Name = MINGW_GXXDLL;
+End
+#endif
 #endif
 
 ScpAction scp_Copy_Xpd_Javaloader
@@ -358,8 +370,10 @@ End
 
 ScpAction scp_Copy_Ds_Store
     Copy = "DS_Store";
+    LangPackCopy = "DS_Store_Langpack";
+    PatchCopy = "DS_Store_Patch";
     Name = ".DS_Store";
     UnixRights = 444;
-    Styles = ();
+    Styles = (FORCELANGUAGEPACK);
 End
 #endif
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 2740fe563b69..3824fe3a0841 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -35,40 +35,62 @@
 
 Shortcut gid_Shortcut_Lib_Icudata
     FileID = gid_File_Lib_Icudata;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icui18n
     FileID = gid_File_Lib_Icui18n;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icule
     FileID = gid_File_Lib_Icule;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icuuc
     FileID = gid_File_Lib_Icuuc;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 #endif
+
+Shortcut gid_Shortcut_Lib_Graphite_0
+    FileID = gid_File_Lib_Graphite;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(libgraphite,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE);
+End
+
+Shortcut gid_Shortcut_Lib_Graphite_1
+    FileID = gid_File_Lib_Graphite;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3));
+    Styles = (NETWORK,RELATIVE);
+End
+
+Shortcut gid_Shortcut_Lib_Graphite_2
+    FileID = gid_File_Lib_Graphite;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3.0));
+    Styles = (NETWORK,RELATIVE);
+End
+
 #endif
 
 #ifdef MACOSX
 
 Shortcut gid_Shortcut_Lib_Hsqldb_2
     FileID = gid_File_Lib_Hsqldb_2;
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "libhsqldb.jnilib";
     Styles = (NETWORK, RELATIVE);
 End
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index bc9629b6ee0b..1c260e2d2508 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -410,6 +410,13 @@ File gid_File_Dl_AffineUnoUno
     // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
 End
 
+File gid_File_Dl_LogUnoUno
+    TXT_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
 File gid_File_Dl_Cli_Uno
     TXT_FILE_BODY;
@@ -832,7 +839,7 @@ File gid_File_Dl_Libxml2
 #else
     Name = SCP2_URE_DL_VER("xml2", "2");
 #endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
 End
 #endif
@@ -910,6 +917,32 @@ File gid_File_Lib_Mingwm10_Ure
 End
 #endif
 
+#if defined(WNT) && defined( _gcc3 )
+
+#if defined(MINGW_GCCDLL)
+
+File gid_File_Lib_Mingw_GccS_Ure
+    TXT_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = MINGW_GCCDLL;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+End
+
+#endif
+
+#if defined(MINGW_GXXDLL)
+
+File gid_File_Lib_Mingw_Stdcpp_Ure
+    TXT_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = MINGW_GXXDLL;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+End
+
+#endif
+
+#endif
+
 #ifdef WNT
 #if defined(M1310)
 File gid_File_Dl_Msvcr71
@@ -1121,6 +1154,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_UrpUno,
             gid_File_Dl_UnsafeUnoUno,
             gid_File_Dl_AffineUnoUno,
+            gid_File_Dl_LogUnoUno,
             gid_File_Dl_Jpipe,
             gid_File_Dl_Juh,
             gid_File_Dl_Juhx,
@@ -1146,6 +1180,8 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Stlport,
             gid_File_Dl_GccS,
             gid_File_Dl_Stdcpp,
+            gid_File_Lib_Mingw_GccS_Ure,
+            gid_File_Lib_Mingw_Stdcpp_Ure,
             gid_File_Lib_Mingwm10_Ure,
             gid_File_Dl_Msvcr71,
             gid_File_Dl_Msvcp71,
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 4924c7ca799d..6042c062d21b 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -50,6 +50,7 @@ File gid_File_Lib_Pythonloader
     Name = "pythonloader.uno.dll";
   #endif
     RegistryID = gid_Starregistry_Services_Rdb;
+    NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
     Styles = (PACKED,UNO_COMPONENT);
 End
 
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index f469a8178b5a..b8dd4e5faed4 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -236,3 +236,13 @@ Unixlink gid_Unixlink_Cppuhelper_Link_Sdk
     Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 End
 #endif
+
+#if (!defined(WNT) && !defined( MACOSX) )
+Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk
+    BIN_FILE_BODY;
+    Styles = ();
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
+    Dir = gid_Dir_Lib_Sdk;
+    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+End
+#endif
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 23ed3b7b2365..e7b3584b32db 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -77,6 +77,6 @@ End
 File gid_File_Lib_Shlxtmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Name = "shlxtmsi.dll";
 End
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 000307175e8c..5c76da172576 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -39,7 +39,7 @@ File gid_File_Lib_Hwpreader
   #else
     Name = "hwp.dll";
   #endif
-    Dir = gid_Dir_Program;
+    Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED, UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
 End
author	sb <sb@openoffice.org>	2009-09-04 12:24:40 +0200
committer	sb <sb@openoffice.org>	2009-09-04 12:24:40 +0200
commit	86f98daab3f81482155a444544662c51490b0b87 (patch)
tree	2a63c2b8a302c70859719e7ca5ed89be684252d9 /scp2/source
parent	fb6954af7263c763bf69a5989dd95646ff57a6a7 (diff)