remove stale javafilters

Change-Id: Id0c413d64e6f6fa7ded3c5ff10e764bc2e40f006

11 files changed, 2 insertions, 831 deletions

diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk
deleted file mode 100644
index ce2210937b3c..000000000000
--- a/scp2/InstallModule_javafilter.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InstallModule_InstallModule,scp2/javafilter))
-
-$(eval $(call gb_InstallModule_add_defs,scp2/javafilter,\
-	$(if $(WINDOWS_SDK_HOME),\
-		-DHAVE_WINDOWS_SDK \
-	) \
-))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\
-    scp2/source/javafilter/file_javafilter \
-))
-
-$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/javafilter,\
-    scp2/source/javafilter/module_javafilter \
-	$(if $(filter WNT,$(OS)),\
-		scp2/source/javafilter/registryitem_javafilter \
-	) \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 166ab4268d5f..7dd47590d080 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -58,9 +58,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		scp2/gnome \
 	) \
-	$(if $(filter TRUE,$(SOLAR_JAVA)),\
-		scp2/javafilter \
-	) \
 	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
 		scp2/kde \
 	) \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index e2b92b4c9af7..4d12b8f8a3f9 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -64,9 +64,6 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		InstallModule_gnome \
 	) \
-	$(if $(filter TRUE,$(SOLAR_JAVA)),\
-		InstallModule_javafilter \
-	) \
 	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
 		InstallModule_kde \
 	) \
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
deleted file mode 100644
index 906bf06fe604..000000000000
--- a/scp2/source/javafilter/file_javafilter.scp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WNT
-
-File gid_File_Lib_Xmergesync
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "xmergesync.dll";
-End
-
-#endif
-
-#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
-
-File gid_File_Lib_Jfregca
-    LIB_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "jfregca.dll";
-End
-
-#endif
-
-File gid_File_Share_Registry_Palm_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name = "palm.xcd";
-End
-
-File gid_File_Share_Registry_Pocketexcel_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name = "pocketexcel.xcd";
-End
-
-File gid_File_Share_Registry_Pocketword_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name = "pocketword.xcd";
-End
-
-#ifdef SOLAR_JAVA
-
-STD_JAR_FILE( gid_File_Jar_Aportisdoc, aportisdoc )
-STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel )
-STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword )
-STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
-STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
-
-#endif
diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp
deleted file mode 100644
index dd69d014caf7..000000000000
--- a/scp2/source/javafilter/module_javafilter.scp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Javafilter
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER);
-    Sortkey = "900";
-    ParentID = gid_Module_Optional;
-    Files = ( gid_File_Lib_Jfregca );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Palm
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM);
-    ParentID = gid_Module_Optional_Javafilter;
-    Sortkey = "100";
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Palm_Aportisdoc
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC);
-    ParentID = gid_Module_Optional_Javafilter_Palm;
-    Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd );
-    Sortkey = "100";
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc
-    ALL_LANG(Name,STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC);
-  #ifdef WNT
-    ALL_LANG(Description,STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_WNT);
-  #else
-    ALL_LANG(Description,STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_UNIX);
-  #endif
-    ParentID = gid_Module_Optional_Javafilter;
-    Sortkey = "200";
-    Files = ( gid_File_Lib_Xmergesync );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD);
-    ParentID = gid_Module_Optional_Javafilter_Pocketpc;
-    Sortkey = "100";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
-
-Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel
-    MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL);
-    ParentID = gid_Module_Optional_Javafilter_Pocketpc;
-    Sortkey = "200";
-    Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf );
-    Minimal = NO;
-    Default = NO;
-    Styles (en-US) = ();
-    Styles (de) = ();
-    Styles (ja) = (HIDDEN_ROOT);
-    Styles (ko) = (HIDDEN_ROOT);
-    Styles (zh-CN) = (HIDDEN_ROOT);
-    Styles (zh-TW) = (HIDDEN_ROOT);
-End
diff --git a/scp2/source/javafilter/module_javafilter.ulf b/scp2/source/javafilter/module_javafilter.ulf
deleted file mode 100644
index cca3a5ef9be5..000000000000
--- a/scp2/source/javafilter/module_javafilter.ulf
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER]
-en-US = "Mobile Device Filters"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER]
-en-US = "Text and spreadsheet filters to support import/export for Palm handheld or Pocket PC (Java required)."
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_PALM]
-en-US = "Palm"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_PALM]
-en-US = "Filters for Palm OS compatible handhelds"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC]
-en-US = "AportisDoc"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC]
-en-US = "Support for the AportisDoc format"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC]
-en-US = "Pocket PC"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_WNT]
-en-US = "Filters and ActiveSync support for Pocket PC compatible handhelds"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_UNIX]
-en-US = "Filters for Pocket PC compatible handhelds."
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD]
-en-US = "Pocket Word"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD]
-en-US = "Support for Pocket Word"
-
-[STR_NAME_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL]
-en-US = "Pocket Excel"
-
-[STR_DESC_MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL]
-en-US = "Support for Pocket Excel"
-
-
-
diff --git a/scp2/source/javafilter/registryitem_javafilter.scp b/scp2/source/javafilter/registryitem_javafilter.scp
deleted file mode 100644
index 3626d914bef4..000000000000
--- a/scp2/source/javafilter/registryitem_javafilter.scp
+++ /dev/null
@@ -1,437 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    ALL_LANG_STR_VALUE_LNG(_43887C67_4D5D_4127_BAAC_87A288494C7C_);
-End
-
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_43887C67_4D5D_4127_BAAC_87A288494C7C__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Import
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Import";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__43887c67_4d5d_4127_Baac_87a288494c7c__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{43887C67-4D5D-4127-BAAC-87A288494C7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "NewExtension";
-    Value = "pxl";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    ALL_LANG_STR_VALUE_LNG(_BDD611C3_7BAB_460F_8711_5B9AC9EF6020_);
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_BDD611C3_7BAB_460F_8711_5B9AC9EF6020__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Export
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Export";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Bdd611c3_7bab_460f_8711_5b9ac9ef6020__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "NewExtension";
-    Value = "sxw";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    ALL_LANG_STR_VALUE_LNG(_C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C_);
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Export
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Export";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__C6ab3e74_9f4f_4370_8120_A8a6fabb7a7c__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "NewExtension";
-    Value = "sxc";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439_
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    ALL_LANG_STR_VALUE_LNG(_CB43F086_838D_4FA4_B5F6_3406B9A57439_);
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\DefaultIcon";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "[INSTALLLOCATION]program\xmergesync.dll";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Inprocserver32_Threadingmodel
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\InProcServer32";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "ThreadingModel";
-    Value = "Apartment";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Description
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Description";
-    ALL_LANG_STR_VALUE_LNG(_CB43F086_838D_4FA4_B5F6_3406B9A57439__PEGASUSFILTER_DESCRIPTION);
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Import
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Import";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Clsid__Cb43f086_838d_4fa4_B5f6_3406b9a57439__Pegasusfilter_Newextension
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "CLSID\{CB43F086-838D-4FA4-B5F6-3406B9A57439}\PegasusFilter";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "NewExtension";
-    Value = "psw";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Classpath_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Classpath";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Classpath_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Classpath";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Java_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "Java";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Java_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "Java";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Javainit_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "JavaInit";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Javainit_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "JavaInit";
-    ALL_LANG_STR_VALUE_LNG(HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT);
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Error_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages\Error";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Pocket_Excel
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Hklm_Soft_Sun_Staroffice_Xmergesync_Msgs_Pocket_Word
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Sun Microsystems\StarOffice\XMergeSync\Messages";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Psw_Writer
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.psw\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Pxl_Calc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.pxl\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Default_Export
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "DefaultExport";
-    Value = "Binary Copy";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Default_Import
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "DefaultImport";
-    Value = "{43887C67-4D5D-4127-BAAC-87A288494C7C}";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Installed_Filters
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxc_Installed_Filters_Pxl
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxc\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel;
-    Name = "{43887C67-4D5D-4127-BAAC-87A288494C7C}";
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Default_Export
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "DefaultExport";
-    Value = "Binary Copy";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Default_Import
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "DefaultImport";
-    Value = "{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Installed_Filters
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Value = "";
-End
-
-RegistryItem gid_Regitem_Wince_Services_Filters_Sxw_Installed_Filters_Psw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\Microsoft\Windows CE Services\Filters\.sxw\InstalledFilters";
-    ModuleID = gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word;
-    Name = "{CB43F086-838D-4FA4-B5F6-3406B9A57439}";
-    Value = "";
-End
diff --git a/scp2/source/javafilter/registryitem_javafilter.ulf b/scp2/source/javafilter/registryitem_javafilter.ulf
deleted file mode 100644
index ea0ae370c077..000000000000
--- a/scp2/source/javafilter/registryitem_javafilter.ulf
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-[STR_VALUE__43887C67_4D5D_4127_BAAC_87A288494C7C_]
-en-US = "Pocket Excel"
-
-[STR_VALUE__43887C67_4D5D_4127_BAAC_87A288494C7C__PEGASUSFILTER_DESCRIPTION]
-en-US = "Pocket Excel Workbook"
-
-[STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020_]
-en-US = "%PRODUCTNAME Writer"
-
-[STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020__PEGASUSFILTER_DESCRIPTION]
-en-US = "%PRODUCTNAME Writer XML Document"
-
-[STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C_]
-en-US = "%PRODUCTNAME Calc"
-
-[STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C__PEGASUSFILTER_DESCRIPTION]
-en-US = "%PRODUCTNAME Calc XML Document"
-
-[STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439_]
-en-US = "Pocket Word"
-
-[STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439__PEGASUSFILTER_DESCRIPTION]
-en-US = "Pocket Word Document - Pocket PC"
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_CLASSPATH]
-en-US = "The %PRODUCTNAME mobile device filters cannot be located."
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVA]
-en-US = "A Java 1.4 installation cannot be located."
-
-[STR_VALUE_HKLM_SOFT_SUN_STAROFFICE_XMERGESYNC_MSGS_ERROR_JAVAINIT]
-en-US = "There was an error while initializing the Java Runtime Environment."
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 4194becac3bb..4dfe36f810f6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -77,7 +77,6 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_Draw,
              gid_Brand_File_Share_Xdg_Extension,
              gid_Brand_File_Share_Xdg_Impress,
