Looks good to me now. One needed for 3.4.2
2011/7/25 Michael Meeks <michael.me...@novell.com> > Hi there, > > On Mon, 2011-07-25 at 10:40 -0400, Kohei Yoshida wrote: > > > http://cgit.freedesktop.org/libreoffice/calc/commit/?id=e5d0ab65f918a3a90d1b7fa4fdf7ee5c2ee89535 > > > > cherry-picked to the -3-4 branch. > > Looks fine to me, I've pushed it to libreoffice-3-4. I'd love to > have > this approved for libreoffice-3-4-2 [ basically the aggregate fix] so we > can get that into rc3. > > Another couple of approvals appreciated. > > Thanks, > > Michael. > > diff --git a/sc/source/core/data/dpobject.cxx > b/sc/source/core/data/dpobject.cxx > index 4426763..d87629a 100644 > --- a/sc/source/core/data/dpobject.cxx > +++ b/sc/source/core/data/dpobject.cxx > @@ -84,7 +84,6 @@ > using namespace com::sun::star; > using ::std::vector; > using ::std::unary_function; > -using ::std::remove_if; > using ::boost::shared_ptr; > using ::com::sun::star::uno::Sequence; > using ::com::sun::star::uno::Reference; > @@ -2561,7 +2560,7 @@ namespace { > /** > * Unary predicate to match DP objects by the table ID. > */ > -class MatchByTable : public unary_function<bool, ScDPObject> > +class MatchByTable : public unary_function<ScDPObject, bool> > { > SCTAB mnTab; > public: > @@ -2612,9 +2611,7 @@ bool ScDPCollection::ClearCache(ScDPObject* pDPObj) > > void ScDPCollection::DeleteOnTab( SCTAB nTab ) > { > - maTables.erase( > - remove_if(maTables.begin(), maTables.end(), MatchByTable(nTab)), > - maTables.end()); > + maTables.erase_if(MatchByTable(nTab)); > } > > void ScDPCollection::UpdateReference( UpdateRefMode eUpdateRefMode, > > > -- > michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot > > > _______________________________________________ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice >
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
