f325b2
From 97a27e85e1e4ec766dd5b528b6c7fba3b2910248 Mon Sep 17 00:00:00 2001
f325b2
From: David Tardon <dtardon@redhat.com>
f325b2
Date: Tue, 1 Mar 2016 07:23:54 +0100
f325b2
Subject: [PATCH] Revert "upload libwps 0.4.0"
f325b2
f325b2
This reverts commit f9568335a653f72732f9c8ebf007cf8850021ff9.
f325b2
f325b2
Change-Id: Iffbbc6fd409b807848a34c2e5cc4ac4c4e930a49
f325b2
---
f325b2
 RepositoryExternal.mk                              |   2 +-
f325b2
 configure.ac                                       |   2 +-
f325b2
 download.lst                                       |   5 +-
f325b2
 ...parser-correct-a-mistake-when-reading-neg.patch |  26 ---
f325b2
 ...01-error-C2065-M_PI-undeclared-identifier.patch |  35 ----
f325b2
 external/libwps/ExternalPackage_libwps.mk          |   6 +-
f325b2
 external/libwps/ExternalProject_libwps.mk          |   2 +-
f325b2
 external/libwps/Library_wps.mk                     |   8 -
f325b2
 external/libwps/UnpackedTarball_libwps.mk          |   2 -
f325b2
 filter/Configuration_filter.mk                     |   4 -
f325b2
 .../config/fragments/filters/WPS_Lotus_Calc.xcu    |  30 ----
f325b2
 .../config/fragments/filters/WPS_QPro_Calc.xcu     |  30 ----
f325b2
 .../fragments/types/calc_WPS_Lotus_Document.xcu    |  29 ----
f325b2
 .../fragments/types/calc_WPS_QPro_Document.xcu     |  29 ----
f325b2
 scp2/source/ooo/file_ooo.scp                       |   1 -
f325b2
 scp2/source/ooo/module_ooo.scp                     |   1 -
f325b2
 writerperfect/Library_wpftcalc.mk                  |   2 -
f325b2
 writerperfect/Library_wpftdraw.mk                  |   2 -
f325b2
 writerperfect/Library_wpftimpress.mk               |   2 -
f325b2
 writerperfect/Library_wpftwriter.mk                |   2 -
f325b2
 writerperfect/Library_writerperfect.mk             |   3 -
f325b2
 writerperfect/Module_writerperfect.mk              |   4 -
f325b2
 writerperfect/UIConfig_writerperfect.mk            |  26 ---
f325b2
 writerperfect/inc/WPFTEncodingDialog.hxx           |  58 -------
f325b2
 .../source/calc/MSWorksCalcImportFilter.cxx        |  72 +--------
f325b2
 writerperfect/source/common/WPFTEncodingDialog.cxx | 180 ---------------------
f325b2
 .../source/writer/MSWorksImportFilter.cxx          |  34 +---
f325b2
 writerperfect/uiconfig/ui/wpftencodingdialog.ui    |  90 -----------
f325b2
 28 files changed, 15 insertions(+), 672 deletions(-)
f325b2
 delete mode 100644 external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch
f325b2
 delete mode 100644 external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch
f325b2
 delete mode 100644 filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu
f325b2
 delete mode 100644 filter/source/config/fragments/filters/WPS_QPro_Calc.xcu
f325b2
 delete mode 100644 filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu
f325b2
 delete mode 100644 filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
f325b2
 delete mode 100644 writerperfect/UIConfig_writerperfect.mk
f325b2
 delete mode 100644 writerperfect/inc/WPFTEncodingDialog.hxx
f325b2
 delete mode 100644 writerperfect/source/common/WPFTEncodingDialog.cxx
f325b2
 delete mode 100644 writerperfect/uiconfig/ui/wpftencodingdialog.ui
f325b2
f325b2
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
f325b2
index 20de676..3df6d6a 100644
f325b2
--- a/RepositoryExternal.mk
f325b2
+++ b/RepositoryExternal.mk
f325b2
@@ -2192,7 +2192,7 @@ $(call gb_LinkTarget_set_include,$(1),\
f325b2
 	$$(INCLUDE) \
f325b2
 )
f325b2
 $(call gb_LinkTarget_add_libs,$(1),\
f325b2
-	-L$(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs -lwps-0.4 \
f325b2
+	-L$(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs -lwps-0.3 \
f325b2
 )
f325b2
 
f325b2
 endef
f325b2
diff --git a/configure.ac b/configure.ac
f325b2
index cc77ee9..6a99034 100644
f325b2
--- a/configure.ac
f325b2
+++ b/configure.ac
f325b2
@@ -7713,7 +7713,7 @@ libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
f325b2
 dnl ===================================================================
f325b2
 dnl Check for system libwps
f325b2
 dnl ===================================================================
f325b2
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
f325b2
+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.3])
f325b2
 
f325b2
 dnl ===================================================================
f325b2
 dnl Check for system libwpg
f325b2
diff --git a/download.lst b/download.lst
f325b2
index 9e16272..dc9aaea 100644
f325b2
--- a/download.lst
f325b2
+++ b/download.lst
f325b2
@@ -146,9 +146,8 @@ export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7
f325b2
 export WPD_TARBALL := libwpd-0.10.0.tar.bz2
f325b2
 export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a
f325b2
 export WPG_TARBALL := libwpg-0.3.0.tar.bz2
f325b2
-export WPS_MD5SUM := e9162d2566421d9d71b3ad2377a68fd5
f325b2
-export WPS_VERSION_MICRO := 0
f325b2
-export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
f325b2
+export WPS_MD5SUM := a111d9ef5a0dab564e9aec0f2cf8d218
f325b2
+export WPS_TARBALL := libwps-0.3.1.tar.bz2
f325b2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
f325b2
 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
f325b2
 export ZLIB_TARBALL := zlib-1.2.8.tar.gz
