[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 20 commits - configure.cmd configure.in filter/source postprocess/packcomponents postprocess/packregistry postprocess/prj postprocess/rebase scp2/prj scp2/source scp2/util set_soenv.in solenv/inc splitbuild/binfilter.lst vcl/inc

Pavel Janík paveljanik at apache.org
Thu Apr 4 16:34:52 PDT 2013


 configure.cmd                                     |    2 
 configure.in                                      |   17 
 filter/source/config/fragments/fcfg_calc_bf.mk    |   79 -
 filter/source/config/fragments/fcfg_chart_bf.mk   |   67 -
 filter/source/config/fragments/fcfg_draw_bf.mk    |   71 -
 filter/source/config/fragments/fcfg_global_bf.mk  |   75 -
 filter/source/config/fragments/fcfg_impress_bf.mk |   86 --
 filter/source/config/fragments/fcfg_math_bf.mk    |   70 -
 filter/source/config/fragments/fcfg_web_bf.mk     |   74 -
 filter/source/config/fragments/fcfg_writer_bf.mk  |   83 -
 filter/source/config/fragments/makefile.mk        |   36 
 filter/source/config/fragments/packagedef.mk      |   12 
 postprocess/packcomponents/makefile.mk            |    6 
 postprocess/packregistry/makefile.mk              |   22 
 postprocess/prj/build.lst                         |    2 
 postprocess/rebase/coffbase.txt                   |   17 
 scp2/prj/build.lst                                |    3 
 scp2/source/binfilter/file_binfilter.scp          |   79 -
 scp2/source/binfilter/makefile.mk                 |   48 -
 scp2/source/binfilter/module_binfilter.scp        |   73 -
 scp2/source/binfilter/module_binfilter.ulf        |   28 
 scp2/source/binfilter/registryitem_binfilter.scp  |  927 ----------------------
 scp2/source/binfilter/registryitem_binfilter.ulf  |   49 -
 scp2/source/templates/makefile.mk                 |    2 
 scp2/util/makefile.mk                             |   14 
 set_soenv.in                                      |    1 
 solenv/inc/libs.mk                                |   36 
 solenv/inc/target.mk                              |    4 
 splitbuild/binfilter.lst                          |    1 
 vcl/inc/vcl/salbtype.hxx                          |    2 
 30 files changed, 4 insertions(+), 1982 deletions(-)

New commits:
commit d6b69ed60c2312ec414c2a03ee3998a502c169e1
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 14:32:51 2013 +0000

    Remove binfilter.

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 4654bc1..154bb28 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -476,24 +476,6 @@ REDLANDLIB = librdf.lib
 
 JVMFWKLIB = ijvmfwk.lib
 
-# #110743#
-# For BinFilters, some libs were added.
-#
-
-BFSVXLIB=bf_svx.lib
-BFSCHLIB=bf_ysch.lib
-BFSMLIB=bf_ysm.lib
-BFSCLIB=bf_sclib.lib
-BFSDLIB=bf_sdlib.lib
-BFSWLIB=bf_swlib.lib
-BFOFALIB=bf_ofa.lib
-BFXMLOFFLIB=ibf_xo.lib
-BFGOODIESLIB=bf_go.lib
-BFBASICLIB=bf_sb.lib
-BFSO3LIB=bf_so.lib
-LEGACYSMGRLIB=ilegacy_binfilters.lib
-BFSVTOOLLIB=bf_svt.lib
-
 SABLOT3RDLIB= $(LIBPRE) sablot.lib
 APP3RDLIB= $(LIBPRE) app.lib
 SAMPLE3RDLIB= $(LIBPRE) sample.lib
commit 181abcc0dc3b60757083cac74e1fea9256db54c4
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 14:30:30 2013 +0000

    Remove binfilter.

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 2a391eb..4654bc1 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -296,24 +296,6 @@ REDLANDLIB=-lrdf
 .ENDIF
 
 
-# #110743#
-# For BinFilters, some libs were added.
-#
-
-BFSVXLIB=-lbf_svx$(DLLPOSTFIX)
-BFSCHLIB=-lbf_ysch
-BFSMLIB=-lbf_ysm
-BFSCLIB=-lbf_sclib
-BFSDLIB=-lbf_sdlib
-BFSWLIB=-lbf_swlib
-BFOFALIB=-lbf_ofa$(DLLPOSTFIX)
-LEGACYSMGRLIB=-llegacy_binfilters$(DLLPOSTFIX)
-BFXMLOFFLIB=-lbf_xo$(DLLPOSTFIX)
-BFGOODIESLIB=-lbf_go$(DLLPOSTFIX)
-BFBASICLIB=-lbf_sb$(DLLPOSTFIX)
-BFSO3LIB=-lbf_so$(DLLPOSTFIX)
-BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX)
-
 #
 # USED_%NAME%_LIBS
 # Variablen, in denen in gueltiger Reihenfolge ALLE Libraries,
commit f88d13c814a11e9009ca12a1d24a86f29a6ddb0f
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 14:26:50 2013 +0000

    Remove binfilter.

diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index fa1772f..55292b1 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -141,7 +141,6 @@ juhx.dll         0x0000000062380000 0x00020000
 jvmaccess3msc.dll 0x0000000062360000 0x00010000
 jvmfwk3.dll      0x0000000062330000 0x00020000
 ldapbe2.uno.dll  0x0000000062300000 0x00020000
-legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000
 libcurl.dll      0x0000000062290000 0x00030000
 libeay32.dll     0x00000000620d0000 0x00110000
 libexslt.dll     0x00000000620a0000 0x00020000
commit a6e45ddcec198d29da4f965640cdc5488af0e23d
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 14:21:09 2013 +0000

    Remove binfilter.

diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 6863aed..3ef810b 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -123,9 +123,7 @@ public:
     inline              BitmapColor( const BitmapColor& rBitmapColor );
     inline              BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue );
     inline              BitmapColor( const Color& rColor );
-#ifndef BINFILTER_COMPAT
     explicit
-#endif // BINFILTER_COMPAT
     inline              BitmapColor( sal_uInt8 cIndex );
 
     inline              ~BitmapColor() {};
commit 3af391b6abf3e45639c74cfa7de94abc6c2796ec
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 14:20:14 2013 +0000

    Remove binfilter.

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 63dfc25..030877a 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -31,10 +31,6 @@ MKFILENAME:=TARGET.MK
 target_empty=warn_target_empty
 .ENDIF
 
-.IF "$(PRJNAME)" == "binfilter"
-CDEFS+=-DBINFILTER_COMPAT
-.ENDIF
-
 .IF "$(STL_OS2_BUILDING)" != ""
 CDEFS+=-DSTL_OS2_BUILDING
 .ENDIF
commit 9f1224ec200922402f09eaebe382362c4051e2de
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 14:08:22 2013 +0000

    Remove binfilter.

diff --git a/configure.cmd b/configure.cmd
index 19f1dd8..65d422f 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -27,5 +27,5 @@ SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
 set config_shell=sh
 set perl_sh_dir=/usr/bin
 
-sh ./configure --prefix=/@unixroot/usr --disable-binfilter --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit --with-system-apr --with-system-apr-util --with-system-serf --with-system-coinmp | tee configure.log
+sh ./configure --prefix=/@unixroot/usr --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit --with-system-apr --with-system-apr-util --with-system-serf --with-system-coinmp | tee configure.log
 endlocal
commit ece96f2105f95aa08490266a78ab012c6a392c8e
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:49:58 2013 +0000

    Remove binfilter.

diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
deleted file mode 100644
index f1366fa..0000000
--- a/scp2/source/binfilter/file_binfilter.scp
+++ /dev/null
@@ -1,79 +0,0 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-
-#include "macros.inc"
-
-File gid_File_Share_Registry_Binfilter_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Registry;
-    Name = "binfilter.xcd";
-End
-
-File gid_Starregistry_Legacy_Binfilters_Rdb
-    TXT_FILE_BODY;
-    Name = "legacy_binfilters.rdb";
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-End
-
-
-
-STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go)
-STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch)
-STD_LIB_FILE( gid_File_Lib_Bf_Xo, bf_xo)
-STD_LIB_FILE( gid_File_Lib_Bf_Svx, bf_svx)
-STD_LIB_FILE( gid_File_Lib_Bf_Svt, bf_svt)
-STD_LIB_FILE( gid_File_Lib_Bf_Frm, bf_frm)
-STD_LIB_FILE( gid_File_Lib_Bf_Ofa, bf_ofa)
-STD_LIB_FILE( gid_File_Lib_Bf_Sb, bf_sb)
-STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc)
-STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd)
-STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
-STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
-#ifdef OS2
-STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapp)
-STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_b)
-#else
-STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
-STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
-#endif
-
-#ifdef OS2
-STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migra)
-#else
-STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
-#endif
-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 )
diff --git a/scp2/source/binfilter/makefile.mk b/scp2/source/binfilter/makefile.mk
deleted file mode 100644
index 3d8287a..0000000
--- a/scp2/source/binfilter/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#**************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJPCH=
-
-PRJNAME=scp2
-TARGET=binfilter
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-SCP_PRODUCT_TYPE=osl
-
-PARFILES= \
-        module_binfilter.par            \
-        file_binfilter.par              \
-        registryitem_binfilter.par
-
-ULFFILES= \
-        module_binfilter.ulf            \
-        registryitem_binfilter.ulf
-
-# --- File ---------------------------------------------------------
-.INCLUDE :  target.mk
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
deleted file mode 100644
index 866a78a..0000000
--- a/scp2/source/binfilter/module_binfilter.scp
+++ /dev/null
@@ -1,73 +0,0 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Binfilter
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_BINFILTER );
-    Sortkey = "700";
-    InstallOrder = "1100";
-    ParentID = gid_Module_Optional;
-    Default = NO;
-    Files = (gid_File_Share_Registry_Binfilter_Xcd,
-    gid_Starregistry_Legacy_Binfilters_Rdb,
-    gid_File_Lib_Bf_Go,
-    gid_File_Lib_Bf_Sch,
-    gid_File_Lib_Bf_Lng,
-    gid_File_Lib_Bf_Xo,
-    gid_File_Lib_Bf_Svx,
-    gid_File_Lib_Bf_Svt,
-    gid_File_Lib_Bf_Frm,
-    gid_File_Lib_Bf_Ofa,
-    gid_File_Lib_Bf_Sb,
-    gid_File_Lib_Bf_Sc,
-    gid_File_Lib_Bf_Sd,
-    gid_File_Lib_Bf_Sm,
-    gid_File_Lib_Bf_So,
-    gid_File_Lib_Bf_Sw,
-    gid_File_Lib_Bf_Wrapper,
-    gid_File_Lib_Legacy_Binfilters,
-    gid_File_Lib_Bf_Migratefilter,
-    gid_File_Lib_Bindet);
-End
-
-Module gid_Module_Langpack_Binfilter_Template
-    ParentID = gid_Module_Optional_Binfilter;
-    Name = "gid_Module_Langpack_Binfilter_Template";
-    Description = "gid_Module_Langpack_Binfilter_Template";
-    Default = YES;
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Res_Bf_Sch,
-             gid_File_Res_Bf_Svx,
-             gid_File_Res_Bf_Svt,
-             gid_File_Res_Bf_Frm,
-             gid_File_Res_Bf_Ofa,
-             gid_File_Res_Bf_Sc,
-             gid_File_Res_Bf_Sd,
-             gid_File_Res_Bf_Sm,
-             gid_File_Res_Bf_Sw,
-             gid_File_Res_Bf_Sfx);
-End
-
-#include "alllangmodules_binfilter.inc"
diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf
deleted file mode 100644
index 462d31d..0000000
--- a/scp2/source/binfilter/module_binfilter.ulf
+++ /dev/null
@@ -1,28 +0,0 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-[STR_NAME_MODULE_OPTIONAL_BINFILTER]
-en-US = "Legacy Filters"
-
-[STR_DESC_MODULE_OPTIONAL_BINFILTER]
-en-US = "Legacy filters, e.g. StarOffice 5.2 binary file formats."
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
deleted file mode 100644
index dcf154c..0000000
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ /dev/null
@@ -1,927 +0,0 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-#include "macros.inc"
-
-RegistryItem gid_Regitem_Sdw_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdw";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.writer";
-End
-
-RegistryItem gid_Regitem_Sdw_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer";
-    Name = "Extension";
-    Value = ".sdw";
-End
-
-RegistryItem gid_Regitem_Sdw_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starwriter";
-    Name = "Extension";
-    Value = ".sdw";
-End
-
-RegistryItem gid_Regitem_Sgl_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sgl";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.writer-global";
-End
-
-RegistryItem gid_Regitem_Sgl_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer-global";
-    Name = "Extension";
-    Value = ".sgl";
-End
-
-RegistryItem gid_Regitem__Sdw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdw";
-    Value = "soffice.StarWriterDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdw";
-    Value = "soffice.StarWriterDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sgl
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sgl";
-    Value = "soffice.StarWriterGlobalDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Sgl
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sgl";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarWriterGlobalDocument.5";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO52_TEXT_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,27";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO51_MASTERDOC_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,35";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// calc
-
-RegistryItem gid_Regitem_Sdc_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdc";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.calc";
-End
-
-RegistryItem gid_Regitem_Sdc_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.calc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Sdc_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starcalc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5";
-    REG_VALUE_LNG(SO51_SPREADSHEET_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,29";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sdc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-    Styles = ();
-End
-
-// impress
-RegistryItem gid_Regitem_Sdd_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdd";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.impress";
-End
-
-RegistryItem gid_Regitem_Sdd_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress";
-    Name = "Extension";
-    Value = ".sdd";
-End
-
-RegistryItem gid_Regitem_Sdd_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starimpress";
-    Name = "Extension";
-    Value = ".sdd";
-End
-
-RegistryItem gid_Regitem_Sdp_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdp";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.impress-packed";
-End
-
-RegistryItem gid_Regitem_Sdp_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress-packed";
-    Name = "Extension";
-    Value = ".sdp";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5";
-    REG_VALUE_LNG(SO51_PRESENT_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,33";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sdd
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdd";
-    Value = "soffice.StarImpressDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdd
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdd";
-    Value = "soffice.StarImpressDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Sdp
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdp";
-    Value = "soffice.StarStorageDocument.5";
-End
-
-// .sdp no longer supported
-// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdp
-//     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-//     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-//     ModuleID = gid_Module_Optional_Binfilter;
-//     Name = ".sdp";
-//     Value = "soffice.StarStorageDocument.5";
-//     Styles = ();
-// End
-
-// draw
-
-RegistryItem gid_Regitem_Sda_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sda";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.draw";
-End
-
-RegistryItem gid_Regitem_Sda_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.draw";
-    Name = "Extension";
-    Value = ".sda";
-End
-
-RegistryItem gid_Regitem_Sda_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-stardraw";
-    Name = "Extension";
-    Value = ".sda";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5";
-    REG_VALUE_LNG(SO51_DRAWING_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,31";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sda
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sda";
-    Value = "soffice.StarDrawDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sda
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sda";
-    Value = "soffice.StarDrawDocument.5";
-    Styles = ();
-End
-
-// chart
-RegistryItem gid_Regitem_Sds_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sds";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.chart";
-End
-
-RegistryItem gid_Regitem_Sds_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.chart";
-    Name = "Extension";
-    Value = ".sds";
-End
-
-RegistryItem gid_Regitem_Sds_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starchart";
-    Name = "Extension";
-    Value = ".sds";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO52_CHART_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,36";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument\CurVer";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarChartDocument.5";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO50_TEMPLATE_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.exe,15";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sds
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sds";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarChartDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sds
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sds";
-    Value = "soffice.StarChartDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Vor
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarOfficeTemplate.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_vor
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".vor";
-    Value = "soffice.StarOfficeTemplate.5";
-    Styles = ();
-End
-
-// StarMath
-RegistryItem gid_Regitem_Smf_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".smf";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.math";
-End
-
-RegistryItem gid_Regitem_Smf_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.math";
-    Name = "Extension";
-    Value = ".smf";
-End
-
-RegistryItem gid_Regitem_Smf_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starmath";
-    Name = "Extension";
-    Value = ".smf";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5";
-    REG_VALUE_LNG(SO51_FORMULA_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,38";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Smf
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".smf";
-    Value = "soffice.StarMathDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_smf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".smf";
-    Value = "soffice.StarMathDocument.5";
-    Styles = ();
-End
-
-
-// .SDW
-RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdw\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterDocument.5";
-    Value = " ";
-End
-
-// .SGL
-RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sgl\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterGlobalDocument.5";
-    Value = " ";
-End
-
-// .SDC
-RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdc\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarCalcDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarCalcDocument.5";
-    Value = " ";
-End
-
-// .SDD
-RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdd\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDP
-RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdp\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDA
-RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sda\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDA
-RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sda\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .SDD
-RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdd\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .SMF
-RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".smf\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarMathDocument.5";
-    Value = " ";
-End
-
-
diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
deleted file mode 100644
index e7b79239..0000000
--- a/scp2/source/binfilter/registryitem_binfilter.ulf
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
-[STR_REG_VAL_SO52_TEXT_OOO]
-en-US = "StarOffice 5.0 Text Document"
-
-[STR_REG_VAL_SO51_MASTERDOC_OOO]
-en-US = "StarOffice 5.0 Master Document"
-
-[STR_REG_VAL_SO51_SPREADSHEET_OOO]
-en-US = "StarOffice 5.0 Spreadsheet"
-
-[STR_REG_VAL_SO51_PRESENT_OOO]
-en-US = "StarOffice 5.0 Presentation"
-
-[STR_REG_VAL_SO51_DRAWING_OOO]
-en-US = "StarOffice 5.0 Drawing"
-
-[STR_REG_VAL_SO51_FORMULA_OOO]
-en-US = "StarOffice 5.0 Formula"
-
-[STR_REG_VAL_SO52_CHART_OOO]
-en-US = "StarOffice 5.0 Chart"
-
-[STR_REG_VAL_SO50_TEMPLATE_OOO]
-en-US = "StarOffice 5.0 Template"
commit 6170b05ed72376176ef400c15efb12eaa1a2a2c6
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:45:59 2013 +0000

    Remove binfilter.

diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 6738f5c..fd64c86 100644
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -36,7 +36,7 @@ TARGET=templates
 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
+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
 
 .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
 .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
commit adddb4772f836e1c81e3e6d8bab5e607516da5dc
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:44:06 2013 +0000

    Remove binfilter.

diff --git a/filter/source/config/fragments/fcfg_calc_bf.mk b/filter/source/config/fragments/fcfg_calc_bf.mk
deleted file mode 100644
index aded0be..0000000
--- a/filter/source/config/fragments/fcfg_calc_bf.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=calc_bf
-
-# -----------------------------------------------
-# count = 7
-T4_CALC_BF = \
-    calc_StarCalc_10 \
-    calc_StarCalc_30 \
-    calc_StarCalc_30_VorlageTemplate \
-    calc_StarCalc_40 \
-    calc_StarCalc_40_VorlageTemplate \
-    calc_StarCalc_50 \
-    calc_StarCalc_50_VorlageTemplate
-
-# -----------------------------------------------
-# count = 7
-F4_CALC_BF = \
-    StarCalc_1_0 \
-    StarCalc_3_0 \
-    StarCalc_3_0_Vorlage_Template \
-    StarCalc_4_0 \
-    StarCalc_4_0_Vorlage_Template \
-    StarCalc_5_0 \
-    StarCalc_5_0_Vorlage_Template
-
-# -----------------------------------------------
-# count = 3
-F4_UI_CALC_BF = \
-    StarCalc_3_0_Vorlage_Template_ui \
-    StarCalc_4_0_Vorlage_Template_ui \
-    StarCalc_5_0_Vorlage_Template_ui
-    
-# -----------------------------------------------
-# count = 0
-L4_CALC_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_CALC_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_calc_bf           = $(foreach,i,$(T4_CALC_BF)    types$/$i.xcu                     )
-FILTERS_4fcfg_calc_bf         = $(foreach,i,$(F4_CALC_BF)    filters$/$i.xcu                   )
-UI_FILTERS_4fcfg_calc_bf      = $(foreach,i,$(F4_UI_CALC_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu   )
-FRAMELOADERS_4fcfg_calc_bf    = $(foreach,i,$(L4_CALC_BF)    frameloaders$/$i.xcu              )
-CONTENTHANDLERS_4fcfg_calc_bf = $(foreach,i,$(C4_CALC_BF)    contenthandlers$/$i.xcu           )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_calc_bf = \
-    $(TYPES_4fcfg_calc) \
-    $(FILTERS_4fcfg_calc) \
-    $(UI_FILTERS_4fcfg_calc) \
-    $(FRAMELOADERS_4fcfg_calc) \
-    $(CONTENTHANDLERS_4fcfg_calc)
-    
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_calc_bf)
-
-ALL_PACKAGES+=calc_bf
-
diff --git a/filter/source/config/fragments/fcfg_chart_bf.mk b/filter/source/config/fragments/fcfg_chart_bf.mk
deleted file mode 100644
index b348932..0000000
--- a/filter/source/config/fragments/fcfg_chart_bf.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=chart_bf
-
-# -----------------------------------------------
-# count = 3
-T4_CHART_BF = \
-    chart_StarChart_30 \
-    chart_StarChart_40 \
-    chart_StarChart_50
-
-# -----------------------------------------------
-# count = 3
-F4_CHART_BF = \
-    StarChart_3_0 \
-    StarChart_4_0 \
-    StarChart_5_0
-
-# -----------------------------------------------
-# count = 0
-F4_UI_CHART_BF =
-
-# -----------------------------------------------
-# count = 0
-L4_CHART_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_CHART_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_chart_bf           = $(foreach,i,$(T4_CHART_BF)    types$/$i.xcu                   )
-FILTERS_4fcfg_chart_bf         = $(foreach,i,$(F4_CHART_BF)    filters$/$i.xcu                 )
-UI_FILTERS_4fcfg_chart_bf      = $(foreach,i,$(F4_UI_CHART_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu )
-FRAMELOADERS_4fcfg_chart_bf    = $(foreach,i,$(L4_CHART_BF)    frameloaders$/$i.xcu            )
-CONTENTHANDLERS_4fcfg_chart_bf = $(foreach,i,$(C4_CHART_BF)    contenthandlers$/$i.xcu         )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_chart_bf = \
-    $(TYPES_4fcfg_chart_bf) \
-    $(FILTERS_4fcfg_chart_bf) \
-    $(UI_FILTERS_4fcfg_chart_bf) \
-    $(FRAMELOADERS_4fcfg_chart_bf) \
-    $(CONTENTHANDLERS_4fcfg_chart_bf)
-    
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_chart_bf)
-
-ALL_PACKAGES+=chart_bf
diff --git a/filter/source/config/fragments/fcfg_draw_bf.mk b/filter/source/config/fragments/fcfg_draw_bf.mk
deleted file mode 100644
index 251045b..0000000
--- a/filter/source/config/fragments/fcfg_draw_bf.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=draw_bf
-
-# -----------------------------------------------
-# count = 4
-T4_DRAW_BF = \
-    draw_StarDraw_30 \
-    draw_StarDraw_30_Vorlage \
-    draw_StarDraw_50 \
-    draw_StarDraw_50_Vorlage
-
-# -----------------------------------------------
-# count = 4
-F4_DRAW_BF = \
-    StarDraw_3_0 \
-    StarDraw_3_0_Vorlage \
-    StarDraw_5_0 \
-    StarDraw_5_0_Vorlage
-
-# -----------------------------------------------
-# count = 2
-F4_UI_DRAW_BF = \
-    StarDraw_3_0_Vorlage_ui \
-    StarDraw_5_0_Vorlage_ui
-    
-# -----------------------------------------------
-# count = 0
-L4_DRAW_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_DRAW_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_draw_bf           = $(foreach,i,$(T4_DRAW_BF)    types$/$i.xcu                    )
-FILTERS_4fcfg_draw_bf         = $(foreach,i,$(F4_DRAW_BF)    filters$/$i.xcu                  )
-UI_FILTERS_4fcfg_draw_bf      = $(foreach,i,$(F4_UI_DRAW_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu  )
-FRAMELOADERS_4fcfg_draw_bf    = $(foreach,i,$(L4_DRAW_BF)    frameloaders$/$i.xcu             )
-CONTENTHANDLERS_4fcfg_draw_bf = $(foreach,i,$(C4_DRAW_BF)    contenthandlers$/$i.xcu          )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_draw_bf = \
-    $(TYPES_4fcfg_draw_bf) \
-    $(FILTERS_4fcfg_draw_bf) \
-    $(UI_FILTERS_4fcfg_draw_bf) \
-    $(FRAMELOADERS_4fcfg_draw_bf) \
-    $(CONTENTHANDLERS_4fcfg_draw_bf)
-    
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_draw_bf)
-
-ALL_PACKAGES+=draw_bf
diff --git a/filter/source/config/fragments/fcfg_global_bf.mk b/filter/source/config/fragments/fcfg_global_bf.mk
deleted file mode 100644
index c5d7eec..0000000
--- a/filter/source/config/fragments/fcfg_global_bf.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=global_bf
-
-
-# -----------------------------------------------
-# count = 5
-T4_GLOBAL_BF = \
-    writer_StarWriter_30 \
-    writer_StarWriter_40 \
-    writer_globaldocument_StarWriter_40GlobalDocument \
-    writer_StarWriter_50 \
-    writer_globaldocument_StarWriter_50GlobalDocument
-
-# -----------------------------------------------
-# count = 5
-F4_GLOBAL_BF = \
-    StarWriter_3_0__StarWriter_GlobalDocument_ \
-    StarWriter_4_0__StarWriter_GlobalDocument_ \
-    StarWriter_4_0_GlobalDocument \
-    StarWriter_5_0__StarWriter_GlobalDocument_ \
-    StarWriter_5_0_GlobalDocument
-
-# -----------------------------------------------
-# count = 2
-F4_UI_GLOBAL_BF = \
-    StarWriter_4_0_GlobalDocument_ui \
-    StarWriter_5_0_GlobalDocument_ui
-
-# -----------------------------------------------
-# count = 0
-L4_GLOBAL_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_GLOBAL_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_global_bf           = $(foreach,i,$(T4_GLOBAL_BF)    types$/$i.xcu                     )
-FILTERS_4fcfg_global_bf         = $(foreach,i,$(F4_GLOBAL_BF)    filters$/$i.xcu                   )
-UI_FILTERS_4fcfg_global_bf      = $(foreach,i,$(F4_UI_GLOBAL_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu   )
-FRAMELOADERS_4fcfg_global_bf    = $(foreach,i,$(L4_GLOBAL_BF)    frameloaders$/$i.xcu              )
-CONTENTHANDLERS_4fcfg_global_bf = $(foreach,i,$(C4_GLOBAL_BF)    contenthandlers$/$i.xcu           )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_global_bf = \
-    $(TYPES_4fcfg_global_bf) \
-    $(FILTERS_4fcfg_global_bf) \
-    $(UI_FILTERS_4fcfg_global_bf) \
-    $(FRAMELOADERS_4fcfg_global_bf) \
-    $(CONTENTHANDLERS_4fcfg_global_bf)
-    
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_global_bf)
-    
-ALL_PACKAGES+=global_bf
-
diff --git a/filter/source/config/fragments/fcfg_impress_bf.mk b/filter/source/config/fragments/fcfg_impress_bf.mk
deleted file mode 100644
index c5091a4..0000000
--- a/filter/source/config/fragments/fcfg_impress_bf.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=impress_bf
-
-
-# -----------------------------------------------
-# count = 9
-T4_IMPRESS_BF = \
-    draw_StarDraw_30 \
-    draw_StarDraw_30_Vorlage \
-    draw_StarDraw_50 \
-    draw_StarDraw_50_Vorlage \
-    impress_StarImpress_40 \
-    impress_StarImpress_40_Vorlage \
-    impress_StarImpress_50 \
-    impress_StarImpress_50_Vorlage \
-    impress_StarImpress_50_packed
-
-# -----------------------------------------------
-# count = 9
-F4_IMPRESS_BF = \
-    StarDraw_3_0_Vorlage__StarImpress_ \
-    StarDraw_3_0__StarImpress_ \
-    StarDraw_5_0_Vorlage__StarImpress_ \
-    StarDraw_5_0__StarImpress_ \
-    StarImpress_4_0 \
-    StarImpress_4_0_Vorlage \
-    StarImpress_5_0 \
-    StarImpress_5_0_Vorlage \
-    StarImpress_5_0__packed_
-
-# -----------------------------------------------
-# count = 5
-F4_UI_IMPRESS_BF = \
-    StarDraw_3_0_Vorlage__StarImpress__ui \
-    StarDraw_5_0_Vorlage__StarImpress__ui \
-    StarImpress_4_0_Vorlage_ui \
-    StarImpress_5_0_Vorlage_ui \
-    StarImpress_5_0__packed__ui \
-
-# -----------------------------------------------
-# count = 0
-L4_IMPRESS_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_IMPRESS_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_impress_bf           = $(foreach,i,$(T4_IMPRESS_BF)    types$/$i.xcu                   )
-FILTERS_4fcfg_impress_bf         = $(foreach,i,$(F4_IMPRESS_BF)    filters$/$i.xcu                 )
-UI_FILTERS_4fcfg_impress_bf      = $(foreach,i,$(F4_UI_IMPRESS_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu )
-FRAMELOADERS_4fcfg_impress_bf    = $(foreach,i,$(L4_IMPRESS_BF)    frameloaders$/$i.xcu            )
-CONTENTHANDLERS_4fcfg_impress_bf = $(foreach,i,$(C4_IMPRESS_BF)    contenthandlers$/$i.xcu         )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_impress_bf = \
-    $(TYPES_4fcfg_impress_bf) \
-    $(FILTERS_4fcfg_impress_bf) \
-    $(UI_FILTERS_4fcfg_impress_bf) \
-    $(FRAMELOADERS_4fcfg_impress_bf) \
-    $(CONTENTHANDLERS_4fcfg_impress_bf)
-
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_impress_bf)
-
-ALL_PACKAGES+=impress_bf
-
diff --git a/filter/source/config/fragments/fcfg_math_bf.mk b/filter/source/config/fragments/fcfg_math_bf.mk
deleted file mode 100644
index a80c080..0000000
--- a/filter/source/config/fragments/fcfg_math_bf.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=math_bf
-
-# -----------------------------------------------
-# count = 4
-T4_MATH_BF = \
-    math_StarMath_20 \
-    math_StarMath_30 \
-    math_StarMath_40 \
-    math_StarMath_50
-
-# -----------------------------------------------
-# count = 4
-F4_MATH_BF = \
-    StarMath_2_0 \
-    StarMath_3_0 \
-    StarMath_4_0 \
-    StarMath_5_0
-
-# -----------------------------------------------
-# count = 0
-F4_UI_MATH_BF =
-    
-# -----------------------------------------------
-# count = 0
-L4_MATH_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_MATH_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_math_bf           = $(foreach,i,$(T4_MATH_BF)    types$/$i.xcu                      )
-FILTERS_4fcfg_math_bf         = $(foreach,i,$(F4_MATH_BF)    filters$/$i.xcu                    )
-UI_FILTERS_4fcfg_math_bf      = $(foreach,i,$(F4_UI_MATH_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu    )
-FRAMELOADERS_4fcfg_math_bf    = $(foreach,i,$(L4_MATH_BF)    frameloaders$/$i.xcu               )
-CONTENTHANDLERS_4fcfg_math_bf = $(foreach,i,$(C4_MATH_BF)    contenthandlers$/$i.xcu            )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_math_bf = \
-    $(TYPES_4fcfg_math_bf) \
-    $(FILTERS_4fcfg_math_bf) \
-    $(UI_FILTERS_4fcfg_math_bf) \
-    $(FRAMELOADERS_4fcfg_math_bf) \
-    $(CONTENTHANDLERS_4fcfg_math_bf)
-
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_math_bf)
-    
-ALL_PACKAGES+=math_bf
-    
diff --git a/filter/source/config/fragments/fcfg_web_bf.mk b/filter/source/config/fragments/fcfg_web_bf.mk
deleted file mode 100644
index 3b7aecf..0000000
--- a/filter/source/config/fragments/fcfg_web_bf.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=web_bf
-
-# -----------------------------------------------
-# count = 5
-T4_WEB_BF = \
-    writer_StarWriter_30 \
-    writer_StarWriter_40 \
-    writer_StarWriter_50 \
-    writer_web_StarWriterWeb_40_VorlageTemplate \
-    writer_web_StarWriterWeb_50_VorlageTemplate
-
-# -----------------------------------------------
-# count = 5
-F4_WEB_BF = \
-    StarWriter_3_0__StarWriter_Web_ \
-    StarWriter_4_0__StarWriter_Web_ \
-    StarWriter_5_0__StarWriter_Web_ \
-    StarWriter_Web_4_0_Vorlage_Template \
-    StarWriter_Web_5_0_Vorlage_Template
-
-# -----------------------------------------------
-# count = 2
-F4_UI_WEB_BF = \
-    StarWriter_Web_4_0_Vorlage_Template_ui \
-    StarWriter_Web_5_0_Vorlage_Template_ui
-    
-# -----------------------------------------------
-# count = 0
-L4_WEB_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_WEB_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_web_bf           = $(foreach,i,$(T4_WEB_BF)    types$/$i.xcu                   )
-FILTERS_4fcfg_web_bf         = $(foreach,i,$(F4_WEB_BF)    filters$/$i.xcu                 )
-UI_FILTERS_4fcfg_web_bf      = $(foreach,i,$(F4_UI_WEB_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu )
-FRAMELOADERS_4fcfg_web_bf    = $(foreach,i,$(L4_WEB_BF)    frameloaders$/$i.xcu            )
-CONTENTHANDLERS_4fcfg_web_bf = $(foreach,i,$(C4_WEB_BF)    contenthandlers$/$i.xcu         )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_web_bf = \
-    $(TYPES_4fcfg_web_bf) \
-    $(FILTERS_4fcfg_web_bf) \
-    $(UI_FILTERS_4fcfg_web_bf) \
-    $(FRAMELOADERS_4fcfg_web_bf) \
-    $(CONTENTHANDLERS_4fcfg_web_bf)
-
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_web_bf)
-    
-ALL_PACKAGES+=web_bf
-    
diff --git a/filter/source/config/fragments/fcfg_writer_bf.mk b/filter/source/config/fragments/fcfg_writer_bf.mk
deleted file mode 100644
index 2b97153..0000000
--- a/filter/source/config/fragments/fcfg_writer_bf.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
-all_fragments+=writer_bf
-
-# -----------------------------------------------
-# count = 9
-T4_WRITER_BF = \
-    writer_StarWriter_10 \
-    writer_StarWriter_20 \
-    writer_StarWriter_30 \
-    writer_StarWriter_30_VorlageTemplate \
-    writer_StarWriter_40 \
-    writer_StarWriter_40_VorlageTemplate \
-    writer_StarWriter_50 \
-    writer_StarWriter_50_VorlageTemplate \
-    writer_StarWriter_DOS
-
-# -----------------------------------------------
-# count = 9
-F4_WRITER_BF = \
-    StarWriter_1_0 \
-    StarWriter_2_0 \
-    StarWriter_3_0 \
-    StarWriter_3_0_Vorlage_Template \
-    StarWriter_4_0 \
-    StarWriter_4_0_Vorlage_Template \
-    StarWriter_5_0 \
-    StarWriter_5_0_Vorlage_Template \
-    StarWriter_DOS
-
-# -----------------------------------------------
-# count = 3
-F4_UI_WRITER_BF = \
-    StarWriter_3_0_Vorlage_Template_ui \
-    StarWriter_4_0_Vorlage_Template_ui \
-    StarWriter_5_0_Vorlage_Template_ui \
-
-# -----------------------------------------------
-# count = 0
-L4_WRITER_BF =
-
-# -----------------------------------------------
-# count = 0
-C4_WRITER_BF =
-
-# -----------------------------------------------
-TYPES_4fcfg_writer_bf           = $(foreach,i,$(T4_WRITER_BF)    types$/$i.xcu                     )
-FILTERS_4fcfg_writer_bf         = $(foreach,i,$(F4_WRITER_BF)    filters$/$i.xcu                   )
-UI_FILTERS_4fcfg_writer_bf      = $(foreach,i,$(F4_UI_WRITER_BF) $(DIR_LOCFRAG)$/filters$/$i.xcu   )
-FRAMELOADERS_4fcfg_writer_bf    = $(foreach,i,$(L4_WRITER_BF)    frameloaders$/$i.xcu              )
-CONTENTHANDLERS_4fcfg_writer_bf = $(foreach,i,$(C4_WRITER_BF)    contenthandlers$/$i.xcu           )
-
-# -----------------------------------------------
-# needed to get dependencies inside global makefile work!
-ALL_4fcfg_writer_bf = \
-    $(TYPES_4fcfg_writer_bf) \
-    $(FILTERS_4fcfg_writer_bf) \
-    $(UI_FILTERS_4fcfg_writer_bf) \
-    $(FRAMELOADERS_4fcfg_writer_bf) \
-    $(CONTENTHANDLERS_4fcfg_writer_bf)
-
-ALL_UI_FILTERS+=$(UI_FILTERS_4fcfg_writer_bf)
-
-ALL_PACKAGES+=writer_bf
-
commit e5264e403bb9f7f8137e6d57e198b1e35d6b2be0
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:42:56 2013 +0000

    Remove binfilter.

diff --git a/filter/source/config/fragments/packagedef.mk b/filter/source/config/fragments/packagedef.mk
index 075318f..770e84f 100644
--- a/filter/source/config/fragments/packagedef.mk
+++ b/filter/source/config/fragments/packagedef.mk
@@ -52,16 +52,4 @@ INCLUDE_FRAGMENTS = \
      $(PRJ)$/source$/config$/fragments$/fcfg_impressgraphics.mk \
      $(PRJ)$/source$/config$/fragments$/fcfg_internalgraphics.mk
 
-.IF "$(WITH_BINFILTER)" != "NO"
-INCLUDE_FRAGMENTS += \
-     $(PRJ)$/source$/config$/fragments$/fcfg_writer_bf.mk \
-     $(PRJ)$/source$/config$/fragments$/fcfg_web_bf.mk \
-     $(PRJ)$/source$/config$/fragments$/fcfg_global_bf.mk \
-     $(PRJ)$/source$/config$/fragments$/fcfg_calc_bf.mk \
-     $(PRJ)$/source$/config$/fragments$/fcfg_draw_bf.mk \
-     $(PRJ)$/source$/config$/fragments$/fcfg_impress_bf.mk \
-     $(PRJ)$/source$/config$/fragments$/fcfg_chart_bf.mk \
-     $(PRJ)$/source$/config$/fragments$/fcfg_math_bf.mk
-.ENDIF
-
 .INCLUDE: $(INCLUDE_FRAGMENTS)
commit 89785aa9c0a67c17da18adcd27bfba8718cbdd58
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:41:16 2013 +0000

    Remove binfilter.

diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index 094c6dc..84497ee 100644
--- a/filter/source/config/fragments/makefile.mk
+++ b/filter/source/config/fragments/makefile.mk
@@ -60,18 +60,6 @@ REALFILTERPACKAGES_TYPES_FLAG = \
     $(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.types_flag       \
     $(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.types_flag
 
-.IF "$(WITH_BINFILTER)" != "NO"
-REALFILTERPACKAGES_TYPES_FLAG += \
-    $(DIR_FILTERCFGOUT)$/fcfg_writer_bf.types_flag          \
-    $(DIR_FILTERCFGOUT)$/fcfg_web_bf.types_flag             \
-    $(DIR_FILTERCFGOUT)$/fcfg_global_bf.types_flag          \
-    $(DIR_FILTERCFGOUT)$/fcfg_calc_bf.types_flag            \
-    $(DIR_FILTERCFGOUT)$/fcfg_draw_bf.types_flag            \
-    $(DIR_FILTERCFGOUT)$/fcfg_impress_bf.types_flag         \
-    $(DIR_FILTERCFGOUT)$/fcfg_chart_bf.types_flag           \
-    $(DIR_FILTERCFGOUT)$/fcfg_math_bf.types_flag
-.ENDIF
-
 REALFILTERPACKAGES_FILTERS_FLAG = \
     $(DIR_FILTERCFGOUT)$/fcfg_base.filters_flag               \
     $(DIR_FILTERCFGOUT)$/fcfg_writer.filters_flag             \
@@ -91,18 +79,6 @@ REALFILTERPACKAGES_FILTERS_FLAG = \
     $(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.filters_flag       \
     $(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.filters_flag
 
-.IF "$(WITH_BINFILTER)" != "NO"
-REALFILTERPACKAGES_FILTERS_FLAG += \
-    $(DIR_FILTERCFGOUT)$/fcfg_writer_bf.filters_flag          \
-    $(DIR_FILTERCFGOUT)$/fcfg_web_bf.filters_flag             \
-    $(DIR_FILTERCFGOUT)$/fcfg_global_bf.filters_flag          \
-    $(DIR_FILTERCFGOUT)$/fcfg_calc_bf.filters_flag            \
-    $(DIR_FILTERCFGOUT)$/fcfg_draw_bf.filters_flag            \
-    $(DIR_FILTERCFGOUT)$/fcfg_impress_bf.filters_flag         \
-    $(DIR_FILTERCFGOUT)$/fcfg_chart_bf.filters_flag           \
-    $(DIR_FILTERCFGOUT)$/fcfg_math_bf.filters_flag
-.ENDIF
-
 REALFILTERPACKAGES_FILTERS_UI_MERGE = \
     $(DIR_LOCMERGE)$/filter_ui.xcu
 
@@ -131,18 +107,6 @@ REALFILTERPACKAGES_OTHERS_FLAG = \
     $(DIR_FILTERCFGOUT)$/fcfg_drawgraphics.others_flag       \
     $(DIR_FILTERCFGOUT)$/fcfg_impressgraphics.others_flag
 
-.IF "$(WITH_BINFILTER)" != "NO"
-REALFILTERPACKAGES_OTHERS_FLAG += \
-    $(DIR_FILTERCFGOUT)$/fcfg_writer_bf.others_flag          \
-    $(DIR_FILTERCFGOUT)$/fcfg_web_bf.others_flag             \
-    $(DIR_FILTERCFGOUT)$/fcfg_global_bf.others_flag          \
-    $(DIR_FILTERCFGOUT)$/fcfg_calc_bf.others_flag            \
-    $(DIR_FILTERCFGOUT)$/fcfg_draw_bf.others_flag            \
-    $(DIR_FILTERCFGOUT)$/fcfg_impress_bf.others_flag         \
-    $(DIR_FILTERCFGOUT)$/fcfg_chart_bf.others_flag           \
-    $(DIR_FILTERCFGOUT)$/fcfg_math_bf.others_flag
-.ENDIF
-
 INTERNALFILTERPACKAGES_TYPES_FLAG = \
     $(DIR_FILTERCFGOUT)$/fcfg_internalgraphics.types_flag
 
commit 421cb1250c807753433fcd2fdb051dd3cc970fd0
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:36:16 2013 +0000

    Remove binfilter.

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e7ae0c5..944485d 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -276,12 +276,6 @@ my_components += ScriptProviderForJavaScript
 .END
 .END
 
-.IF "$(WITH_BINFILTER)" != "NO"
-my_components += \
-    bf_migratefilter \
-    bindet
-.END
-
 .IF "$(WITH_LDAP)" == "YES"
 my_components += ldapbe2
 .END
commit 870dd2290b5a61c9e561d04aa71d6530658a0fca
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:35:46 2013 +0000

    Remove binfilter.

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 41a79f1..edf6164 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -434,28 +434,6 @@ MY_FILES_xsltfilter = \
     $(MY_MOD)/fcfg_xslt_filters.xcu \
     $(MY_MOD)/fcfg_xslt_types.xcu
 
-.IF "$(WITH_BINFILTER)" != "NO"
-MY_XCDS += $(MISC)/binfilter.xcd
-MY_DEPS_binfilter = main
-MY_FILES_binfilter = \
-    $(MY_MOD)/fcfg_chart_bf_filters.xcu \
-    $(MY_MOD)/fcfg_chart_bf_types.xcu \
-    $(MY_MOD)/fcfg_calc_bf_filters.xcu \
-    $(MY_MOD)/fcfg_calc_bf_types.xcu \
-    $(MY_MOD)/fcfg_draw_bf_filters.xcu \
-    $(MY_MOD)/fcfg_draw_bf_types.xcu \
-    $(MY_MOD)/fcfg_global_bf_filters.xcu \
-    $(MY_MOD)/fcfg_global_bf_types.xcu \
-    $(MY_MOD)/fcfg_impress_bf_filters.xcu \
-    $(MY_MOD)/fcfg_impress_bf_types.xcu \
-    $(MY_MOD)/fcfg_math_bf_filters.xcu \
-    $(MY_MOD)/fcfg_math_bf_types.xcu \
-    $(MY_MOD)/fcfg_web_bf_filters.xcu \
-    $(MY_MOD)/fcfg_web_bf_types.xcu \
-    $(MY_MOD)/fcfg_writer_bf_filters.xcu \
-    $(MY_MOD)/fcfg_writer_bf_types.xcu
-.END
-
 .IF "$(GUIBASE)" == "unx" && \
         (("$(ENABLE_GCONF)" == "TRUE" && "$(ENABLE_LOCKDOWN)" == "YES") || \
          "$(ENABLE_GIO)" == "TRUE")
commit a92e2aa7680d9c3420204d1fb3c145556c0fc8af
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:35:20 2013 +0000

    Remove binfilter.

diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index e1c2a72..9346ff6 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po      postprocess     ::      svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
commit 85f790351618e757614ec90118da8e9468979a0b
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:34:43 2013 +0000

    Remove binfilter.

diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index c81e9f0..fa1772f 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -15,23 +15,7 @@ basebmpmi.dll    0x00000000678a0000 0x002f0000
 basegfxmi.dll    0x0000000067820000 0x00070000
 basprovmi.uno.dll 0x00000000677f0000 0x00020000
 behelper.uno.dll 0x00000000677a0000 0x00010000
-bf_frmmi.dll     0x00000000676b0000 0x000e0000
-bf_gomi.dll      0x0000000067680000 0x00020000
-bf_migratefiltermi.dll 0x0000000067660000 0x00010000
-bf_ofami.dll     0x0000000067640000 0x00010000
-bf_sbmi.dll      0x00000000675b0000 0x00080000
-bf_schmi.dll     0x0000000067500000 0x000a0000
-bf_scmi.dll      0x00000000672a0000 0x00250000
-bf_sdmi.dll      0x00000000671f0000 0x000a0000
-bf_smmi.dll      0x0000000067190000 0x00050000
-bf_somi.dll      0x00000000670f0000 0x00090000
-bf_svtmi.dll     0x0000000066f30000 0x001b0000
-bf_svxmi.dll     0x0000000066b50000 0x003d0000
-bf_swmi.dll      0x00000000668b0000 0x00290000
-bf_wrappermi.dll 0x0000000066880000 0x00020000
-bf_xomi.dll      0x0000000066480000 0x003f0000
 bibmi.dll        0x0000000066430000 0x00040000
-bindetmi.dll     0x0000000066410000 0x00010000
 bootstrap.uno.dll 0x0000000066380000 0x00080000
 bootstrpdtmi.dll 0x0000000066350000 0x00020000
 bridgefac.uno.dll 0x0000000066330000 0x00010000
commit bf119583a5494ac80f1ccec96d4b36a0c6f523a7
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:34:14 2013 +0000

    Remove binfilter.

diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 11198b1..46b8008 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -3,7 +3,6 @@ cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
 cp    scp2\source\activex         nmake    -    all    cp_activex cp_langmacros cp_langtemplates NULL
-cp    scp2\source\binfilter       nmake    -    all    cp_binfilter cp_langmacros cp_langtemplates NULL
 cp    scp2\source\calc            nmake    -    all    cp_calc cp_langmacros cp_langtemplates NULL
 cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
 cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
@@ -24,4 +23,4 @@ cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_
 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\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
commit 15c0cb00df625a259a69a0a58fbad75a2cb7eeed
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:33:17 2013 +0000

    Remove binfilter.

diff --git a/splitbuild/binfilter.lst b/splitbuild/binfilter.lst
deleted file mode 100644
index 1baa90b..0000000
--- a/splitbuild/binfilter.lst
+++ /dev/null
@@ -1 +0,0 @@
-binfilter
commit 88d85821c0bca03f5814c3902b8698adc2f4e4e3
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:32:33 2013 +0000

    Remove binfilter.

diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 4fdcf70..a0d84ac 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -87,13 +87,6 @@ SCP1FILES  = installation_ooo.par          \
 SCP1FILES +=                               \
              directory_ooo_macosx.par      
 .ENDIF
- 
-.IF "$(WITH_BINFILTER)" != "NO"
-SCP1FILES +=                               \
-             module_binfilter.par          \
-             registryitem_binfilter.par    \
-             file_binfilter.par
-.ENDIF
 
 .IF "$(ENABLE_OPENGL)" == "TRUE"
 SCP1FILES +=                               \
@@ -242,13 +235,6 @@ SCP2FILES  = installation_ooo.par          \
 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 +=                               \
commit 284b99e1d7e2625a074c854367b83b82adcc3409
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:31:56 2013 +0000

    Remove binfilter.

diff --git a/configure.in b/configure.in
index 08361e0..5326135 100644
--- a/configure.in
+++ b/configure.in
@@ -364,9 +364,6 @@ AC_ARG_ENABLE(kde4,
                           where Qt4 and KDE4 are available. May be used with --enable-kde 
                           if you want to support both KDE3 and KDE4.
 ],,)
-AC_ARG_ENABLE(binfilter,
-[  --enable-binfilter      Enable legacy binary file formats filters
-],,enable_binfilter=no)
 AC_ARG_ENABLE(rpath,
 [  --disable-rpath         Disable the use of relative paths in shared libraries
 ],,)
@@ -1523,20 +1520,6 @@ if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \
 fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
-dnl ===================================================================
-dnl Disable legacy binary file formats filters
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable filters for legacy binary file formats (StarOffice 5.2)])
-if test "$enable_binfilter" = "yes"; then
-   WITH_BINFILTER="YES"
-   BUILD_TYPE="$BUILD_TYPE BINFILTER"
-   AC_MSG_RESULT([yes])
-else
-   WITH_BINFILTER="NO"
-   AC_MSG_RESULT([no])
-fi
-AC_SUBST(WITH_BINFILTER)
-
 if test "$_os" = "WINNT"; then
    AC_MSG_CHECKING([whether to use DirectX])
    ENABLE_DIRECT_DRAW=""
commit 8f336f95c8964ca27a20190f02951f349c33d66d
Author: Pavel Janík <paveljanik at apache.org>
Date:   Thu Apr 4 12:31:19 2013 +0000

    Remove binfilter.

diff --git a/set_soenv.in b/set_soenv.in
index f7b6cce..0624250 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1898,7 +1898,6 @@ ToFile( "WITH_CATB_FONTS",   "@WITH_CATB_FONTS@",  "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
 ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );
-ToFile( "WITH_BINFILTER",    "@WITH_BINFILTER@",   "e" );
 ToFile( "BUILD_TYPE",        "@BUILD_TYPE@",       "e" );
 ToFile( "ADDITIONAL_REPOSITORIES", "@ADDITIONAL_REPOSITORIES@", "e" );
 ToFile( "VERBOSE",           "@VERBOSE@",          "e" );


More information about the Libreoffice-commits mailing list