[Libreoffice-commits] core.git: sw/source

[Bjoern Michaelsen]

 sw/source/core/draw/dcontact.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 01f28ca8c555cc8b6496d155ea466ed6b47ca32b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Feb 28 11:26:44 2017 +0100

    remove UsedOrUnusedVirtObjPred and replace it with a small lambda
    
    Change-Id: I189e5b78aafe03a600194df206ad48076e27ff63
    Reviewed-on: https://gerrit.libreoffice.org/34728
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 78e6710..bdb41f9 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -75,15 +75,6 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    /** unary function used to find a disconnected 'virtual' drawing object */
-    struct UsedOrUnusedVirtObjPred
-    {
-        bool m_bUsedPred;
-        UsedOrUnusedVirtObjPred(bool bUsed) : m_bUsedPred(bUsed) {};
-        bool operator()(const std::unique_ptr<SwDrawVirtObj>& pDrawVirtObj)
-                { return pDrawVirtObj->IsConnected() == m_bUsedPred; };
-    };
-
     /** unary function used to find a 'virtual' drawing object anchored at a given frame */
     struct VirtObjAnchoredAtFramePred
     {
@@ -1687,7 +1678,7 @@ void SwDrawContact::DisconnectObjFromLayout( SdrObject* _pDrawObj )
     else
     {
         const auto ppVirtDrawObj(std::find_if(maDrawVirtObjs.begin(), maDrawVirtObjs.end(),
-                UsedOrUnusedVirtObjPred(true)));
+                [] (const std::unique_ptr<SwDrawVirtObj>& pObj) { return pObj->IsConnected(); }));
         if(ppVirtDrawObj != maDrawVirtObjs.end())
         {
             // replace found 'virtual' drawing object by 'master' drawing