From 97a27e85e1e4ec766dd5b528b6c7fba3b2910248 Mon Sep 17 00:00:00 2001

From: David Tardon <dtardon@redhat.com>

Date: Tue, 1 Mar 2016 07:23:54 +0100

Subject: [PATCH] Revert "upload libwps 0.4.0"

This reverts commit f9568335a653f72732f9c8ebf007cf8850021ff9.

Change-Id: Iffbbc6fd409b807848a34c2e5cc4ac4c4e930a49

---

 RepositoryExternal.mk                              |   2 +-

 configure.ac                                       |   2 +-

 download.lst                                       |   5 +-

 ...parser-correct-a-mistake-when-reading-neg.patch |  26 ---

 ...01-error-C2065-M_PI-undeclared-identifier.patch |  35 ----

 external/libwps/ExternalPackage_libwps.mk          |   6 +-

 external/libwps/ExternalProject_libwps.mk          |   2 +-

 external/libwps/Library_wps.mk                     |   8 -

 external/libwps/UnpackedTarball_libwps.mk          |   2 -

 filter/Configuration_filter.mk                     |   4 -

 .../config/fragments/filters/WPS_Lotus_Calc.xcu    |  30 ----

 .../config/fragments/filters/WPS_QPro_Calc.xcu     |  30 ----

 .../fragments/types/calc_WPS_Lotus_Document.xcu    |  29 ----

 .../fragments/types/calc_WPS_QPro_Document.xcu     |  29 ----

 scp2/source/ooo/file_ooo.scp                       |   1 -

 scp2/source/ooo/module_ooo.scp                     |   1 -

 writerperfect/Library_wpftcalc.mk                  |   2 -

 writerperfect/Library_wpftdraw.mk                  |   2 -

 writerperfect/Library_wpftimpress.mk               |   2 -

 writerperfect/Library_wpftwriter.mk                |   2 -

 writerperfect/Library_writerperfect.mk             |   3 -

 writerperfect/Module_writerperfect.mk              |   4 -

 writerperfect/UIConfig_writerperfect.mk            |  26 ---

 writerperfect/inc/WPFTEncodingDialog.hxx           |  58 -------

 .../source/calc/MSWorksCalcImportFilter.cxx        |  72 +--------

 writerperfect/source/common/WPFTEncodingDialog.cxx | 180 ---------------------

 .../source/writer/MSWorksImportFilter.cxx          |  34 +---

 writerperfect/uiconfig/ui/wpftencodingdialog.ui    |  90 -----------

 28 files changed, 15 insertions(+), 672 deletions(-)

 delete mode 100644 external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch

 delete mode 100644 external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch

 delete mode 100644 filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu

 delete mode 100644 filter/source/config/fragments/filters/WPS_QPro_Calc.xcu

 delete mode 100644 filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu

 delete mode 100644 filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu

 delete mode 100644 writerperfect/UIConfig_writerperfect.mk

 delete mode 100644 writerperfect/inc/WPFTEncodingDialog.hxx

 delete mode 100644 writerperfect/source/common/WPFTEncodingDialog.cxx

 delete mode 100644 writerperfect/uiconfig/ui/wpftencodingdialog.ui

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk

index 20de676..3df6d6a 100644

--- a/RepositoryExternal.mk

+++ b/RepositoryExternal.mk

@@ -2192,7 +2192,7 @@ $(call gb_LinkTarget_set_include,$(1),\

 	$$(INCLUDE) \

 )

 $(call gb_LinkTarget_add_libs,$(1),\

-	-L$(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs -lwps-0.4 \

+	-L$(call gb_UnpackedTarball_get_dir,libwps)/src/lib/.libs -lwps-0.3 \

 )

 endef

diff --git a/configure.ac b/configure.ac

index cc77ee9..6a99034 100644

--- a/configure.ac

+++ b/configure.ac

@@ -7713,7 +7713,7 @@ libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])

 dnl ===================================================================

 dnl Check for system libwps

 dnl ===================================================================

-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])

+libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.3])

 dnl ===================================================================

 dnl Check for system libwpg

diff --git a/download.lst b/download.lst

index 9e16272..dc9aaea 100644

--- a/download.lst

+++ b/download.lst

@@ -146,9 +146,8 @@ export WPD_MD5SUM := 0773d79a1f240ef9f4f20242b13c5bb7

 export WPD_TARBALL := libwpd-0.10.0.tar.bz2

 export WPG_MD5SUM := 17da9770cb8b317b7633f9807b32b71a

 export WPG_TARBALL := libwpg-0.3.0.tar.bz2

-export WPS_MD5SUM := e9162d2566421d9d71b3ad2377a68fd5

-export WPS_VERSION_MICRO := 0

-export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2

+export WPS_MD5SUM := a111d9ef5a0dab564e9aec0f2cf8d218

+export WPS_TARBALL := libwps-0.3.1.tar.bz2

 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip

 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40

 export ZLIB_TARBALL := zlib-1.2.8.tar.gz

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

deleted file mode 100644

index d5a6f54..0000000

--- a/external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch

+++ /dev/null

@@ -1,26 +0,0 @@

-From 45a3dd5393e07340d5a63d8a8735789d73a61b17 Mon Sep 17 00:00:00 2001

-From: osnola <alonso@loria.fr>

-Date: Mon, 18 May 2015 08:27:59 +0200

-Subject: [PATCH] QuattroPro parser: correct a mistake when reading negative

- cell's position

-

----

- src/lib/QuattroSpreadsheet.cpp | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp

-index cb0f4f5..ce5e20a 100644

---- a/src/lib/QuattroSpreadsheet.cpp

-+++ b/src/lib/QuattroSpreadsheet.cpp

-@@ -1668,7 +1668,7 @@ bool QuattroSpreadsheet::readCell

- 			else

- 			{

- 				val &= 0x3FFF;

--				if (val & 0x2000) val = val - 0x4000;

-+				if (val>0x1000) val = val - 0x2000;

- 			}

- 			if (dim==2)

- 				val += sheetId;

--- 

-2.3.2 (Apple Git-55)

-

diff --git a/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch b/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch

deleted file mode 100644

index 01109dc..0000000

--- a/external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch

+++ /dev/null

@@ -1,35 +0,0 @@

-From 94af34d42129bad72fd7ce50dc6901287509703e Mon Sep 17 00:00:00 2001

-From: David Tardon <dtardon@redhat.com>

-Date: Mon, 18 May 2015 18:50:25 +0200

-Subject: [PATCH] error C2065: M_PI : undeclared identifier

-

----

- src/lib/libwps_internal.h | 5 +++++

- 1 file changed, 5 insertions(+)

-

-diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h

-index fb9016d..02a87bc 100644

---- a/src/lib/libwps_internal.h

-+++ b/src/lib/libwps_internal.h

-@@ -28,6 +28,7 @@

- #include <stdio.h>

- #endif

- 

-+#include <cmath>

- #include <iostream>

- #include <map>

- #include <string>

-@@ -36,6 +37,10 @@

- #include <librevenge-stream/librevenge-stream.h>

- #include <librevenge/librevenge.h>

- 

-+#ifndef M_PI

-+#define M_PI 3.14159265358979323846

-+#endif

-+

- #if defined(_MSC_VER) || defined(__DJGPP__)

- typedef signed char int8_t;

- typedef unsigned char uint8_t;

--- 

-2.4.0

-

diff --git a/external/libwps/ExternalPackage_libwps.mk b/external/libwps/ExternalPackage_libwps.mk

index 24b00c6..3e0f79b 100644

--- a/external/libwps/ExternalPackage_libwps.mk

+++ b/external/libwps/ExternalPackage_libwps.mk

@@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libwps,libwps))

 $(eval $(call gb_ExternalPackage_use_external_project,libwps,libwps))

 ifeq ($(OS),MACOSX)

-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.4.dylib,src/lib/.libs/libwps-0.4.4.dylib))

+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.3.dylib,src/lib/.libs/libwps-0.3.3.dylib))

 else ifeq ($(OS),WNT)

-$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.4.dll,src/lib/.libs/libwps-0.4.dll))

+$(eval $(call gb_ExternalPackage_add_file,libwps,$(LIBO_LIB_FOLDER)/libwps-0.3.dll,src/lib/.libs/libwps-0.3.dll))

 else ifeq ($(filter IOS ANDROID,$(OS)),)

-$(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)))

+$(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))

 endif

 # vim: set noet sw=4 ts=4:

diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk

index 10b39b3..8cd2138 100644

--- a/external/libwps/ExternalProject_libwps.mk

+++ b/external/libwps/ExternalProject_libwps.mk

@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :

 		&& $(MAKE) \

 		$(if $(filter MACOSX,$(OS)),\

 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \

-				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.4.4.dylib \

+				$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.3.3.dylib \

 		) \

 	)

diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk

index ef323ce..be9f3c6 100644

--- a/external/libwps/Library_wps.mk

+++ b/external/libwps/Library_wps.mk

@@ -33,12 +33,6 @@ $(eval $(call gb_Library_add_defs,wps,\

 $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))

 $(eval $(call gb_Library_add_generated_exception_objects,wps,\

-	UnpackedTarball/libwps/src/lib/Lotus \

-	UnpackedTarball/libwps/src/lib/LotusGraph \

-	UnpackedTarball/libwps/src/lib/LotusSpreadsheet \

-	UnpackedTarball/libwps/src/lib/LotusStyleManager \

-	UnpackedTarball/libwps/src/lib/Quattro \

-	UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \

 	UnpackedTarball/libwps/src/lib/WKS4 \

 	UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \

 	UnpackedTarball/libwps/src/lib/WKSContentListener \

@@ -58,8 +52,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\

 	UnpackedTarball/libwps/src/lib/WPSDebug \

 	UnpackedTarball/libwps/src/lib/WPSDocument \

 	UnpackedTarball/libwps/src/lib/WPSFont \

-	UnpackedTarball/libwps/src/lib/WPSGraphicShape \

-	UnpackedTarball/libwps/src/lib/WPSGraphicStyle \

 	UnpackedTarball/libwps/src/lib/WPSHeader \

 	UnpackedTarball/libwps/src/lib/WPSList \

 	UnpackedTarball/libwps/src/lib/WPSOLEParser \

diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk

index 52d9ab3..fd5953e 100644

--- a/external/libwps/UnpackedTarball_libwps.mk

+++ b/external/libwps/UnpackedTarball_libwps.mk

@@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))

 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))

 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\

-	external/libwps/0001-QuattroPro-parser-correct-a-mistake-when-reading-neg.patch \

-	external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \

 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \

 ))

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk

index 213e981..576536e 100644

--- a/filter/Configuration_filter.mk

+++ b/filter/Configuration_filter.mk

@@ -496,8 +496,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,f

 	calc_OOXML \

 	calc_OOXML_Template \

 	calc_MS_Works_Document \

-	calc_WPS_Lotus_Document \

-	calc_WPS_QPro_Document \

 	calc_Beagle_Works \

 	calc_ClarisWorks \

 	calc_Claris_Resolve \

@@ -537,8 +535,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x

 	calc_OOXML \

 	calc_OOXML_Template \

 	MS_Works_Calc \

-	WPS_Lotus_Calc \

-	WPS_QPro_Calc \

 	Beagle_Works_Calc \

 	ClarisWorks_Calc \

 	Claris_Resolve_Calc \

diff --git a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu b/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu

deleted file mode 100644

index 721e68f..0000000

--- a/filter/source/config/fragments/filters/WPS_Lotus_Calc.xcu

+++ /dev/null

@@ -1,30 +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 .

--->

-    <node oor:name="WPS_Lotus_Calc" oor:op="replace">

-        <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop>

-        <prop oor:name="UIComponent"/>

-        <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>

-        <prop oor:name="UserData"><value></value></prop>

-        <prop oor:name="UIName">

-            <value xml:lang="en-US">Lotus Document</value>

-        </prop>

-        <prop oor:name="FileFormatVersion"><value>0</value></prop>

-        <prop oor:name="Type"><value>calc_WPS_Lotus_Document</value></prop>

-        <prop oor:name="TemplateName"/>

-        <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>

-    </node>

diff --git a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu b/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu

deleted file mode 100644

index 77c7b45..0000000

--- a/filter/source/config/fragments/filters/WPS_QPro_Calc.xcu

+++ /dev/null