f325b2
diff --git a/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch b/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch
f325b2
deleted file mode 100644
f325b2
index d5a6f54..0000000
f325b2
--- a/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch
f325b2
+++ /dev/null
f325b2
@@ -1,26 +0,0 @@
f325b2
-From 45a3dd5393e07340d5a63d8a8735789d73a61b17 Mon Sep 17 00:00:00 2001
f325b2
-From: osnola <alonso@loria.fr>
f325b2
-Date: Mon, 18 May 2015 08:27:59 +0200
f325b2
-Subject: [PATCH] QuattroPro parser: correct a mistake when reading negative
f325b2
- cell's position
f325b2
-
f325b2
----
f325b2
- src/lib/QuattroSpreadsheet.cpp | 2 +-
f325b2
- 1 file changed, 1 insertion(+), 1 deletion(-)
f325b2
-
f325b2
-diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
f325b2
-index cb0f4f5..ce5e20a 100644
f325b2
---- a/src/lib/QuattroSpreadsheet.cpp
f325b2
-+++ b/src/lib/QuattroSpreadsheet.cpp
f325b2
-@@ -1668,7 +1668,7 @@ bool QuattroSpreadsheet::readCell
f325b2
- 			else
f325b2
- 			{
f325b2
- 				val &= 0x3FFF;
f325b2
--				if (val & 0x2000) val = val - 0x4000;
f325b2
-+				if (val>0x1000) val = val - 0x2000;
f325b2
- 			}
f325b2
- 			if (dim==2)
f325b2
- 				val += sheetId;
f325b2
--- 
f325b2
-2.3.2 (Apple Git-55)
f325b2
-
f325b2
diff --git a/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch b/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch
f325b2
deleted file mode 100644
f325b2
index 01109dc..0000000
f325b2
--- a/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch
f325b2
+++ /dev/null
f325b2
@@ -1,35 +0,0 @@
f325b2
-From 94af34d42129bad72fd7ce50dc6901287509703e Mon Sep 17 00:00:00 2001
f325b2
-From: David Tardon <dtardon@redhat.com>
f325b2
-Date: Mon, 18 May 2015 18:50:25 +0200
f325b2
-Subject: [PATCH] error C2065: M_PI : undeclared identifier
f325b2
-
f325b2
----
f325b2
- src/lib/libwps_internal.h | 5 +++++
f325b2
- 1 file changed, 5 insertions(+)
f325b2
-
f325b2
-diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h
f325b2
-index fb9016d..02a87bc 100644
f325b2
---- a/src/lib/libwps_internal.h
f325b2
-+++ b/src/lib/libwps_internal.h
f325b2
-@@ -28,6 +28,7 @@
f325b2
- #include <stdio.h>
f325b2
- #endif
f325b2
- 
f325b2
-+#include <cmath>
f325b2
- #include <iostream>
f325b2
- #include <map>
f325b2
- #include <string>
f325b2
-@@ -36,6 +37,10 @@
f325b2
- #include <librevenge-stream/librevenge-stream.h>
f325b2
- #include <librevenge/librevenge.h>
f325b2
- 
f325b2
-+#ifndef M_PI
f325b2
-+#define M_PI 3.14159265358979323846
f325b2
-+#endif
f325b2
-+
f325b2
- #if defined(_MSC_VER) || defined(__DJGPP__)
f325b2
- typedef signed char int8_t;
f325b2
- typedef unsigned char uint8_t;
f325b2
--- 
f325b2
-2.4.0
f325b2
-
f325b2
diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk
f325b2
index 24b00c6..3e0f79b 100644
f325b2
--- a/external/libwps/ExternalPackage_libwps.mk
f325b2
+++ b/external/libwps/ExternalPackage_libwps.mk
f325b2
@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps))
f325b2
 $(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps))
f325b2
 
f325b2
 ifeq ($(OS),MACOSX)
f325b2
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4.dylib,src/lib/.libs/libwps-0.4.4.dylib))
f325b2
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.3.dylib,src/lib/.libs/libwps-0.3.3.dylib))
f325b2
 else ifeq ($(OS),WNT)
f325b2
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll))
f325b2
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.dll,src/lib/.libs/libwps-0.3.dll))
f325b2
 else ifeq ($(filter IOS ANDROID,$(OS)),)
f325b2
-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4-lo.so.4,src/lib/.libs/libwps-0.4-lo.so.4.0.$(WPS_VERSION_MICRO)))
f325b2
+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.so.3,src/lib/.libs/libwps-0.3.so.3.0.1))
f325b2
 endif
f325b2
 
f325b2
 # vim: set noet sw=4 ts=4:
f325b2
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
f325b2
index 10b39b3..8cd2138 100644
f325b2
--- a/external/libwps/ExternalProject_libwps.mk
f325b2
+++ b/external/libwps/ExternalProject_libwps.mk
f325b2
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
f325b2
 		&& $(MAKE) \
f325b2
 		$(if $(filter MACOSX,$(OS)),\
f325b2
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
f325b2
-				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.4.4.dylib \
f325b2
+				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.3.3.dylib \
f325b2
 		) \
f325b2
 	)
f325b2
 
