Looks good to me now.<br><br>One needed for 3.4.2<br><br><div class="gmail_quote">2011/7/25 Michael Meeks <span dir="ltr">&lt;<a href="mailto:michael.meeks@novell.com">michael.meeks@novell.com</a>&gt;</span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Hi there,<br>
<div class="im"><br>
On Mon, 2011-07-25 at 10:40 -0400, Kohei Yoshida wrote:<br>
</div><div class="im">&gt; <a href="http://cgit.freedesktop.org/libreoffice/calc/commit/?id=e5d0ab65f918a3a90d1b7fa4fdf7ee5c2ee89535" target="_blank">http://cgit.freedesktop.org/libreoffice/calc/commit/?id=e5d0ab65f918a3a90d1b7fa4fdf7ee5c2ee89535</a><br>

&gt;<br>
&gt; cherry-picked to the -3-4 branch.<br>
<br>
</div>        Looks fine to me, I&#39;ve pushed it to libreoffice-3-4. I&#39;d love to have<br>
this approved for libreoffice-3-4-2 [ basically the aggregate fix] so we<br>
can get that into rc3.<br>
<br>
        Another couple of approvals appreciated.<br>
<br>
        Thanks,<br>
<br>
                Michael.<br>
<br>
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx<br>
index 4426763..d87629a 100644<br>
--- a/sc/source/core/data/dpobject.cxx<br>
+++ b/sc/source/core/data/dpobject.cxx<br>
@@ -84,7 +84,6 @@<br>
 using namespace com::sun::star;<br>
 using ::std::vector;<br>
 using ::std::unary_function;<br>
-using ::std::remove_if;<br>
 using ::boost::shared_ptr;<br>
 using ::com::sun::star::uno::Sequence;<br>
 using ::com::sun::star::uno::Reference;<br>
@@ -2561,7 +2560,7 @@ namespace {<br>
 /**<br>
  * Unary predicate to match DP objects by the table ID.<br>
  */<br>
-class MatchByTable : public unary_function&lt;bool, ScDPObject&gt;<br>
+class MatchByTable : public unary_function&lt;ScDPObject, bool&gt;<br>
 {<br>
     SCTAB mnTab;<br>
 public:<br>
@@ -2612,9 +2611,7 @@ bool ScDPCollection::ClearCache(ScDPObject* pDPObj)<br>
<br>
 void ScDPCollection::DeleteOnTab( SCTAB nTab )<br>
 {<br>
-    maTables.erase(<br>
-        remove_if(maTables.begin(), maTables.end(), MatchByTable(nTab)),<br>
-        maTables.end());<br>
+    maTables.erase_if(MatchByTable(nTab));<br>
 }<br>
<br>
 void ScDPCollection::UpdateReference( UpdateRefMode eUpdateRefMode,<br>
<font color="#888888"><br>
<br>
--<br>
 <a href="mailto:michael.meeks@novell.com">michael.meeks@novell.com</a>  &lt;&gt;&lt;, Pseudo Engineer, itinerant idiot<br>
</font><div><div></div><div class="h5"><br>
<br>
_______________________________________________<br>
LibreOffice mailing list<br>
<a href="mailto:LibreOffice@lists.freedesktop.org">LibreOffice@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/libreoffice" target="_blank">http://lists.freedesktop.org/mailman/listinfo/libreoffice</a><br>
</div></div></blockquote></div><br>