[Libreoffice-commits] core.git: 2 commits - configure.ac download.lst external/libmwaw filter/source writerperfect/qa writerperfect/source
David Tardon
dtardon at redhat.com
Tue Aug 25 01:03:53 PDT 2015
configure.ac | 2
download.lst | 4
external/libmwaw/Library_mwaw.mk | 6
filter/source/config/fragments/filters/Mac_RagTime.xcu | 2
writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw |binary
writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag |binary
writerperfect/source/common/WPFTEncodingDialog.cxx | 99 ++++++----
writerperfect/source/common/WPXSvInputStream.cxx | 2
8 files changed, 77 insertions(+), 38 deletions(-)
New commits:
commit 6b0585a5b7e32d9acb6d8bc5f15d187959c7cc5b
Author: David Tardon <dtardon at redhat.com>
Date: Mon Aug 24 20:49:00 2015 +0200
upload libmwaw 0.3.6
Change-Id: I09249673d42d36bf72ee1ffbf8f3f37734bd8bae
diff --git a/configure.ac b/configure.ac
index 5944d23..145c3d6 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 bc5a9f6..0f321c0 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 052362a..f5aeee0 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 69a23b2..6344292 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
new file mode 100644
index 0000000..5bb15fc
Binary files /dev/null and b/writerperfect/qa/unit/data/draw/libmwaw/pass/MacDraft_5.5.drw differ
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
new file mode 100644
index 0000000..927c5c3
Binary files /dev/null and b/writerperfect/qa/unit/data/writer/libmwaw/pass/RagTime_5.5.rag differ
commit 51adbedb840470919b9275c6b006c3af7673b6a0
Author: David Tardon <dtardon at redhat.com>
Date: Tue Aug 25 10:02:33 2015 +0200
astyle
Change-Id: I597c007e4636f6b05873f24ef3e89c0a7c2c3670
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index 2841be8..238df4a 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -30,7 +30,8 @@ namespace writerperfect
namespace
{
-std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] = {
+std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] =
+{
{OUStringLiteral("MacArabic"), OUStringLiteral("Arabic (Apple Macintosh)")},
{OUStringLiteral("CP864"), OUStringLiteral("Arabic (DOS/OS2-864)")},
{OUStringLiteral("CP1006"), OUStringLiteral("Arabic (IBM-1006)")},
@@ -38,21 +39,33 @@ std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] = {
{OUStringLiteral("CP775"), OUStringLiteral("Baltic (DOS/OS2-775)")},
{OUStringLiteral("CP1257"), OUStringLiteral("Baltic (Windows-1257)")},
{OUStringLiteral("MacCeltic"), OUStringLiteral("Celtic (Apple Macintosh)")},
- {OUStringLiteral("MacCyrillic"),
- OUStringLiteral("Cyrillic (Apple Macintosh)")},
+ {
+ OUStringLiteral("MacCyrillic"),
+ OUStringLiteral("Cyrillic (Apple Macintosh)")
+ },
{OUStringLiteral("CP855"), OUStringLiteral("Cyrillic (DOS/OS2-855)")},
- {OUStringLiteral("CP866"),
- OUStringLiteral("Cyrillic (DOS/OS2-866/Russian)")},
+ {
+ OUStringLiteral("CP866"),
+ OUStringLiteral("Cyrillic (DOS/OS2-866/Russian)")
+ },
{OUStringLiteral("CP1251"), OUStringLiteral("Cyrillic (Windows-1251)")},
- {OUStringLiteral("MacCEurope"),
- OUStringLiteral("Eastern Europe (Apple Macintosh)")},
- {OUStringLiteral("MacCroatian"),
- OUStringLiteral("Eastern Europe (Apple Macintosh/Croatian)")},
- {OUStringLiteral("MacRomanian"),
- OUStringLiteral("Eastern Europe (Apple Macintosh/Romanian)")},
+ {
+ OUStringLiteral("MacCEurope"),
+ OUStringLiteral("Eastern Europe (Apple Macintosh)")
+ },
+ {
+ OUStringLiteral("MacCroatian"),
+ OUStringLiteral("Eastern Europe (Apple Macintosh/Croatian)")
+ },
+ {
+ OUStringLiteral("MacRomanian"),
+ OUStringLiteral("Eastern Europe (Apple Macintosh/Romanian)")
+ },
{OUStringLiteral("CP852"), OUStringLiteral("Eastern Europe (DOS/OS2-852)")},
- {OUStringLiteral("CP1250"),
- OUStringLiteral("Eastern Europe (Windows-1250/WinLatin 2)")},
+ {
+ OUStringLiteral("CP1250"),
+ OUStringLiteral("Eastern Europe (Windows-1250/WinLatin 2)")
+ },
{OUStringLiteral("MacGreek"), OUStringLiteral("Greek (Apple Macintosh)")},
{OUStringLiteral("CP737"), OUStringLiteral("Greek (DOS/OS2-737)")},
{OUStringLiteral("CP869"), OUStringLiteral("Greek (DOS/OS2-869/Greek-2)")},
@@ -66,31 +79,51 @@ std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] = {
{OUStringLiteral("CP500"), OUStringLiteral("International (DOS/OS2-500)")},
{OUStringLiteral("MacThai"), OUStringLiteral("Thai (Apple Macintosh)")},
{OUStringLiteral("CP874"), OUStringLiteral("Thai (DOS/OS2-874)")},
- {OUStringLiteral("MacTurkish"),
- OUStringLiteral("Turkish (Apple Macintosh)")},
+ {
+ OUStringLiteral("MacTurkish"),
+ OUStringLiteral("Turkish (Apple Macintosh)")
+ },
{OUStringLiteral("CP857"), OUStringLiteral("Turkish (DOS/OS2-857)")},
{OUStringLiteral("CP1026"), OUStringLiteral("Turkish (DOS/OS2-1026)")},
{OUStringLiteral("CP1254"), OUStringLiteral("Turkish (Windows-1254)")},
{OUStringLiteral("CP1258"), OUStringLiteral("Vietnamese (Windows-1258)")},
- {OUStringLiteral("MacRoman"),
- OUStringLiteral("Western Europe (Apple Macintosh)")},
- {OUStringLiteral("MacIceland"),
- OUStringLiteral("Western Europe (Apple Macintosh/Icelandic)")},
- {OUStringLiteral("CP037"),
- OUStringLiteral("Western Europe (DOS/OS2-037/US-Canada)")},
- {OUStringLiteral("CP437"),
- OUStringLiteral("Western Europe (DOS/OS2-437/US)")},
+ {
+ OUStringLiteral("MacRoman"),
+ OUStringLiteral("Western Europe (Apple Macintosh)")
+ },
+ {
+ OUStringLiteral("MacIceland"),
+ OUStringLiteral("Western Europe (Apple Macintosh/Icelandic)")
+ },
+ {
+ OUStringLiteral("CP037"),
+ OUStringLiteral("Western Europe (DOS/OS2-037/US-Canada)")
+ },
+ {
+ OUStringLiteral("CP437"),
+ OUStringLiteral("Western Europe (DOS/OS2-437/US)")
+ },
{OUStringLiteral("CP850"), OUStringLiteral("Western Europe (DOS/OS2-850)")},
- {OUStringLiteral("CP860"),
- OUStringLiteral("Western Europe (DOS/OS2-860/Portuguese)")},
- {OUStringLiteral("CP861"),
- OUStringLiteral("Western Europe (DOS/OS2-861/Icelandic)")},
- {OUStringLiteral("CP863"),
- OUStringLiteral("Western Europe (DOS/OS2-863/French)")},
- {OUStringLiteral("CP865"),
- OUStringLiteral("Western Europe (DOS/OS2-865/Nordic)")},
- {OUStringLiteral("CP1252"),
- OUStringLiteral("Western Europe (Windows-1252/WinLatin 1)")}
+ {
+ OUStringLiteral("CP860"),
+ OUStringLiteral("Western Europe (DOS/OS2-860/Portuguese)")
+ },
+ {
+ OUStringLiteral("CP861"),
+ OUStringLiteral("Western Europe (DOS/OS2-861/Icelandic)")
+ },
+ {
+ OUStringLiteral("CP863"),
+ OUStringLiteral("Western Europe (DOS/OS2-863/French)")
+ },
+ {
+ OUStringLiteral("CP865"),
+ OUStringLiteral("Western Europe (DOS/OS2-865/Nordic)")
+ },
+ {
+ OUStringLiteral("CP1252"),
+ OUStringLiteral("Western Europe (Windows-1252/WinLatin 1)")
+ }
};
std::size_t const numEncodings = SAL_N_ELEMENTS(s_encodings);
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 180461a..d3befd0 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -401,7 +401,7 @@ class WPXSvInputStreamImpl
{
public:
explicit WPXSvInputStreamImpl(::com::sun::star::uno::Reference<
- ::com::sun::star::io::XInputStream > xStream);
+ ::com::sun::star::io::XInputStream > xStream);
~WPXSvInputStreamImpl();
bool isStructured();
More information about the Libreoffice-commits
mailing list