-             gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
              gid_Brand_File_Share_Xdg_QStart,
@@ -736,15 +735,6 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_JavaFilter
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "javafilter.desktop";
-    Styles = (PACKED,SCPZIP_REPLACE);
-End
-#endif
-
-#if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_XsltFilter
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Xdg;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a5c2eb952943..64c7ed967794 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -435,6 +435,8 @@ STD_JAR_FILE( gid_File_Jar_Table, table )
 STD_JAR_FILE( gid_File_Jar_Form, form )
 STD_JAR_FILE( gid_File_Jar_Query, query )
 STD_JAR_FILE( gid_File_Jar_Web, web )
+STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
+STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
 #endif
 
 #if defined SOLAR_JAVA && defined WNT
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 4242fcdf5d04..31b133f79d9f 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -83,24 +83,6 @@ End
 
 #ifdef HAVE_WINDOWS_SDK
 
-WindowsCustomAction gid_Customaction_Jfregcadll1
-	Name = "Jfregcadll1";
-	Typ = "65";
-	Source = "jfregca.dll";
-	Target = "install_jf";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
-WindowsCustomAction gid_Customaction_Jfregcadll2
-	Name = "Jfregcadll2";
-	Typ = "65";
-	Source = "jfregca.dll";
-	Target = "uninstall_jf";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "end");
-End
-
 WindowsCustomAction gid_Customaction_sdqsmsidll
 	Name = "sdqsmsidll";
 	Typ = "65";