[Libreoffice-commits] core.git: fpicker/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Sun Nov 15 16:05:25 UTC 2020


 fpicker/source/aqua/SalAquaFilePicker.mm   |    4 ++--
 fpicker/source/aqua/SalAquaFolderPicker.mm |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3eb23bd401ac133ac279b0f901d2ea656d051539
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Nov 12 13:54:15 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Nov 15 17:04:44 2020 +0100

    NSArray index type is NSUInteger, not long
    
    Change-Id: I2c632a873a4fff66c3c440561add9abb7abc45ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105740
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index b8db6d94b663..deff8783bbe9 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -253,12 +253,12 @@ uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
         files = [NSArray arrayWithObjects:[m_pDialog URL], nil];
     }
 
-    long nFiles = [files count];
+    NSUInteger nFiles = [files count];
     SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
 
     uno::Sequence< OUString > aSelectedFiles(nFiles);
 
-    for(long nIndex = 0; nIndex < nFiles; nIndex += 1)
+    for(NSUInteger nIndex = 0; nIndex < nFiles; nIndex += 1)
     {
         NSURL *url = [files objectAtIndex:nIndex];
 
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index e86110f22203..fa1285b053e9 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -114,7 +114,7 @@ OUString SAL_CALL SalAquaFolderPicker::getDirectory()
         files = [static_cast<NSOpenPanel*>(m_pDialog) URLs];
     }
 
-    long nFiles = [files count];
+    NSUInteger nFiles = [files count];
     SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
 
     if (nFiles < 1) {


More information about the Libreoffice-commits mailing list