[Libreoffice-commits] core.git: external/libmwaw

[David Tardon]

 external/libmwaw/0001-use-correct-type.patch |   52 +++++++++++++++++++++++++++
 external/libmwaw/UnpackedTarball_libmwaw.mk  |    1 
 2 files changed, 53 insertions(+)

New commits:
commit 2cb29ab6a364716fb6f2811099178c10045302ab
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 3 13:00:46 2013 +0100

    fix a bit more
    
    Change-Id: I8961fa9279a955f5570e58f29e23d412e5fd049c

diff --git a/external/libmwaw/0001-use-correct-type.patch b/external/libmwaw/0001-use-correct-type.patch
new file mode 100644
index 0000000..7a6ef2d
--- /dev/null
+++ b/external/libmwaw/0001-use-correct-type.patch
@@ -0,0 +1,52 @@
+From cde8d7c47cdea327f8153ab72cde650f1b36f7f8 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 3 Nov 2013 12:59:29 +0100
+Subject: [PATCH] use correct type
+
+---
+ src/lib/HMWJGraph.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/HMWJGraph.cxx b/src/lib/HMWJGraph.cxx
+index fca366c..dd83ace 100644
+--- a/src/lib/HMWJGraph.cxx
++++ b/src/lib/HMWJGraph.cxx
+@@ -2668,7 +2668,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWPosition po
+     return true;
+   }
+ 
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<group.m_childsList.size(); ++c) {
+     long fId=group.m_childsList[c];
+@@ -2690,7 +2690,7 @@ bool HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWPosition po
+ 
+ bool HMWJGraph::canCreateGraphic(HMWJGraphInternal::Group const &group)
+ {
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int page = group.m_page;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<group.m_childsList.size(); ++c) {
+@@ -2726,7 +2726,7 @@ void HMWJGraph::sendGroup(HMWJGraphInternal::Group const &group, MWAWGraphicList
+   if (!listener) return;
+   group.m_parsed=true;
+   MWAWInputStreamPtr &input= m_parserState->m_input;
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<group.m_childsList.size(); ++c) {
+     long fId=group.m_childsList[c];
+@@ -2784,7 +2784,7 @@ void HMWJGraph::sendGroupChild(HMWJGraphInternal::Group const &group, MWAWPositi
+   Box2f partialBdBox;
+   MWAWPosition partialPos(pos);
+   MWAWInputStreamPtr &input= m_parserState->m_input;
+-  std::multimap<long, int>::const_iterator fIt;
++  std::map<long, int>::const_iterator fIt;
+   int numFrames = int(m_state->m_framesList.size());
+   for (size_t c=0; c<numChilds; ++c) {
+     long fId=group.m_childsList[c];
+-- 
+1.8.3.1
+
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index eea0a94..efd8797 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
 	external/libmwaw/0001-std-isfinite-is-C-11.patch \
+	external/libmwaw/0001-use-correct-type.patch \
 ))
 
 # vim: set noet sw=4 ts=4: