[Libreoffice-commits] core.git: cui/source include/vcl vcl/source

Muhammet Kara (via logerrit) logerrit at kemper.freedesktop.org
Sat Feb 1 13:14:22 UTC 2020


 cui/source/customize/acccfg.cxx |    4 ++--
 include/vcl/svapp.hxx           |    4 ++--
 vcl/source/app/svapp.cxx        |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 08edc74a6b6ccf0d4d1560f57ec99a1ad9b390ce
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Feb 1 14:20:44 2020 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sat Feb 1 14:13:49 2020 +0100

    sal_uLong to size_t for sizeof related types
    
    Change-Id: I00055ffd7b79d2e5637b69390ca516f11b0cffd9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87801
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index cb1ed554d501..ca602f8e96be 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1032,8 +1032,8 @@ void SfxAcceleratorConfigPage::Init(const uno::Reference<ui::XAcceleratorConfigu
     }
 
     // Map the VCL hardcoded key codes and mark them as not changeable
-    sal_uLong c3 = Application::GetReservedKeyCodeCount();
-    sal_uLong i3 = 0;
+    size_t c3 = Application::GetReservedKeyCodeCount();
+    size_t i3 = 0;
     for (i3 = 0; i3 < c3; ++i3)
     {
         const vcl::KeyCode* pKeyCode = Application::GetReservedKeyCode(i3);
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 61a7443c5cec..0fa4b08d7600 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1038,7 +1038,7 @@ public:
 
      @see GetReservedKeyCode
     */
-    static sal_uLong            GetReservedKeyCodeCount();
+    static size_t               GetReservedKeyCodeCount();
 
     /** Get the reserved key code.
 
@@ -1048,7 +1048,7 @@ public:
 
      @see GetReservedKeyCodeCount
     */
-    static const vcl::KeyCode*  GetReservedKeyCode( sal_uLong i );
+    static const vcl::KeyCode*  GetReservedKeyCode( size_t i );
 
     ///@}
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a5aefbbf2f2f..14674da4ff3b 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -274,12 +274,12 @@ void Application::Abort( const OUString& rErrorText )
     SalAbort( rErrorText, dumpCore );
 }
 
-sal_uLong Application::GetReservedKeyCodeCount()
+size_t Application::GetReservedKeyCodeCount()
 {
     return SAL_N_ELEMENTS(ReservedKeys);
 }
 
-const vcl::KeyCode* Application::GetReservedKeyCode( sal_uLong i )
+const vcl::KeyCode* Application::GetReservedKeyCode( size_t i )
 {
     if( i >= GetReservedKeyCodeCount() )
         return nullptr;


More information about the Libreoffice-commits mailing list