[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sw/source

[Miklos Vajna]

 sw/source/core/doc/docbm.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c5b7485354ad9d99f4d7762ac32ddfb17bff4767
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 8 18:36:11 2014 +0100

    sw: one more bind -> boost::bind
    
    Change-Id: I6f3d36f0b0775559f3f0617d273a4f4595feda76

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index c70612e..7ac32fa 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -847,7 +847,7 @@ namespace sw { namespace mark
             find_if(
                 pMarkLow,
                 pMarkHigh,
-                boost::bind(equal_to<const IMark*>(), bind(&boost::shared_ptr<IMark>::get, _1), pMark) );
+                boost::bind(equal_to<const IMark*>(), boost::bind(&boost::shared_ptr<IMark>::get, _1), pMark) );
         if(pMarkFound != pMarkHigh)
             deleteMark(pMarkFound);
     }
commit 58372eeaddb499185259cf4067cf9e251703a5b0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 8 18:21:32 2014 +0100

    sw: try to fix Windows build
    
    Change-Id: If6423d2ee942e0e0a27c61c69b995fedee5f5f7e

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 3690917..c70612e 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -841,13 +841,13 @@ namespace sw { namespace mark
                 m_vAllMarks.begin(),
                 m_vAllMarks.end(),
                 pMark->GetMarkStart(),
-                bind(&IMark::StartsBefore, _1, _2) );
+                sw::mark::CompareIMarkStartsBefore());
         iterator_t pMarkHigh = m_vAllMarks.end();
         iterator_t pMarkFound =
             find_if(
                 pMarkLow,
                 pMarkHigh,
-                bind(equal_to<const IMark*>(), bind(&boost::shared_ptr<IMark>::get, _1), pMark) );
+                boost::bind(equal_to<const IMark*>(), bind(&boost::shared_ptr<IMark>::get, _1), pMark) );
         if(pMarkFound != pMarkHigh)
             deleteMark(pMarkFound);
     }