diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-13 14:32:44 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-13 14:45:59 +0200 |
| commit | 6b3869cf74473eb58a1b756b67f60c5263f9e7cb (patch) | |
| tree | 84d6ae8d2932beddfa508a866052dd014bdc7e5a /external/libmwaw | |
| parent | 5ce80c9728ac53ef4e1c8f68d6ef4b7be1f7bf1c (diff) | |
libmwaw: avoid 'MWAWDocument::isFileFormatSupported()' when opening .doc files
There is only a single libmwaw switch to enable both "noopt + symbols"
and "debug messages", and we enable that switch in debug builds.
Backport upstream patch to avoid a debug message during type detection.
Change-Id: I53440ceed90529e3db7c9d91c788c7a3b2723eb1
Diffstat (limited to 'external/libmwaw')
| -rw-r--r-- | external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch | 24 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch b/external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch new file mode 100644 index 000000000000..0b33534e28dd --- /dev/null +++ b/external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch @@ -0,0 +1,24 @@ +From 3355f5314cd01d8c264c91014d136a58f68d03f4 Mon Sep 17 00:00:00 2001 +From: osnola <alonso@loria.fr> +Date: Wed, 13 Aug 2014 11:00:35 +0200 +Subject: [PATCH] MWAWDocument.cxx: remove an useless debug message. + +--- + src/lib/MWAWDocument.cxx | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/lib/MWAWDocument.cxx b/src/lib/MWAWDocument.cxx +index 5591f70..8246bf7 100644 +--- a/src/lib/MWAWDocument.cxx ++++ b/src/lib/MWAWDocument.cxx +@@ -109,7 +109,6 @@ MWAWDocument::Confidence MWAWDocument::isFileFormatSupported(librevenge::RVNGInp + } + + try { +- MWAW_DEBUG_MSG(("MWAWDocument::isFileFormatSupported()\n")); + MWAWInputStreamPtr ip(new MWAWInputStream(input, false, true)); + MWAWInputStreamPtr rsrc=ip->getResourceForkStream(); + shared_ptr<MWAWRSRCParser> rsrcParser; +-- +1.8.4.5 + diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 27bc24d5b028..c1b7db7c12e1 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\ external/libmwaw/0001-librevenge-stream-is-optional-don-t-depend-on-it.patch \ external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \ external/libmwaw/0001-msvc2013-does-not-like-this.patch \ + external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch \ )) # vim: set noet sw=4 ts=4: |