f325b2
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
f325b2
index ef323ce..be9f3c6 100644
f325b2
--- a/external/libwps/Library_wps.mk
f325b2
+++ b/external/libwps/Library_wps.mk
f325b2
@@ -33,12 +33,6 @@ $(eval $(call gb_Library_add_defs,wps,\
f325b2
 $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
f325b2
 
f325b2
 $(eval $(call gb_Library_add_generated_exception_objects,wps,\
f325b2
-	UnpackedTarball/libwps/src/lib/Lotus \
f325b2
-	UnpackedTarball/libwps/src/lib/LotusGraph \
f325b2
-	UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
f325b2
-	UnpackedTarball/libwps/src/lib/LotusStyleManager \
f325b2
-	UnpackedTarball/libwps/src/lib/Quattro \
f325b2
-	UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
f325b2
 	UnpackedTarball/libwps/src/lib/WKS4 \
f325b2
 	UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \
f325b2
 	UnpackedTarball/libwps/src/lib/WKSContentListener \
f325b2
@@ -58,8 +52,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
f325b2
 	UnpackedTarball/libwps/src/lib/WPSDebug \
f325b2
 	UnpackedTarball/libwps/src/lib/WPSDocument \
f325b2
 	UnpackedTarball/libwps/src/lib/WPSFont \
f325b2
-	UnpackedTarball/libwps/src/lib/WPSGraphicShape \
f325b2
-	UnpackedTarball/libwps/src/lib/WPSGraphicStyle \
f325b2
 	UnpackedTarball/libwps/src/lib/WPSHeader \
f325b2
 	UnpackedTarball/libwps/src/lib/WPSList \
f325b2
 	UnpackedTarball/libwps/src/lib/WPSOLEParser \
f325b2
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
f325b2
index 52d9ab3..fd5953e 100644
f325b2
--- a/external/libwps/UnpackedTarball_libwps.mk
f325b2
+++ b/external/libwps/UnpackedTarball_libwps.mk
f325b2
@@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
f325b2
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
f325b2
 
f325b2
 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
f325b2
-	external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch \
f325b2
-	external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \
f325b2
 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
f325b2
 ))
f325b2
 
f325b2
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
f325b2
index 213e981..576536e 100644
f325b2
--- a/filter/Configuration_filter.mk
f325b2
+++ b/filter/Configuration_filter.mk
f325b2
@@ -496,8 +496,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,f
f325b2
 	calc_OOXML \
f325b2
 	calc_OOXML_Template \
f325b2
 	calc_MS_Works_Document \
f325b2
-	calc_WPS_Lotus_Document \
f325b2
-	calc_WPS_QPro_Document \
f325b2
 	calc_Beagle_Works \
f325b2
 	calc_ClarisWorks \
f325b2
 	calc_Claris_Resolve \
f325b2
@@ -537,8 +535,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x
f325b2
 	calc_OOXML \
f325b2
 	calc_OOXML_Template \
f325b2
 	MS_Works_Calc \
f325b2
-	WPS_Lotus_Calc \
f325b2
-	WPS_QPro_Calc \
f325b2
 	Beagle_Works_Calc \
f325b2
 	ClarisWorks_Calc \
f325b2
 	Claris_Resolve_Calc \
f325b2
diff --git a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu
f325b2
deleted file mode 100644
f325b2
index 721e68f..0000000
f325b2
--- a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu
f325b2
+++ /dev/null
f325b2
@@ -1,30 +0,0 @@
f325b2
-
f325b2
- * This file is part of the LibreOffice project.
f325b2
- *
f325b2
- * This Source Code Form is subject to the terms of the Mozilla Public
f325b2
- * License, v. 2.0. If a copy of the MPL was not distributed with this
f325b2
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
- *
f325b2
- * This file incorporates work covered by the following license notice:
f325b2
- *
f325b2
- *   Licensed to the Apache Software Foundation (ASF) under one or more
f325b2
- *   contributor license agreements. See the NOTICE file distributed
f325b2
- *   with this work for additional information regarding copyright
f325b2
- *   ownership. The ASF licenses this file to you under the Apache
f325b2
- *   License, Version 2.0 (the "License"); you may not use this file
f325b2
- *   except in compliance with the License. You may obtain a copy of
f325b2
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
f325b2
--->
f325b2
-    <node oor:name="WPS_Lotus_Calc" oor:op="replace">
f325b2
-        <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop>
f325b2
-        <prop oor:name="UIComponent"/>
f325b2
-        <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>
f325b2
-        <prop oor:name="UserData"><value></value></prop>
f325b2
-        <prop oor:name="UIName">
f325b2
-            <value xml:lang="en-US">Lotus Document</value>
f325b2
-        </prop>
f325b2
-        <prop oor:name="FileFormatVersion"><value>0</value></prop>
f325b2
-        <prop oor:name="Type"><value>calc_WPS_Lotus_Document</value></prop>
f325b2
-        <prop oor:name="TemplateName"/>
f325b2
-        <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
f325b2
-    </node>
f325b2
diff --git a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu
f325b2
deleted file mode 100644
f325b2
index 77c7b45..0000000
f325b2
--- a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu
f325b2
+++ /dev/null
f325b2
@@ -1,30 +0,0 @@
f325b2
-
f325b2
- * This file is part of the LibreOffice project.
f325b2
- *
f325b2
- * This Source Code Form is subject to the terms of the Mozilla Public
f325b2
- * License, v. 2.0. If a copy of the MPL was not distributed with this
f325b2
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
- *
f325b2
- * This file incorporates work covered by the following license notice:
f325b2
- *
f325b2
- *   Licensed to the Apache Software Foundation (ASF) under one or more
f325b2
- *   contributor license agreements. See the NOTICE file distributed
f325b2
- *   with this work for additional information regarding copyright
f325b2
- *   ownership. The ASF licenses this file to you under the Apache
f325b2
- *   License, Version 2.0 (the "License"); you may not use this file
f325b2
- *   except in compliance with the License. You may obtain a copy of
f325b2
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
f325b2
--->
f325b2
-    <node oor:name="WPS_QPro_Calc" oor:op="replace">
f325b2
-        <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop>
f325b2
-        <prop oor:name="UIComponent"/>
f325b2
-        <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>
f325b2
-        <prop oor:name="UserData"><value></value></prop>
f325b2
-        <prop oor:name="UIName">
f325b2
-            <value xml:lang="en-US">QuattroPro Document</value>
f325b2
-        </prop>
f325b2
-        <prop oor:name="FileFormatVersion"><value>0</value></prop>
f325b2
-        <prop oor:name="Type"><value>calc_WPS_QPro_Document</value></prop>
f325b2
-        <prop oor:name="TemplateName"/>
f325b2
-        <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
f325b2
-    </node>
f325b2
diff --git a/filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu b/filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu
f325b2
deleted file mode 100644
f325b2
index 0ecc711..0000000
f325b2
--- a/filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu
f325b2
+++ /dev/null
f325b2
@@ -1,29 +0,0 @@
f325b2
-
f325b2
- * This file is part of the LibreOffice project.
f325b2
- *
f325b2
- * This Source Code Form is subject to the terms of the Mozilla Public
f325b2
- * License, v. 2.0. If a copy of the MPL was not distributed with this
f325b2
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
- *
f325b2
- * This file incorporates work covered by the following license notice:
f325b2
- *
f325b2
- *   Licensed to the Apache Software Foundation (ASF) under one or more
f325b2
- *   contributor license agreements. See the NOTICE file distributed
f325b2
- *   with this work for additional information regarding copyright
f325b2
- *   ownership. The ASF licenses this file to you under the Apache
f325b2
- *   License, Version 2.0 (the "License"); you may not use this file
f325b2
- *   except in compliance with the License. You may obtain a copy of
f325b2
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
f325b2
--->
f325b2
-    <node oor:name="calc_WPS_Lotus_Document" oor:op="replace" >
f325b2
-        <prop oor:name="DetectService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>
f325b2
-        <prop oor:name="URLPattern"/>
f325b2
-        <prop oor:name="Extensions"><value>wk1 wk3</value></prop>
f325b2
-        <prop oor:name="MediaType"></prop>
f325b2
-        <prop oor:name="Preferred"><value>true</value></prop>
f325b2
-        <prop oor:name="PreferredFilter"><value>WPS_Lotus_Calc</value></prop>
f325b2
-        <prop oor:name="UIName">
f325b2
-            <value>Lotus Wk1-Wk3</value>
f325b2
-        </prop>
f325b2
-        <prop oor:name="ClipboardFormat"/>
f325b2
-    </node>
f325b2
diff --git a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
f325b2
deleted file mode 100644
f325b2
index a335004..0000000
f325b2
--- a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
f325b2
+++ /dev/null
f325b2
@@ -1,29 +0,0 @@
f325b2
-
f325b2
- * This file is part of the LibreOffice project.
f325b2
- *
f325b2
- * This Source Code Form is subject to the terms of the Mozilla Public
f325b2
- * License, v. 2.0. If a copy of the MPL was not distributed with this
f325b2
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
- *
f325b2
- * This file incorporates work covered by the following license notice:
f325b2
- *
f325b2
- *   Licensed to the Apache Software Foundation (ASF) under one or more
f325b2
- *   contributor license agreements. See the NOTICE file distributed
f325b2
- *   with this work for additional information regarding copyright
f325b2
- *   ownership. The ASF licenses this file to you under the Apache
f325b2
- *   License, Version 2.0 (the "License"); you may not use this file
f325b2
- *   except in compliance with the License. You may obtain a copy of
f325b2
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
f325b2
--->
f325b2
-    <node oor:name="calc_WPS_QPro_Document" oor:op="replace" >
f325b2
-        <prop oor:name="DetectService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>
f325b2
-        <prop oor:name="URLPattern"/>
f325b2
-        <prop oor:name="Extensions"><value>wq1 wq2</value></prop>
f325b2
-        <prop oor:name="MediaType"></prop>
f325b2
-        <prop oor:name="Preferred"><value>true</value></prop>
f325b2
-        <prop oor:name="PreferredFilter"><value>WPS_QPro_Calc</value></prop>
f325b2
-        <prop oor:name="UIName">
f325b2
-            <value>QuattroPro Document</value>
f325b2
-        </prop>
f325b2
-        <prop oor:name="ClipboardFormat"/>
f325b2
-    </node>
f325b2
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
f325b2
index b0f3382..2405fb3 100644
f325b2
--- a/scp2/source/ooo/file_ooo.scp
f325b2
+++ b/scp2/source/ooo/file_ooo.scp
f325b2
@@ -290,7 +290,6 @@ UI_FILELIST(tubes, "UIConfig/tubes.filelist")
f325b2
 #endif
f325b2
 UI_FILELIST(uui, "UIConfig/uui.filelist")
f325b2
 UI_FILELIST(vcl, "UIConfig/vcl.filelist")
f325b2
-UI_FILELIST(writerperfect, "UIConfig/writerperfect.filelist")
f325b2
 UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist")
f325b2
 
f325b2
 UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE)
f325b2
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
f325b2
index 9acfbe8..7cd2514 100644
f325b2
--- a/scp2/source/ooo/module_ooo.scp
f325b2
+++ b/scp2/source/ooo/module_ooo.scp
f325b2
@@ -126,7 +126,6 @@ Module gid_Module_Root
f325b2
 #endif
f325b2
              gid_File_Share_Config_Sofficecfg_uiconfig_uui,
f325b2
              gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
f325b2
-             gid_File_Share_Config_Sofficecfg_uiconfig_writerperfect,
f325b2
              gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
f325b2
              gid_File_Share_Registry_Main_Xcd,
f325b2
              gid_File_Share_Registry_Forcedefault_Xcd,
f325b2
diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk
f325b2
index 18cc378..86c0fea 100644
f325b2
--- a/writerperfect/Library_wpftcalc.mk
f325b2
+++ b/writerperfect/Library_wpftcalc.mk
f325b2
@@ -34,10 +34,8 @@ $(eval $(call gb_Library_use_libraries,wpftcalc,\
f325b2
 	cppuhelper \
f325b2
 	sal \
f325b2
 	sot \
f325b2
-	svx \
f325b2
 	tl \
f325b2
 	utl \
f325b2
-	vcl \
f325b2
 	writerperfect \
f325b2
 	xo \
f325b2
 	$(gb_UWINAPI) \
f325b2
diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk
f325b2
index 1e57fcd..29409c1 100644
f325b2
--- a/writerperfect/Library_wpftdraw.mk
f325b2
+++ b/writerperfect/Library_wpftdraw.mk
f325b2
@@ -34,10 +34,8 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\
f325b2
 	cppuhelper \
f325b2
 	sal \
f325b2
 	sot \
f325b2
-	svx \
f325b2
 	tl \
f325b2
 	utl \
f325b2
-	vcl \
f325b2
 	writerperfect \
f325b2
 	xo \
f325b2
 	$(gb_UWINAPI) \
f325b2
diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk
f325b2
index 3d35aa7..eac71cb 100644
f325b2
--- a/writerperfect/Library_wpftimpress.mk
f325b2
+++ b/writerperfect/Library_wpftimpress.mk
f325b2
@@ -34,11 +34,9 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\
f325b2
 	cppuhelper \
f325b2
 	sal \
f325b2
 	sot \
f325b2
-	svx \
f325b2
 	tl \
f325b2
 	ucbhelper \
f325b2
 	utl \
f325b2
-	vcl \
f325b2
 	writerperfect \
f325b2
 	xo \
f325b2
 	$(gb_UWINAPI) \
f325b2
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
f325b2
index 288c929..60ff3b6 100644
f325b2
--- a/writerperfect/Library_wpftwriter.mk
f325b2
+++ b/writerperfect/Library_wpftwriter.mk
f325b2
@@ -36,11 +36,9 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
f325b2
 	sal \
f325b2
 	sfx \
f325b2
 	sot \
f325b2
-	svx \
f325b2
 	tl \
f325b2
 	ucbhelper \
f325b2
 	utl \
f325b2
-	vcl \
f325b2
 	writerperfect \
f325b2
 	xo \
f325b2
 	$(gb_UWINAPI) \
f325b2
diff --git a/writerperfect/Library_writerperfect.mk b/writerperfect/Library_writerperfect.mk
f325b2
index 165a7a0..1b8494b 100644
f325b2
--- a/writerperfect/Library_writerperfect.mk
f325b2
+++ b/writerperfect/Library_writerperfect.mk
f325b2
@@ -42,11 +42,9 @@ $(eval $(call gb_Library_use_libraries,writerperfect,\
f325b2
 	cppuhelper \
f325b2
 	sal \
f325b2
 	sot \
f325b2
-	svx \
f325b2
 	tl \
f325b2
 	ucbhelper \
f325b2
 	utl \
f325b2
-	vcl \
f325b2
 	xo \
f325b2
 	$(gb_UWINAPI) \
f325b2
 ))
f325b2
@@ -54,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,writerperfect,\
f325b2
 $(eval $(call gb_Library_add_exception_objects,writerperfect,\
f325b2
 	writerperfect/source/common/DirectoryStream \
f325b2
 	writerperfect/source/common/DocumentHandler \
f325b2
-	writerperfect/source/common/WPFTEncodingDialog \
f325b2
 	writerperfect/source/common/WPXSvInputStream \
f325b2
 ))
f325b2
 
f325b2
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
f325b2
index e787043..9c30697 100644
f325b2
--- a/writerperfect/Module_writerperfect.mk
f325b2
+++ b/writerperfect/Module_writerperfect.mk
f325b2
@@ -27,10 +27,6 @@ $(eval $(call gb_Module_add_targets,writerperfect,\
f325b2
 	Library_writerperfect \
f325b2
 ))
f325b2
 
f325b2
-$(eval $(call gb_Module_add_l10n_targets,writerperfect,\
f325b2
-	UIConfig_writerperfect \
f325b2
-))
f325b2
-
f325b2
 $(eval $(call gb_Module_add_check_targets,writerperfect,\
f325b2
 	CppunitTest_writerperfect_stream \
f325b2
 ))
f325b2
diff --git a/writerperfect/UIConfig_writerperfect.mk b/writerperfect/UIConfig_writerperfect.mk
f325b2
deleted file mode 100644
f325b2
index d0d8ef5..0000000
f325b2
--- a/writerperfect/UIConfig_writerperfect.mk
f325b2
+++ /dev/null
f325b2
@@ -1,26 +0,0 @@
f325b2
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
f325b2
-#
f325b2
-# This file is part of the LibreOffice project.
f325b2
-#
f325b2
-# This Source Code Form is subject to the terms of the Mozilla Public
f325b2
-# License, v. 2.0. If a copy of the MPL was not distributed with this
f325b2
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
-#
f325b2
-# This file incorporates work covered by the following license notice:
f325b2
-#
f325b2
-#   Licensed to the Apache Software Foundation (ASF) under one or more
f325b2
-#   contributor license agreements. See the NOTICE file distributed
f325b2
-#   with this work for additional information regarding copyright
f325b2
-#   ownership. The ASF licenses this file to you under the Apache
f325b2
-#   License, Version 2.0 (the "License"); you may not use this file
f325b2
-#   except in compliance with the License. You may obtain a copy of
f325b2
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
f325b2
-#
f325b2
-
f325b2
-$(eval $(call gb_UIConfig_UIConfig,writerperfect))
f325b2
-
f325b2
-$(eval $(call gb_UIConfig_add_uifiles,writerperfect,\
f325b2
-	writerperfect/uiconfig/ui/wpftencodingdialog \
f325b2
-))
f325b2
-
f325b2
-# vim: set noet sw=4 ts=4:
f325b2
diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx
f325b2
deleted file mode 100644
f325b2
index 2d3a63a..0000000
f325b2
--- a/writerperfect/inc/WPFTEncodingDialog.hxx
f325b2
+++ /dev/null
f325b2
@@ -1,58 +0,0 @@
f325b2
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
f325b2
-/* MSWorksImportFilter: Sets up the filter, and calls DocumentCollector
f325b2
- * to do the actual filtering
f325b2
- *
f325b2
- * This file is part of the LibreOffice project.
f325b2
- *
f325b2
- * This Source Code Form is subject to the terms of the Mozilla Public
f325b2
- * License, v. 2.0. If a copy of the MPL was not distributed with this
f325b2
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
- */
f325b2
-
f325b2
-#ifndef INCLUDED_WRITERPERFECT_WPFTENCODINGDIALOG_HXX
f325b2
-#define INCLUDED_WRITERPERFECT_WPFTENCODINGDIALOG_HXX
f325b2
-
f325b2
-#include <sal/types.h>
f325b2
-
f325b2
-#include <vcl/button.hxx>
f325b2
-#include <vcl/dialog.hxx>
f325b2
-#include <vcl/lstbox.hxx>
f325b2
-
f325b2
-#include <writerperfectdllapi.h>
f325b2
-
f325b2
-namespace writerperfect
f325b2
-{
f325b2
-
f325b2
-class WRITERPERFECT_DLLPUBLIC WPFTEncodingDialog : public ModalDialog
f325b2
-{
f325b2
-public:
f325b2
-    WPFTEncodingDialog(const OUString &title, const OUString &defEncoding);
f325b2
-
f325b2
-    virtual ~WPFTEncodingDialog();
f325b2
-
f325b2
-    OUString GetEncoding() const;
f325b2
-    bool hasUserCalledCancel() const
f325b2
-    {
f325b2
-        return m_userHasCancelled;
f325b2
-    }
f325b2
-private:
f325b2
-    VclPtr<ListBox> m_pLbCharset;
f325b2
-    VclPtr<OKButton>           m_pBtnOk;
f325b2
-    VclPtr<CancelButton>           m_pBtnCancel;
f325b2
-
f325b2
-    bool m_userHasCancelled;
f325b2
-private:
f325b2
-    DECL_LINK(DoubleClickHdl, ListBox *);
f325b2
-    DECL_LINK(CancelHdl, void *);
f325b2
-
f325b2
-    void dispose() SAL_OVERRIDE;
f325b2
-
f325b2
-    WPFTEncodingDialog(WPFTEncodingDialog const &) SAL_DELETED_FUNCTION;
f325b2
-    WPFTEncodingDialog &operator=(WPFTEncodingDialog const &) SAL_DELETED_FUNCTION;
f325b2
-};
f325b2
-
f325b2
-}
f325b2
-
f325b2
-#endif
f325b2
-
f325b2
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
f325b2
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
f325b2
index 3ccf2db..d897638 100644
f325b2
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
f325b2
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
f325b2
@@ -14,7 +14,6 @@
f325b2
 
f325b2
 #include <libwps/libwps.h>
f325b2
 
f325b2
-#include "WPFTEncodingDialog.hxx"
f325b2
 #include "MSWorksCalcImportFilter.hxx"
f325b2
 
f325b2
 using com::sun::star::uno::Sequence;
f325b2
@@ -27,79 +26,18 @@ using com::sun::star::uno::XComponentContext;
f325b2
 
f325b2
 bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, OdsGenerator &rGenerator, utl::MediaDescriptor &)
f325b2
 {
f325b2
-    libwps::WPSKind kind = libwps::WPS_TEXT;
f325b2
-    libwps::WPSCreator creator;
f325b2
-    bool needEncoding;
f325b2
-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needEncoding);
f325b2
-
f325b2
-    std::string fileEncoding("");
f325b2
-    if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
f325b2
-    {
f325b2
-        OUString title, encoding;
f325b2
-        if (creator == libwps::WPS_MSWORKS)
f325b2
-        {
f325b2
-            title="Import MsWorks files(libwps)";
f325b2
-            encoding="CP850";
f325b2
-        }
f325b2
-        else if (creator == libwps::WPS_LOTUS)
f325b2
-        {
f325b2
-            title="Import Lotus files(libwps)";
f325b2
-            encoding="CP437";
f325b2
-        }
f325b2
-        else if (creator == libwps::WPS_SYMPHONY)
f325b2
-        {
f325b2
-            title="Import Symphony files(libwps)";
f325b2
-            encoding="CP437";
f325b2
-        }
f325b2
-        else
f325b2
-        {
f325b2
-            title="Import Quattro Pro files(libwps)";
f325b2
-            encoding="CP437";
f325b2
-        }
f325b2
-        try
f325b2
-        {
f325b2
-            const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg(title, encoding);
f325b2
-            if (pDlg->Execute() == RET_OK)
f325b2
-            {
f325b2
-                if (!pDlg->GetEncoding().isEmpty())
f325b2
-                    fileEncoding=pDlg->GetEncoding().toUtf8().getStr();
f325b2
-            }
f325b2
-            // we can fail because we are in headless mode, the user has cancelled conversion, ...
f325b2
-            else if (pDlg->hasUserCalledCancel())
f325b2
-                return false;
f325b2
-        }
f325b2
-        catch (css::uno::Exception &e)
f325b2
-        {
f325b2
-            SAL_WARN("writerperfect", "ignoring Exception " << e.Message);
f325b2
-        }
f325b2
-    }
f325b2
-    return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator, "", fileEncoding.c_str());
f325b2
+    return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator);
f325b2
 }
