mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not require newest libwps for build

Browse Source 
Change-Id: Iba0090da0591b6f9a6d74bb18ebaabef53448063
This commit is contained in:
David Tardon
2015-12-17 15:43:24 +01:00
parent 3fd652b3de
commit 36b087f8b0
5 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config_host/config_writerperfect.h.in
View File

@@ -20,4 +20,8 @@
#undef MWAW_VERSION_MINOR #undef MWAW_VERSION_MINOR
#undef MWAW_VERSION_MICRO #undef MWAW_VERSION_MICRO
#undef WPS_VERSION_MAJOR
#undef WPS_VERSION_MINOR
#undef WPS_VERSION_MICRO
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
configure.ac
View File

@@ -7827,7 +7827,8 @@ libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
dnl =================================================================== dnl ===================================================================
dnl Check for system libwps dnl Check for system libwps
dnl =================================================================== dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4 >= 0.4.2]) libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.2])
dnl =================================================================== dnl ===================================================================
dnl Check for system libwpg dnl Check for system libwpg

3
writerperfect/qa/unit/WpftImportTestBase.hxx
View File

@@ -35,6 +35,9 @@
#define REQUIRE_MWAW_VERSION(major, minor, micro) \ #define REQUIRE_MWAW_VERSION(major, minor, micro) \
REQUIRE_VERSION(MWAW_VERSION_MAJOR, MWAW_VERSION_MINOR, MWAW_VERSION_MICRO, major, minor, micro) REQUIRE_VERSION(MWAW_VERSION_MAJOR, MWAW_VERSION_MINOR, MWAW_VERSION_MICRO, major, minor, micro)
#define REQUIRE_WPS_VERSION(major, minor, micro) \
REQUIRE_VERSION(WPS_VERSION_MAJOR, WPS_VERSION_MINOR, WPS_VERSION_MICRO, major, minor, micro)
namespace com namespace com
{ {
namespace sun namespace sun

4
writerperfect/qa/unit/WpftWriterFilterTest.cxx
View File

@@ -41,6 +41,10 @@ void WpftWriterFilterTest::test()
{"RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)}, {"RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2)},
{"RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6)}, {"RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6)},
}; };
const writerperfect::test::WpftOptionalMap_t aWpsOptional
{
{"Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2)},
};
doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/"); doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");

2
writerperfect/source/writer/MSWorksImportFilter.cxx
View File

@@ -55,7 +55,7 @@ bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
else if (pDlg->hasUserCalledCancel()) else if (pDlg->hasUserCalledCancel())
return false; return false;
} }
else if ((kind == libwps::WPS_TEXT) && (creator == libwps::WPS_MSWRITE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding) else if ((kind == libwps::WPS_TEXT) && (creator == libwps::WPS_RESERVED_0) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
{ {
const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg( const ScopedVclPtrInstance<writerperfect::WPFTEncodingDialog> pDlg(
"Import MsWrite files(libwps)", "CP1252"); "Import MsWrite files(libwps)", "CP1252");