@@ -1,30 +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 .

--->

-    <node oor:name="WPS_QPro_Calc" oor:op="replace">

-        <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER</value></prop>

-        <prop oor:name="UIComponent"/>

-        <prop oor:name="FilterService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>

-        <prop oor:name="UserData"><value></value></prop>

-        <prop oor:name="UIName">

-            <value xml:lang="en-US">QuattroPro Document</value>

-        </prop>

-        <prop oor:name="FileFormatVersion"><value>0</value></prop>

-        <prop oor:name="Type"><value>calc_WPS_QPro_Document</value></prop>

-        <prop oor:name="TemplateName"/>

-        <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>

-    </node>

diff --git a/filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu b/filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu

deleted file mode 100644

index 0ecc711..0000000

--- a/filter/source/config/fragments/types/calc_WPS_Lotus_Document.xcu

+++ /dev/null

@@ -1,29 +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 .

--->

-    <node oor:name="calc_WPS_Lotus_Document" oor:op="replace" >

-        <prop oor:name="DetectService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>

-        <prop oor:name="URLPattern"/>

-        <prop oor:name="Extensions"><value>wk1 wk3</value></prop>

-        <prop oor:name="MediaType"></prop>

-        <prop oor:name="Preferred"><value>true</value></prop>

-        <prop oor:name="PreferredFilter"><value>WPS_Lotus_Calc</value></prop>

-        <prop oor:name="UIName">

-            <value>Lotus Wk1-Wk3</value>

-        </prop>

-        <prop oor:name="ClipboardFormat"/>

-    </node>

diff --git a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu

deleted file mode 100644

index a335004..0000000

--- a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu

+++ /dev/null

@@ -1,29 +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 .

--->

-    <node oor:name="calc_WPS_QPro_Document" oor:op="replace" >

-        <prop oor:name="DetectService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>

-        <prop oor:name="URLPattern"/>

-        <prop oor:name="Extensions"><value>wq1 wq2</value></prop>

-        <prop oor:name="MediaType"></prop>

-        <prop oor:name="Preferred"><value>true</value></prop>

-        <prop oor:name="PreferredFilter"><value>WPS_QPro_Calc</value></prop>

-        <prop oor:name="UIName">

-            <value>QuattroPro Document</value>

-        </prop>

-        <prop oor:name="ClipboardFormat"/>

-    </node>

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp

index b0f3382..2405fb3 100644

--- a/scp2/source/ooo/file_ooo.scp

+++ b/scp2/source/ooo/file_ooo.scp

@@ -290,7 +290,6 @@ UI_FILELIST(tubes, "UIConfig/tubes.filelist")

 #endif

 UI_FILELIST(uui, "UIConfig/uui.filelist")

 UI_FILELIST(vcl, "UIConfig/vcl.filelist")

-UI_FILELIST(writerperfect, "UIConfig/writerperfect.filelist")

 UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist")

 UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE)

diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp

index 9acfbe8..7cd2514 100644

--- a/scp2/source/ooo/module_ooo.scp

+++ b/scp2/source/ooo/module_ooo.scp

@@ -126,7 +126,6 @@ Module gid_Module_Root

 #endif

              gid_File_Share_Config_Sofficecfg_uiconfig_uui,

              gid_File_Share_Config_Sofficecfg_uiconfig_vcl,

-             gid_File_Share_Config_Sofficecfg_uiconfig_writerperfect,

              gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,

              gid_File_Share_Registry_Main_Xcd,

              gid_File_Share_Registry_Forcedefault_Xcd,

diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk

index 18cc378..86c0fea 100644

--- a/writerperfect/Library_wpftcalc.mk

+++ b/writerperfect/Library_wpftcalc.mk

