mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#97906 Calc: Correct cell reference shortcut keys

Browse Source 
Remove Shift+F4 shortcut key for cell reference and add it to the OOo
Legacy compatibility mode. Improve wording of cell reference error
message. Unify shortcut for Data Sources to Ctrl + Shift + F4.

Change-Id: I0f4ab3768d2663984bb294763c2e4b299c5e8186
Reviewed-on: https://gerrit.libreoffice.org/22803
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
This commit is contained in:
Yousuf Philips
2016-03-01 11:48:11 +04:00
parent 61a91be4aa
commit d9f751a416
3 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
View File

@@ -87,7 +87,7 @@
<value xml:lang="en-US">.uno:MacroDialog</value> <value xml:lang="en-US">.uno:MacroDialog</value>
</prop> </prop>
</node> </node>
<node oor:name="F4" oor:op="replace"> <node oor:name="F4_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"> <prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ViewDataSourceBrowser</value> <value xml:lang="en-US">.uno:ViewDataSourceBrowser</value>
@@ -347,7 +347,7 @@
<value xml:lang="en-US">.uno:Delete</value> <value xml:lang="en-US">.uno:Delete</value>
</prop> </prop>
</node> </node>
<node oor:name="F4" oor:op="replace"> <node oor:name="F4_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command"> <prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ViewDataSourceBrowser</value> <value xml:lang="en-US">.uno:ViewDataSourceBrowser</value>
@@ -768,24 +768,6 @@
<value xml:lang="en-US">.uno:ToggleRelative</value> <value xml:lang="en-US">.uno:ToggleRelative</value>
</prop> </prop>
</node> </node>
<node oor:name="F4_SHIFT" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ToggleRelative</value>
</prop>
</node>
<node oor:name="F4_SHIFT_MOD1" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ViewDataSourceBrowser</value>
</prop>
</node>
<node oor:name="F4_SHIFT_MOD3" oor:op="replace">
<prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
<value xml:lang="en-US">.uno:ViewDataSourceBrowser</value>
</prop>
</node>
<node oor:name="F5" oor:op="replace"> <node oor:name="F5" oor:op="replace">
<prop oor:name="Command"> <prop oor:name="Command">
<value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>

12
sc/source/ui/docshell/docsh.cxx
View File

@@ -3008,11 +3008,11 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
aCtrlShiftF4.Modifiers = awt::KeyModifier::MOD1 | awt::KeyModifier::SHIFT; aCtrlShiftF4.Modifiers = awt::KeyModifier::MOD1 | awt::KeyModifier::SHIFT;
aKeys.push_back(&aCtrlShiftF4); aKeys.push_back(&aCtrlShiftF4);
// CTRL+SHIFT+F4 Mac // SHIFT+F4
awt::KeyEvent aCtrlShiftF4Mac; awt::KeyEvent aShiftF4;
aCtrlShiftF4Mac.KeyCode = awt::Key::F4; aShiftF4.KeyCode = awt::Key::F4;
aCtrlShiftF4Mac.Modifiers = awt::KeyModifier::MOD3 | awt::KeyModifier::SHIFT; aShiftF4.Modifiers = awt::KeyModifier::SHIFT;
aKeys.push_back(&aCtrlShiftF4Mac); aKeys.push_back(&aShiftF4);
// Remove all involved keys first, because swapping commands don't work // Remove all involved keys first, because swapping commands don't work
// well without doing this. // well without doing this.
@@ -3028,13 +3028,13 @@ void ScDocShell::ResetKeyBindings( ScOptionsUtil::KeyBindingType eType )
xScAccel->setKeyEvent(aAltDown, ".uno:DataSelect"); xScAccel->setKeyEvent(aAltDown, ".uno:DataSelect");
xScAccel->setKeyEvent(aF4, ".uno:ToggleRelative"); xScAccel->setKeyEvent(aF4, ".uno:ToggleRelative");
xScAccel->setKeyEvent(aCtrlShiftF4, ".uno:ViewDataSourceBrowser"); xScAccel->setKeyEvent(aCtrlShiftF4, ".uno:ViewDataSourceBrowser");
xScAccel->setKeyEvent(aCtrlShiftF4Mac, ".uno:ViewDataSourceBrowser");
break; break;
case ScOptionsUtil::KEY_OOO_LEGACY: case ScOptionsUtil::KEY_OOO_LEGACY:
xScAccel->setKeyEvent(aDelete, ".uno:Delete"); xScAccel->setKeyEvent(aDelete, ".uno:Delete");
xScAccel->setKeyEvent(aBackspace, ".uno:ClearContents"); xScAccel->setKeyEvent(aBackspace, ".uno:ClearContents");
xScAccel->setKeyEvent(aCtrlD, ".uno:DataSelect"); xScAccel->setKeyEvent(aCtrlD, ".uno:DataSelect");
xScAccel->setKeyEvent(aF4, ".uno:ViewDataSourceBrowser"); xScAccel->setKeyEvent(aF4, ".uno:ViewDataSourceBrowser");
xScAccel->setKeyEvent(aShiftF4, ".uno:ToggleRelative");
break; break;
default: default:
; ;

2
sc/source/ui/src/globstr.src
View File

@@ -1391,7 +1391,7 @@ Resource RID_GLOBSTR
}; };
String STR_ERR_NOREF String STR_ERR_NOREF
{ {
Text [ en-US ] = "No references found." ; Text [ en-US ] = "No cell references are found in the selected cells." ;
}; };
String STR_ERR_LINKOVERLAP String STR_ERR_LINKOVERLAP
{ {