f325b2
 
f325b2
 bool MSWorksCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
f325b2
 {
f325b2
     libwps::WPSKind kind = libwps::WPS_TEXT;
f325b2
-    libwps::WPSCreator creator;
f325b2
-    bool needEncoding;
f325b2
-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needEncoding);
f325b2
+    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind);
f325b2
 
f325b2
-    if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE) && confidence == libwps::WPS_CONFIDENCE_EXCELLENT)
f325b2
+    if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT))
f325b2
     {
f325b2
-        if (creator == libwps::WPS_MSWORKS)
f325b2
-        {
f325b2
-            rTypeName = "calc_MS_Works_Document";
f325b2
-            return true;
f325b2
-        }
f325b2
-        if (creator == libwps::WPS_LOTUS || creator == libwps::WPS_SYMPHONY)
f325b2
-        {
f325b2
-            rTypeName = "calc_WPS_Lotus_Document";
f325b2
-            return true;
f325b2
-        }
f325b2
-        if (creator == libwps::WPS_QUATTRO_PRO)
f325b2
-        {
f325b2
-            rTypeName = "calc_WPS_QPro_Document";
f325b2
-            return true;
f325b2
-        }
f325b2
+        rTypeName = "calc_MS_Works_Document";
f325b2
+        return true;
f325b2
     }