@@ -34,10 +34,8 @@ $(eval $(call gb_Library_use_libraries,wpftcalc,\

 	cppuhelper \

 	sal \

 	sot \

-	svx \

 	tl \

 	utl \

-	vcl \

 	writerperfect \

 	xo \

 	$(gb_UWINAPI) \

diff --git a/writerperfect/Library_wpftdraw.mk b/writerperfect/Library_wpftdraw.mk

index 1e57fcd..29409c1 100644

--- a/writerperfect/Library_wpftdraw.mk

+++ b/writerperfect/Library_wpftdraw.mk

@@ -34,10 +34,8 @@ $(eval $(call gb_Library_use_libraries,wpftdraw,\

 	cppuhelper \

 	sal \

 	sot \

-	svx \

 	tl \

 	utl \

-	vcl \

 	writerperfect \

 	xo \

 	$(gb_UWINAPI) \

diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk

index 3d35aa7..eac71cb 100644

--- a/writerperfect/Library_wpftimpress.mk

+++ b/writerperfect/Library_wpftimpress.mk

@@ -34,11 +34,9 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\

 	cppuhelper \

 	sal \

 	sot \

-	svx \

 	tl \

 	ucbhelper \

 	utl \

-	vcl \

 	writerperfect \

 	xo \

 	$(gb_UWINAPI) \

diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk

index 288c929..60ff3b6 100644

--- a/writerperfect/Library_wpftwriter.mk

+++ b/writerperfect/Library_wpftwriter.mk

@@ -36,11 +36,9 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\

 	sal \

 	sfx \

 	sot \

-	svx \

 	tl \

 	ucbhelper \

 	utl \

-	vcl \

 	writerperfect \

 	xo \

 	$(gb_UWINAPI) \

diff --git a/writerperfect/Library_writerperfect.mk b/writerperfect/Library_writerperfect.mk

index 165a7a0..1b8494b 100644

--- a/writerperfect/Library_writerperfect.mk

+++ b/writerperfect/Library_writerperfect.mk

@@ -42,11 +42,9 @@ $(eval $(call gb_Library_use_libraries,writerperfect,\

 	cppuhelper \

 	sal \

 	sot \

-	svx \

 	tl \

 	ucbhelper \

 	utl \

-	vcl \

 	xo \

 	$(gb_UWINAPI) \

 ))

@@ -54,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,writerperfect,\

 $(eval $(call gb_Library_add_exception_objects,writerperfect,\

 	writerperfect/source/common/DirectoryStream \

 	writerperfect/source/common/DocumentHandler \

-	writerperfect/source/common/WPFTEncodingDialog \

 	writerperfect/source/common/WPXSvInputStream \

 ))

diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk

index e787043..9c30697 100644

--- a/writerperfect/Module_writerperfect.mk

+++ b/writerperfect/Module_writerperfect.mk

@@ -27,10 +27,6 @@ $(eval $(call gb_Module_add_targets,writerperfect,\

 	Library_writerperfect \

 ))

-$(eval $(call gb_Module_add_l10n_targets,writerperfect,\

-	UIConfig_writerperfect \

-))

-

 $(eval $(call gb_Module_add_check_targets,writerperfect,\

 	CppunitTest_writerperfect_stream \

 ))

diff --git a/writerperfect/UIConfig_writerperfect.mk b/writerperfect/UIConfig_writerperfect.mk

deleted file mode 100644

index d0d8ef5..0000000

--- a/writerperfect/UIConfig_writerperfect.mk

+++ /dev/null

@@ -1,26 +0,0 @@

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-

-#

-# 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 .

-#

-

-$(eval $(call gb_UIConfig_UIConfig,writerperfect))

-

-$(eval $(call gb_UIConfig_add_uifiles,writerperfect,\

-	writerperfect/uiconfig/ui/wpftencodingdialog \

-))

-

-# vim: set noet sw=4 ts=4:

diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx

deleted file mode 100644

index 2d3a63a..0000000

--- a/writerperfect/inc/WPFTEncodingDialog.hxx

+++ /dev/null

@@ -1,58 +0,0 @@

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

-/* MSWorksImportFilter: Sets up the filter, and calls DocumentCollector

- * to do the actual filtering

- *

- * 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/.

- */

-

-#ifndef INCLUDED_WRITERPERFECT_WPFTENCODINGDIALOG_HXX

-#define INCLUDED_WRITERPERFECT_WPFTENCODINGDIALOG_HXX

-

-#include <sal/types.h>

-

-#include <vcl/button.hxx>

-#include <vcl/dialog.hxx>

-#include <vcl/lstbox.hxx>

-

-#include <writerperfectdllapi.h>

-

-namespace writerperfect

-{

-

-class WRITERPERFECT_DLLPUBLIC WPFTEncodingDialog : public ModalDialog

-{

-public:

-    WPFTEncodingDialog(const OUString &title, const OUString &defEncoding);

-

-    virtual ~WPFTEncodingDialog();

-

-    OUString GetEncoding() const;

-    bool hasUserCalledCancel() const

-    {

-        return m_userHasCancelled;

-    }

-private:

-    VclPtr<ListBox> m_pLbCharset;

-    VclPtr<OKButton>           m_pBtnOk;

-    VclPtr<CancelButton>           m_pBtnCancel;

-

-    bool m_userHasCancelled;

-private:

-    DECL_LINK(DoubleClickHdl, ListBox *);

-    DECL_LINK(CancelHdl, void *);

-

-    void dispose() SAL_OVERRIDE;

-

-    WPFTEncodingDialog(WPFTEncodingDialog const &) SAL_DELETED_FUNCTION;

-    WPFTEncodingDialog &operator=(WPFTEncodingDialog const &) SAL_DELETED_FUNCTION;

-};

-

-}

-

-#endif

-

-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx

index 3ccf2db..d897638 100644

--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx

+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx

@@ -14,7 +14,6 @@

 #include <libwps/libwps.h>

-#include "WPFTEncodingDialog.hxx"

 #include "MSWorksCalcImportFilter.hxx"

 using com::sun::star::uno::Sequence;

@@ -27,79 +26,18 @@ using com::sun::star::uno::XComponentContext;

 bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, OdsGenerator &rGenerator, utl::MediaDescriptor &)

 {

-    libwps::WPSKind kind = libwps::WPS_TEXT;

-    libwps::WPSCreator creator;

-    bool needEncoding;

-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needEncoding);

-

-    std::string fileEncoding("");

-    if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)

-    {

-        OUString title, encoding;

-        if (creator == libwps::WPS_MSWORKS)

-        {

-            title="Import MsWorks files(libwps)";

-            encoding="CP850";

-        }

-        else if (creator == libwps::WPS_LOTUS)

-        {

-            title="Import Lotus files(libwps)";

-            encoding="CP437";

-        }

-        else if (creator == libwps::WPS_SYMPHONY)

-        {

-            title="Import Symphony files(libwps)";

-            encoding="CP437";

-        }

-        else

-        {

-            title="Import Quattro Pro files(libwps)";

-            encoding="CP437";

-        }

-        try

-        {

-            const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg(title, encoding);

-            if (pDlg->Execute() == RET_OK)

-            {

-                if (!pDlg->GetEncoding().isEmpty())

-                    fileEncoding=pDlg->GetEncoding().toUtf8().getStr();

-            }

-            // we can fail because we are in headless mode, the user has cancelled conversion, ...

-            else if (pDlg->hasUserCalledCancel())

-                return false;

-        }

-        catch (css::uno::Exception &e)

-        {

-            SAL_WARN("writerperfect", "ignoring Exception " << e.Message);

-        }

-    }

-    return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator, "", fileEncoding.c_str());

+    return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator);

 }

 bool MSWorksCalcImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)

 {

     libwps::WPSKind kind = libwps::WPS_TEXT;

-    libwps::WPSCreator creator;

-    bool needEncoding;

-    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind, creator, needEncoding);

+    const libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&rInput, kind);

-    if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE) && confidence == libwps::WPS_CONFIDENCE_EXCELLENT)

+    if ((kind == libwps::WPS_SPREADSHEET || kind == libwps::WPS_DATABASE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT))

     {

-        if (creator == libwps::WPS_MSWORKS)

-        {

-            rTypeName = "calc_MS_Works_Document";

-            return true;

-        }

-        if (creator == libwps::WPS_LOTUS || creator == libwps::WPS_SYMPHONY)

-        {

-            rTypeName = "calc_WPS_Lotus_Document";

-            return true;

-        }

-        if (creator == libwps::WPS_QUATTRO_PRO)

-        {

-            rTypeName = "calc_WPS_QPro_Document";

-            return true;

-        }

+        rTypeName = "calc_MS_Works_Document";

+        return true;

     }

     return false;

diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx

deleted file mode 100644