From ce4b67da18ab465986a5d0c0ee089813bf6fb52b Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 14 May 2008 12:11:57 +0000
Subject: [PATCH] INTEGRATION: CWS native149 (1.25.8); FILE MERGED 2008/04/28
 14:03:56 is 1.25.8.2: #i88801# only one application module left 2008/04/24
 14:44:18 is 1.25.8.1: #i87006# writerfilter library into writer package

---
 scp2/source/writer/module_writer.scp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 593015348ad8..f4fd8afd1b3b 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: module_writer.scp,v $
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -44,9 +44,7 @@ Module gid_Module_Prg_Wrt_Bin
     Sortkey = "100";
     Minimal = YES;
     Default = YES;
-  #ifdef UNX
     Styles = (HIDDEN_ROOT);
-  #endif
     Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
     gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
     gid_File_Lib_Jsreader, gid_File_Lib_Wps2star,
@@ -54,6 +52,7 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Lib_Swd,
     gid_File_Lib_Swui,
     gid_File_Lib_Wpft,
+    gid_File_Lib_Writerfilter,
     gid_File_Lib_T602Filter,
     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
     gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
@@ -95,11 +94,7 @@ Module gid_Module_Brand_Prg_Wrt
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Wrt";
     Description = "gid_Module_Brand_Prg_Wrt";
-  #ifdef UNX
     ParentID = gid_Module_Prg_Wrt;
-  #else
-    ParentID = gid_Module_Prg_Wrt_Bin;
-  #endif
     Sortkey = "100";
     Minimal = YES;
     Default = YES;