f325b2
 
f325b2
     return false;
f325b2
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
f325b2
deleted file mode 100644
f325b2
index dec775b..0000000
f325b2
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
f325b2
+++ /dev/null
f325b2
@@ -1,180 +0,0 @@
f325b2
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
f325b2
-/*
f325b2
- * This file is part of the LibreOffice project.
f325b2
- *
f325b2
- * This Source Code Form is subject to the terms of the Mozilla Public
f325b2
- * License, v. 2.0. If a copy of the MPL was not distributed with this
f325b2
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
- *
f325b2
- * This file incorporates work covered by the following license notice:
f325b2
- *
f325b2
- *   Licensed to the Apache Software Foundation (ASF) under one or more
f325b2
- *   contributor license agreements. See the NOTICE file distributed
f325b2
- *   with this work for additional information regarding copyright
f325b2
- *   ownership. The ASF licenses this file to you under the Apache
f325b2
- *   License, Version 2.0 (the "License"); you may not use this file
f325b2
- *   except in compliance with the License. You may obtain a copy of
f325b2
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
f325b2
- */
f325b2
-
f325b2
-#include <WPFTEncodingDialog.hxx>
f325b2
-
f325b2
-namespace writerperfect
f325b2
-{
f325b2
-
f325b2
-namespace
f325b2
-{
f325b2
-
f325b2
-struct EncodingImplementation
f325b2
-{
f325b2
-
f325b2
-    static OUString const(s_encodings[]);
f325b2
-
f325b2
-    static int numEncodings();
f325b2
-    static void insertEncodings(ListBox *box);
f325b2
-    static void selectEncoding(ListBox *box, const OUString &encoding);
f325b2
-    static OUString getEncoding(ListBox *box);
f325b2
-};
f325b2
-
f325b2
-OUString const(EncodingImplementation::s_encodings[])=
f325b2
-{
f325b2
-    OUString("MacArabic"), OUString("Arabic (Apple Macintosh)"),
f325b2
-    OUString("CP864"), OUString("Arabic (DOS/OS2-864)"),
f325b2
-    OUString("CP1006"), OUString("Arabic (IBM-1006)"),
f325b2
-    OUString("CP1256"), OUString("Arabic (Windows-1256)"),
f325b2
-    OUString("CP775"), OUString("Baltic (DOS/OS2-775)"),
f325b2
-    OUString("CP1257"), OUString("Baltic (Windows-1257)"),
f325b2
-    OUString("MacCeltic"), OUString("Celtic (Apple Macintosh)"),
f325b2
-    OUString("MacCyrillic"), OUString("Cyrillic (Apple Macintosh)"),
f325b2
-    OUString("CP855"), OUString("Cyrillic (DOS/OS2-855)"),
f325b2
-    OUString("CP866"), OUString("Cyrillic (DOS/OS2-866/Russian)"),
f325b2
-    OUString("CP1251"), OUString("Cyrillic (Windows-1251)"),
f325b2
-    OUString("MacCEurope"), OUString("Eastern Europe (Apple Macintosh)"),
f325b2
-    OUString("MacCroatian"), OUString("Eastern Europe (Apple Macintosh/Croatian)"),
f325b2
-    OUString("MacRomanian"), OUString("Eastern Europe (Apple Macintosh/Romanian)"),
f325b2
-    OUString("CP852"), OUString("Eastern Europe (DOS/OS2-852)"),
f325b2
-    OUString("CP1250"), OUString("Eastern Europe (Windows-1250/WinLatin 2)"),
f325b2
-    OUString("MacGreek"), OUString("Greek (Apple Macintosh)"),
f325b2
-    OUString("CP737"), OUString("Greek (DOS/OS2-737)"),
f325b2
-    OUString("CP869"), OUString("Greek (DOS/OS2-869/Greek-2)"),
f325b2
-    OUString("CP875"), OUString("Greek (DOS/OS2-875)"),
f325b2
-    OUString("CP1253"), OUString("Greek (Windows-1253)"),
f325b2
-    OUString("MacHebrew"), OUString("Hebrew (Apple Macintosh)"),
f325b2
-    OUString("CP424"), OUString("Hebrew (DOS/OS2-424)"),
f325b2
-    OUString("CP856"), OUString("Hebrew (DOS/OS2-856)"),
f325b2
-    OUString("CP862"), OUString("Hebrew (DOS/OS2-862)"),
f325b2
-    OUString("CP1255"), OUString("Hebrew (Windows-1255)"),
f325b2
-    OUString("CP500"), OUString("International (DOS/OS2-500)"),
f325b2
-    OUString("MacThai"), OUString("Thai (Apple Macintosh)"),
f325b2
-    OUString("CP874"), OUString("Thai (DOS/OS2-874)"),
f325b2
-    OUString("MacTurkish"), OUString("Turkish (Apple Macintosh)"),
f325b2
-    OUString("CP857"), OUString("Turkish (DOS/OS2-857)"),
f325b2
-    OUString("CP1026"), OUString("Turkish (DOS/OS2-1026)"),
f325b2
-    OUString("CP1254"), OUString("Turkish (Windows-1254)"),
f325b2
-    OUString("CP1258"), OUString("Vietnamese (Windows-1258)"),
f325b2
-    OUString("MacRoman"), OUString("Western Europe (Apple Macintosh)"),
f325b2
-    OUString("MacIceland"), OUString("Western Europe (Apple Macintosh/Icelandic)"),
f325b2
-    OUString("CP037"), OUString("Western Europe (DOS/OS2-037/US-Canada)"),
f325b2
-    OUString("CP437"), OUString("Western Europe (DOS/OS2-437/US)"),
f325b2
-    OUString("CP850"), OUString("Western Europe (DOS/OS2-850)"),
f325b2
-    OUString("CP860"), OUString("Western Europe (DOS/OS2-860/Portuguese)"),
f325b2
-    OUString("CP861"), OUString("Western Europe (DOS/OS2-861/Icelandic)"),
f325b2
-    OUString("CP863"), OUString("Western Europe (DOS/OS2-863/French)"),
f325b2
-    OUString("CP865"), OUString("Western Europe (DOS/OS2-865/Nordic)"),
f325b2
-    OUString("CP1252"), OUString("Western Europe (Windows-1252/WinLatin 1)")
f325b2
-};
f325b2
-
f325b2
-int EncodingImplementation::numEncodings()
f325b2
-{
f325b2
-    return int(sizeof(s_encodings)/(2*sizeof(const OUString *)));
f325b2
-}
f325b2
-
f325b2
-void EncodingImplementation::insertEncodings(ListBox *box)
f325b2
-{
f325b2
-    sal_IntPtr num=sal_IntPtr(numEncodings());
f325b2
-    for (sal_IntPtr i=0; i
f325b2
-    {
f325b2
-        sal_IntPtr nAt=box->InsertEntry(s_encodings[2*i+1]);
f325b2
-        box->SetEntryData(nAt, reinterpret_cast<void *>(i));
f325b2
-    }
f325b2
-}
f325b2
-
f325b2
-void EncodingImplementation::selectEncoding(ListBox *box, const OUString &encoding)
f325b2
-{
f325b2
-    sal_IntPtr num=sal_IntPtr(numEncodings());
f325b2
-    for (sal_IntPtr i=0; i
f325b2
-    {
f325b2
-        if (encoding!=s_encodings[2*i]) continue;
f325b2
-        box->SelectEntryPos(i);
f325b2
-        return;
f325b2
-    }
f325b2
-}
f325b2
-
f325b2
-OUString EncodingImplementation::getEncoding(ListBox *box)
f325b2
-{
f325b2
-    sal_IntPtr pos = reinterpret_cast<sal_IntPtr>(box->GetSelectEntryData());
f325b2
-    if (pos<0||pos>=numEncodings())
f325b2
-        return OUString();
f325b2
-    return s_encodings[2*pos];
f325b2
-}
f325b2
-
f325b2
-}
f325b2
-
f325b2
-WPFTEncodingDialog::WPFTEncodingDialog(
f325b2
-    const OUString &title, const OUString &encoding)
f325b2
-    :   ModalDialog(nullptr, "WPFTEncodingDialog", "writerperfect/ui/wpftencodingdialog.ui"),
f325b2
-        m_pLbCharset(), m_pBtnOk(), m_pBtnCancel(), m_userHasCancelled(false)
f325b2
-{
f325b2
-    get(m_pLbCharset, "comboboxtext");
f325b2
-    get(m_pBtnOk, "ok");
f325b2
-    get(m_pBtnCancel, "cancel");
f325b2
-
f325b2
-    m_pBtnCancel->SetClickHdl(LINK(this, WPFTEncodingDialog, CancelHdl));
f325b2
-
f325b2
-    EncodingImplementation::insertEncodings(m_pLbCharset);
f325b2
-    m_pLbCharset->SetStyle(m_pLbCharset->GetStyle() | WB_SORT);
f325b2
-    // m_pLbCharset->set_height_request(6 * m_pLbCharset->GetTextHeight());
f325b2
-    m_pLbCharset->SetDoubleClickHdl(LINK(this, WPFTEncodingDialog, DoubleClickHdl));
f325b2
-    EncodingImplementation::selectEncoding(m_pLbCharset, encoding);
f325b2
-    m_pLbCharset->Show();
f325b2
-
f325b2
-    SetText(title);
f325b2
-}
f325b2
-
f325b2
-WPFTEncodingDialog::~WPFTEncodingDialog()
f325b2
-{
f325b2
-    disposeOnce();
f325b2
-}
f325b2
-
f325b2
-OUString WPFTEncodingDialog::GetEncoding() const
f325b2
-{
f325b2
-    return EncodingImplementation::getEncoding(m_pLbCharset);
f325b2
-}
f325b2
-
f325b2
-IMPL_LINK_NOARG(WPFTEncodingDialog, CancelHdl)
f325b2
-{
f325b2
-    m_userHasCancelled=true;
f325b2
-    Close();
f325b2
-    return 0;
f325b2
-}
f325b2
-
f325b2
-IMPL_LINK(WPFTEncodingDialog, DoubleClickHdl, ListBox *, pLb)
f325b2
-{
f325b2
-    if (pLb == m_pLbCharset)
f325b2
-    {
f325b2
-        m_pBtnOk->Click();
f325b2
-    }
f325b2
-    return 0;
f325b2
-}
f325b2
-
f325b2
-void WPFTEncodingDialog::dispose()
f325b2
-{
f325b2
-    m_pLbCharset.disposeAndClear();
f325b2
-    m_pBtnOk.disposeAndClear();
f325b2
-    m_pBtnCancel.disposeAndClear();
f325b2
-    ModalDialog::dispose();
f325b2
-}
f325b2
-
f325b2
-}
f325b2
-
f325b2
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
f325b2
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
f325b2
index 018f790..61c54f5 100644
f325b2
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
f325b2
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
f325b2
@@ -9,13 +9,11 @@
f325b2
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
f325b2
  */
f325b2
 
f325b2
-#include <boost/scoped_ptr.hpp>
f325b2
 #include <com/sun/star/uno/Reference.h>
f325b2
 #include <cppuhelper/supportsservice.hxx>
f325b2
 
f325b2
 #include <libwps/libwps.h>
f325b2
 
f325b2
-#include "WPFTEncodingDialog.hxx"
f325b2
 #include "MSWorksImportFilter.hxx"
f325b2
 
f325b2
 using com::sun::star::uno::Sequence;
f325b2
@@ -35,41 +33,13 @@ static bool handleEmbeddedWKSObject(const librevenge::RVNGBinaryData &data, OdfD
f325b2
 
f325b2
 bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, OdtGenerator &rGenerator, utl::MediaDescriptor &)
f325b2
 {
f325b2
-    libwps::WPSKind kind = libwps::WPS_TEXT;
f325b2
-    libwps::WPSCreator creator;
f325b2
-    bool needEncoding;
f325b2
-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needEncoding);
f325b2
-
f325b2
-    std::string fileEncoding("");
f325b2
-    try
f325b2
-    {
f325b2
-        if ((kind == libwps::WPS_TEXT) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
f325b2
-        {
f325b2
-            const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg(
f325b2
-                "Import MsWorks files(libwps)", "CP850");
f325b2
-            if (pDlg->Execute() == RET_OK)
f325b2
-            {
f325b2
-                if (!pDlg->GetEncoding().isEmpty())
f325b2
-                    fileEncoding=pDlg->GetEncoding().toUtf8().getStr();
f325b2
-            }
f325b2
-            // we can fail because we are in headless mode, the user has cancelled conversion, ...
f325b2
-            else if (pDlg->hasUserCalledCancel())
f325b2
-                return false;
f325b2
-        }
f325b2
-    }
f325b2
-    catch (css::uno::Exception &e)
f325b2
-    {
f325b2
-        SAL_WARN("writerperfect", "ignoring Exception " << e.Message);
f325b2
-    }
f325b2
-    return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator, "", fileEncoding.c_str());
f325b2
+    return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator);
f325b2
 }
