[Libreoffice-commits] core.git: 2 commits - onlineupdate/source slideshow/source

[Jan Holesovsky]

 onlineupdate/source/libmar/tool/mar.c          |    3 +++
 slideshow/source/engine/slide/layermanager.cxx |   25 ++++++++-----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 695cec87d73d56617e1cdc62621971ab35ac67eb
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Aug 12 06:53:04 2015 +0200

    Add the needed #ifndef instead of removing the variable.
    
    This reverts commit 058c924c9385d003eefa728be7b23b2effd73913.
    
    Change-Id: I0418af18177cef350b2bf13008ed54336c54938c

diff --git a/onlineupdate/source/libmar/tool/mar.c b/onlineupdate/source/libmar/tool/mar.c
index 0cf0d9c..8fb1666 100644
--- a/onlineupdate/source/libmar/tool/mar.c
+++ b/onlineupdate/source/libmar/tool/mar.c
@@ -124,6 +124,9 @@ int main(int argc, char **argv) {
   const char *certNames[MAX_SIGNATURES];
   char *MARChannelID = MAR_CHANNEL_ID;
   char *productVersion = MOZ_APP_VERSION;
+#ifndef NO_SIGN_VERIFY
+  uint32_t k;
+#endif
   int rv = -1;
   uint32_t certCount = 0;
   int32_t sigIndex = -1;
commit 1e4b29e1ad16e908f550eae035c3fae8e56831dd
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Aug 12 06:46:46 2015 +0200

    Range-based for-loops.
    
    Change-Id: I6fb0d182dfccb3af42f0bbc60969c72df09b6ce6

diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 7f25df5..2440672 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -142,28 +142,19 @@ namespace slideshow
             // for all shapes, though.
 
             const bool bMoreThanOneLayer(maLayers.size() > 1);
-            if( mnActiveSprites || bMoreThanOneLayer )
+            if (mnActiveSprites || bMoreThanOneLayer)
             {
                 // clear all viewlayers, dump everything but the
                 // background layer - this will also remove all shape
                 // sprites
-                std::for_each( maAllShapes.begin(),
-                               maAllShapes.end(),
-                               []( const LayerShapeMap::value_type& cp )
-                               { cp.first->clearAllViewLayers(); } );
-
-                for (LayerShapeMap::iterator
-                         iShape (maAllShapes.begin()),
-                         iEnd (maAllShapes.end());
-                     iShape!=iEnd;
-                     ++iShape)
-                {
-                    iShape->second.reset();
-                }
+                for (auto& rShape : maAllShapes)
+                    rShape.first->clearAllViewLayers();
+
+                for (auto& rShape : maAllShapes)
+                    rShape.second.reset();
 
-                if( bMoreThanOneLayer )
-                    maLayers.erase(maLayers.begin()+1,
-                                   maLayers.end());
+                if (bMoreThanOneLayer)
+                    maLayers.erase(maLayers.begin() + 1, maLayers.end());
 
                 mbLayerAssociationDirty = true;
             }