summaryrefslogtreecommitdiffstats
path: root/sw/uiconfig/swreport
diff options
context:
space:
mode:
authorPhilipp Lohmann <Philipp.Lohmann@Sun.COM>2009-10-09 15:11:54 +0200
committerPhilipp Lohmann <Philipp.Lohmann@Sun.COM>2009-10-09 15:11:54 +0200
commit2231280aac5054a14f95716659905e9d0af81ee5 (patch)
treeee9a394f13757d84fa99922df363e1c436b31a58 /sw/uiconfig/swreport
parentfix an erroneously committed merge conflict (diff)
parentCreate DEV300_m61 milestone tag from trunk@276697 (diff)
downloadcore-2231280aac5054a14f95716659905e9d0af81ee5.tar.gz
core-2231280aac5054a14f95716659905e9d0af81ee5.zip
merge with m61
Diffstat (limited to 'sw/uiconfig/swreport')
-rw-r--r--sw/uiconfig/swreport/accelerator/en-GB/default.xml2
-rw-r--r--sw/uiconfig/swreport/accelerator/en-US/default.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/uiconfig/swreport/accelerator/en-GB/default.xml b/sw/uiconfig/swreport/accelerator/en-GB/default.xml
index 0e5e41657cd9..83f88ade9dc1 100644
--- a/sw/uiconfig/swreport/accelerator/en-GB/default.xml
+++ b/sw/uiconfig/swreport/accelerator/en-GB/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>
diff --git a/sw/uiconfig/swreport/accelerator/en-US/default.xml b/sw/uiconfig/swreport/accelerator/en-US/default.xml
index 0e5e41657cd9..83f88ade9dc1 100644
--- a/sw/uiconfig/swreport/accelerator/en-US/default.xml
+++ b/sw/uiconfig/swreport/accelerator/en-US/default.xml
@@ -111,5 +111,5 @@
<accel:item accel:code="KEY_J" accel:shift="true" accel:mod1="true" xlink:href=".uno:FullScreen"/>
<accel:item accel:code="KEY_X" accel:shift="true" accel:mod1="true" xlink:href=".uno:RemoveDirectCharFormats"/>
<accel:item accel:code="KEY_DIVIDE" accel:mod1="true" xlink:href=".uno:InsertZWSP"/>
- <accel:item accel:code="KEY_N" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
+ <accel:item accel:code="KEY_C" accel:mod1="true" accel:mod2="true" xlink:href=".uno:InsertAnnotation"/>
</accel:acceleratorlist>