commit 880bc4255099132557fe8d7d36a50c06f05cf5a1
author Dr. David Alan Gilbert <dave@treblig.org> Thu Jun 08 21:56:02 2023 +0100
committer Caolán McNamara <caolan.mcnamara@collabora.com> Tue Jun 13 16:22:27 2023 +0200
tree 308d02d8cd4b3bf430c602d0495f6d6947e22177
parent 9bc3c4fa8d380bd7ae5689692cc80f815bed4707

tdf#147021: vcl/* KeyboardReplacements SAL_N_ELEMENTS removal

A couple more tables using SAL_N_ELEMENTS.
(I do wonder why these are separate).
Note, I've not attacked the 'for' use of SAL_N_ELEMENTS in these files
since they require some separate thinking about their indexing.

Change-Id: I7fe66510fce7d59bda34b1f22417a2fb6070b065
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152775
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>

vcl/unx/generic/app/keysymnames.cxx

diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index 16ffaa4..d4842df 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -461,21 +461,21 @@ namespace vcl_sal {

    const struct KeyboardReplacements aKeyboards[] =
    {
        { "ca", aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) },
        { "de", aImplReplacements_German, SAL_N_ELEMENTS(aImplReplacements_German) },
        { "sl", aImplReplacements_Slovenian, SAL_N_ELEMENTS(aImplReplacements_Slovenian) },
        { "es", aImplReplacements_Spanish, SAL_N_ELEMENTS(aImplReplacements_Spanish) },
        { "et", aImplReplacements_Estonian, SAL_N_ELEMENTS(aImplReplacements_Estonian) },
        { "fr", aImplReplacements_French, SAL_N_ELEMENTS(aImplReplacements_French) },
        { "hu", aImplReplacements_Hungarian, SAL_N_ELEMENTS(aImplReplacements_Hungarian) },
        { "it", aImplReplacements_Italian, SAL_N_ELEMENTS(aImplReplacements_Italian) },
        { "lt", aImplReplacements_Lithuanian, SAL_N_ELEMENTS(aImplReplacements_Lithuanian) },
        { "nl", aImplReplacements_Dutch, SAL_N_ELEMENTS(aImplReplacements_Dutch) },
        { "no", aImplReplacements_Norwegian, SAL_N_ELEMENTS(aImplReplacements_Norwegian) },
        { "pt", aImplReplacements_Portuguese, SAL_N_ELEMENTS(aImplReplacements_Portuguese) },
        { "ru", aImplReplacements_Russian, SAL_N_ELEMENTS(aImplReplacements_Russian) },
        { "sv", aImplReplacements_Swedish, SAL_N_ELEMENTS(aImplReplacements_Swedish) },
        { "tr", aImplReplacements_Turkish, SAL_N_ELEMENTS(aImplReplacements_Turkish) },
        { "ca", aImplReplacements_Catalan, std::size(aImplReplacements_Catalan) },
        { "de", aImplReplacements_German, std::size(aImplReplacements_German) },
        { "sl", aImplReplacements_Slovenian, std::size(aImplReplacements_Slovenian) },
        { "es", aImplReplacements_Spanish, std::size(aImplReplacements_Spanish) },
        { "et", aImplReplacements_Estonian, std::size(aImplReplacements_Estonian) },
        { "fr", aImplReplacements_French, std::size(aImplReplacements_French) },
        { "hu", aImplReplacements_Hungarian, std::size(aImplReplacements_Hungarian) },
        { "it", aImplReplacements_Italian, std::size(aImplReplacements_Italian) },
        { "lt", aImplReplacements_Lithuanian, std::size(aImplReplacements_Lithuanian) },
        { "nl", aImplReplacements_Dutch, std::size(aImplReplacements_Dutch) },
        { "no", aImplReplacements_Norwegian, std::size(aImplReplacements_Norwegian) },
        { "pt", aImplReplacements_Portuguese, std::size(aImplReplacements_Portuguese) },
        { "ru", aImplReplacements_Russian, std::size(aImplReplacements_Russian) },
        { "sv", aImplReplacements_Swedish, std::size(aImplReplacements_Swedish) },
        { "tr", aImplReplacements_Turkish, std::size(aImplReplacements_Turkish) },
    };

    // translate keycodes, used within the displayed menu shortcuts

vcl/win/window/keynames.cxx

diff --git a/vcl/win/window/keynames.cxx b/vcl/win/window/keynames.cxx
index 8f09964..e30f728 100644
--- a/vcl/win/window/keynames.cxx
+++ b/vcl/win/window/keynames.cxx
@@ -192,13 +192,13 @@ namespace vcl_sal {

    const struct KeyboardReplacements aKeyboards[] =
    {
        { "ast",aImplReplacements_Asturian, SAL_N_ELEMENTS(aImplReplacements_Asturian) },
        { "ca", aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) },
        { "et", aImplReplacements_Estonian, SAL_N_ELEMENTS(aImplReplacements_Estonian) },
        { "hu", aImplReplacements_Hungarian, SAL_N_ELEMENTS(aImplReplacements_Hungarian) },
        { "lt", aImplReplacements_Lithuanian, SAL_N_ELEMENTS(aImplReplacements_Lithuanian) },
        { "sl", aImplReplacements_Slovenian, SAL_N_ELEMENTS(aImplReplacements_Slovenian) },
        { "es", aImplReplacements_Spanish, SAL_N_ELEMENTS(aImplReplacements_Spanish) },
        { "ast",aImplReplacements_Asturian, std::size(aImplReplacements_Asturian) },
        { "ca", aImplReplacements_Catalan, std::size(aImplReplacements_Catalan) },
        { "et", aImplReplacements_Estonian, std::size(aImplReplacements_Estonian) },
        { "hu", aImplReplacements_Hungarian, std::size(aImplReplacements_Hungarian) },
        { "lt", aImplReplacements_Lithuanian, std::size(aImplReplacements_Lithuanian) },
        { "sl", aImplReplacements_Slovenian, std::size(aImplReplacements_Slovenian) },
        { "es", aImplReplacements_Spanish, std::size(aImplReplacements_Spanish) },
    };

    // translate keycodes, used within the displayed menu shortcuts