[Libreoffice-commits] core.git: 5 commits - connectivity/source fpicker/source lingucomponent/source sfx2/source vcl/osx

[Stephan Bergmann]

 connectivity/source/drivers/macab/macaborder.cxx            |    9 ++++-----
 fpicker/source/aqua/SalAquaFilePicker.mm                    |    2 +-
 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |    2 +-
 sfx2/source/appl/shutdowniconaqua.mm                        |    2 +-
 vcl/osx/salmenu.cxx                                         |    2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 1754c4d2abaf4360f973973035e51ba1685847bb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 22:57:22 2015 +0200

    loplugin:loopvartoosmall
    
    Change-Id: I08c484c54e27c55157836d68a28d2a0e580499d9

diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 63fb8ef..0abc5fe 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -439,7 +439,7 @@ void AquaSalMenu::setMainMenu()
         {
             unsetMainMenu();
             // insert our items
-            for( unsigned int i = 0; i < maItems.size(); i++ )
+            for( std::vector<AquaSalMenuItem *>::size_type i = 0; i < maItems.size(); i++ )
             {
                 NSMenuItem* pItem = maItems[i]->mpMenuItem;
                 [mpMenu insertItem: pItem atIndex: i+1];
commit 7a65f6c524a224c26bf6f4c065fdc5aab81724d9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 22:57:18 2015 +0200

    loplugin:loopvartoosmall
    
    Change-Id: I721a9da1f277ce641375411f302557372331e6a2

diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 7d5a37f..234329f 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -216,7 +216,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star
     }
 
     // insert new recent items
-    for ( sal_uInt32 i = 0; i < m_pRecentFilesItems->size(); i++ )
+    for ( std::vector<RecentMenuEntry>::size_type i = 0; i < m_pRecentFilesItems->size(); i++ )
     {
         rtl::OUString   aMenuTitle;
         INetURLObject   aURL( (*m_pRecentFilesItems)[i].aURL );
commit c984b76efc71c106ad480ea29b5effd24a806a34
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 22:57:13 2015 +0200

    loplugin:loopvartoosmall
    
    Change-Id: I33f4e74f97ba52b9240e6304d53eb256bd822060

diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index 609e315..4104641 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -118,7 +118,7 @@ Sequence< Locale > SAL_CALL MacSpellChecker::getLocales()
         NSArray *aLocales = [NSLocale availableLocaleIdentifiers];
 
         //Test for existence of the dictionaries
-        for (unsigned int i = 0; i < [aLocales count]; i++)
+        for (NSUInteger i = 0; i < [aLocales count]; i++)
         {
             NSString* pLangStr = (NSString*)[aLocales objectAtIndex:i];
             if( [macSpell setLanguage:pLangStr ] )
commit 1d25c7102137a4b7eda069fe9dc0d7ba13604ac2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 22:57:07 2015 +0200

    loplugin:loopvartoosmall
    
    Change-Id: Icdaba21efeb8a910617642b7cb4e082f03f7a0ef

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index a760f84..97bc5ed 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -337,7 +337,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno::
 
     uno::Sequence< rtl::OUString > aSelectedFiles(nFiles > 1 ? nFiles + 1 : nFiles);
 
-    for(int nIndex = 0; nIndex < nFiles; nIndex += 1)
+    for(long nIndex = 0; nIndex < nFiles; nIndex += 1)
     {
         NSURL *url = [files objectAtIndex:nIndex];
 
commit 8b9be6fd5ffcc37363efb4228dec9126a8e179a6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 22:57:02 2015 +0200

    loplugin:loopvartoosmall
    
    Change-Id: I63917d68b05d6e2f1248bcf88e27952df201d2c5

diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index 399e179..1a5a8f1 100644
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
@@ -54,8 +54,8 @@ MacabComplexOrder::MacabComplexOrder()
 
 MacabComplexOrder::~MacabComplexOrder()
 {
-    for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
-        delete m_aOrders[i];
+    for (auto p: m_aOrders)
+        delete p;
 }
 
 void MacabComplexOrder::addOrder(MacabOrder *pOrder)
@@ -65,10 +65,9 @@ void MacabComplexOrder::addOrder(MacabOrder *pOrder)
 
 sal_Int32 MacabComplexOrder::compare(const MacabRecord *record1, const MacabRecord *record2) const
 {
-    for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
+    for (auto p: m_aOrders)
     {
-        const MacabOrder *pOrder = m_aOrders[i];
-        sal_Int32 result = pOrder->compare(record1, record2);
+        sal_Int32 result = p->compare(record1, record2);
 
         if (result) return result;
     }