[Libreoffice-commits] .: libwpd/libwpd-0.9.5-msc.patch

[Libreoffice Gerrit user]

 libwpd/libwpd-0.9.5-msc.patch |   65 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

New commits:
commit 7ed1d7a42d7faa9094cfda76f7351cd4951ae4dd
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 24 18:53:18 2012 +0200

    Fix some obscurous windows linking problems
    
    Change-Id: I6dc82bcb2e5997623b6b0e5b846cedfc7e223912

diff --git a/libwpd/libwpd-0.9.5-msc.patch b/libwpd/libwpd-0.9.5-msc.patch
index 4fd979d..d417687 100644
--- a/libwpd/libwpd-0.9.5-msc.patch
+++ b/libwpd/libwpd-0.9.5-msc.patch
@@ -104,3 +104,68 @@ index 8c02ed1..f4ae836 100644
  				PrecompiledHeaderFile=".\Release/wpd2text.pch"
  				AssemblerListingLocation=".\Release/"
  				ObjectFile=".\Release/"
+--- src/lib/WP6BoxGroup.cpp
++++ src/lib/WP6BoxGroup.cpp
+@@ -304,8 +304,8 @@ void WP6BoxGroup::parse(WP6Listener *listener)
+ 	if (!m_nativeHeight && gbsPacket)
+ 		m_nativeHeight = gbsPacket->getNativeHeight();
+ 
+-	std::vector<uint16_t> graphicsDataIds;
+-	std::vector<uint16_t>::iterator gdiIter;
++	std::vector<unsigned> graphicsDataIds;
++	std::vector<unsigned>::iterator gdiIter;
+ 	WP6SubDocument *subDocument = 0;
+ 
+ 	// Get the box content
+@@ -389,7 +389,7 @@ void WP6BoxGroup::parse(WP6Listener *listener)
+ 	if (tmpContentType == 0x03)
+ 	{
+ 		for (gdiIter = graphicsDataIds.begin(); gdiIter != graphicsDataIds.end(); gdiIter++)
+-			listener->insertGraphicsData((*gdiIter));
++			listener->insertGraphicsData(((uint16_t)*gdiIter));
+ 	}
+ 	if ((tmpContentType == 0x01) && (subDocument))
+ 	{
+--- src/lib/WP6BoxGroup.h
++++ src/lib/WP6BoxGroup.h
+@@ -28,7 +28,6 @@
+ #define WP6BOXGROUP_H
+ 
+ #include "WP6VariableLengthGroup.h"
+-#include <vector>
+ #include "libwpd_internal.h"
+ 
+ class WPXInputStream;
+--- src/lib/WP6GraphicsFilenamePacket.cpp
++++ src/lib/WP6GraphicsFilenamePacket.cpp
+@@ -50,4 +50,9 @@ void WP6GraphicsFilenamePacket::_readContents(WPXInputStream *input, WPXEncrypti
+ 		m_childIds.push_back(readU16(input, encryption));
+ }
+ 
++const std::vector<unsigned> WP6GraphicsFilenamePacket::getChildIds() const
++{
++	return m_childIds;
++}
++
+ /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+--- src/lib/WP6GraphicsFilenamePacket.h
++++ src/lib/WP6GraphicsFilenamePacket.h
+@@ -39,16 +39,12 @@ public:
+ 	~WP6GraphicsFilenamePacket();
+ 	void _readContents(WPXInputStream *input, WPXEncryption *encryption);
+ 	void parse(WP6Listener * /*listener */) const {}
+-	const std::vector<uint16_t> &getChildIds() const
+-	{
+-		return m_childIds;
+-	}
+-
++	const std::vector<unsigned> getChildIds() const;
+ 
+ private:
+ 	WP6GraphicsFilenamePacket(const WP6GraphicsFilenamePacket &);
+ 	WP6GraphicsFilenamePacket &operator=(const WP6GraphicsFilenamePacket &);
+-	std::vector<uint16_t> m_childIds;
++	std::vector<unsigned> m_childIds;
+ 	const uint8_t m_flags;
+ 
+ };