diff options
| author | Christian Dywan <christian.dywan@lanedo.com> | 2011-04-14 15:34:51 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-15 22:13:36 +0200 |
| commit | 2a9ab74e24a6bf9d7167e64c11b2ecda5eadbe87 (patch) | |
| tree | ca11bb9bedd2b3c560d4b085fcf505d2dd5691bb | |
| parent | 9be31e132e6314879cf495052a5e11120e15ede0 (diff) | |
Remove unneeded minus and plus keyboard aliases
Fixes: fdo#36235
| -rw-r--r-- | vcl/unx/source/app/keysymnames.cxx | 18 | ||||
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 4 |
2 files changed, 2 insertions, 20 deletions
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx index 3ea61eb86bdc..80623499897f 100644 --- a/vcl/unx/source/app/keysymnames.cxx +++ b/vcl/unx/source/app/keysymnames.cxx @@ -95,8 +95,6 @@ namespace vcl_sal { { XK_Control_R, "Ctrl" }, { XK_Escape, "Esc" }, { XK_space, "Space" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_Turkish[] = @@ -152,8 +150,6 @@ namespace vcl_sal { { SunXK_Paste, "Einsetzen" }, { SunXK_Find, "Suchen" }, { SunXK_Cut, "Ausschneiden" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_French[] = @@ -184,8 +180,6 @@ namespace vcl_sal { { SunXK_Paste, "Coller" }, { SunXK_Find, "Cher." }, { SunXK_Cut, "Couper" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_Italian[] = @@ -215,8 +209,6 @@ namespace vcl_sal { { SunXK_Paste, "Incolla" }, { SunXK_Find, "Trova" }, { SunXK_Cut, "Taglia" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_Dutch[] = @@ -241,8 +233,6 @@ namespace vcl_sal { { SunXK_Paste, "Paste" }, { SunXK_Find, "Find" }, { SunXK_Cut, "Cut" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_Norwegian[] = @@ -268,8 +258,6 @@ namespace vcl_sal { { SunXK_Paste, "Lim" }, { SunXK_Find, "Søk" }, { SunXK_Cut, "Klipp" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_Swedish[] = @@ -296,8 +284,6 @@ namespace vcl_sal { { SunXK_Paste, "Klistra in" }, { SunXK_Find, "Sök" }, { SunXK_Cut, "Klipp ut" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_Portuguese[] = @@ -322,8 +308,6 @@ namespace vcl_sal { { SunXK_Paste, "Paste" }, { SunXK_Find, "Find" }, { SunXK_Cut, "Cut" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeysymNameReplacement aImplReplacements_Spanish[] = @@ -354,8 +338,6 @@ namespace vcl_sal { { SunXK_Paste, "Pegar" }, { SunXK_Find, "Buscar" }, { SunXK_Cut, "Cortar" }, - { XK_minus, "-" }, - { XK_plus, "+" } }; static const struct KeyboardReplacements aKeyboards[] = diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index f3527ff3cead..65f6f471323d 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -1290,10 +1290,10 @@ XubString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const nKeySym = GetServerVendor() == vendor_sun ? SunXK_Cut : XK_L10; break; case KEY_ADD: - nKeySym = XK_plus; + aCustomKeyName = '+'; break; case KEY_SUBTRACT: - nKeySym = XK_minus; + aCustomKeyName = '-'; break; case KEY_MULTIPLY: nKeySym = XK_asterisk; |