[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - libwpd/libwpd.corruptedprefix.patch libwpd/makefile.mk

[Fridrich Strba]

 libwpd/libwpd.corruptedprefix.patch |   28 ++++++++++++++--------------
 libwpd/makefile.mk                  |    2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit bd02cce8d88b84760505757974639531e8346669
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Apr 1 18:53:57 2011 +0200

    Now the patch applies

diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index dd46e3e..6ecbbfa 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -44,8 +44,8 @@ TARGET=wpd
 TARFILE_NAME=libwpd-0.9.1
 TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c
 PATCH_FILES=libwpd.gcc460.patch \
+    libwpd.corruptedprefix.patch \
     libwpd.warnings.patch
-#   libwpd.corruptedprefix.patch \ - disabled ...
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
 
commit d8256d686c72d6c76958eb43072b14290e8a589e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Apr 1 18:47:49 2011 +0200

    This patch should apply now

diff --git a/libwpd/libwpd.corruptedprefix.patch b/libwpd/libwpd.corruptedprefix.patch
index 1fa051f..9d5288d 100644
--- a/libwpd/libwpd.corruptedprefix.patch
+++ b/libwpd/libwpd.corruptedprefix.patch
@@ -1,10 +1,10 @@
---- misc/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp
-+++ misc/build/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp
-@@ -46,45 +46,67 @@ WP6PrefixDataPacket::WP6PrefixDataPacket(WPXInputStream * /* input */, WPXEncryp
+--- misc/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp	2010-08-26 13:35:21.000000000 +0200
++++ misc/build/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp	2011-04-01 18:25:41.328379372 +0200
+@@ -46,45 +46,67 @@
  }
-
+ 
  WP6PrefixDataPacket * WP6PrefixDataPacket::constructPrefixDataPacket(WPXInputStream * input, WPXEncryption *encryption, WP6PrefixIndice *prefixIndice)
--{
+-{	       
 -	switch (prefixIndice->getType())
 +{
 +	WP6PrefixDataPacket *tmpPacket = 0;
@@ -62,26 +62,26 @@
 +	}
 +	catch (FileException)
  	{
--	case WP6_INDEX_HEADER_INITIAL_FONT:
--		return new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(),
+-	case WP6_INDEX_HEADER_INITIAL_FONT:			
+-		return new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(), 
 -				prefixIndice->getDataOffset(), prefixIndice->getDataSize());
 -	case WP6_INDEX_HEADER_GENERAL_WORDPERFECT_TEXT:
--		return new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(),
+-		return new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(), 
 -				prefixIndice->getDataOffset(), prefixIndice->getDataSize());
 -	case WP6_INDEX_HEADER_DESIRED_FONT_DESCRIPTOR_POOL:
--		return new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(),
+-		return new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(), 
 -				prefixIndice->getDataOffset(), prefixIndice->getDataSize());
 -	case WP6_INDEX_HEADER_FILL_STYLE:
--		return new WP6FillStylePacket(input, encryption, prefixIndice->getID(),
+-		return new WP6FillStylePacket(input, encryption, prefixIndice->getID(), 
 -				prefixIndice->getDataOffset(), prefixIndice->getDataSize());
 -	case WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY:
--		return new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(),
+-		return new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(), 
 -				prefixIndice->getDataOffset(), prefixIndice->getDataSize());
 -	case WP6_INDEX_HEADER_OUTLINE_STYLE:
--		return new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(),
+-		return new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(), 
 -				prefixIndice->getDataOffset(), prefixIndice->getDataSize());
 -	case WP6_INDEX_HEADER_GRAPHICS_FILENAME:
--		return new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(),
+-		return new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(), 
 -				prefixIndice->getDataOffset(), prefixIndice->getDataSize());
 -	case WP6_INDEX_HEADER_GRAPHICS_CACHED_FILE_DATA:
 -		return new WP6GraphicsCachedFileDataPacket(input, encryption, prefixIndice->getID(),
@@ -103,5 +103,5 @@
  	}
 +	return tmpPacket;
  }
-
+ 
  void WP6PrefixDataPacket::_read(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataOffset, uint32_t dataSize)