diff options
| author | David Tardon <dtardon@redhat.com> | 2015-08-24 20:49:00 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-08-25 10:03:11 +0200 |
| commit | 6b0585a5b7e32d9acb6d8bc5f15d187959c7cc5b (patch) | |
| tree | bc9956fc57b8f5a93c69202b8a273e57c9c9fb1d | |
| parent | 51adbedb840470919b9275c6b006c3af7673b6a0 (diff) | |
upload libmwaw 0.3.6
Change-Id: I09249673d42d36bf72ee1ffbf8f3f37734bd8bae
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libmwaw/Library_mwaw.mk | 6 | ||||
| -rw-r--r-- | filter/source/config/fragments/filters/Mac_RagTime.xcu | 2 | ||||
| -rw-r--r-- | writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw | bin | 0 -> 62079 bytes | |||
| -rw-r--r-- | writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag | bin | 0 -> 14652 bytes |
6 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5944d23317e3..145c3d6b7324 100644 --- a/configure.ac +++ b/configure.ac @@ -7698,7 +7698,7 @@ libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1]) dnl =================================================================== dnl Check for system libmwaw dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.5]) +libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.6]) dnl =================================================================== dnl Check for system libpagemaker diff --git a/download.lst b/download.lst index bc5a9f63fdea..0f321c026627 100644 --- a/download.lst +++ b/download.lst @@ -105,8 +105,8 @@ export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe export MDDS_TARBALL := mdds_0.12.1.tar.bz2 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 -export MWAW_MD5SUM := bdc58bbf89aaaf6d29b3516d96830a06 -export MWAW_VERSION_MICRO := 5 +export MWAW_MD5SUM := a8364bf2e4ece2860ab96d6bee75f1d7 +export MWAW_VERSION_MICRO := 6 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2 export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index 052362a919fb..f5aeee03d67e 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_add_defs,mwaw,\ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/ActaParser \ UnpackedTarball/libmwaw/src/lib/ActaText \ + UnpackedTarball/libmwaw/src/lib/ApplePictParser \ UnpackedTarball/libmwaw/src/lib/BeagleWksBMParser \ UnpackedTarball/libmwaw/src/lib/BeagleWksDBParser \ UnpackedTarball/libmwaw/src/lib/BeagleWksDRParser \ @@ -117,6 +118,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/MWAWTable \ UnpackedTarball/libmwaw/src/lib/MWAWTextListener \ UnpackedTarball/libmwaw/src/lib/MacDocParser \ + UnpackedTarball/libmwaw/src/lib/MacDraft5Parser \ + UnpackedTarball/libmwaw/src/lib/MacDraft5StyleManager \ UnpackedTarball/libmwaw/src/lib/MacDraftParser \ UnpackedTarball/libmwaw/src/lib/MacDrawParser \ UnpackedTarball/libmwaw/src/lib/MacDrawProParser \ @@ -152,9 +155,12 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/NisusWrtText \ UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \ UnpackedTarball/libmwaw/src/lib/RagTime5Graph \ + UnpackedTarball/libmwaw/src/lib/RagTime5Layout \ UnpackedTarball/libmwaw/src/lib/RagTime5Parser \ + UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \ UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \ UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \ + UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \ UnpackedTarball/libmwaw/src/lib/RagTime5Text \ UnpackedTarball/libmwaw/src/lib/RagTimeParser \ UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \ diff --git a/filter/source/config/fragments/filters/Mac_RagTime.xcu b/filter/source/config/fragments/filters/Mac_RagTime.xcu index 69a23b267538..6344292daeaf 100644 --- a/filter/source/config/fragments/filters/Mac_RagTime.xcu +++ b/filter/source/config/fragments/filters/Mac_RagTime.xcu @@ -15,7 +15,7 @@ <value>com.sun.star.comp.Writer.MWAWImportFilter</value> </prop> <prop oor:name="UIName"> - <value xml:lang="en-US">RagTime Mac v2-3 Document</value> + <value xml:lang="en-US">RagTime Mac v2-5 Document</value> </prop> <prop oor:name="FileFormatVersion"> <value>0</value> diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw Binary files differnew file mode 100644 index 000000000000..5bb15fc08001 --- /dev/null +++ b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag b/writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag Binary files differnew file mode 100644 index 000000000000..927c5c37c329 --- /dev/null +++ b/writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag |