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

Stephan Bergmann sbergman at redhat.com
Sat Aug 8 06:17:00 PDT 2015


 chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx |    2 +-
 extensions/source/logging/logger.cxx                               |    2 +-
 slideshow/source/engine/pointersymbol.cxx                          |    2 +-
 sw/source/core/doc/docbm.cxx                                       |   10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8a7b4d5bb51b9d3d827bc4d0c8c7861f0935060c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Aug 8 15:16:34 2015 +0200

    Explicit capture annotations
    
    Change-Id: I7be1a36196a07a80a7b7173c3869621f5d707204

diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
index 7f13479..30a2e63 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
@@ -57,7 +57,7 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec
                 aAny >>= aCID;
                 ObjectType eType = ObjectIdentifier::getObjectType(aCID);
                 bCorrectObjectSelected = std::any_of(maTypes.begin(), maTypes.end(),
-                        [=](const ObjectType& eTypeInVector) { return eType == eTypeInVector; });
+                        [eType](const ObjectType& eTypeInVector) { return eType == eTypeInVector; });
             }
         }
     }
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 654994e..5a62c89 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -174,7 +174,7 @@ namespace logging
             return;
 
         m_aHandlers.forEach< XLogHandler >(
-            [&] (Reference<XLogHandler> const& rxListener) { rxListener->publish(_rRecord); } );
+            [&_rRecord] (Reference<XLogHandler> const& rxListener) { rxListener->publish(_rRecord); } );
         m_aHandlers.forEach< XLogHandler >(
             [] (Reference<XLogHandler> const& rxListener) { rxListener->flush(); } );
     }
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index eed4056..7b33333 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -66,7 +66,7 @@ PointerSymbol::PointerSymbol( uno::Reference<rendering::XBitmap> const &   xBitm
 {
     std::for_each( rViewContainer.begin(),
                    rViewContainer.end(),
-                   [&]( const UnoViewSharedPtr& sp )
+                   [this]( const UnoViewSharedPtr& sp )
                    { this->viewAdded(sp); } );
 }
 
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 536cd7a..ff66dbf 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -166,7 +166,7 @@ namespace
             rMarks.begin(),
             pCandidatesEnd,
             back_inserter(vCandidates),
-            [&] (IDocumentMarkAccess::pMark_t const& rpMark) { return !rpMark->EndsBefore(rPos); } );
+            [&rPos] (IDocumentMarkAccess::pMark_t const& rpMark) { return !rpMark->EndsBefore(rPos); } );
         // no candidate left => we are in front of the first mark or there are none
         if(vCandidates.empty()) return NULL;
         // return the highest (last) candidate using mark end ordering
@@ -267,7 +267,7 @@ namespace
         return find_if(
             ppMarksBegin,
             ppMarksEnd,
-            [&] (IDocumentMarkAccess::pMark_t const& rpMark) { return rpMark->GetName() == rName; } );
+            [&rName] (IDocumentMarkAccess::pMark_t const& rpMark) { return rpMark->GetName() == rName; } );
     }
 
 #if 0
@@ -958,7 +958,7 @@ namespace sw { namespace mark
             find_if(
                 pMarkLow,
                 pMarkHigh,
-                [&] (pMark_t const& rpMark) { return rpMark.get() == pMark; } );
+                [pMark] (pMark_t const& rpMark) { return rpMark.get() == pMark; } );
         if(pMarkFound != pMarkHigh)
             deleteMark(pMarkFound);
     }
@@ -1014,7 +1014,7 @@ namespace sw { namespace mark
         const_iterator_t pFieldmark = find_if(
             m_vFieldmarks.begin(),
             m_vFieldmarks.end(),
-            [&] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } );
+            [&rPos] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } );
         if(pFieldmark == m_vFieldmarks.end()) return NULL;
         return dynamic_cast<IFieldmark*>(pFieldmark->get());
     }
@@ -1080,7 +1080,7 @@ namespace sw { namespace mark
         const_iterator_t pAnnotationMark = find_if(
             m_vAnnotationMarks.begin(),
             m_vAnnotationMarks.end(),
-            [&] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } );
+            [&rPos] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } );
         if (pAnnotationMark == m_vAnnotationMarks.end())
             return NULL;
         return pAnnotationMark->get();


More information about the Libreoffice-commits mailing list