f325b2
 
f325b2
 bool MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
f325b2
 {
f325b2
     libwps::WPSKind kind = libwps::WPS_TEXT;
f325b2
-    libwps::WPSCreator creator;
f325b2
-    bool needEncoding;
f325b2
-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needEncoding);
f325b2
+    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind);
f325b2
 
f325b2
     if ((kind == libwps::WPS_TEXT) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT))
f325b2
     {
f325b2
diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
f325b2
deleted file mode 100644
f325b2
index 40d2652..0000000
f325b2
--- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
f325b2
+++ /dev/null
f325b2
@@ -1,90 +0,0 @@
f325b2
-
f325b2
-
f325b2
-<interface>
f325b2
-  <requires lib="gtk+" version="3.12"/>
f325b2
-  <object class="GtkDialog" id="WPFTEncodingDialog">
f325b2
-    <property name="can_focus">False</property>
f325b2
-    <property name="border_width">6</property>
f325b2
-    <property name="resizable">False</property>
f325b2
-    <property name="modal">True</property>
f325b2
-    <property name="default_height">-1</property>
f325b2
-    <property name="type_hint">dialog</property>
f325b2
-    <child internal-child="vbox">
f325b2
-      <object class="GtkBox" id="dialog-vbox1">
f325b2
-        <property name="can_focus">False</property>
f325b2
-        <property name="orientation">vertical</property>
f325b2
-        <property name="spacing">6</property>
f325b2
-        <child internal-child="action_area">
f325b2
-          <object class="GtkButtonBox" id="dialog-action_area1">
f325b2
-            <property name="can_focus">False</property>
f325b2
-            <property name="layout_style">end</property>
f325b2
-            <child>
f325b2
-              <object class="GtkButton" id="ok">
f325b2
-                <property name="label">gtk-ok</property>
f325b2
-                <property name="visible">True</property>
f325b2
-                <property name="can_focus">True</property>
f325b2
-                <property name="has_default">True</property>
f325b2
-                <property name="receives_default">True</property>
f325b2
-                <property name="use_stock">True</property>
f325b2
-                <property name="yalign">0.62000000476837158</property>
f325b2
-              </object>
f325b2
-              <packing>
f325b2
-                <property name="expand">True</property>
f325b2
-                <property name="fill">True</property>
f325b2
-                <property name="position">0</property>
f325b2
-              </packing>
f325b2
-            </child>
f325b2
-            <child>
f325b2
-              <object class="GtkButton" id="cancel">
f325b2
-                <property name="label">gtk-cancel</property>
f325b2
-                <property name="visible">True</property>
f325b2
-                <property name="can_focus">True</property>
f325b2
-                <property name="receives_default">True</property>
f325b2
-                <property name="use_stock">True</property>
f325b2
-              </object>
f325b2
-              <packing>
f325b2
-                <property name="expand">True</property>
f325b2
-                <property name="fill">True</property>
f325b2
-                <property name="position">1</property>
f325b2
-              </packing>
f325b2
-            </child>
f325b2
-          </object>
f325b2
-          <packing>
f325b2
-            <property name="expand">False</property>
f325b2
-            <property name="fill">False</property>
f325b2
-            <property name="position">2</property>
f325b2
-          </packing>
f325b2
-        </child>
f325b2
-        <child>
f325b2
-          <object class="GtkLabel" id="label">
f325b2
-            <property name="visible">True</property>
f325b2
-            <property name="can_focus">False</property>
f325b2
-            <property name="halign">start</property>
f325b2
-            <property name="label" translatable="yes">_Character set:</property>
f325b2
-            <property name="use_underline">True</property>
f325b2
-            <property name="mnemonic_widget">comboboxtext</property>
f325b2
-          </object>
f325b2
-          <packing>
f325b2
-            <property name="expand">False</property>
f325b2
-            <property name="fill">True</property>
f325b2
-            <property name="position">0</property>
f325b2
-          </packing>
f325b2
-        </child>
f325b2
-        <child>
f325b2
-          <object class="GtkComboBoxText" id="comboboxtext">
f325b2
-            <property name="can_focus">False</property>
f325b2
-          </object>
f325b2
-          <packing>
f325b2
-            <property name="expand">False</property>
f325b2
-            <property name="fill">True</property>
f325b2
-            <property name="position">1</property>
f325b2
-          </packing>
f325b2
-        </child>
f325b2
-      </object>
f325b2
-    </child>
f325b2
-    <action-widgets>
f325b2
-      <action-widget response="0">ok</action-widget>
f325b2
-      <action-widget response="0">cancel</action-widget>
f325b2
-    </action-widgets>
f325b2
-  </object>
f325b2
-</interface>
f325b2
-- 
f325b2
2.5.0
f325b2