[Libreoffice-commits] .: 4 commits - officecfg/registry svx/inc svx/source

Kohei Yoshida kohei at kemper.freedesktop.org
Wed Oct 13 21:40:41 PDT 2010


 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |    5 
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs       |   98 ++--------
 svx/inc/svx/dialogs.hrc                                        |   11 -
 svx/source/src/app.hrc                                         |    2 
 4 files changed, 42 insertions(+), 74 deletions(-)

New commits:
commit d55b4b7018d750e7389a3069b7b627c85cfa8f5c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 14 00:32:24 2010 -0400

    Use Ctrl-Shift-D to launch selection list in Calc.

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 5829996..c40fb77 100755
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -437,6 +437,11 @@
       <value xml:lang="en-US">.uno:FillDown</value>
      </prop>
     </node>
+    <node oor:name="D_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:DataSelect</value>
+     </prop>
+    </node>
     <node oor:name="END" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:GoToEndOfRow</value>
commit b8242e106203832a6338e73bf36cce239f9ca81f
Merge: 206d6a4... 65bfd5b...
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Oct 13 23:21:50 2010 -0400

    Merge branch 'master' into feature/calc-key-binding-compat

commit 206d6a474256dc4c7464cfb1d6830750c8712df2
Merge: 1b75058... 65e1613...
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 11 20:40:27 2010 -0400

    Merge branch 'master' into feature/calc-key-binding-compat

commit 1b750582d4ccc8a84bce07d3ebc68ef844a92b6c
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 11 17:04:57 2010 -0400

    New options tab page for Calc's compatibility settings.

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 3a9cd02..efec263 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1542,74 +1542,34 @@
                 </prop>
             </group>
         </group>
+        <group oor:name="Compatibility">
+            <info>
+                <desc>Contains various compatibility settings.</desc>
+            </info>
+            <group oor:name="KeyBindings">
+                <info>
+                    <desc>Contains options related to key bindings</desc>
+                </info>
+                <prop oor:name="BaseGroup" oor:type="xs:int">
+                    <!-- UIHints: Tools - Options - Spreadsheet - Compatibility -->
+                    <info>
+                        <author>Kohei Yoshida</author>
+                        <desc>Specifies baseline key binding group to use.</desc>
+                    </info>
+                    <constraints>
+                        <enumeration oor:value="0">
+                            <info>
+                                <desc>Default</desc>
+                            </info>
+                        </enumeration>
+                        <enumeration oor:value="1">
+                            <info>
+                                <desc>OpenOffice.org legacy</desc>
+                            </info>
+                        </enumeration>
+                    </constraints>
+                </prop>
+            </group>
+        </group>
 	</component>
 </oor:component-schema>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 5315ffb..e33e90d 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -1053,16 +1053,17 @@
 #define SID_SC_TP_MISC					(RID_OFA_START + 239)
 #define OFA_TP_TABPROPERTIES_TEXT	    (RID_OFA_START + 245)
 #define OFA_TP_HELPERPROG               (RID_OFA_START + 249)
+#define SID_SC_TP_FORMULA               (RID_OFA_START + 257)
+#define SID_SC_TP_COMPATIBILITY         (RID_OFA_START + 258)
 
 // ----------------------------------------------------------------------------
 // ooo-build specific resources
 
 #define SVX_OOO_BUILD_START             (RID_SVX_START + 1200)
 
-#define SID_SC_TP_FORMULA               (SVX_OOO_BUILD_START + 1)
-#define RID_SVXBMP_DOC_MODIFIED_YES     (SVX_OOO_BUILD_START + 2)
-#define RID_SVXBMP_DOC_MODIFIED_NO      (SVX_OOO_BUILD_START + 3)
-#define RID_SVXSTR_DOC_MODIFIED_YES     (SVX_OOO_BUILD_START + 4)
-#define RID_SVXSTR_DOC_MODIFIED_NO      (SVX_OOO_BUILD_START + 5)
+#define RID_SVXBMP_DOC_MODIFIED_YES     (SVX_OOO_BUILD_START + 1)
+#define RID_SVXBMP_DOC_MODIFIED_NO      (SVX_OOO_BUILD_START + 2)
+#define RID_SVXSTR_DOC_MODIFIED_YES     (SVX_OOO_BUILD_START + 3)
+#define RID_SVXSTR_DOC_MODIFIED_NO      (SVX_OOO_BUILD_START + 4)
 
 #endif
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 1cdc416..5fb1bfc 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -201,6 +201,8 @@
 #define	RID_OFA_TP_INTERNATIONAL_IMPR	(RID_OFA_START + 254)		// 4 impress
 #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
 #define RID_SW_TP_OPTCAPTION_PAGE       (RID_OFA_START + 256)
+#define SID_SC_TP_FORMULA               (RID_OFA_START + 257)
+#define SID_SC_TP_COMPATIBILITY         (RID_OFA_START + 258)
 
 // Strings ------------------------------------------
 


More information about the Libreoffice-commits mailing list