diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2017-02-28 11:26:44 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2017-03-01 13:20:56 +0000 |
| commit | 01f28ca8c555cc8b6496d155ea466ed6b47ca32b (patch) | |
| tree | 0b97ee00a86c1c5471a86a7b10d6d147254ce421 /sw | |
| parent | 720dc84b855b6f200d97882157ac07d96207ffab (diff) | |
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@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 78e67105190a..bdb41f98bb39 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 |