[Libreoffice-commits] core.git: 2 commits - svx/source ucb/source

[Noel Grandin (via logerrit)]

 svx/source/tbxctrls/fontworkgallery.cxx    |    4 ++--
 ucb/source/ucp/webdav-neon/NeonSession.cxx |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f7e4a52411255b61e8fcc4172e67c9f86cf25e36
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jul 8 11:12:02 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Jul 8 12:54:09 2019 +0200

    fix loop variable type
    
    it's not a std::vector<Bitmap>, it's a std::vector<BitmapEx>
    
    Change-Id: I4a315f98bab4c432d6b136cb7bad75cf29899e66
    Reviewed-on: https://gerrit.libreoffice.org/75200
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index aa832961b0b8..7d9c5b974438 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -146,7 +146,7 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId)
     aThumbSize.AdjustWidth( -12 );
     aThumbSize.AdjustHeight( -12 );
 
-    std::vector< Bitmap * >::size_type nFavCount = maFavoritesHorizontal.size();
+    auto nFavCount = maFavoritesHorizontal.size();
 
     // ValueSet favorites
     if( nFavCount > (nColCount * nLineCount) )
@@ -158,7 +158,7 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId)
 
     maCtlFavorites.Clear();
 
-    for( std::vector<Bitmap *>::size_type nFavorite = 1; nFavorite <= nFavCount; nFavorite++ )
+    for( size_t nFavorite = 1; nFavorite <= nFavCount; nFavorite++ )
     {
         OUString aStr(SvxResId(RID_SVXFLOAT3D_FAVORITE));
         aStr += " ";
commit ed920b71b846a25472bc290e1613b0b6dd76f5f4
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Jul 8 09:14:31 2019 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Jul 8 12:53:57 2019 +0200

    Simplify lastChanceToSendRefreshRequest calculation
    
    Change-Id: I5c716f641e3d45572f4de01b52316377a21655af
    Reviewed-on: https://gerrit.libreoffice.org/75192
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index a075268806c8..7ee9c56d4807 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1526,8 +1526,7 @@ namespace
             sal_Int32 calltime = aEnd.Seconds - rStart.Seconds;
             if ( calltime <= timeout )
             {
-                lastChanceToSendRefreshRequest
-                    = aEnd.Seconds + timeout - calltime;
+                lastChanceToSendRefreshRequest = rStart.Seconds + timeout;
             }
             else
             {